chore: remove some cycles

modules/UI/UI.js

@@ -15,7 +15,7 @@ import {
     dockToolbox,
     setToolboxEnabled,
     showToolbox
-} from '../../react/features/toolbox';
+} from '../../react/features/toolbox/actions.web';
 import UIEvents from '../../service/UI/UIEvents';
 
 import EtherpadManager from './etherpad/Etherpad';

modules/UI/etherpad/Etherpad.js

@@ -1,7 +1,7 @@
 /* global $, APP, interfaceConfig */
 
 import { getSharedDocumentUrl, setDocumentEditingState } from '../../../react/features/etherpad';
-import { getToolboxHeight } from '../../../react/features/toolbox';
+import { getToolboxHeight } from '../../../react/features/toolbox/functions.web';
 import Filmstrip from '../videolayout/Filmstrip';
 import LargeContainer from '../videolayout/LargeContainer';
 import VideoLayout from '../videolayout/VideoLayout';

modules/UI/shared_video/SharedVideo.js

@@ -12,12 +12,9 @@ import {
     participantLeft,
     pinParticipant
 } from '../../../react/features/base/participants';
-import {
-    dockToolbox,
-    getToolboxHeight,
-    showToolbox
-} from '../../../react/features/toolbox';
-import { YOUTUBE_PARTICIPANT_NAME } from '../../../react/features/youtube-player';
+import { dockToolbox, showToolbox } from '../../../react/features/toolbox/actions.web';
+import { getToolboxHeight } from '../../../react/features/toolbox/functions.web';
+import { YOUTUBE_PARTICIPANT_NAME } from '../../../react/features/youtube-player/constants';
 import UIEvents from '../../../service/UI/UIEvents';
 import UIUtil from '../util/UIUtil';
 import Filmstrip from '../videolayout/Filmstrip';

react/features/base/participants/components/ParticipantView.native.js

@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { Text, View } from 'react-native';
 
-import { YoutubeLargeVideo } from '../../../youtube-player';
+import { YoutubeLargeVideo } from '../../../youtube-player/components';
 import { Avatar } from '../../avatar';
 import { translate } from '../../i18n';
 import { JitsiParticipantConnectionStatus } from '../../lib-jitsi-meet';

react/features/base/premeeting/components/web/PreMeetingScreen.js

@@ -2,7 +2,7 @@
 
 import React, { PureComponent } from 'react';
 
-import { AudioSettingsButton, VideoSettingsButton } from '../../../../toolbox';
+import { AudioSettingsButton, VideoSettingsButton } from '../../../../toolbox/components/web';
 
 import CopyMeetingUrl from './CopyMeetingUrl';
 import Preview from './Preview';

react/features/base/toolbox/index.js

@@ -1,3 +0,0 @@
-// @flow
-
-export * from './components';

react/features/blur/components/VideoBlurButton.js

@@ -6,8 +6,8 @@ import { createVideoBlurEvent, sendAnalytics } from '../../analytics';
 import { translate } from '../../base/i18n';
 import { IconBlurBackground } from '../../base/icons';
 import { connect } from '../../base/redux';
-import { AbstractButton, BetaTag } from '../../base/toolbox';
-import type { AbstractButtonProps } from '../../base/toolbox';
+import { AbstractButton, BetaTag } from '../../base/toolbox/components';
+import type { AbstractButtonProps } from '../../base/toolbox/components';
 import { toggleBlurEffect } from '../actions';
 
 /**

react/features/chat/components/PrivateMessageButton.js

@@ -4,7 +4,7 @@ import { translate } from '../../base/i18n';
 import { IconMessage, IconReply } from '../../base/icons';
 import { getParticipantById } from '../../base/participants';
 import { connect } from '../../base/redux';
-import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
 import { setPrivateMessageRecipient } from '../actions';
 
 export type Props = AbstractButtonProps & {

react/features/chat/components/native/ChatButton.js

@@ -8,7 +8,7 @@ import { connect } from '../../../base/redux';
 import {
     AbstractButton,
     type AbstractButtonProps
-} from '../../../base/toolbox';
+} from '../../../base/toolbox/components';
 import { openDisplayNamePrompt } from '../../../display-name';
 import { CHAT_VIEW_MODAL_ID } from '../../constants';
 import { getUnreadCount } from '../../functions';

react/features/chat/middleware.js

@@ -18,7 +18,8 @@ import {
 } from '../base/participants';
 import { MiddlewareRegistry, StateListenerRegistry } from '../base/redux';
 import { playSound, registerSound, unregisterSound } from '../base/sounds';
-import { isButtonEnabled, showToolbox } from '../toolbox';
+import { showToolbox } from '../toolbox/actions';
+import { isButtonEnabled } from '../toolbox/functions';
 
 import { SEND_MESSAGE, SET_PRIVATE_MESSAGE_RECIPIENT } from './actionTypes';
 import { addMessage, clearMessages, toggleChat } from './actions';

react/features/conference/components/native/Conference.js

@@ -25,7 +25,9 @@ import { LargeVideo } from '../../../large-video';
 import { KnockingParticipantList } from '../../../lobby';
 import { BackButtonRegistry } from '../../../mobile/back-button';
 import { Captions } from '../../../subtitles';
-import { isToolboxVisible, setToolboxVisible, Toolbox } from '../../../toolbox';
+import { setToolboxVisible } from '../../../toolbox/actions';
+import { Toolbox } from '../../../toolbox/components/native';
+import { isToolboxVisible } from '../../../toolbox/functions';
 import {
     AbstractConference,
     abstractMapStateToProps

react/features/conference/components/native/NavigationBar.js

@@ -8,7 +8,7 @@ import { getConferenceName } from '../../../base/conference';
 import { getFeatureFlag, CONFERENCE_TIMER_ENABLED, MEETING_NAME_ENABLED } from '../../../base/flags';
 import { connect } from '../../../base/redux';
 import { PictureInPictureButton } from '../../../mobile/picture-in-picture';
-import { isToolboxVisible } from '../../../toolbox';
+import { isToolboxVisible } from '../../../toolbox/functions.native';
 import ConferenceTimer from '../ConferenceTimer';
 
 import styles, { NAVBAR_GRADIENT_COLORS } from './styles';

react/features/conference/components/web/Conference.js

@@ -14,12 +14,8 @@ import { CalleeInfoContainer } from '../../../invite';
 import { LargeVideo } from '../../../large-video';
 import { KnockingParticipantList, LobbyScreen } from '../../../lobby';
 import { Prejoin, isPrejoinPageVisible } from '../../../prejoin';
-import {
-    Toolbox,
-    fullScreenChanged,
-    setToolboxAlwaysVisible,
-    showToolbox
-} from '../../../toolbox';
+import { fullScreenChanged, setToolboxAlwaysVisible, showToolbox } from '../../../toolbox/actions.web';
+import { Toolbox } from '../../../toolbox/components/web';
 import { LAYOUTS, getCurrentLayout } from '../../../video-layout';
 import { maybeShowSuboptimalExperienceNotification } from '../../functions';
 import {

react/features/conference/components/web/InviteMore.js

@@ -7,10 +7,7 @@ import { Icon, IconInviteMore } from '../../../base/icons';
 import { getParticipantCount } from '../../../base/participants';
 import { connect } from '../../../base/redux';
 import { beginAddPeople } from '../../../invite';
-import {
-    isButtonEnabled,
-    isToolboxVisible
-} from '../../../toolbox';
+import { isButtonEnabled, isToolboxVisible } from '../../../toolbox/functions.web';
 import { shouldDisplayTileView } from '../../../video-layout/functions';
 
 declare var interfaceConfig: Object;

react/features/conference/components/web/Subject.js

@@ -5,7 +5,7 @@ import React, { Component } from 'react';
 import { getConferenceName } from '../../../base/conference/functions';
 import { getParticipantCount } from '../../../base/participants/functions';
 import { connect } from '../../../base/redux';
-import { isToolboxVisible } from '../../../toolbox';
+import { isToolboxVisible } from '../../../toolbox/functions.web';
 import ConferenceTimer from '../ConferenceTimer';
 
 import ParticipantsCount from './ParticipantsCount';

react/features/conference/middleware.js

@@ -13,7 +13,7 @@ import { MiddlewareRegistry, StateListenerRegistry } from '../base/redux';
 import { SET_REDUCED_UI } from '../base/responsive-ui';
 import { FeedbackDialog } from '../feedback';
 import { setFilmstripEnabled } from '../filmstrip';
-import { setToolboxEnabled } from '../toolbox';
+import { setToolboxEnabled } from '../toolbox/actions';
 
 import { notifyKickedOut } from './actions';
 

react/features/etherpad/components/SharedDocumentButton.js

@@ -6,7 +6,7 @@ import { createToolbarEvent, sendAnalytics } from '../../analytics';
 import { translate } from '../../base/i18n';
 import { IconShareDoc } from '../../base/icons';
 import { connect } from '../../base/redux';
-import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
 import { toggleDocument } from '../actions';
 
 

react/features/filmstrip/components/native/Thumbnail.js

@@ -21,7 +21,7 @@ import { getTrackByMediaTypeAndParticipant } from '../../../base/tracks';
 import { ConnectionIndicator } from '../../../connection-indicator';
 import { DisplayNameLabel } from '../../../display-name';
 import { RemoteVideoMenu } from '../../../remote-video-menu';
-import { toggleToolboxVisible } from '../../../toolbox';
+import { toggleToolboxVisible } from '../../../toolbox/actions.native';
 
 import AudioMutedIndicator from './AudioMutedIndicator';
 import DominantSpeakerIndicator from './DominantSpeakerIndicator';

react/features/filmstrip/components/web/Filmstrip.js

@@ -12,7 +12,7 @@ import {
 import { translate } from '../../../base/i18n';
 import { Icon, IconMenuDown, IconMenuUp } from '../../../base/icons';
 import { connect } from '../../../base/redux';
-import { dockToolbox } from '../../../toolbox';
+import { dockToolbox } from '../../../toolbox/actions.web';
 import { getCurrentLayout, LAYOUTS } from '../../../video-layout';
 import { setFilmstripHovered, setFilmstripVisible } from '../../actions';
 import { shouldRemoteVideosBeVisible } from '../../functions';

react/features/filmstrip/components/web/Toolbar.js

@@ -8,7 +8,7 @@ import {
     AudioMuteButton,
     HangupButton,
     VideoMuteButton
-} from '../../../toolbox';
+} from '../../../toolbox/components';
 
 declare var interfaceConfig: Object;
 

react/features/invite/components/add-people-dialog/native/InviteButton.js

@@ -6,8 +6,7 @@ import { getFeatureFlag, INVITE_ENABLED } from '../../../../base/flags';
 import { translate } from '../../../../base/i18n';
 import { IconAddPeople } from '../../../../base/icons';
 import { connect } from '../../../../base/redux';
-import { AbstractButton } from '../../../../base/toolbox';
-import type { AbstractButtonProps } from '../../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../../base/toolbox/components';
 import { doInvitePeople } from '../../../actions.native';
 
 type Props = AbstractButtonProps & {

react/features/lobby/components/web/KnockingParticipantList.js

@@ -5,7 +5,7 @@ import React from 'react';
 import { Avatar } from '../../../base/avatar';
 import { translate } from '../../../base/i18n';
 import { connect } from '../../../base/redux';
-import { isToolboxVisible } from '../../../toolbox';
+import { isToolboxVisible } from '../../../toolbox/functions.web';
 import AbstractKnockingParticipantList, {
     mapStateToProps as abstractMapStateToProps,
     type Props as AbstractProps

react/features/local-recording/components/LocalRecordingButton.js → react/features/local-recording/components/LocalRecordingButton.web.js

@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 
 import { translate } from '../../base/i18n';
 import { IconRec } from '../../base/icons';
-import { ToolbarButton } from '../../toolbox';
+import { ToolbarButton } from '../../toolbox/components/web';
 
 /**
  * The type of the React {@code Component} state of

react/features/mobile/audio-mode/components/AudioRouteButton.js

@@ -4,8 +4,7 @@ import { openDialog } from '../../../base/dialog';
 import { translate } from '../../../base/i18n';
 import { IconAudioRoute } from '../../../base/icons';
 import { connect } from '../../../base/redux';
-import { AbstractButton } from '../../../base/toolbox';
-import type { AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 
 import AudioRoutePickerDialog from './AudioRoutePickerDialog';
 

react/features/mobile/incoming-call/components/AnswerButton.js

@@ -3,8 +3,7 @@
 import { translate } from '../../../base/i18n';
 import { IconHangup } from '../../../base/icons';
 import { connect } from '../../../base/redux';
-import { AbstractButton } from '../../../base/toolbox';
-import type { AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 import { incomingCallAnswered } from '../actions';
 
 /**

react/features/mobile/incoming-call/components/DeclineButton.js

@@ -3,8 +3,7 @@
 import { translate } from '../../../base/i18n';
 import { IconHangup } from '../../../base/icons';
 import { connect } from '../../../base/redux';
-import { AbstractButton } from '../../../base/toolbox';
-import type { AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 import { incomingCallDeclined } from '../actions';
 
 /**

react/features/mobile/picture-in-picture/components/PictureInPictureButton.js

@@ -6,8 +6,7 @@ import { PIP_ENABLED, getFeatureFlag } from '../../../base/flags';
 import { translate } from '../../../base/i18n';
 import { IconMenuDown } from '../../../base/icons';
 import { connect } from '../../../base/redux';
-import { AbstractButton } from '../../../base/toolbox';
-import type { AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 import { enterPictureInPicture } from '../actions';
 
 type Props = AbstractButtonProps & {

react/features/recording/components/LiveStream/AbstractLiveStreamButton.js

@@ -4,10 +4,7 @@ import { openDialog } from '../../../base/dialog';
 import { IconLiveStreaming } from '../../../base/icons';
 import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet';
 import { getLocalParticipant } from '../../../base/participants';
-import {
-    AbstractButton,
-    type AbstractButtonProps
-} from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 import { getActiveSession } from '../../functions';
 
 import {

react/features/recording/components/Recording/AbstractRecordButton.js

@@ -11,10 +11,7 @@ import {
     getLocalParticipant,
     isLocalParticipantModerator
 } from '../../../base/participants';
-import {
-    AbstractButton,
-    type AbstractButtonProps
-} from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 import { getActiveSession } from '../../functions';
 
 import { StartRecordingDialog, StopRecordingDialog } from './_';

react/features/remote-video-menu/components/AbstractGrantModeratorButton.js

@@ -8,8 +8,7 @@ import {
     isParticipantModerator,
     PARTICIPANT_ROLE
 } from '../../base/participants';
-import { AbstractButton } from '../../base/toolbox';
-import type { AbstractButtonProps } from '../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
 
 import { GrantModeratorDialog } from '.';
 

react/features/remote-video-menu/components/AbstractKickButton.js

@@ -2,8 +2,7 @@
 
 import { openDialog } from '../../base/dialog';
 import { IconKick } from '../../base/icons';
-import { AbstractButton } from '../../base/toolbox';
-import type { AbstractButtonProps } from '../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
 
 import { KickRemoteParticipantDialog } from '.';
 

react/features/remote-video-menu/components/AbstractMuteButton.js

@@ -7,10 +7,7 @@ import {
 import { openDialog } from '../../base/dialog';
 import { IconMicDisabled } from '../../base/icons';
 import { MEDIA_TYPE } from '../../base/media';
-import {
-    AbstractButton,
-    type AbstractButtonProps
-} from '../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
 import { isRemoteTrackMuted } from '../../base/tracks';
 
 import { MuteRemoteParticipantDialog } from '.';

react/features/remote-video-menu/components/native/PinButton.js

@@ -4,7 +4,7 @@ import { translate } from '../../../base/i18n';
 import { IconPin } from '../../../base/icons';
 import { pinParticipant } from '../../../base/participants';
 import { connect } from '../../../base/redux';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 import { shouldDisplayTileView } from '../../../video-layout/functions';
 
 export type Props = AbstractButtonProps & {

react/features/remote-video-menu/components/web/PrivateMessageMenuButton.js

@@ -10,7 +10,7 @@ import {
     _mapStateToProps as _abstractMapStateToProps,
     type Props as AbstractProps
 } from '../../../chat/components/PrivateMessageButton';
-import { isButtonEnabled } from '../../../toolbox';
+import { isButtonEnabled } from '../../../toolbox/functions.web';
 
 import RemoteVideoMenuButton from './RemoteVideoMenuButton';
 

react/features/room-lock/components/RoomLockButton.js

@@ -5,8 +5,7 @@ import { translate } from '../../base/i18n';
 import { IconRoomLock, IconRoomUnlock } from '../../base/icons';
 import { isLocalParticipantModerator } from '../../base/participants';
 import { connect } from '../../base/redux';
-import { AbstractButton } from '../../base/toolbox';
-import type { AbstractButtonProps } from '../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
 import { beginRoomLockRequest, unlockRoom } from '../actions';
 
 type Props = AbstractButtonProps & {

react/features/security/components/security-dialog/SecurityDialogButton.js

@@ -4,7 +4,7 @@ import { createToolbarEvent, sendAnalytics } from '../../../analytics';
 import { translate } from '../../../base/i18n';
 import { IconSecurityOff, IconSecurityOn } from '../../../base/icons';
 import { connect } from '../../../base/redux';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 import { toggleSecurityDialog } from '../../actions';
 
 

react/features/settings/components/web/SettingsButton.js

@@ -4,8 +4,7 @@ import { createToolbarEvent, sendAnalytics } from '../../../analytics';
 import { translate } from '../../../base/i18n';
 import { IconSettings } from '../../../base/icons';
 import { connect } from '../../../base/redux';
-import { AbstractButton } from '../../../base/toolbox';
-import type { AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 import { openDeviceSelectionPopup } from '../../../device-selection';
 import { openSettingsDialog } from '../../actions';
 import { SETTINGS_TABS } from '../../constants';

react/features/subtitles/components/AbstractClosedCaptionButton.js

@@ -2,7 +2,7 @@
 
 import { createToolbarEvent, sendAnalytics } from '../../analytics';
 import { isLocalParticipantModerator } from '../../base/participants';
-import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
 import { toggleRequestingSubtitles } from '../actions';
 
 export type AbstractProps = AbstractButtonProps & {

react/features/toolbox/components/AudioMuteButton.js

@@ -9,8 +9,8 @@ import {
 import { translate } from '../../base/i18n';
 import { MEDIA_TYPE } from '../../base/media';
 import { connect } from '../../base/redux';
-import { AbstractAudioMuteButton } from '../../base/toolbox';
-import type { AbstractButtonProps } from '../../base/toolbox';
+import { AbstractAudioMuteButton } from '../../base/toolbox/components';
+import type { AbstractButtonProps } from '../../base/toolbox/components';
 import { isLocalTrackMuted } from '../../base/tracks';
 import { muteLocal } from '../../remote-video-menu/actions';
 

react/features/toolbox/components/DownloadButton.js

@@ -4,7 +4,7 @@ import { createToolbarEvent, sendAnalytics } from '../../analytics';
 import { translate } from '../../base/i18n';
 import { IconDownload } from '../../base/icons';
 import { connect } from '../../base/redux';
-import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
 import { openURLInBrowser } from '../../base/util';
 
 

react/features/toolbox/components/HangupButton.js

@@ -7,8 +7,8 @@ import { appNavigate } from '../../app/actions';
 import { disconnect } from '../../base/connection';
 import { translate } from '../../base/i18n';
 import { connect } from '../../base/redux';
-import { AbstractHangupButton } from '../../base/toolbox';
-import type { AbstractButtonProps } from '../../base/toolbox';
+import { AbstractHangupButton } from '../../base/toolbox/components';
+import type { AbstractButtonProps } from '../../base/toolbox/components';
 
 /**
  * The type of the React {@code Component} props of {@link HangupButton}.

react/features/toolbox/components/HelpButton.js

@@ -4,7 +4,7 @@ import { createToolbarEvent, sendAnalytics } from '../../analytics';
 import { translate } from '../../base/i18n';
 import { IconHelp } from '../../base/icons';
 import { connect } from '../../base/redux';
-import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
 import { openURLInBrowser } from '../../base/util';
 
 

react/features/toolbox/components/VideoMuteButton.js

@@ -16,8 +16,8 @@ import {
     setVideoMuted
 } from '../../base/media';
 import { connect } from '../../base/redux';
-import { AbstractVideoMuteButton } from '../../base/toolbox';
-import type { AbstractButtonProps } from '../../base/toolbox';
+import { AbstractVideoMuteButton } from '../../base/toolbox/components';
+import type { AbstractButtonProps } from '../../base/toolbox/components';
 import { getLocalVideoType, isLocalVideoTrackMuted } from '../../base/tracks';
 
 declare var APP: Object;

react/features/toolbox/components/native/AudioOnlyButton.js

@@ -4,8 +4,7 @@ import { toggleAudioOnly } from '../../../base/audio-only';
 import { translate } from '../../../base/i18n';
 import { IconAudioOnly, IconAudioOnlyOff } from '../../../base/icons';
 import { connect } from '../../../base/redux';
-import { AbstractButton } from '../../../base/toolbox';
-import type { AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 
 /**
  * The type of the React {@code Component} props of {@link AudioOnlyButton}.

react/features/toolbox/components/native/MoreOptionsButton.js

@@ -2,8 +2,7 @@
 
 import { translate } from '../../../base/i18n';
 import { IconMenu } from '../../../base/icons';
-import { AbstractButton } from '../../../base/toolbox';
-import type { AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 
 
 type Props = AbstractButtonProps;

react/features/toolbox/components/native/OverflowMenu.js

@@ -17,7 +17,7 @@ import { LiveStreamButton, RecordButton } from '../../../recording';
 import { RoomLockButton } from '../../../room-lock';
 import { ClosedCaptionButton } from '../../../subtitles';
 import { TileViewButton } from '../../../video-layout';
-import { VideoShareButton } from '../../../youtube-player';
+import { VideoShareButton } from '../../../youtube-player/components';
 import HelpButton from '../HelpButton';
 
 import AudioOnlyButton from './AudioOnlyButton';

react/features/toolbox/components/native/OverflowMenuButton.js

@@ -4,8 +4,7 @@ import { openDialog } from '../../../base/dialog';
 import { translate } from '../../../base/i18n';
 import { IconMenuThumb } from '../../../base/icons';
 import { connect } from '../../../base/redux';
-import { AbstractButton } from '../../../base/toolbox';
-import type { AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 
 import OverflowMenu from './OverflowMenu';
 

react/features/toolbox/components/native/RaiseHandButton.js

@@ -14,8 +14,7 @@ import {
     participantUpdated
 } from '../../../base/participants';
 import { connect } from '../../../base/redux';
-import { AbstractButton } from '../../../base/toolbox';
-import type { AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 
 /**
  * The type of the React {@code Component} props of {@link RaiseHandButton}.

react/features/toolbox/components/native/ToggleCameraButton.js

@@ -4,8 +4,7 @@ import { translate } from '../../../base/i18n';
 import { IconSwitchCamera } from '../../../base/icons';
 import { MEDIA_TYPE, toggleCameraFacingMode } from '../../../base/media';
 import { connect } from '../../../base/redux';
-import { AbstractButton } from '../../../base/toolbox';
-import type { AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 import { isLocalTrackMuted } from '../../../base/tracks';
 
 /**

react/features/toolbox/components/web/AudioSettingsButton.js

@@ -6,7 +6,7 @@ import { isMobileBrowser } from '../../../base/environment/utils';
 import { IconArrowDown } from '../../../base/icons';
 import JitsiMeetJS from '../../../base/lib-jitsi-meet/_';
 import { connect } from '../../../base/redux';
-import { ToolboxButtonWithIcon } from '../../../base/toolbox';
+import { ToolboxButtonWithIcon } from '../../../base/toolbox/components';
 import { getMediaPermissionPromptVisibility } from '../../../overlay';
 import { AudioSettingsPopup, toggleAudioSettings } from '../../../settings';
 import { isAudioSettingsButtonDisabled } from '../../functions';

react/features/toolbox/components/web/MuteEveryoneButton.js

@@ -6,7 +6,7 @@ import { translate } from '../../../base/i18n';
 import { IconMuteEveryone } from '../../../base/icons';
 import { getLocalParticipant, PARTICIPANT_ROLE } from '../../../base/participants';
 import { connect } from '../../../base/redux';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
 import { MuteEveryoneDialog } from '../../../remote-video-menu';
 
 type Props = AbstractButtonProps & {

react/features/toolbox/components/web/Toolbox.js

@@ -30,7 +30,7 @@ import {
     participantUpdated
 } from '../../../base/participants';
 import { connect, equals } from '../../../base/redux';
-import { OverflowMenuItem } from '../../../base/toolbox';
+import { OverflowMenuItem } from '../../../base/toolbox/components';
 import { getLocalVideoTrack, toggleScreensharing } from '../../../base/tracks';
 import { VideoBlurButton } from '../../../blur';
 import { CHAT_SIZE, ChatCounter, toggleChat } from '../../../chat';

react/features/toolbox/components/web/VideoSettingsButton.js

@@ -6,7 +6,7 @@ import { isMobileBrowser } from '../../../base/environment/utils';
 import { IconArrowDown } from '../../../base/icons';
 import JitsiMeetJS from '../../../base/lib-jitsi-meet/_';
 import { connect } from '../../../base/redux';
-import { ToolboxButtonWithIcon } from '../../../base/toolbox';
+import { ToolboxButtonWithIcon } from '../../../base/toolbox/components';
 import { getLocalJitsiVideoTrack } from '../../../base/tracks';
 import { getMediaPermissionPromptVisibility } from '../../../overlay';
 import { toggleVideoSettings, VideoSettingsPopup } from '../../../settings';

react/features/toolbox/index.js

@@ -1,4 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
-export * from './components';
-export * from './functions';

react/features/video-layout/components/TileViewButton.js

@@ -11,10 +11,7 @@ import { translate } from '../../base/i18n';
 import { IconTileView } from '../../base/icons';
 import { getParticipantCount } from '../../base/participants';
 import { connect } from '../../base/redux';
-import {
-    AbstractButton,
-    type AbstractButtonProps
-} from '../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
 import { setTileView } from '../actions';
 import { shouldDisplayTileView } from '../functions';
 import logger from '../logger';

react/features/video-layout/functions.js

@@ -1,7 +1,7 @@
 // @flow
 
 import { getPinnedParticipant, getParticipantCount } from '../base/participants';
-import { isYoutubeVideoPlaying } from '../youtube-player';
+import { isYoutubeVideoPlaying } from '../youtube-player/functions';
 
 import { LAYOUTS } from './constants';
 

react/features/youtube-player/components/VideoShareButton.js

@@ -7,8 +7,7 @@ import { translate } from '../../base/i18n';
 import { IconShareVideo } from '../../base/icons';
 import { getLocalParticipant } from '../../base/participants';
 import { connect } from '../../base/redux';
-import { AbstractButton } from '../../base/toolbox';
-import type { AbstractButtonProps } from '../../base/toolbox';
+import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
 import { toggleSharedVideo } from '../actions';
 
 /**

react/features/youtube-player/index.js

@@ -1,7 +0,0 @@
-// @flow
-
-export * from './actions';
-export * from './actionTypes';
-export * from './components';
-export * from './constants';
-export * from './functions';