fix(web/menu): show values description without requiring button desc

overextended · Oct 30, 2022 · 765fff3 · 765fff3
1 parent 847f521
commit 765fff3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/web/src/features/dev/debug/menu.ts b/web/src/features/dev/debug/menu.ts
@@ -24,7 +24,6 @@ export const debugMenu = () => {
               'pogchamp',
             ],
             icon: 'tag',
-            description: 'Tooltip description 2',
           },
           { label: 'Option 1' },
           { label: 'Option 2' },

diff --git a/web/src/features/menu/list/index.tsx b/web/src/features/menu/list/index.tsx
@@ -27,6 +27,10 @@ export interface MenuSettings {
   startItemIndex?: number;
 }
 
+const isValuesObject = (values?: Array<string | { label: string; description: string }>) => {
+  return Array.isArray(values) && typeof values === 'object';
+};
+
 const ListMenu: React.FC = () => {
   const [menu, setMenu] = useState<MenuSettings>({
     position: 'top-left',
@@ -176,12 +180,17 @@ const ListMenu: React.FC = () => {
       {visible && (
         <Tooltip
           label={
-            Array.isArray(menu.items[selected].values) && typeof menu.items[selected].values === 'object'
+            isValuesObject(menu.items[selected].values)
               ? // @ts-ignore
                 menu.items[selected].values[indexStates[selected]].description
               : menu.items[selected].description
           }
-          isOpen={!!menu.items[selected].description}
+          isOpen={
+            isValuesObject(menu.items[selected].values)
+              ? // @ts-ignore
+                !!menu.items[selected].values[indexStates[selected]].description
+              : !!menu.items[selected].description
+          }
           bg="#25262B"
           color="#909296"
           placement="bottom"