Merge pull request #111 from BerkieBb/master

fix(web/menu): force close menu when using the nui event
This commit is contained in:
Luke
2022-09-30 10:04:15 +02:00
committed by GitHub

View File

@@ -37,8 +37,8 @@ const ListMenu: React.FC = () => {
const [indexStates, setIndexStates] = useState<Record<number, number>>({});
const listRefs = useRef<Array<HTMLDivElement | null>>([]);
const closeMenu = (ignoreFetch?: boolean, keyPressed?: string) => {
if (menu.canClose === false) return;
const closeMenu = (ignoreFetch?: boolean, keyPressed?: string, forceClose?: boolean) => {
if (menu.canClose === false && !forceClose) return;
setVisible(false);
if (!ignoreFetch) fetchNui('closeMenu', keyPressed);
};
@@ -119,7 +119,7 @@ const ListMenu: React.FC = () => {
return () => window.removeEventListener('keydown', keyHandler);
}, [visible]);
useNuiEvent('closeMenu', () => closeMenu(true));
useNuiEvent('closeMenu', () => closeMenu(true, undefined, true));
useNuiEvent('setMenu', (data: MenuSettings) => {
if (!data.startItemIndex || data.startItemIndex < 0) data.startItemIndex = 0;