push history on modal mount, if current history ref is not this same component id

benjiwheeler · benjiwheeler · commit 3f4e969810d5 · 2018-12-19T08:53:33.000-05:00
diff --git a/src/containers/modal.jsx b/src/containers/modal.jsx
@@ -19,7 +19,7 @@ class Modal extends React.Component {
     componentDidMount () {
         // Add a history event only if it's not currently for our modal. This
         // avoids polluting the history with many entries. We only need one.
-        this.pushHistory(this.id, history.state === null);
+        this.pushHistory(this.id, (history.state === null || history.state !== this.id));
     }
     componentWillUnmount () {
         this.removeEventListeners();

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Modal extends React.Component {`
`19`	`19`	`componentDidMount () {`
`20`	`20`	`// Add a history event only if it's not currently for our modal. This`
`21`	`21`	`// avoids polluting the history with many entries. We only need one.`
`22`		`- this.pushHistory(this.id, history.state === null);`
	`22`	`+ this.pushHistory(this.id, (history.state === null \|\| history.state !== this.id));`
`23`	`23`	`}`
`24`	`24`	`componentWillUnmount () {`
`25`	`25`	`this.removeEventListeners();`