From 36cb896680b98c3b4a900a118f1d4a341756e8a3 Mon Sep 17 00:00:00 2001 From: Calin Chitu Date: Thu, 24 Jun 2021 16:26:55 +0300 Subject: [PATCH] feat(native-participants-pane) resolved rebase conflicts and updated import paths --- package.json | 2 +- .../components/AskToUnmuteButton.js | 2 +- .../components/FooterContextMenu.js | 2 +- .../components/ParticipantQuickAction.js | 2 +- .../native/ContextMenuMeetingParticipantDetails.js | 3 +-- .../components/native/MeetingParticipantItem.js | 6 +++--- .../components/native/ParticipantItem.js | 12 ++++++------ .../components/web/LobbyParticipantItem.js | 4 ++-- .../participants-pane/components/web/styled.js | 4 ++-- 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 3a7fe9a37..e6a5f442b 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@react-native-async-storage/async-storage": "1.13.2", "@react-native-community/google-signin": "3.0.1", "@react-native-community/netinfo": "4.1.5", - "@react-native-community/slider": "^3.0.3", + "@react-native-community/slider": "3.0.3", "@svgr/webpack": "4.3.2", "amplitude-js": "8.2.1", "base64-js": "1.3.1", diff --git a/react/features/participants-pane/components/AskToUnmuteButton.js b/react/features/participants-pane/components/AskToUnmuteButton.js index 0200751cf..bcfad07a9 100644 --- a/react/features/participants-pane/components/AskToUnmuteButton.js +++ b/react/features/participants-pane/components/AskToUnmuteButton.js @@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux'; import { approveParticipant } from '../../av-moderation/actions'; -import { QuickActionButton } from './styled'; +import { QuickActionButton } from './web/styled'; type Props = { diff --git a/react/features/participants-pane/components/FooterContextMenu.js b/react/features/participants-pane/components/FooterContextMenu.js index 0115eafcd..d92969af1 100644 --- a/react/features/participants-pane/components/FooterContextMenu.js +++ b/react/features/participants-pane/components/FooterContextMenu.js @@ -22,7 +22,7 @@ import { MuteEveryonesVideoDialog } from '../../video-menu/components'; import { ContextMenu, ContextMenuItem -} from './styled'; +} from './web/styled'; const useStyles = makeStyles(() => { return { diff --git a/react/features/participants-pane/components/ParticipantQuickAction.js b/react/features/participants-pane/components/ParticipantQuickAction.js index 8396473b7..0ec6f5efd 100644 --- a/react/features/participants-pane/components/ParticipantQuickAction.js +++ b/react/features/participants-pane/components/ParticipantQuickAction.js @@ -5,7 +5,7 @@ import React from 'react'; import { QUICK_ACTION_BUTTON } from '../constants'; import AskToUnmuteButton from './AskToUnmuteButton'; -import { QuickActionButton } from './styled'; +import { QuickActionButton } from './web/styled'; type Props = { diff --git a/react/features/participants-pane/components/native/ContextMenuMeetingParticipantDetails.js b/react/features/participants-pane/components/native/ContextMenuMeetingParticipantDetails.js index fc20b98d7..4751f8daa 100644 --- a/react/features/participants-pane/components/native/ContextMenuMeetingParticipantDetails.js +++ b/react/features/participants-pane/components/native/ContextMenuMeetingParticipantDetails.js @@ -10,8 +10,7 @@ import { Avatar } from '../../../base/avatar'; import { hideDialog, openDialog } from '../../../base/dialog/actions'; import BottomSheet from '../../../base/dialog/components/native/BottomSheet'; import { - // eslint-disable-next-line no-unused-vars - Icon, IconCloseCircle, IconConnectionActive, IconMessage, + Icon, IconCloseCircle, IconMessage, IconMicrophoneEmptySlash, IconMuteEveryoneElse, IconVideoOff } from '../../../base/icons'; diff --git a/react/features/participants-pane/components/native/MeetingParticipantItem.js b/react/features/participants-pane/components/native/MeetingParticipantItem.js index 90924948b..67e4dc747 100644 --- a/react/features/participants-pane/components/native/MeetingParticipantItem.js +++ b/react/features/participants-pane/components/native/MeetingParticipantItem.js @@ -8,7 +8,7 @@ import { getIsParticipantVideoMuted } from '../../../base/tracks'; import { showContextMenuDetails } from '../../actions.native'; -import { MediaState } from '../../constants'; +import { MEDIA_STATE } from '../../constants'; import ParticipantItem from './ParticipantItem'; @@ -29,11 +29,11 @@ export const MeetingParticipantItem = ({ participant: p }: Props) => { return ( + videoMuteState = { isVideoMuted ? MEDIA_STATE.Muted : MEDIA_STATE.Unmuted } /> ); }; diff --git a/react/features/participants-pane/components/native/ParticipantItem.js b/react/features/participants-pane/components/native/ParticipantItem.js index 7462d8d9e..46ea3dc2a 100644 --- a/react/features/participants-pane/components/native/ParticipantItem.js +++ b/react/features/participants-pane/components/native/ParticipantItem.js @@ -23,7 +23,7 @@ type Props = { /** * Media state for audio */ - audioMuteState: MediaState, + audioMediaState: MediaState, /** * React children @@ -58,7 +58,7 @@ type Props = { /** * Media state for video */ - videoMuteState: MediaState + videoMediaState: MediaState } /** @@ -72,8 +72,8 @@ function ParticipantItem({ name, onPress, participant: p, - audioMuteState = MediaState.None, - videoMuteState = MediaState.None + audioMediaState = MediaState.None, + videoMediaState = MediaState.None }: Props) { const displayName = name || useSelector(getParticipantDisplayNameWithId(p.id)); @@ -102,8 +102,8 @@ function ParticipantItem({ p.raisedHand && } - {VideoStateIcons[videoMuteState]} - {AudioStateIcons[audioMuteState]} + {VideoStateIcons[videoMediaState]} + {AudioStateIcons[audioMediaState]} } diff --git a/react/features/participants-pane/components/web/LobbyParticipantItem.js b/react/features/participants-pane/components/web/LobbyParticipantItem.js index 30a7a502d..6c0c43e6a 100644 --- a/react/features/participants-pane/components/web/LobbyParticipantItem.js +++ b/react/features/participants-pane/components/web/LobbyParticipantItem.js @@ -4,8 +4,8 @@ import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch } from 'react-redux'; -import { approveKnockingParticipant, rejectKnockingParticipant } from '../../lobby/actions'; -import { ACTION_TRIGGER, MEDIA_STATE } from '../constants'; +import { approveKnockingParticipant, rejectKnockingParticipant } from '../../../lobby/actions'; +import { ACTION_TRIGGER, MEDIA_STATE } from '../../constants'; import ParticipantItem from './ParticipantItem'; import { ParticipantActionButton } from './styled'; diff --git a/react/features/participants-pane/components/web/styled.js b/react/features/participants-pane/components/web/styled.js index 53a443208..c6c076a6e 100644 --- a/react/features/participants-pane/components/web/styled.js +++ b/react/features/participants-pane/components/web/styled.js @@ -1,8 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { Icon, IconHorizontalPoints } from '../../base/icons'; -import { ACTION_TRIGGER } from '../constants'; +import { Icon, IconHorizontalPoints } from '../../../base/icons'; +import { ACTION_TRIGGER } from '../../constants'; export const ignoredChildClassName = 'ignore-child';