@ethlete/core 4.29.4 → 4.29.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ethlete/core
 
+## 4.29.6
+
+### Patch Changes
+
+- [`452c6f9`](https://github.com/ethlete-io/ethdk/commit/452c6f9d3ff446fee37b719c233daf1216930e98) Thanks [@TomTomB](https://github.com/TomTomB)! - Fix initial values inside router state being null by default
+
+## 4.29.5
+
+### Patch Changes
+
+- [`0ffe4f9`](https://github.com/ethlete-io/ethdk/commit/0ffe4f9b629ab47e0632fa1fdb8eb99a6552ca4b) Thanks [@TomTomB](https://github.com/TomTomB)! - Fix router state not getting updated on initial load once the router is ready
+
 ## 4.29.4
 
 ### Patch Changes

package/fesm2022/ethlete-core.mjs

@@ -2296,18 +2296,49 @@ const createRouterState = (router) => {
         fragment,
     };
 };
+const createInitialRouterState = () => {
+    if (!isPlatformBrowser(inject(PLATFORM_ID)))
+        return {
+            data: {},
+            pathParams: {},
+            queryParams: {},
+            title: null,
+            fragment: null,
+        };
+    const url = new URL(window.location.href);
+    const queryParams = {};
+    url.searchParams.forEach((value, key) => {
+        queryParams[key] = value;
+    });
+    const fragment = url.hash ? url.hash.substring(1) : null;
+    const title = document.title || null;
+    return {
+        data: {},
+        pathParams: {}, // Cannot determine path params without route configuration
+        queryParams,
+        title,
+        fragment,
+    };
+};
 /**
  * Inject the complete router state. This includes the current route data, path params, query params, title and fragment.
  */
 const injectRouterState = () => {
-    const url = injectUrl();
+    const event = injectRouterEvent();
     const router = inject(Router);
-    const routerState = signal(createRouterState(router), ...(ngDevMode ? [{ debugName: "routerState" }] : []));
+    const routerState = signal(createInitialRouterState(), ...(ngDevMode ? [{ debugName: "routerState" }] : []));
     effect(() => {
-        url();
-        untracked(() => routerState.set(createRouterState(router)));
+        const e = event();
+        untracked(() => {
+            if (e instanceof NavigationEnd && e.id === -1) {
+                return;
+            }
+            else {
+                routerState.set(createRouterState(router));
+            }
+        });
     });
-    return routerState.asReadonly();
+    return computed(() => routerState(), { equal });
 };
 /** Inject a signal containing the current route fragment (the part after the # inside the url if present) */
 const injectFragment = (config) => {