mirror/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia.git synced 2026-04-23 07:38:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't call done callback unless it exists

Browse Source
This commit is contained in:
Opender Singh
2021-07-07 11:47:54 +12:00
parent 17de9ef556
commit ff49cb3093
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/insomnia-app/app/ui/components/modals/ask-modal.tsx
View File

@@ -14,6 +14,14 @@ interface State {
loading: boolean;
}
interface AskModalOptions {
title?: string;
message?: string;
onDone?: (success: boolean) => Promise<void>;
yesText?: string;
noText?: string;
}
@autoBindMethodsForReact(AUTOBIND_CFG)
class AskModal extends PureComponent<{}, State> {
state: State = {
@@ -26,8 +34,9 @@ class AskModal extends PureComponent<{}, State> {
modal: Modal | null = null;
yesButton: HTMLButtonElement | null = null;
_doneCallback: Function = () => {};
_promiseCallback: Function = () => {};
_doneCallback: AskModalOptions['onDone'];
_promiseCallback: (value: boolean | PromiseLike<boolean>) => void = () => {};
_setModalRef(m: Modal) {
this.modal = m;
@@ -42,19 +51,17 @@ class AskModal extends PureComponent<{}, State> {
loading: true,
});
if (this._doneCallback) {
// Wait for the callback to finish before closing
await this._doneCallback(true);
}
// Wait for the callback to finish before closing
await this._doneCallback?.(true);
this._promiseCallback(true);
this.hide();
}
_handleNo() {
async _handleNo() {
this.hide();
this?._doneCallback(false);
await this._doneCallback?.(false);
this._promiseCallback(false);
}
@@ -63,8 +70,7 @@ class AskModal extends PureComponent<{}, State> {
this.modal?.hide();
}
show(options: any = {}) {
const { title, message, onDone, yesText, noText } = options;
show({ title, message, onDone, yesText, noText }: AskModalOptions = {}) {
this._doneCallback = onDone;
this.setState({
title: title || 'Confirm',
@@ -74,10 +80,12 @@ class AskModal extends PureComponent<{}, State> {
loading: false,
});
this.modal?.show();
setTimeout(() => {
this.yesButton && this.yesButton.focus();
}, 100);
return new Promise(resolve => {
return new Promise<boolean>(resolve => {
this._promiseCallback = resolve;
});
}