From d72b7eb00a7f11f19514a326a82dcdee6f89a106 Mon Sep 17 00:00:00 2001
From: Diogo Manuel Coelho Morais dos Santos <moozdzn@gmail.com>
Date: Tue, 28 Feb 2023 19:47:14 +0000
Subject: [PATCH] fix(radial): go back to correct more page when going back
 from sub (#247)

---
 resource/interface/client/radial.lua   | 31 ++++++++++++++------------
 web/src/features/menu/radial/index.tsx |  8 +++++--
 web/src/typings/radial.ts              |  1 +
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/resource/interface/client/radial.lua b/resource/interface/client/radial.lua
index c0a6169..49402fd 100644
--- a/resource/interface/client/radial.lua
+++ b/resource/interface/client/radial.lua
@@ -19,7 +19,7 @@ local menus = {}
 ---@type RadialMenuItem[]
 local menuItems = {}
 
----@type string[]
+---@type table<{id: string, option: string}>
 local menuHistory = {}
 
 ---@type RadialMenuProps?
@@ -27,7 +27,8 @@ local currentRadial = nil
 
 ---Open a the global radial menu or a registered radial submenu with the given id.
 ---@param id string?
-local function showRadial(id)
+---@param option number?
+local function showRadial(id, option)
     local radial = id and menus[id]
 
     if id and not radial then
@@ -51,7 +52,8 @@ local function showRadial(id)
         action = 'openRadialMenu',
         data = {
             items = radial and radial.items or menuItems,
-            sub = radial and true or nil
+            sub = radial and true or nil,
+            option = option
         }
     })
 end
@@ -65,10 +67,10 @@ local function refreshRadial(menuId)
             return showRadial(menuId)
         else
             for i = 1, #menuHistory do
-                local subMenuId = menuHistory[i]
+                local subMenu = menuHistory[i]
 
-                if subMenuId == menuId then
-                    local parent = menus[subMenuId]
+                if subMenu.id == menuId then
+                    local parent = menus[subMenu.id]
 
                     for j = 1, #parent.items do
                         -- If we still have a path to the current submenu, refresh instead of returning
@@ -181,10 +183,7 @@ RegisterNUICallback('radialClick', function(index, cb)
     end
 
     if item.menu then
-        if currentRadial then
-            menuHistory[#menuHistory + 1] = currentRadial.id
-        end
-
+        menuHistory[#menuHistory + 1] = { id = currentRadial and currentRadial.id, option = item.menu }
         showRadial(item.menu)
     else
         lib.hideRadial()
@@ -207,9 +206,12 @@ RegisterNUICallback('radialBack', function(_, cb)
     local numHistory = #menuHistory
     local lastMenu = numHistory > 0 and menuHistory[numHistory]
 
-    if lastMenu then
-        menuHistory[numHistory] = nil
-        return showRadial(lastMenu)
+    if not lastMenu then return end
+    
+    menuHistory[numHistory] = nil
+
+    if lastMenu.id then
+        return showRadial(lastMenu.id, lastMenu.option)
     end
 
     currentRadial = nil
@@ -228,7 +230,8 @@ RegisterNUICallback('radialBack', function(_, cb)
     SendNUIMessage({
         action = 'openRadialMenu',
         data = {
-            items = menuItems
+            items = menuItems,
+            option = lastMenu.option
         }
     })
 end)
diff --git a/web/src/features/menu/radial/index.tsx b/web/src/features/menu/radial/index.tsx
index 6ec784e..540bd75 100644
--- a/web/src/features/menu/radial/index.tsx
+++ b/web/src/features/menu/radial/index.tsx
@@ -87,9 +87,13 @@ const RadialMenu: React.FC = () => {
     setMenuItems(items);
   }, [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);
-    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);
   });
 
diff --git a/web/src/typings/radial.ts b/web/src/typings/radial.ts
index 4bb20c8..3aa13c0 100644
--- a/web/src/typings/radial.ts
+++ b/web/src/typings/radial.ts
@@ -4,4 +4,5 @@ export interface RadialMenuItem {
   icon: IconProp;
   label: string;
   isMore?: boolean;
+  menu?: string;
 }