fix for remember, for now

Author: joetannenbaum

packages/core/src/page.ts

@@ -13,7 +13,7 @@ class CurrentPage {
     event: PageEvent
     callback: VoidFunction
   }[] = []
-  protected firstPageLoad = true
+  protected isFirstPageLoad = true
 
   public init({ initialPage, swapComponent, resolveComponent }: RouterInitParams) {
     this.page = initialPage
@@ -48,23 +48,23 @@ class CurrentPage {
       page.scrollRegions ??= []
       page.rememberedState ??= {}
       replace = replace || isSameUrlWithoutHash(hrefToUrl(page.url), window.location)
+      // This is where the actual URL change happens
+      // TODO: When we are remembering the state, "back" doesn't update the URL... why
       replace ? History.replaceState(page) : History.pushState(page)
 
       const isNewComponent = !this.isTheSame(page)
 
       this.page = page
 
       if (isNewComponent) {
-        this.listeners
-          .filter((listener) => listener.event === 'newComponent')
-          .forEach((listener) => listener.callback())
+        this.fireEventsFor('newComponent')
       }
 
-      if (this.firstPageLoad) {
-        this.listeners.filter((listener) => listener.event === 'firstLoad').forEach((listener) => listener.callback())
+      if (this.isFirstPageLoad) {
+        this.fireEventsFor('firstLoad')
       }
 
-      this.firstPageLoad = false
+      this.isFirstPageLoad = false
 
       return this.swap({ component, page, preserveState }).then(() => {
         if (!preserveScroll) {
@@ -78,6 +78,20 @@ class CurrentPage {
     })
   }
 
+  public setQuietly(
+    page: Page,
+    {
+      preserveState = false,
+    }: {
+      preserveState?: PreserveStateOption
+    } = {},
+  ) {
+    return this.resolve(page.component).then((component) => {
+      this.page = page
+      return this.swap({ component, page, preserveState })
+    })
+  }
+
   public get(): Page {
     return this.page
   }
@@ -125,6 +139,10 @@ class CurrentPage {
       this.listeners = this.listeners.filter((listener) => listener.event !== event && listener.callback !== callback)
     }
   }
+
+  public fireEventsFor(event: PageEvent): void {
+    this.listeners.filter((listener) => listener.event === event).forEach((listener) => listener.callback())
+  }
 }
 
 export const page = new CurrentPage()

packages/core/src/response.ts

@@ -5,7 +5,7 @@ import modal from './modal'
 import { page as currentPage } from './page'
 import { RequestParams } from './requestParams'
 import { SessionStorage } from './sessionStorage'
-import { ErrorBag, Errors, LocationVisit, Page } from './types'
+import { ErrorBag, Errors, Page } from './types'
 import { hrefToUrl, isSameUrlWithoutHash, setHashIfSameUrl } from './url'
 
 export class Response {
@@ -47,7 +47,7 @@ export class Response {
 
       setHashIfSameUrl(this.requestParams.params.url, locationUrl)
 
-      return this.locationVisit(locationUrl, this.requestParams.params.preserveScroll === true)
+      return this.locationVisit(locationUrl)
     }
 
     if (fireInvalidEvent(this.response)) {
@@ -78,9 +78,9 @@ export class Response {
   /**
    * @link https://inertiajs.com/redirects#external-redirects
    */
-  protected locationVisit(url: URL, preserveScroll: LocationVisit['preserveScroll']): boolean | void {
+  protected locationVisit(url: URL): boolean | void {
     try {
-      SessionStorage.set({ preserveScroll })
+      SessionStorage.set({ preserveScroll: this.requestParams.params.preserveScroll === true })
 
       if (isSameUrlWithoutHash(window.location, url)) {
         window.location.reload()

packages/core/src/router.ts

@@ -337,12 +337,9 @@ export class Router {
       return
     }
 
-    currentPage
-      .resolve(page.component)
-      .then((component) => currentPage.swap({ component, page, preserveState: false }))
-      .then(() => {
-        Scroll.restore(page)
-        fireNavigateEvent(page)
-      })
+    currentPage.setQuietly(page, { preserveState: false }).then(() => {
+      Scroll.restore(currentPage.get())
+      fireNavigateEvent(currentPage.get())
+    })
   }
 }