From 33bd3ebc772ee2ceced568994e4d9fbcf36d4d40 Mon Sep 17 00:00:00 2001
From: Luke <sabolukas03@gmail.com>
Date: Tue, 2 Aug 2022 12:15:50 +0200
Subject: [PATCH] feat(web/menu): send args in callback function

---
 resource/interface/client/menu.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/resource/interface/client/menu.lua b/resource/interface/client/menu.lua
index c2393b2..84bb2c3 100644
--- a/resource/interface/client/menu.lua
+++ b/resource/interface/client/menu.lua
@@ -27,10 +27,11 @@ RegisterNUICallback('confirmSelected', function(data, cb)
     cb(1)
     SetNuiFocus(false, false)
     local selected = data
+    local args = registeredMenus[openMenu].options[selected+1].args
     if type(selected) == 'number' then
-        registeredMenus[openMenu].cb(selected)
+        registeredMenus[openMenu].cb(selected, nil, args)
     else
-        registeredMenus[openMenu].cb(selected[1], selected[2])
+        registeredMenus[openMenu].cb(selected[1], selected[2], args)
     end
 end)
 
@@ -38,10 +39,11 @@ RegisterNUICallback('changeSelected', function(data, cb)
     cb(1)
     if not registeredMenus[openMenu].onChange then return end
     local selected = data
+    local args = registeredMenus[openMenu].options[selected+1].args
     if type(selected) == 'number' then
-        registeredMenus[openMenu].onChange(selected)
+        registeredMenus[openMenu].onChange(selected, nil, args)
     else
-        registeredMenus[openMenu].onChange(selected[1], selected[2])
+        registeredMenus[openMenu].onChange(selected[1], selected[2], args)
     end
 end)
 
@@ -55,15 +57,11 @@ RegisterCommand('testMenu', function()
     lib.registerMenu({
         id = 'epic_menu',
         title = 'Nice menu',
-        onChange = function(selected, scrollIndex)
-            print(selected, scrollIndex)
-        end,
         options = {
             {label = 'Nice option'},
             {label = 'Nice header', values = {'Option1', 'option2', 'option3'}, description = 'Tooltip description'}
         }
-    }, function(selected, scrollIndex)
-        print(selected, scrollIndex)
+    }, function(selected, scrollIndex, args)
         lib.registerMenu({
             id = 'more_epic_menu',
             title = 'Nicer menu',
@@ -72,11 +70,13 @@ RegisterCommand('testMenu', function()
                 lib.showMenu('epic_menu')
             end,
             options = {
-                {label = 'Extra nice option'},
+                {label = 'Extra nice option', args = 'Hello there'},
                 {label = 'Giga nice option'},
                 {label = 'Omega nice option'},
             }
-        }, function() end)
+        }, function(selected, scrollIndex, args)
+            print(selected, scrollIndex, args)
+         end)
         lib.showMenu('more_epic_menu')
     end)
     lib.showMenu('epic_menu')