Skip to content

Fix(alert dialog) unhandled reject #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikigoalie wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix(alert dialog) unhandled reject #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b45c5e6
Update alert.lua
mikigoalie Sep 12, 2025
200a53b
Update alert.ts
mikigoalie Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package/client/resource/interface/alert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interface AlertDialogProps {
};
}

type alertDialog = (data: AlertDialogProps) => Promise<'cancel' | 'confirm'>;
type alertDialog = (data: AlertDialogProps) => Promise<'cancel' | 'confirm' | 'timeout' | undefined>;

export const alertDialog: alertDialog = async (data, timeout?: number) =>
await exports.ox_lib.alertDialog(data, timeout);
Expand Down
6 changes: 3 additions & 3 deletions resource/interface/client/alert.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ local alertId = 0

---@param data AlertDialogProps
---@param timeout? number Force the window to timeout after `x` milliseconds.
---@return 'cancel' | 'confirm' | nil
---@return 'cancel' | 'confirm' | 'timeout' | nil
function lib.alertDialog(data, timeout)
if alert then return end

Expand Down Expand Up @@ -53,10 +53,10 @@ function lib.closeAlertDialog(reason)
action = 'closeAlertDialog'
})

local p = alert
local _alert = alert
alert = nil

if reason then p:reject(reason) else p:resolve() end
_alert:resolve(reason)
end

RegisterNUICallback('closeAlert', function(data, cb)
Expand Down