FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-18 23:46:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(interface/alert): support dialog timeout

Browse Source 
closeAlertDialog will now error if a reason is passed.
Added timeout param to alertDialog.
Resolves #522.
This commit is contained in:
Linden
2024-05-08 05:23:27 +10:00
parent b1cb2142f0
commit 43905bdd62
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/client/resource/interface/alert.ts
View File

@@ -13,6 +13,7 @@ interface AlertDialogProps {
type alertDialog = (data: AlertDialogProps) => Promise<'cancel' | 'confirm'>; type alertDialog = (data: AlertDialogProps) => Promise<'cancel' | 'confirm'>;
export const alertDialog: alertDialog = async (data) => await exports.ox_lib.alertDialog(data); export const alertDialog: alertDialog = async (data, timeout?: number) =>
await exports.ox_lib.alertDialog(data, timeout);
export const closeAlertDialog = () => exports.ox_lib.closeAlertDialog(); export const closeAlertDialog = (reason?: string) => exports.ox_lib.closeAlertDialog(reason);

23
resource/interface/client/alert.lua
View File

@@ -1,4 +1,6 @@
---@type promise?
local alert = nil local alert = nil
local alertId = 0
---@class AlertDialogProps ---@class AlertDialogProps
---@field header string; ---@field header string;
@@ -10,10 +12,13 @@ local alert = nil
---@field labels? {cancel?: string, confirm?: string} ---@field labels? {cancel?: string, confirm?: string}
---@param data AlertDialogProps ---@param data AlertDialogProps
---@param timeout number Force the window to timeout after `x` milliseconds.
---@return 'cancel' | 'confirm' | nil ---@return 'cancel' | 'confirm' | nil
function lib.alertDialog(data) function lib.alertDialog(data, timeout)
if alert then return end if alert then return end
local id = alertId + 1
alertId = id
alert = promise.new() alert = promise.new()
lib.setNuiFocus(false) lib.setNuiFocus(false)
@@ -22,10 +27,17 @@ function lib.alertDialog(data)
data = data data = data
}) })
if timeout then
SetTimeout(timeout, function()
if id == alertId then lib.closeAlertDialog('timeout') end
end)
end
return Citizen.Await(alert) return Citizen.Await(alert)
end end
function lib.closeAlertDialog() ---@param reason? string An optional reason for the window to be closed.
function lib.closeAlertDialog(reason)
if not alert then return end if not alert then return end
lib.resetNuiFocus() lib.resetNuiFocus()
@@ -33,16 +45,17 @@ function lib.closeAlertDialog()
action = 'closeAlertDialog' action = 'closeAlertDialog'
}) })
alert:resolve(nil) local p = alert
alert = nil alert = nil
end
if reason then p:reject(reason) else p:resolve() end
end
RegisterNUICallback('closeAlert', function(data, cb) RegisterNUICallback('closeAlert', function(data, cb)
cb(1) cb(1)
lib.resetNuiFocus() lib.resetNuiFocus()
local promise = alert local promise = alert --[[@as promise]]
alert = nil alert = nil
promise:resolve(data) promise:resolve(data)