BUGFIX: Fix unresolved promise in ns.prompt API (#1257)

This commit is contained in:
catloversg 2024-05-10 15:55:50 +07:00 committed by GitHub
parent e55387df4d
commit 35c32e2871
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 9 deletions

@ -32,7 +32,9 @@ True if the player clicks “Yes”; false if the player clicks “No”; or the
RAM cost: 0 GB RAM cost: 0 GB
Prompts the player with a dialog box. Here is an explanation of the various options. Prompts the player with a dialog box and returns a promise. If the player cancels this dialog box (press X button or click outside the dialog box), the promise is resolved with a default value (empty string or "false"). If this API is called again while the old dialog box still exists, the old dialog box will be replaced with a new one, and the old promise will be resolved with the default value.
Here is an explanation of the various options.
- `options.type` is not provided to the function. If `options.type` is left out and only a string is passed to the function, then the default behavior is to create a boolean dialog box. - `options.type` is not provided to the function. If `options.type` is left out and only a string is passed to the function, then the default behavior is to create a boolean dialog box.

@ -7158,7 +7158,12 @@ export interface NS {
* @remarks * @remarks
* RAM cost: 0 GB * RAM cost: 0 GB
* *
* Prompts the player with a dialog box. Here is an explanation of the various options. * Prompts the player with a dialog box and returns a promise. If the player cancels this dialog box (press X button
* or click outside the dialog box), the promise is resolved with a default value (empty string or "false"). If this
* API is called again while the old dialog box still exists, the old dialog box will be replaced with a new one, and
* the old promise will be resolved with the default value.
*
* Here is an explanation of the various options.
* *
* - `options.type` is not provided to the function. If `options.type` is left out and * - `options.type` is not provided to the function. If `options.type` is left out and
* only a string is passed to the function, then the default behavior is to create a * only a string is passed to the function, then the default behavior is to create a

@ -18,19 +18,31 @@ interface Prompt {
export function PromptManager({ hidden }: { hidden: boolean }): React.ReactElement { export function PromptManager({ hidden }: { hidden: boolean }): React.ReactElement {
const [prompt, setPrompt] = useState<Prompt | null>(null); const [prompt, setPrompt] = useState<Prompt | null>(null);
const resolveCurrentPromptWithDefaultValue = (currentPrompt: Prompt) => {
if (["text", "select"].includes(currentPrompt.options?.type ?? "")) {
currentPrompt.resolve("");
} else {
currentPrompt.resolve(false);
}
};
useEffect(() => { useEffect(() => {
return PromptEvent.subscribe((p: Prompt) => { return PromptEvent.subscribe((newPrompt: Prompt) => {
setPrompt(p); setPrompt((currentPrompt) => {
if (currentPrompt) {
resolveCurrentPromptWithDefaultValue(currentPrompt);
}
return newPrompt;
});
}); });
}, []); }, []);
function close(): void { function close(): void {
if (prompt === null) return; if (prompt === null) {
if (["text", "select"].includes(prompt.options?.type ?? "")) { return;
prompt.resolve("");
} else {
prompt.resolve(false);
} }
resolveCurrentPromptWithDefaultValue(prompt);
setPrompt(null); setPrompt(null);
} }