use a single prop to close modal

superdesk · Dec 11, 2024 · d779abe · d779abe
1 parent 9e52aaf
commit d779abe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/scripts/core/prompt-modal.tsx b/scripts/core/prompt-modal.tsx
@@ -4,8 +4,7 @@ import {gettext} from './utils';
 
 interface IProps {
     label: string;
-    closeModal(): void;
-    onDone(value: string): void;
+    closeModal(result: {value: string | null}): void;
     okButtonText?: string;
     cancelButtonText?: string;
 }
@@ -27,21 +26,20 @@ export class PromptModal extends React.Component<IProps, IState> {
             <Modal
                 position="top"
                 visible
-                onHide={this.props.closeModal}
+                onHide={() => this.props.closeModal({value: null})}
                 footerTemplate={
                     (
                         <Spacer h gap="4" justifyContent="end" noWrap>
                             <Button
                                 type="default"
                                 text={this.props.cancelButtonText ?? gettext('Cancel')}
-                                onClick={this.props.closeModal}
+                                onClick={() => this.props.closeModal({value: null})}
                             />
                             <Button
                                 type="primary"
                                 text={this.props.okButtonText ?? gettext('Ok')}
                                 onClick={() => {
-                                    this.props.onDone(this.state.value);
-                                    this.props.closeModal();
+                                    this.props.closeModal({value: this.state.value});
                                 }}
                             />
                         </Spacer>

diff --git a/scripts/core/ui-utils.tsx b/scripts/core/ui-utils.tsx
@@ -25,13 +25,16 @@ export const ui = {
             showModal(({closeModal}) => {
                 return (
                     <PromptModal
-                        closeModal={closeModal}
+                        closeModal={({value}) => {
+                            closeModal();
+
+                            if (value != null) {
+                                resolve(value);
+                            }
+                        }}
                         label={options.inputLabel}
                         okButtonText={options.okButtonText}
                         cancelButtonText={options.cancelButtonText}
-                        onDone={(value) => {
-                            resolve(value);
-                        }}
                     />
                 );
             });