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

fix(radial): go back to correct more page when going back from sub (#247)

Browse Source
This commit is contained in:
Diogo Manuel Coelho Morais dos Santos
2023-02-28 19:47:14 +00:00
committed by GitHub
parent bbc1216a54
commit d72b7eb00a
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
resource/interface/client/radial.lua
View File

@@ -19,7 +19,7 @@ local menus = {}
---@type RadialMenuItem[] ---@type RadialMenuItem[]
local menuItems = {} local menuItems = {}
---@type string[] ---@type table<{id: string, option: string}>
local menuHistory = {} local menuHistory = {}
---@type RadialMenuProps? ---@type RadialMenuProps?
@@ -27,7 +27,8 @@ local currentRadial = nil
---Open a the global radial menu or a registered radial submenu with the given id. ---Open a the global radial menu or a registered radial submenu with the given id.
---@param id string? ---@param id string?
local function showRadial(id) ---@param option number?
local function showRadial(id, option)
local radial = id and menus[id] local radial = id and menus[id]
if id and not radial then if id and not radial then
@@ -51,7 +52,8 @@ local function showRadial(id)
action = 'openRadialMenu', action = 'openRadialMenu',
data = { data = {
items = radial and radial.items or menuItems, items = radial and radial.items or menuItems,
sub = radial and true or nil sub = radial and true or nil,
option = option
} }
}) })
end end
@@ -65,10 +67,10 @@ local function refreshRadial(menuId)
return showRadial(menuId) return showRadial(menuId)
else else
for i = 1, #menuHistory do for i = 1, #menuHistory do
local subMenuId = menuHistory[i] local subMenu = menuHistory[i]
if subMenuId == menuId then if subMenu.id == menuId then
local parent = menus[subMenuId] local parent = menus[subMenu.id]
for j = 1, #parent.items do for j = 1, #parent.items do
-- If we still have a path to the current submenu, refresh instead of returning -- If we still have a path to the current submenu, refresh instead of returning
@@ -181,10 +183,7 @@ RegisterNUICallback('radialClick', function(index, cb)
end end
if item.menu then if item.menu then
if currentRadial then menuHistory[#menuHistory + 1] = { id = currentRadial and currentRadial.id, option = item.menu }
menuHistory[#menuHistory + 1] = currentRadial.id
end
showRadial(item.menu) showRadial(item.menu)
else else
lib.hideRadial() lib.hideRadial()
@@ -207,9 +206,12 @@ RegisterNUICallback('radialBack', function(_, cb)
local numHistory = #menuHistory local numHistory = #menuHistory
local lastMenu = numHistory > 0 and menuHistory[numHistory] local lastMenu = numHistory > 0 and menuHistory[numHistory]
if lastMenu then if not lastMenu then return end
menuHistory[numHistory] = nil menuHistory[numHistory] = nil
return showRadial(lastMenu)
if lastMenu.id then
return showRadial(lastMenu.id, lastMenu.option)
end end
currentRadial = nil currentRadial = nil
@@ -228,7 +230,8 @@ RegisterNUICallback('radialBack', function(_, cb)
SendNUIMessage({ SendNUIMessage({
action = 'openRadialMenu', action = 'openRadialMenu',
data = { data = {
items = menuItems items = menuItems,
option = lastMenu.option
} }
}) })
end) end)

8
web/src/features/menu/radial/index.tsx
View File

@@ -87,9 +87,13 @@ const RadialMenu: React.FC = () => {
setMenuItems(items); setMenuItems(items);
}, [menu.items, menu.page]); }, [menu.items, menu.page]);
useNuiEvent('openRadialMenu', async (data: { items: RadialMenuItem[]; sub?: boolean } | false) => { useNuiEvent('openRadialMenu', async (data: { items: RadialMenuItem[]; sub?: boolean, option?: string } | false) => {
if (!data) return setVisible(false); if (!data) return setVisible(false);
setMenu({ ...data, page: 1 }); let initialPage = 1;
if (data.option) {
data.items.findIndex((item, index) => item.menu == data.option && (initialPage = Math.floor(index / PAGE_ITEMS) + 1));
}
setMenu({ ...data, page: initialPage });
setVisible(true); setVisible(true);
}); });

1
web/src/typings/radial.ts
View File

@@ -4,4 +4,5 @@ export interface RadialMenuItem {
icon: IconProp; icon: IconProp;
label: string; label: string;
isMore?: boolean; isMore?: boolean;
menu?: string;
} }