From 058c82a70456d36d7273b4534e16f5becb6a202a Mon Sep 17 00:00:00 2001 From: Calin-Teodor Date: Mon, 11 Jul 2022 15:25:59 +0300 Subject: [PATCH] feat(toolbox/conference): review remarks --- .../toolbox/components/native/OverflowMenu.js | 24 +++++++++++++++---- .../toolbox/components/native/Toolbox.js | 7 ++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/react/features/toolbox/components/native/OverflowMenu.js b/react/features/toolbox/components/native/OverflowMenu.js index 2041eb1e4b..6845229f26 100644 --- a/react/features/toolbox/components/native/OverflowMenu.js +++ b/react/features/toolbox/components/native/OverflowMenu.js @@ -7,6 +7,7 @@ import { BottomSheet, hideSheet } from '../../../base/dialog'; import { bottomSheetStyles } from '../../../base/dialog/components/native/styles'; import { connect } from '../../../base/redux'; import { SharedDocumentButton } from '../../../etherpad'; +import { ParticipantsPaneButton } from '../../../participants-pane/components/native'; import { ReactionMenu } from '../../../reactions/components'; import { isReactionsEnabled } from '../../../reactions/functions.any'; import { LiveStreamButton, RecordButton } from '../../../recording'; @@ -25,7 +26,6 @@ import LinkToSalesforceButton from './LinkToSalesforceButton'; import OpenCarmodeButton from './OpenCarmodeButton'; import RaiseHandButton from './RaiseHandButton'; import ScreenSharingButton from './ScreenSharingButton'; -import ToggleCameraButton from './ToggleCameraButton'; import ToggleSelfViewButton from './ToggleSelfViewButton'; /** @@ -114,14 +114,31 @@ class OverflowMenu extends PureComponent { styles: bottomSheetStyles.buttons }; + const topButtonProps = { + afterClick: this._onCancel, + showLabel: true, + styles: { + ...bottomSheetStyles.buttons, + style: { + ...bottomSheetStyles.buttons.style, + borderTopLeftRadius: 16, + borderTopRightRadius: 16 + } + } + }; + + const firstMenuButtonProps + = toolbarButtons.has('participantspane') ? topButtonProps : buttonProps; + return ( - {_selfViewHidden && } - + {!toolbarButtons.has('participantspane') && } + + {_selfViewHidden && } {!_reactionsEnabled && !toolbarButtons.has('raisehand') && } @@ -132,7 +149,6 @@ class OverflowMenu extends PureComponent { - {!toolbarButtons.has('togglecamera') && } {!toolbarButtons.has('tileview') && } diff --git a/react/features/toolbox/components/native/Toolbox.js b/react/features/toolbox/components/native/Toolbox.js index 8591d2d180..fccf80ec7b 100644 --- a/react/features/toolbox/components/native/Toolbox.js +++ b/react/features/toolbox/components/native/Toolbox.js @@ -102,8 +102,11 @@ function Toolbox(props: Props) { styles = { buttonStylesBorderless } toggledStyles = { backgroundToggledStyle } />)} {additionalButtons.has('tileview') && } - + { + additionalButtons.has('participantspane') + && + }