From 8f1a7d52d2b64e934f8bc4f53c4adc4d752afd12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Thu, 20 Jan 2022 11:59:50 +0100 Subject: [PATCH] fix(rn,build) fix use of "bare" relative path The Metro bundler gets confused and the result of such import statements is `undefined`. --- react/features/base/participants/middleware.js | 4 ++-- react/features/polls/components/native/PollItem.js | 4 ++-- react/features/polls/components/native/PollsList.js | 4 +--- react/features/polls/components/web/PollsList.js | 2 +- react/features/polls/components/web/PollsPane.js | 3 +-- .../video-menu/components/AbstractGrantModeratorButton.js | 2 +- react/features/video-menu/components/AbstractKickButton.js | 2 +- .../video-menu/components/AbstractMuteEveryoneElseButton.js | 2 +- .../components/AbstractMuteEveryoneElsesVideoButton.js | 2 +- .../features/video-menu/components/AbstractMuteVideoButton.js | 2 +- 10 files changed, 12 insertions(+), 15 deletions(-) diff --git a/react/features/base/participants/middleware.js b/react/features/base/participants/middleware.js index 425ac1bcc..4f01ce3e9 100644 --- a/react/features/base/participants/middleware.js +++ b/react/features/base/participants/middleware.js @@ -46,6 +46,7 @@ import { localParticipantLeft, participantLeft, participantUpdated, + raiseHand, raiseHandUpdateQueue, setLoadableAvatarUrl } from './actions'; @@ -64,12 +65,11 @@ import { getParticipantDisplayName, getRaiseHandsQueue, getRemoteParticipants, + hasRaisedHand, isLocalParticipantModerator } from './functions'; import { PARTICIPANT_JOINED_FILE, PARTICIPANT_LEFT_FILE } from './sounds'; -import { hasRaisedHand, raiseHand } from '.'; - declare var APP: Object; /** diff --git a/react/features/polls/components/native/PollItem.js b/react/features/polls/components/native/PollItem.js index 64a73cb89..98a45ff87 100644 --- a/react/features/polls/components/native/PollItem.js +++ b/react/features/polls/components/native/PollItem.js @@ -6,10 +6,10 @@ import { useSelector } from 'react-redux'; import { shouldShowResults } from '../../functions'; +import PollAnswer from './PollAnswer'; +import PollResults from './PollResults'; import { chatStyles } from './styles'; -import { PollAnswer, PollResults } from '.'; - type Props = { /** diff --git a/react/features/polls/components/native/PollsList.js b/react/features/polls/components/native/PollsList.js index 499b64445..e26c6d43c 100644 --- a/react/features/polls/components/native/PollsList.js +++ b/react/features/polls/components/native/PollsList.js @@ -4,13 +4,11 @@ import { FlatList } from 'react-native'; import { Text } from 'react-native-paper'; import { useSelector } from 'react-redux'; +import PollItem from './PollItem'; import { chatStyles } from './styles'; -import { PollItem } from '.'; - const PollsList = () => { - const polls = useSelector(state => state['features/polls'].polls); const { t } = useTranslation(); const listPolls = Object.keys(polls); diff --git a/react/features/polls/components/web/PollsList.js b/react/features/polls/components/web/PollsList.js index 536d3e8cd..d22bf3a28 100644 --- a/react/features/polls/components/web/PollsList.js +++ b/react/features/polls/components/web/PollsList.js @@ -6,7 +6,7 @@ import { useSelector } from 'react-redux'; import { Icon, IconChatUnread } from '../../../base/icons'; -import { PollItem } from '.'; +import PollItem from './PollItem'; const PollsList = () => { const { t } = useTranslation(); diff --git a/react/features/polls/components/web/PollsPane.js b/react/features/polls/components/web/PollsPane.js index 74bc159d4..7b4f70bca 100644 --- a/react/features/polls/components/web/PollsPane.js +++ b/react/features/polls/components/web/PollsPane.js @@ -5,12 +5,11 @@ import React from 'react'; import AbstractPollsPane from '../AbstractPollsPane'; import type { AbstractProps } from '../AbstractPollsPane'; +import PollCreate from './PollCreate'; import PollsList from './PollsList'; -import { PollCreate } from '.'; const PollsPane = (props: AbstractProps) => { - const { createMode, onCreate, setCreateMode, t } = props; return createMode diff --git a/react/features/video-menu/components/AbstractGrantModeratorButton.js b/react/features/video-menu/components/AbstractGrantModeratorButton.js index fdf4ad0e8..1e419fc02 100644 --- a/react/features/video-menu/components/AbstractGrantModeratorButton.js +++ b/react/features/video-menu/components/AbstractGrantModeratorButton.js @@ -10,7 +10,7 @@ import { } from '../../base/participants'; import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components'; -import { GrantModeratorDialog } from '.'; +import { GrantModeratorDialog } from './'; export type Props = AbstractButtonProps & { diff --git a/react/features/video-menu/components/AbstractKickButton.js b/react/features/video-menu/components/AbstractKickButton.js index 10c475e26..471c61a91 100644 --- a/react/features/video-menu/components/AbstractKickButton.js +++ b/react/features/video-menu/components/AbstractKickButton.js @@ -4,7 +4,7 @@ import { openDialog } from '../../base/dialog'; import { IconCloseCircle } from '../../base/icons'; import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components'; -import { KickRemoteParticipantDialog } from '.'; +import { KickRemoteParticipantDialog } from './'; export type Props = AbstractButtonProps & { diff --git a/react/features/video-menu/components/AbstractMuteEveryoneElseButton.js b/react/features/video-menu/components/AbstractMuteEveryoneElseButton.js index 11bafc438..72d46ee36 100644 --- a/react/features/video-menu/components/AbstractMuteEveryoneElseButton.js +++ b/react/features/video-menu/components/AbstractMuteEveryoneElseButton.js @@ -5,7 +5,7 @@ import { openDialog } from '../../base/dialog'; import { IconMuteEveryone } from '../../base/icons'; import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components'; -import { MuteEveryoneDialog } from '.'; +import { MuteEveryoneDialog } from './'; export type Props = AbstractButtonProps & { diff --git a/react/features/video-menu/components/AbstractMuteEveryoneElsesVideoButton.js b/react/features/video-menu/components/AbstractMuteEveryoneElsesVideoButton.js index 0265cc289..d1ad20095 100644 --- a/react/features/video-menu/components/AbstractMuteEveryoneElsesVideoButton.js +++ b/react/features/video-menu/components/AbstractMuteEveryoneElsesVideoButton.js @@ -5,7 +5,7 @@ import { openDialog } from '../../base/dialog'; import { IconMuteVideoEveryone } from '../../base/icons'; import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components'; -import { MuteEveryonesVideoDialog } from '.'; +import { MuteEveryonesVideoDialog } from './'; export type Props = AbstractButtonProps & { diff --git a/react/features/video-menu/components/AbstractMuteVideoButton.js b/react/features/video-menu/components/AbstractMuteVideoButton.js index 3bf904726..84de39c83 100644 --- a/react/features/video-menu/components/AbstractMuteVideoButton.js +++ b/react/features/video-menu/components/AbstractMuteVideoButton.js @@ -10,7 +10,7 @@ import { MEDIA_TYPE } from '../../base/media'; import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components'; import { isRemoteTrackMuted } from '../../base/tracks'; -import { MuteRemoteParticipantsVideoDialog } from '.'; +import { MuteRemoteParticipantsVideoDialog } from './'; export type Props = AbstractButtonProps & {