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

fix(web/menu): fix button tooltip not displaying on side scroll button

Browse Source
This commit is contained in:
Luke
2022-11-12 13:58:34 +01:00
parent 9b7eef2880
commit 39668aa26a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,12 +18,9 @@ export const debugMenu = () => {
}, },
{ {
label: 'Vehicle class', label: 'Vehicle class',
values: [ values: ['pogchamp', 'nice champ', { label: 'POGGERS', description: 'CHAMPPERS' }],
{ label: 'nice', description: 'description 1' },
{ label: 'even nicer', description: 'description 2' },
'pogchamp',
],
icon: 'tag', icon: 'tag',
description: 'Side scroll general description',
}, },
{ label: 'Option 1' }, { label: 'Option 1' },
{ label: 'Option 2' }, { label: 'Option 2' },

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

@@ -1,5 +1,5 @@
import { Box, Stack, Tooltip } from '@chakra-ui/react'; import { Box, Stack, Tooltip } from '@chakra-ui/react';
import { useEffect, useRef, useState } from 'react'; import { useCallback, useEffect, useRef, useState } from 'react';
import { useNuiEvent } from '../../../hooks/useNuiEvent'; import { useNuiEvent } from '../../../hooks/useNuiEvent';
import ListItem from './ListItem'; import ListItem from './ListItem';
import Header from './Header'; import Header from './Header';
@@ -27,10 +27,6 @@ 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',
@@ -153,6 +149,13 @@ const ListMenu: React.FC = () => {
return () => window.removeEventListener('keydown', keyHandler); return () => window.removeEventListener('keydown', keyHandler);
}, [visible]); }, [visible]);
const isValuesObject = useCallback(
(values?: Array<string | { label: string; description: string }>) => {
return Array.isArray(values) && typeof values[indexStates[selected]] === 'object';
},
[indexStates, selected]
);
useNuiEvent('closeMenu', () => closeMenu(true, undefined, true)); useNuiEvent('closeMenu', () => closeMenu(true, undefined, true));
useNuiEvent('setMenu', (data: MenuSettings) => { useNuiEvent('setMenu', (data: MenuSettings) => {