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

fix(web/menu): fix onSideScroll getting called on open

Browse Source 
Potentially fixes an issue where if your first item in the menu was a side scroll the onSideScroll would get instantly called when opening
This commit is contained in:
Luke
2022-12-08 11:23:49 +01:00
parent d9511231b1
commit e806781dde
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,11 +95,11 @@ const ListMenu: React.FC = () => {
}; };
useEffect(() => { useEffect(() => {
if (menu.items[selected]?.checked === undefined) return;
if (firstRenderRef.current) { if (firstRenderRef.current) {
firstRenderRef.current = false; firstRenderRef.current = false;
return; return;
} }
if (menu.items[selected]?.checked === undefined) return;
const timer = setTimeout(() => { const timer = setTimeout(() => {
fetchNui('changeChecked', [selected, checkedStates[selected]]).catch(); fetchNui('changeChecked', [selected, checkedStates[selected]]).catch();
}, 100); }, 100);
@@ -107,11 +107,11 @@ const ListMenu: React.FC = () => {
}, [checkedStates]); }, [checkedStates]);
useEffect(() => { useEffect(() => {
if (!menu.items[selected]?.values) return;
if (firstRenderRef.current) { if (firstRenderRef.current) {
firstRenderRef.current = false; firstRenderRef.current = false;
return; return;
} }
if (!menu.items[selected]?.values) return;
const timer = setTimeout(() => { const timer = setTimeout(() => {
fetchNui('changeIndex', [selected, indexStates[selected]]).catch(); fetchNui('changeIndex', [selected, indexStates[selected]]).catch();
}, 100); }, 100);
@@ -162,7 +162,6 @@ const ListMenu: React.FC = () => {
useNuiEvent('closeMenu', () => closeMenu(true, undefined, true)); useNuiEvent('closeMenu', () => closeMenu(true, undefined, true));
useNuiEvent('setMenu', (data: MenuSettings) => { useNuiEvent('setMenu', (data: MenuSettings) => {
firstRenderRef.current = true;
if (!data.startItemIndex || data.startItemIndex < 0) data.startItemIndex = 0; if (!data.startItemIndex || data.startItemIndex < 0) data.startItemIndex = 0;
else if (data.startItemIndex >= data.items.length) data.startItemIndex = data.items.length - 1; else if (data.startItemIndex >= data.items.length) data.startItemIndex = data.items.length - 1;
setSelected(data.startItemIndex); setSelected(data.startItemIndex);
@@ -179,6 +178,7 @@ const ListMenu: React.FC = () => {
setIndexStates(arrayIndexes); setIndexStates(arrayIndexes);
setCheckedStates(checkedIndexes); setCheckedStates(checkedIndexes);
listRefs.current[data.startItemIndex]?.focus(); listRefs.current[data.startItemIndex]?.focus();
firstRenderRef.current = true;
}); });
return ( return (