Merge branch 'dev' into jupyter

plotly · Jun 21, 2023 · 5443d0c · 5443d0c
2 parents 07721d2 + 8894c45
commit 5443d0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ## Fixed
 
+- [#2555](https://github.com/plotly/dash/pull/2555) Fix browser back button when removing one of multiple location components from layout, fix [#1312](https://github.com/plotly/dash/issues/1312)
 - [#2565](https://github.com/plotly/dash/pull/2565) Fix sorting for > 10 pages, fix [#2564](https://github.com/plotly/dash/issues/2564)
 
 ## [2.10.2] - 2023-05-31

diff --git a/components/dash-core-components/src/components/Location.react.js b/components/dash-core-components/src/components/Location.react.js
@@ -112,7 +112,7 @@ export default class Location extends Component {
     }
 
     componentDidMount() {
-        window.onpopstate = this.onLocationChange;
+        window.addEventListener('popstate', this.onLocationChange);
 
         window.addEventListener(
             '_dashprivate_pushstate',
@@ -122,7 +122,7 @@ export default class Location extends Component {
     }
 
     componentWillUnmount() {
-        window.onpopstate = () => {};
+        window.removeEventListener('popstate', this.onLocationChange);
         window.removeEventListener(
             '_dashprivate_pushstate',
             this.onLocationChange