From 15cc956ed4f5f84e0d0c3e546c7c745291b29768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Fri, 4 Feb 2022 11:06:07 +0100 Subject: [PATCH] fix(shared-video) use more space on recorders They don't render the toolbar so there is more space available. The reason this commit does that is because getToolboxHeight will now always be 0 for recorders. --- .../shared-video/components/web/SharedVideo.js | 6 ++---- react/features/toolbox/components/web/Toolbox.js | 14 +++++++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/react/features/shared-video/components/web/SharedVideo.js b/react/features/shared-video/components/web/SharedVideo.js index 6f3dcfdc8..cdc1efc58 100644 --- a/react/features/shared-video/components/web/SharedVideo.js +++ b/react/features/shared-video/components/web/SharedVideo.js @@ -31,15 +31,13 @@ type Props = { /** * Is the video shared by the local user. - * - * @private */ - isOwner: boolean, + isOwner: boolean, /** * The shared video url. */ - videoUrl: string, + videoUrl: string, } /** . diff --git a/react/features/toolbox/components/web/Toolbox.js b/react/features/toolbox/components/web/Toolbox.js index b7265ab4f..2be6e0174 100644 --- a/react/features/toolbox/components/web/Toolbox.js +++ b/react/features/toolbox/components/web/Toolbox.js @@ -144,6 +144,11 @@ type Props = { */ _dialog: boolean, + /** + * Whether or not the toolbox is disabled. It is for recorders. + */ + _disabled: boolean, + /** * Whether or not call feedback can be sent. */ @@ -447,6 +452,10 @@ class Toolbox extends Component { * @returns {ReactElement} */ render() { + if (this.props._disabled) { + return null; + } + const { _chatOpen, _visible, _toolbarButtons } = this.props; const rootClassNames = `new-toolbox ${_visible ? 'visible' : ''} ${ _toolbarButtons.length ? '' : 'no-buttons'} ${_chatOpen ? 'shift-right' : ''}`; @@ -1346,11 +1355,13 @@ function _mapStateToProps(state, ownProps) { const { conference } = state['features/base/conference']; let desktopSharingEnabled = JitsiMeetJS.isDesktopSharingEnabled(); const { + buttonsWithNotifyClick, callStatsID, disableProfile, enableFeaturesBasedOnToken, hideDominantSpeakerBadge, - buttonsWithNotifyClick + iAmRecorder, + iAmSipGateway } = state['features/base/config']; const { fullScreen, @@ -1391,6 +1402,7 @@ function _mapStateToProps(state, ownProps) { _desktopSharingButtonDisabled: isDesktopShareButtonDisabled(state), _desktopSharingDisabledTooltipKey: desktopSharingDisabledTooltipKey, _dialog: Boolean(state['features/base/dialog'].component), + _disabled: Boolean(iAmRecorder || iAmSipGateway), _feedbackConfigured: Boolean(callStatsID), _fullScreen: fullScreen, _isProfileDisabled: Boolean(disableProfile),