comments

Author: tomhamiltonstubber

src/components/appointments/Appointments.js

@@ -203,8 +203,7 @@ class Appointments extends Component {
                     update={this.update}
                     signin={this.signin}
                     signout={this.signout}
-                    history={props.history}
-                    parent_el={this.props.config.modal_parent}/>
+                    history={props.history}/>
         )}/>
       </div>
     )

src/components/appointments/AptModal.js

@@ -165,7 +165,7 @@ class AptModal extends Component {
   render () {
     if (!this.props.got_data) {
       return (
-        <Modal history={this.props.history} title='' parent_el={this.props.config.modal_parent}>
+        <Modal history={this.props.history} title='' config={this.props.config}>
           <p>Loading...</p>
         </Modal>
       )
@@ -196,7 +196,7 @@ class AptModal extends Component {
              title={title}
              last_url={this.props.last_url}
              flex={false}
-             parent_el={this.props.config.modal_parent}>
+             config={this.props.config}>
         <AptDetails apt={apt}
                     spaces_available={spaces_available}
                     attending={Boolean(this.state.display_data && this.state.attendees)}

src/components/contractors/ConModal.js

@@ -38,22 +38,22 @@ class ConModal extends Component {
   render () {
     if (!this.props.got_contractors) {
       return (
-        <Modal history={this.props.history} title='' parent_el={this.props.config.modal_parent}>
+        <Modal history={this.props.history} title='' config={this.props.config}>
           <p>Loading...</p>
         </Modal>
       )
     }
     const _con = this.get_contractor()
     if (!_con) {
       return (
-        <Modal history={this.props.history} parent_el={this.props.config.modal_parent} title='Contractor not Found'>
+        <Modal history={this.props.history} config={this.props.config} title='Contractor not Found'>
           <p>No Contractor found with id {this.props.id}.</p>
         </Modal>
       )
     }
     const {contractor, contractor_extra} = _con
     return (
-      <Modal history={this.props.history} title={contractor.name} last_url={this.props.last_url}>
+      <Modal history={this.props.history} title={contractor.name} last_url={this.props.last_url} config={this.props.config}>
         <div className="tcs-extra">
           <Photo contractor={contractor} config={this.props.config}/>
           <Stars contractor={contractor} config={this.props.config}/>

src/components/contractors/Contractors.js

@@ -201,7 +201,6 @@ class Contractors extends Component {
                     get_contractor_details={this.get_contractor_details}
                     root={this.props.root}
                     config={this.props.config}
-                    parent_el={this.props.config.modal_parent}
                     history={props.history}/>
         )}/>
       </div>

src/components/enquiry/EnquiryModal.js

@@ -3,7 +3,7 @@ import Modal from '../shared/Modal'
 import EnquiryForm from '../shared/EnquiryForm'
 
 const EnquiryModal = ({root, config, history}) => (
-  <Modal history={history} title={config.get_text('enquiry_title')} parent_el={config.modal_parent}>
+  <Modal history={history} title={config.get_text('enquiry_title')} config={config}>
     <div className="tcs-content">
       <EnquiryForm root={root} config={config} mode='enquiry-modal'/>
     </div>

src/components/shared/Modal.js

@@ -63,8 +63,8 @@ class Modal extends Component {
         </div>
       </div>
     )
-    if (this.props.parent_el) {
-      return ReactDOM.createPortal(el, document.getElementById(this.props.parent_el))
+    if (this.props.config.parent_el) {
+      return ReactDOM.createPortal(el, document.getElementById(this.props.config.parent_el))
     } else {
       return el
     }

src/index.js

@@ -151,9 +151,6 @@ window.socket = async function (public_key, config) {
   if (!config.element) {
     config.element = '#socket'
   }
-  if (!config.modal_parent) {
-    config.modal_parent = null
-  }
 
   config.contractor_filter = {}
   if (config.labels_include) {