Update with last changes

hotwired · Nov 13, 2023 · a49f6a6 · a49f6a6
1 parent 9d3fdeb
commit a49f6a6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/assets/javascripts/turbo.js b/app/assets/javascripts/turbo.js
@@ -2543,7 +2543,9 @@ class Navigator {
       } else {
         await this.view.renderPage(snapshot, false, true, this.currentVisit);
       }
-      this.view.scrollToTop();
+      if (!snapshot.shouldPreserveScrollPosition) {
+        this.view.scrollToTop();
+      }
       this.view.clearSnapshotCache();
     }
   }
@@ -3737,7 +3739,7 @@ class PageView extends View {
     return this.snapshotCache.get(location);
   }
   isPageRefresh(visit) {
-    return visit && this.lastRenderedLocation.href === visit.location.href;
+    return !visit || this.lastRenderedLocation.href === visit.location.href;
   }
   get snapshot() {
     return PageSnapshot.fromElement(this.element);

diff --git a/app/assets/javascripts/turbo.min.js b/app/assets/javascripts/turbo.min.js
diff --git a/app/assets/javascripts/turbo.min.js.map b/app/assets/javascripts/turbo.min.js.map