Merge branch 'main' into feat-value-over-get-set

hybridsjs · May 14, 2024 · e9d4d51 · e9d4d51
2 parents b695020 + d0182d2
commit e9d4d51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/router.js b/src/router.js
@@ -375,7 +375,7 @@ function setupView(hybrids, routerOptions, parent, nestedParent) {
           return params;
         },
         (host, params, lastParams) => {
-          if (!lastParams) return;
+          if (!lastParams || !globalThis.history.state) return;
 
           const state = globalThis.history.state;
           const index = state.findIndex((entry) => {

diff --git a/test/spec/router.js b/test/spec/router.js
@@ -634,6 +634,17 @@ describe("router:", () => {
         });
       });
 
+      it("does not throw when browser pushes null state", () => {
+        window.history.pushState(null, "", "");
+        const rootView = host.views[0];
+        rootView.globalB = "value";
+
+        return resolveTimeout(() => {
+          expect(hybrids(host.views[0])).toBe(RootView);
+          expect(hybrids(host.children[0])).toBe(RootView);
+        });
+      });
+
       it("displays root view", () =>
         resolveTimeout(() => {
           expect(hybrids(host.views[0])).toBe(RootView);