Add more tests. test "scroll:false" behaviour.

RevoTale · Jun 8, 2024 · 0c48ee3 · 0c48ee3
1 parent 78f754d
commit 0c48ee3
Show file tree

Hide file tree

Showing 6 changed files with 2,539 additions and 2,055 deletions.
diff --git a/__tests__/ScrollRestorer.spec.ts b/__tests__/ScrollRestorer.spec.ts
@@ -132,6 +132,14 @@ test('End to end testing of scroll restorer', async ({page, browserName}) => {
     await resolveTimeout(1000)//Sometimes browsers struggle to restore the same millisecond
     await expectScrollToBe(page, mainPage)
 
+
+
+    await page.getByText('Lets-go without scroll').scrollIntoViewIfNeeded()
+    await expectScrollToBe(page, mainPage)
+    await page.getByText('Lets-go without scroll').click()
+    await page.waitForURL('/?fff=fff')
+    await expectScrollToBe(page, mainPage)
+
 })
 
 test('Safari scroll reset bug simulation', async ({page}) => {

diff --git a/next-app-mock/src/ClientSideScrollRestorer.tsx b/next-app-mock/src/ClientSideScrollRestorer.tsx
@@ -1,8 +1,7 @@
-
-import {Suspense} from "react"
+'use client'
 import {ScrollRestorer} from "../../src"
 
 const ClientSideScrollRestorer = () => {
-    return <Suspense><ScrollRestorer /></Suspense>
+    return <ScrollRestorer />
 }
 export default ClientSideScrollRestorer
diff --git a/next-app-mock/src/app/layout.tsx b/next-app-mock/src/app/layout.tsx
@@ -2,7 +2,7 @@ import ClientSideScrollRestorer from "@/ClientSideScrollRestorer"
 import type {Metadata} from 'next'
 import {Inter} from 'next/font/google'
 import './globals.css'
-import {FunctionComponent, ReactNode} from "react"
+import {FunctionComponent, ReactNode, Suspense} from "react"
 
 const inter = Inter({subsets: ['latin']})
 
@@ -16,7 +16,9 @@ const RootLayout: FunctionComponent<{
     return (
         <html lang="en">
         <body className={inter.className}>
-        <ClientSideScrollRestorer/>
+        <Suspense>
+            <ClientSideScrollRestorer/>
+        </Suspense>
         {children}
         </body>
         </html>

diff --git a/next-app-mock/src/app/page.tsx b/next-app-mock/src/app/page.tsx
@@ -9,6 +9,9 @@ const Page  = ()=>{
         <Link href="/low-page">
             Lets-go to low-page
         </Link>
+        <Link href="/?fff=fff" scroll={false}>
+            Lets-go without scroll
+        </Link>
     </div>
 }
 export default Page
diff --git a/package.json b/package.json
@@ -51,13 +51,14 @@
     "changeset": "^0.2.6",
     "eslint-config-grisaia-react": "^0.6.15",
     "eslint-config-grisaia-typescript": "^0.6.14",
-    "grisaia-package-builder": "^0.1.16"
+    "grisaia-package-builder": "^0.1.16",
+    "typescript": "^5.4.5"
   },
   "peerDependencies": {
     "next": "^13.0 || ^14.0",
     "react": "^17.0 || ^18.0"
   },
-  "packageManager": "pnpm@8.7.5",
+  "packageManager": "pnpm@9.1.2",
   "dependencies": {
     "@bladl/react-hooks": "^1.5.2"
   }