Refactor Modal.js

rdmorganiser · Aug 25, 2024 · 50dd90d · 50dd90d
1 parent abb3a50
commit 50dd90d
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/rdmo/core/assets/js/components/Modal.js b/rdmo/core/assets/js/components/Modal.js
@@ -2,9 +2,9 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { Modal as BootstrapModal } from 'react-bootstrap'
 
-const Modal = ({ bsSize, buttonLabel, buttonProps, title, show, onClose, onSave, children }) => {
+const Modal = ({ title, show, modalProps, submitLabel, submitProps, onClose, onSubmit, children }) => {
   return (
-    <BootstrapModal bsSize={bsSize} className="element-modal" onHide={onClose} show={show}>
+    <BootstrapModal className="element-modal" onHide={onClose} show={show} {...modalProps}>
       <BootstrapModal.Header closeButton>
         <h2 className="modal-title">{title}</h2>
       </BootstrapModal.Header>
@@ -15,26 +15,27 @@ const Modal = ({ bsSize, buttonLabel, buttonProps, title, show, onClose, onSave,
         <button type="button" className="btn btn-default" onClick={onClose}>
           {gettext('Close')}
         </button>
-        { onSave ?
-          <button type="button" className="btn btn-primary" onClick={onSave} {...buttonProps}>
-            {buttonLabel ?? gettext('Save')}
-          </button>
-          : null
+        {
+          onSubmit && (
+            <button type="button" className="btn btn-primary" onClick={onSubmit} {...submitProps}>
+              {submitLabel ?? gettext('Save')}
+            </button>
+          )
         }
       </BootstrapModal.Footer>
     </BootstrapModal>
   )
 }
 
 Modal.propTypes = {
-  bsSize: PropTypes.oneOf(['lg', 'large', 'sm', 'small']),
-  buttonLabel: PropTypes.string,
-  buttonProps: PropTypes.object,
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired,
-  onClose: PropTypes.func.isRequired,
-  onSave: PropTypes.func,
-  show: PropTypes.bool.isRequired,
   title: PropTypes.string.isRequired,
+  show: PropTypes.bool.isRequired,
+  modalProps: PropTypes.object,
+  submitLabel: PropTypes.string,
+  submitProps: PropTypes.object,
+  onClose: PropTypes.func.isRequired,
+  onSubmit: PropTypes.func,
+  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired,
 }
 
 export default Modal