ZF/jitsi-meet
1
0
Fork 0
mirror of https://gitcode.com/GitHub_Trending/ji/jitsi-meet.git synced 2025-12-30 11:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(main-Toolbox): Display the correct buttons.

Browse Source 
If some of the buttons from the main toolbar are disabled we were
displaying buttons from the overflow menu in their place.
This commit is contained in:
Hristo Terezov
2023-04-27 19:16:57 -05:00
parent e7db18bd80
commit be55ccd6f4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
react/features/toolbox/components/web/Toolbox.tsx
View File

@@ -1015,9 +1015,8 @@ class Toolbox extends Component<IProps> {
this._setButtonsNotifyClickMode(buttons);
const isHangupVisible = isToolbarButtonEnabled('hangup', _toolbarButtons);
const { order } = THRESHOLDS.find(({ width }) => _clientWidth > width)
let { order } = THRESHOLDS.find(({ width }) => _clientWidth > width)
|| THRESHOLDS[THRESHOLDS.length - 1];
let sliceIndex = order.length + 2;
const keys = Object.keys(buttons);
@@ -1028,6 +1027,11 @@ class Toolbox extends Component<IProps> {
!_jwtDisabledButons.includes(key)
&& (isToolbarButtonEnabled(key, _toolbarButtons) || isToolbarButtonEnabled(alias, _toolbarButtons))
);
const filteredKeys = filtered.map(button => button.key);
order = order.filter(key => filteredKeys.includes(buttons[key as keyof typeof buttons].key));
let sliceIndex = order.length + 2;
if (isHangupVisible) {
sliceIndex -= 1;