Merge branch 'master' into chore/sc-28094/givefreely-modal-snippet

Sefaria · Jun 20, 2024 · e8a4a6e · e8a4a6e
2 parents c359ea4 + 5ad689e
commit e8a4a6e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/static/js/ReaderApp.jsx b/static/js/ReaderApp.jsx
@@ -282,8 +282,14 @@ class ReaderApp extends Component {
       } else {
         state.panels = [];
       }
-      this.setState(state, () => {
-        if (state.scrollPosition) {
+
+      // need to clone state and panels; if we don't clone them, when we run setState, it will make it so that
+      // this.state.panels refers to the same object as history.state.panels, which cause back button bugs
+      const newState = {...state};
+      newState.panels = newState.panels.map(panel => this.clonePanel(panel));
+
+      this.setState(newState, () => {
+        if (newState.scrollPosition) {
           $(".content").scrollTop(event.state.scrollPosition)
             .trigger("scroll");
         }