stop exiting a modal using history.back()

tutorcruncher · Jan 30, 2018 · f59bcfe · f59bcfe
1 parent 81a4277
commit f59bcfe
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/public/index.html b/public/index.html
@@ -66,7 +66,7 @@
     socket(public_key, {
       element: '#socket4',
       router_mode: 'history',
-      mode: 'enquiry',
+      mode: 'enquiry-modal',
       api_root: api_root,
     })
   </script>

diff --git a/src/components/contractors/ConModal.js b/src/components/contractors/ConModal.js
@@ -52,7 +52,7 @@ class ConModal extends Component {
     }
     const {contractor, contractor_extra} = _con
     return (
-      <Modal history={this.props.history} title={contractor.name}>
+      <Modal history={this.props.history} title={contractor.name} last_url={this.props.last_url}>
         <div className="tcs-body">
           <div className="tcs-extra">
             <img src={contractor.photo} alt={contractor.name}/>

diff --git a/src/components/contractors/Contractors.js b/src/components/contractors/Contractors.js
@@ -16,6 +16,7 @@ class Contractors extends Component {
       more_pages: false,
       subjects: [],
       selected_subject: null,
+      last_url: null,
     }
     this.update_contractors = this.update_contractors.bind(this)
     this.get_contractor_details = this.get_contractor_details.bind(this)
@@ -52,7 +53,9 @@ class Contractors extends Component {
   }
 
   subject_change (selected_subject) {
-    this.props.history.push(this.subject_url(selected_subject))
+    const url = this.subject_url(selected_subject)
+    this.props.history.push(url)
+    this.setState({last_url: url})
     this.update_contractors(selected_subject)
   }
 
@@ -135,6 +138,7 @@ class Contractors extends Component {
         </If>
         <Route path={this.props.root.url(':id(\\d+):_extra')} render={props => (
           <ConModal id={props.match.params.id}
+                    last_url={this.state.last_url}
                     contractors={this.state.contractors}
                     got_contractors={this.state.got_contractors}
                     get_contractor_details={this.get_contractor_details}

diff --git a/src/components/shared/Modal.js b/src/components/shared/Modal.js
@@ -37,7 +37,9 @@ class Modal extends Component {
 
   close () {
     this.setState({show: false})
-    setTimeout(() => this.props.history.goBack(), 200)
+    const h = this.props.history
+    const next_url = this.props.last_url ? this.props.last_url : h.location.pathname.replace(/\/[^/]+$/, '')
+    setTimeout(() => h.push(next_url), 200)
   }
 
   render () {