From fc6a95c73c8d61da380b7c1dd5c1c52d9babd1f1 Mon Sep 17 00:00:00 2001 From: Diogo Manuel Coelho Morais dos Santos Date: Fri, 10 Mar 2023 19:38:34 +0000 Subject: [PATCH] fix(interface): Add table to icon typings (#261) --- resource/interface/client/context.lua | 2 +- resource/interface/client/input.lua | 2 +- resource/interface/client/main.lua | 2 ++ resource/interface/client/menu.lua | 2 +- resource/interface/client/notify.lua | 2 +- resource/interface/client/radial.lua | 2 +- resource/interface/client/textui.lua | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/resource/interface/client/context.lua b/resource/interface/client/context.lua index 3dd51c9..b9a0171 100644 --- a/resource/interface/client/context.lua +++ b/resource/interface/client/context.lua @@ -4,7 +4,7 @@ local openContextMenu = nil ---@class ContextMenuItem ---@field title? string ---@field menu? string ----@field icon? string +---@field icon? string | {[1]: IconProp, [2]: string}; ---@field iconColor? string ---@field onSelect? fun(args: any) ---@field arrow? boolean diff --git a/resource/interface/client/input.lua b/resource/interface/client/input.lua index e5c2b4e..92eab3d 100644 --- a/resource/interface/client/input.lua +++ b/resource/interface/client/input.lua @@ -5,7 +5,7 @@ local input ---@field label string ---@field options? { value: string, label: string, default?: string }[] ---@field password? boolean ----@field icon? string +---@field icon? string | {[1]: IconProp, [2]: string}; ---@field iconColor? string ---@field placeholder? string ---@field default? string | number diff --git a/resource/interface/client/main.lua b/resource/interface/client/main.lua index ea1c428..7ee309b 100644 --- a/resource/interface/client/main.lua +++ b/resource/interface/client/main.lua @@ -1,3 +1,5 @@ +---@alias IconProp 'fas' | 'far' | 'fal' | 'fat' | 'fad' | 'fab' | 'fak' | 'fass' + local keepInput = IsNuiFocusKeepingInput() function lib.setNuiFocus(allowInput, disableCursor) diff --git a/resource/interface/client/menu.lua b/resource/interface/client/menu.lua index a43aa58..2906104 100644 --- a/resource/interface/client/menu.lua +++ b/resource/interface/client/menu.lua @@ -8,7 +8,7 @@ local openMenu ---@class MenuOptions ---@field label string ----@field icon? string +---@field icon? string | {[1]: IconProp, [2]: string}; ---@field checked? boolean ---@field values? table ---@field description? string diff --git a/resource/interface/client/notify.lua b/resource/interface/client/notify.lua index 2b240ea..55db59e 100644 --- a/resource/interface/client/notify.lua +++ b/resource/interface/client/notify.lua @@ -9,7 +9,7 @@ ---@field position? NotificationPosition ---@field type? NotificationType ---@field style? { [string]: any } ----@field icon? string; +---@field icon? string | {[1]: IconProp, [2]: string}; ---@field iconColor? string; ---@param data NotifyProps diff --git a/resource/interface/client/radial.lua b/resource/interface/client/radial.lua index 79fe95d..4412a8a 100644 --- a/resource/interface/client/radial.lua +++ b/resource/interface/client/radial.lua @@ -1,6 +1,6 @@ ---@class RadialMenuItem ---@field id string ----@field icon string +---@field icon string | {[1]: IconProp, [2]: string}; ---@field label string ---@field menu? string ---@field onSelect? fun(currentMenu: string | nil, itemIndex: number) | string diff --git a/resource/interface/client/textui.lua b/resource/interface/client/textui.lua index a7dd508..60f998a 100644 --- a/resource/interface/client/textui.lua +++ b/resource/interface/client/textui.lua @@ -1,6 +1,6 @@ ---@class TextUIOptions ---@field position? 'right-center' | 'left-center' | 'top-center'; ----@field icon? string; +---@field icon? string | {[1]: IconProp, [2]: string}; ---@field iconColor? string; ---@field style? string;