FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-18 23:46:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Luke
2022-10-30 10:16:28 +01:00
parent 847f5218f6
commit 765fff3598
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/src/features/dev/debug/menu.ts
View File

@@ -24,7 +24,6 @@ export const debugMenu = () => {
'pogchamp', 'pogchamp',
], ],
icon: 'tag', icon: 'tag',
description: 'Tooltip description 2',
}, },
{ label: 'Option 1' }, { label: 'Option 1' },
{ label: 'Option 2' }, { label: 'Option 2' },

13
web/src/features/menu/list/index.tsx
View File

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