@simonbackx/vue-app-navigation 2.8.0 → 2.8.1

package/dist/index.js

@@ -276,15 +276,20 @@ class HistoryManagerStatic {
       });
     });
   }
-  resolveUrl(url, index) {
-    if (url !== null) {
-      return "/" + UrlHelper.trim(UrlHelper.transformUrl(url));
+  getStateUrl(index) {
+    if (index < 0) {
+      return "";
     }
-    if (!this.states[index - 1]) {
-      return "/" + UrlHelper.trim(UrlHelper.transformUrl("/"));
+    if (!this.states[index]) {
+      return this.getStateUrl(index - 1);
     }
-    const previousUrl = this.states[index - 1].url;
-    return this.resolveUrl(previousUrl ?? null, index - 1);
+    if (this.states[index].url !== null) {
+      return this.states[index].url;
+    }
+    return this.getStateUrl(index - 1);
+  }
+  resolveUrl(index) {
+    return "/" + UrlHelper.trim(UrlHelper.transformUrl(this.getStateUrl(index)));
   }
   /// Set the current URL without modifying states
   setUrl(url, title, index) {
@@ -306,7 +311,7 @@ class HistoryManagerStatic {
           if (this.counter !== count || state.url !== url) {
             return;
           }
-          const formattedUrl = this.resolveUrl(url, count);
+          const formattedUrl = this.resolveUrl(count);
           history.replaceState({ counter: count }, "", formattedUrl);
           if (state.title) {
             window.document.title = this.formatTitle(state.title);
@@ -345,7 +350,7 @@ class HistoryManagerStatic {
     }
     this.addToQueue(() => {
       const lastState = this.states[this.states.length - 1];
-      const formattedUrl = this.resolveUrl(lastState.url ?? null, lastState.index);
+      const formattedUrl = this.resolveUrl(lastState.index);
       history.replaceState({ counter: this.counter }, "", formattedUrl);
     });
   }
@@ -375,6 +380,16 @@ class HistoryManagerStatic {
   getCurrentState() {
     return this.states[this.counter];
   }
+  getState(index) {
+    if (index < 0) {
+      return null;
+    }
+    const s = this.states[index];
+    if (s && s.index === index) {
+      return s;
+    }
+    return this.getState(index - 1);
+  }
   pushState(url, undoAction, options) {
     if (!this.active) {
       return;
@@ -1396,7 +1411,9 @@ const NavigationController$1 = defineComponent({
               comp.keepAlive = true;
             }
           }
-          HistoryManager.invalidateHistory();
+          if (this.components.length !== components.length) {
+            HistoryManager.invalidateHistory();
+          }
         } else {
           this.components.push(...components);
         }
@@ -1420,10 +1437,12 @@ const NavigationController$1 = defineComponent({
           }
         } else {
           for (const component2 of components) {
-            HistoryManager.pushState(void 0, null, {
-              adjustHistory,
-              invalid: options.invalidHistory ?? !!replace
-            });
+            if (!replace || this.components.length !== components.length) {
+              HistoryManager.pushState(void 0, null, {
+                adjustHistory,
+                invalid: options.invalidHistory ?? !!replace
+              });
+            }
             component2.assignHistoryIndex();
           }
         }
@@ -2052,7 +2071,7 @@ function normalizePushOptions(o, currentComponent, urlHelpers) {
   if (options.url !== void 0) {
     const url = options.url;
     for (const component of options.components) {
-      component.provide.reactive_navigation_url = computed(() => url === null ? null : urlHelpers.extendUrl(url));
+      component.provide.reactive_navigation_url = computed(() => url === null ? null : urlHelpers.extendUrl(url, { returnHistory: options.replace ?? 0 }));
     }
   }
   return options;
@@ -2156,6 +2175,7 @@ function useUrl() {
   const currentComponent = useCurrentComponent();
   const navigationUrl = inject("reactive_navigation_url", null);
   const disableUrl = inject("reactive_navigation_disable_url", null);
+  const historyIndex = inject("navigation_historyIndex", null);
   return {
     getUrl() {
       return unref(navigationUrl) ?? "";
@@ -2175,8 +2195,17 @@ function useUrl() {
         currentComponent.setTitle(title);
       }
     },
-    extendUrl(url) {
-      const prefix = this.getUrl();
+    extendUrl(url, options = {}) {
+      let prefix = this.getUrl();
+      if (options.returnHistory) {
+        console.log("returnHistory", options.returnHistory);
+        const index = unref(historyIndex);
+        if (index !== null && index !== void 0) {
+          prefix = HistoryManager.getStateUrl(index - options.returnHistory);
+        } else {
+          console.error("Failed to get history index");
+        }
+      }
       if (prefix && prefix !== "/") {
         return prefix + "/" + UrlHelper.trim(url);
       }

package/dist/src/HistoryManager.d.ts

@@ -30,7 +30,8 @@ declare class HistoryManagerStatic {
     private addToQueue;
     private runQueue;
     private go;
-    resolveUrl(url: HistoryUrl, index: number): string;
+    getStateUrl(index: number): string;
+    resolveUrl(index: number): string;
     setUrl(url: HistoryUrl, title?: string, index?: number): void;
     updateUrl(): void;
     formatTitle(title: string): string;
@@ -39,6 +40,7 @@ declare class HistoryManagerStatic {
      */
     setTitle(title: string, index?: number): void;
     getCurrentState(): HistoryState;
+    getState(index: number): HistoryState | null;
     pushState(url: string | undefined, undoAction: ((animate: boolean) => void | Promise<void>) | null, options?: Partial<HistoryState>): void;
     /**
      * Call when an action is performed that breaks back/forward navigation

package/dist/src/utils/navigationHooks.d.ts

@@ -95,7 +95,9 @@ export declare function useUrl(): {
      * Ideally call this after you've processed all the .match() calls (and awaited async stuff)
      */
     setTitle(title: string): void;
-    extendUrl(url: string): string;
+    extendUrl(url: string, options?: {
+        returnHistory?: number;
+    }): string;
     match<Params>(template: string, params?: UrlParamsConstructors<Params>): UrlMatchResult<Params> | undefined;
     matchCurrent<Params>(template: string, params?: UrlParamsConstructors<Params>): UrlMatchResult<Params> | undefined;
     overrideUrl(url: HistoryUrl, title?: string): void;

package/package.json

@@ -2,7 +2,7 @@
     "name": "@simonbackx/vue-app-navigation",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
-    "version": "2.8.0",
+    "version": "2.8.1",
     "exports": {
         ".": {
             "import": "./dist/index.js",