fix scroll restoration

darkroomengineering · Jul 30, 2023 · ccefb40 · ccefb40 · github-actions · Jul 30, 2023
1 parent 55ef6d9
commit ccefb40
Show file tree

Hide file tree

Showing 3 changed files with 1,872 additions and 1,936 deletions.
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "@ducanh2912/next-pwa": "^9.2.0",
     "@studio-freight/compono": "^0.0.21",
     "@studio-freight/hamo": "^0.6.19",
-    "@studio-freight/react-lenis": "^0.0.23",
+    "@studio-freight/react-lenis": "^0.0.25",
     "@studio-freight/tempus": "^0.0.38",
     "@theatre/core": "^0.6.1",
     "@theatre/studio": "^0.6.1",
@@ -47,6 +47,11 @@
     "prettier": "^3.0.0",
     "prettier-eslint": "^15.0.1"
   },
+  "pnpm": {
+    "overrides": {
+      "@studio-freight/react-lenis": "0.0.25"
+    }
+  },
   "lint-staged": {
     "*.js": "eslint --cache --fix",
     "*.{js,css,scss,md}": "prettier --write"

diff --git a/pages/_app.js b/pages/_app.js
@@ -13,8 +13,13 @@ import { useEffect } from 'react'
 import 'styles/global.scss'
 
 if (typeof window !== 'undefined') {
+  // reset scroll position
+  window.scrollTo(0, 0)
+  window.history.scrollRestoration = 'manual'
+
   gsap.defaults({ ease: 'none' })
   gsap.registerPlugin(ScrollTrigger)
+  ScrollTrigger.clearScrollMemory('manual')
   ScrollTrigger.defaults({ markers: process.env.NODE_ENV === 'development' })
 
   // merge rafs
@@ -23,10 +28,6 @@ if (typeof window !== 'undefined') {
   Tempus?.add((time) => {
     gsap.updateRoot(time / 1000)
   }, 0)
-
-  // reset scroll position
-  window.scrollTo(0, 0)
-  window.history.scrollRestoration = 'manual'
 }
 
 function MyApp({ Component, pageProps }) {