From 71885f5831971f2fc0f61be2957071e2abfc4d56 Mon Sep 17 00:00:00 2001
From: Luke <39926192+LukeWasTakenn@users.noreply.github.com>
Date: Fri, 10 Feb 2023 18:17:30 +0100
Subject: [PATCH] refactor(web/radial): disable nui focus when closing with x
 button

---
 resource/interface/client/radial.lua   | 11 +++++++++++
 web/src/features/menu/radial/index.tsx |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/resource/interface/client/radial.lua b/resource/interface/client/radial.lua
index a7e0967..9680faf 100644
--- a/resource/interface/client/radial.lua
+++ b/resource/interface/client/radial.lua
@@ -97,6 +97,17 @@ RegisterNUICallback('radialBack', function(_, cb)
     })
 end)
 
+RegisterNUICallback('radialClose', function(_, cb)
+    cb(1)
+
+    if not isOpen then return end
+
+    SetNuiFocus(false, false)
+
+    isOpen = false
+    currentRadial = nil
+end)
+
 lib.addKeybind({
     name = 'ox_lib-radial',
     description = 'Open radial menu',
diff --git a/web/src/features/menu/radial/index.tsx b/web/src/features/menu/radial/index.tsx
index 5cf41e3..b8619c3 100644
--- a/web/src/features/menu/radial/index.tsx
+++ b/web/src/features/menu/radial/index.tsx
@@ -124,7 +124,11 @@ const RadialMenu: React.FC = () => {
             <g
               transform={`translate(175, 175)`}
               onClick={() => {
-                menu.sub ? fetchNui('radialBack') : setVisible(false);
+                if (menu.sub) fetchNui('radialBack');
+                else {
+                  setVisible(false);
+                  fetchNui('radialClose');
+                }
               }}
             >
               <circle r={30} className={classes.centerCircle} />