|
@@ -44,15 +44,6 @@ interface IProps {
|
44
|
44
|
|
45
|
45
|
const useStyles = makeStyles()(() => {
|
46
|
46
|
return {
|
47
|
|
- contextMenu: {
|
48
|
|
- position: 'relative',
|
49
|
|
- right: 'auto',
|
50
|
|
- margin: 0,
|
51
|
|
- marginBottom: '8px',
|
52
|
|
- maxHeight: 'calc(100dvh - 100px)',
|
53
|
|
- minWidth: '240px'
|
54
|
|
- },
|
55
|
|
-
|
56
|
47
|
hangupMenu: {
|
57
|
48
|
position: 'relative',
|
58
|
49
|
right: 'auto',
|
|
@@ -61,7 +52,7 @@ const useStyles = makeStyles()(() => {
|
61
|
52
|
rowGap: '8px',
|
62
|
53
|
margin: 0,
|
63
|
54
|
padding: '16px',
|
64
|
|
- marginBottom: '4px'
|
|
55
|
+ marginBottom: '8px'
|
65
|
56
|
}
|
66
|
57
|
};
|
67
|
58
|
});
|
|
@@ -111,6 +102,8 @@ export default function Toolbox({
|
111
|
102
|
const mainToolbarButtonsThresholds
|
112
|
103
|
= useSelector((state: IReduxState) => state['features/toolbox'].mainToolbarButtonsThresholds);
|
113
|
104
|
const allButtons = useToolboxButtons(customToolbarButtons);
|
|
105
|
+ const isMobile = isMobileBrowser();
|
|
106
|
+ const endConferenceSupported = Boolean(conference?.isEndConferenceSupported() && isModerator);
|
114
|
107
|
|
115
|
108
|
useKeyboardShortcuts(toolbarButtonsToUse);
|
116
|
109
|
|
|
@@ -150,7 +143,12 @@ export default function Toolbox({
|
150
|
143
|
}, [ dispatch ]);
|
151
|
144
|
|
152
|
145
|
useEffect(() => {
|
153
|
|
- if (hangupMenuVisible && !toolbarVisible) {
|
|
146
|
+
|
|
147
|
+ // On mobile web we want to keep both toolbox and hang up menu visible
|
|
148
|
+ // because they depend on each other.
|
|
149
|
+ if (endConferenceSupported && isMobile) {
|
|
150
|
+ hangupMenuVisible && dispatch(setToolboxVisible(true));
|
|
151
|
+ } else if (hangupMenuVisible && !toolbarVisible) {
|
154
|
152
|
onSetHangupVisible(false);
|
155
|
153
|
dispatch(setToolbarHovered(false));
|
156
|
154
|
}
|
|
@@ -219,8 +217,6 @@ export default function Toolbox({
|
219
|
217
|
return null;
|
220
|
218
|
}
|
221
|
219
|
|
222
|
|
- const endConferenceSupported = Boolean(conference?.isEndConferenceSupported() && isModerator);
|
223
|
|
- const isMobile = isMobileBrowser();
|
224
|
220
|
|
225
|
221
|
const rootClassNames = `new-toolbox ${toolbarVisible ? 'visible' : ''} ${
|
226
|
222
|
toolbarButtonsToUse.length ? '' : 'no-buttons'} ${chatOpen ? 'shift-right' : ''}`;
|