From d2799075ad0f94b6d00b6427698fbcf0ffc7f736 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Mon, 21 Nov 2022 16:45:46 +1100
Subject: [PATCH] fix: types and nil-checks

---
 imports/addCommand/server.lua      |  2 +-
 resource/interface/client/menu.lua | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/imports/addCommand/server.lua b/imports/addCommand/server.lua
index ebace51..252c22a 100644
--- a/imports/addCommand/server.lua
+++ b/imports/addCommand/server.lua
@@ -33,7 +33,7 @@ local function chatSuggestion(name, parameters, help)
 	}
 end
 
----@param group string | string[]
+---@param group string | string[] | false
 ---@param name string | string[]
 ---@param callback function
 ---@param parameters table
diff --git a/resource/interface/client/menu.lua b/resource/interface/client/menu.lua
index 0084242..a6df23b 100644
--- a/resource/interface/client/menu.lua
+++ b/resource/interface/client/menu.lua
@@ -1,7 +1,7 @@
 ---@type { [string]: MenuProps }
 local registeredMenus = {}
 ---@type MenuProps | nil
-local openMenu = nil
+local openMenu
 local keepInput = IsNuiFocusKeepingInput()
 
 ---@alias MenuPosition 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right'
@@ -11,7 +11,7 @@ local keepInput = IsNuiFocusKeepingInput()
 ---@field label string
 ---@field icon? string
 ---@field checked? boolean
----@field values? Array<string | { label: string, description: string }>
+---@field values? table<string | { label: string, description: string }>
 ---@field description? string
 ---@field defaultIndex? number
 ---@field args? {[any]: any}
@@ -91,6 +91,9 @@ end
 ---@param onExit boolean?
 function lib.hideMenu(onExit)
     local menu = openMenu
+
+    if not menu then return end
+
     openMenu = nil
 
     if onExit and menu.onClose then
@@ -116,7 +119,7 @@ function lib.setMenuOptions(id, options, index)
 end
 
 ---@return string?
-function lib.getOpenMenu() return openMenu?.id end
+function lib.getOpenMenu() return openMenu and openMenu.id end
 
 RegisterNUICallback('confirmSelected', function(data, cb)
     cb(1)
@@ -128,6 +131,8 @@ RegisterNUICallback('confirmSelected', function(data, cb)
 
     local menu = openMenu
 
+    if not menu then return end
+
     if menu.options[data[1]].close ~= false then
         resetFocus()
         openMenu = nil
@@ -140,7 +145,7 @@ end)
 
 RegisterNUICallback('changeIndex', function(data, cb)
     cb(1)
-    if not openMenu?.onSideScroll then return end
+    if not openMenu or not openMenu.onSideScroll then return end
 
     data[1] += 1 -- selected
 
@@ -153,7 +158,7 @@ end)
 
 RegisterNUICallback('changeSelected', function(data, cb)
     cb(1)
-    if not openMenu?.onSelected then return end
+    if not openMenu or not openMenu.onSelected then return end
 
     data[1] += 1 -- selected
 
@@ -176,7 +181,7 @@ end)
 
 RegisterNUICallback('changeChecked', function(data, cb)
     cb(1)
-    if not openMenu?.onCheck then return end
+    if not openMenu or not openMenu.onCheck then return end
 
     data[1] += 1 -- selected
 
@@ -188,6 +193,9 @@ RegisterNUICallback('closeMenu', function(data, cb)
     resetFocus()
 
     local menu = openMenu
+
+    if not menu then return end
+
     openMenu = nil
 
     if menu.onClose then