feat(toolbox): updated getVisibleNativeButtons

jitsi · Feb 11, 2025 · 2138d90 · 2138d90
1 parent b30e5f0
commit 2138d90
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/react/features/toolbox/functions.native.ts b/react/features/toolbox/functions.native.ts
@@ -98,7 +98,21 @@ export function getVisibleNativeButtons({ allButtons, clientWidth, mainToolbarBu
         button && mainButtonsKeys.push(button);
     }
 
-    const mainMenuButtons = mainButtonsKeys.map(key => allButtons[key]);
+    const mainMenuButtons = mainButtonsKeys.map(key => allButtons[key])
+        .sort((a, b) => {
+
+            // Native toolbox includes hangup and overflowmenu button keys, too
+            // hangup goes last, overflowmenu goes second-to-last
+            if (a.key === 'hangup' || a.key === 'overflowmenu') {
+                return 1;
+            }
+            if (b.key === 'hangup' || b.key === 'overflowmenu') {
+                return -1;
+            }
+
+            // other buttons are sorted by priority
+            return 0;
+        });
 
     return {
         mainMenuButtons,