merge page object when replacing state

Author: joetannenbaum

packages/core/src/history.ts

@@ -11,7 +11,7 @@ export class History {
     History.replaceState({
       ...currentPage.get(),
       rememberedState: {
-        ...currentPage.get()?.rememberedState,
+        ...(currentPage.get()?.rememberedState ?? {}),
         [key]: data,
       },
     })
@@ -28,6 +28,7 @@ export class History {
   }
 
   public static replaceState(page: Page): void {
+    currentPage.merge(page)
     window.history.replaceState(History.pageData(page), '', page.url)
   }
 

packages/core/src/page.ts

@@ -82,6 +82,10 @@ class CurrentPage {
     return this.page
   }
 
+  public merge(data: Partial<Page>): void {
+    this.page = { ...this.page, ...data }
+  }
+
   public setUrlHash(hash: string): void {
     this.page.url += hash
   }