@simonbackx/vue-app-navigation 2.5.0 → 2.5.2

package/dist/index.js

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { inject, ref, reactive, markRaw, proxyRefs, getCurrentInstance, provide, computed, unref, onActivated, onMounted, queuePostFlushCb, onBeforeUnmount, onBeforeMount, onUpdated, warn, h, setTransitionHooks, callWithAsyncErrorHandling, ErrorCodes, shallowRef, resolveComponent, openBlock, createElementBlock, createElementVNode, createVNode, defineComponent, Transition, withCtx, createBlock, createCommentVNode, customRef, onScopeDispose, onDeactivated, normalizeClass, normalizeStyle, TransitionGroup, Fragment, renderList, isRef } from "vue";
+import { inject, ref, reactive, markRaw, proxyRefs, getCurrentInstance, provide, computed, unref, onActivated, onMounted, queuePostFlushCb, onBeforeUnmount, onBeforeMount, onUpdated, warn, h, setTransitionHooks, callWithAsyncErrorHandling, ErrorCodes, shallowRef, resolveComponent, openBlock, createElementBlock, createElementVNode, createVNode, defineComponent, Transition, withCtx, createBlock, createCommentVNode, customRef, onScopeDispose, onDeactivated, normalizeClass, normalizeStyle, isRef, TransitionGroup, Fragment, renderList } from "vue";
 const _UrlHelper = class _UrlHelper {
   constructor(url, localFixedPrefix) {
     __publicField(this, "url");
@@ -276,6 +276,16 @@ class HistoryManagerStatic {
       });
     });
   }
+  resolveUrl(url, index) {
+    if (url !== null) {
+      return "/" + UrlHelper.trim(UrlHelper.transformUrl(url));
+    }
+    if (!this.states[index - 1]) {
+      return "/" + UrlHelper.trim(UrlHelper.transformUrl("/"));
+    }
+    const previousUrl = this.states[index - 1].url;
+    return this.resolveUrl(previousUrl ?? null, index - 1);
+  }
   /// Set the current URL without modifying states
   setUrl(url, title, index) {
     if (!this.active) {
@@ -302,7 +312,7 @@ class HistoryManagerStatic {
           if (ComponentWithProperties.debug) {
             console.log("history.replaceState", count, url);
           }
-          const formattedUrl = "/" + UrlHelper.trim(UrlHelper.transformUrl(url));
+          const formattedUrl = this.resolveUrl(url, count);
           history.replaceState({ counter: count }, "", formattedUrl);
           if (state.title) {
             window.document.title = this.formatTitle(state.title);
@@ -343,12 +353,8 @@ class HistoryManagerStatic {
       if (ComponentWithProperties.debug) {
         console.log("history.replaceState - updateUrl");
       }
-      const current = new UrlHelper();
-      const formattedUrl = "/" + UrlHelper.trim(
-        UrlHelper.transformUrl(
-          current.getPath()
-        )
-      );
+      const lastState = this.states[this.states.length - 1];
+      const formattedUrl = this.resolveUrl(lastState.url ?? null, lastState.index);
       history.replaceState({ counter: this.counter }, "", formattedUrl);
     });
   }
@@ -2130,7 +2136,8 @@ function useCanDismiss() {
   return computed(() => !!unref(rawDismiss));
 }
 function useFocused() {
-  return inject("reactive_navigation_focused", true);
+  const rawFocused = inject("reactive_navigation_focused", true);
+  return computed(() => !!unref(rawFocused));
 }
 function extendUrl(url) {
   const urlHelpers = useUrl();
@@ -2250,15 +2257,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const j = Object.keys(vvv).filter((p) => !!vvv[p]).join(" ");
       return j + (j ? " " : "") + (props.className ? props.className : "popup") + (props.root.animated ? " animated" : "");
     });
-    const isFocused = computed(() => {
-      var _a;
-      const popups = (_a = modalStackComponent.value.stackComponent) == null ? void 0 : _a.getFocusedComponent();
-      if (popups !== component) {
-        return false;
-      }
-      return true;
-    });
-    provide("reactive_navigation_focused", isFocused);
+    const isFocused = useFocused();
     const onKey = (event) => {
       if (event.defaultPrevented || event.repeat) {
         return;
@@ -2326,6 +2325,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
+function injectHooks(instanceProxy, definitions) {
+  const ctx = instanceProxy.$.ctx;
+  for (const key in definitions) {
+    if (!isRef(definitions[key])) {
+      ctx[key] = definitions[key];
+    } else {
+      const val = definitions[key];
+      Object.defineProperty(ctx, key, {
+        enumerable: true,
+        configurable: true,
+        get: () => {
+          return val.value;
+        },
+        set: () => {
+          warn(`Cannot assign to '${key}' of navigation mixin. This is a read-only property.`);
+        }
+      });
+    }
+  }
+}
 const StackComponent$1 = defineComponent({
   name: "StackComponent",
   components: {
@@ -2340,6 +2359,12 @@ const StackComponent$1 = defineComponent({
   beforeUnmount() {
     this.components = [];
   },
+  created() {
+    const definitions = {
+      parentIsFocused: useFocused()
+    };
+    injectHooks(this, definitions);
+  },
   methods: {
     getCustomProvide(index, key) {
       return {
@@ -2351,7 +2376,8 @@ const StackComponent$1 = defineComponent({
           console.warn("Avoid calling dismiss in components on the StackComponent, since options are not supported here");
           this.removeAt(index, key);
         },
-        reactive_navigation_can_dismiss: false
+        reactive_navigation_can_dismiss: false,
+        reactive_navigation_focused: !!this.parentIsFocused && this.getFocusedComponent() === this.components[index]
       };
     },
     show(component) {
@@ -2417,26 +2443,6 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 const StackComponent = /* @__PURE__ */ _export_sfc(StackComponent$1, [["render", _sfc_render$2]]);
-function injectHooks(instanceProxy, definitions) {
-  const ctx = instanceProxy.$.ctx;
-  for (const key in definitions) {
-    if (!isRef(definitions[key])) {
-      ctx[key] = definitions[key];
-    } else {
-      const val = definitions[key];
-      Object.defineProperty(ctx, key, {
-        enumerable: true,
-        configurable: true,
-        get: () => {
-          return val.value;
-        },
-        set: () => {
-          warn(`Cannot assign to '${key}' of navigation mixin. This is a read-only property.`);
-        }
-      });
-    }
-  }
-}
 function useModalStackComponent() {
   const c = inject("reactive_modalStackComponent");
   return shallowRef(c);
@@ -2477,6 +2483,12 @@ const ModalStackComponent$1 = defineComponent({
     // Can also be wrapped in modal stack component
     modalStackComponent() {
       return this;
+    },
+    isFocused() {
+      return !!this.parentIsFocused;
+    },
+    isNavigationControllerFocused() {
+      return this.isFocused && !this.stackComponent.getFocusedComponent();
     }
   },
   created() {
@@ -2484,7 +2496,8 @@ const ModalStackComponent$1 = defineComponent({
       parentPresent: usePresent(),
       parentDismiss: useDismiss(),
       parentPop: usePop(),
-      parentShow: useShow()
+      parentShow: useShow(),
+      parentIsFocused: useFocused()
     };
     injectHooks(this, definitions);
   },
@@ -2549,8 +2562,11 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
       ref: "navigationController",
       "animation-type": "modal",
       root: _ctx.root,
-      "initial-components": _ctx.initialComponents
-    }, null, 8, ["root", "initial-components"]),
+      "initial-components": _ctx.initialComponents,
+      "custom-provide": {
+        reactive_navigation_focused: _ctx.isNavigationControllerFocused
+      }
+    }, null, 8, ["root", "initial-components", "custom-provide"]),
     createVNode(_component_StackComponent, {
       ref: "stackComponent",
       onReturnToHistoryIndex: _ctx.returnToHistoryIndex

package/dist/src/ComponentWithProperties.d.ts

@@ -1,3 +1,4 @@
+import { HistoryUrl } from './HistoryManager';
 import { ComponentPublicInstance, VNode } from 'vue';
 
 export type ModalDisplayStyle = "cover" | "popup" | "overlay" | "sheet" | "side-view";
@@ -46,8 +47,8 @@ export declare class ComponentWithProperties {
     assignHistoryIndex(): void;
     inheritHistoryIndex(index: number): void;
     ownsHistoryIndex(): boolean;
-    overrideUrl(url: string, title?: string): void;
-    setUrl(url: string, title?: string): void;
+    overrideUrl(url: HistoryUrl, title?: string): void;
+    setUrl(url: HistoryUrl, title?: string): void;
     setTitle(title: string): void;
     /**
      * This will get called when the user returned to this component

package/dist/src/HistoryManager.d.ts

@@ -1,6 +1,10 @@
 /// <reference types="node" />
+/**
+ * null makes sure the previous URL is used for this route
+ */
+export type HistoryUrl = string | null;
 type HistoryState = {
-    url?: string;
+    url?: HistoryUrl;
     title?: string;
     index: number;
     adjustHistory: boolean;
@@ -26,7 +30,8 @@ declare class HistoryManagerStatic {
     private addToQueue;
     private runQueue;
     private go;
-    setUrl(url: string, title?: string, index?: number): void;
+    resolveUrl(url: HistoryUrl, index: number): string;
+    setUrl(url: HistoryUrl, title?: string, index?: number): void;
     updateUrl(): void;
     formatTitle(title: string): string;
     /**

package/dist/src/ModalMixin.d.ts

@@ -29,6 +29,7 @@ export declare const ModalMixin: import('vue').DefineComponent<{}, {}, {}, {}, {
                 reactive_navigation_can_pop: boolean;
                 reactive_navigation_dismiss: () => void;
                 reactive_navigation_can_dismiss: boolean;
+                reactive_navigation_focused: boolean;
             };
             show(component: import('./ComponentWithProperties').ComponentWithProperties): void;
             getFocusedComponent(): {
@@ -66,8 +67,8 @@ export declare const ModalMixin: import('vue').DefineComponent<{}, {}, {}, {}, {
                 assignHistoryIndex: () => void;
                 inheritHistoryIndex: (index: number) => void;
                 ownsHistoryIndex: () => boolean;
-                overrideUrl: (url: string, title?: string | undefined) => void;
-                setUrl: (url: string, title?: string | undefined) => void;
+                overrideUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
+                setUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
                 setTitle: (title: string) => void;
                 returnToHistoryIndex: () => boolean;
                 componentInstance: () => import('vue').ComponentPublicInstance | null;
@@ -100,6 +101,7 @@ export declare const ModalMixin: import('vue').DefineComponent<{}, {}, {}, {}, {
                 reactive_navigation_can_pop: boolean;
                 reactive_navigation_dismiss: () => void;
                 reactive_navigation_can_dismiss: boolean;
+                reactive_navigation_focused: boolean;
             };
             show(component: import('./ComponentWithProperties').ComponentWithProperties): void;
             getFocusedComponent(): {
@@ -137,8 +139,8 @@ export declare const ModalMixin: import('vue').DefineComponent<{}, {}, {}, {}, {
                 assignHistoryIndex: () => void;
                 inheritHistoryIndex: (index: number) => void;
                 ownsHistoryIndex: () => boolean;
-                overrideUrl: (url: string, title?: string | undefined) => void;
-                setUrl: (url: string, title?: string | undefined) => void;
+                overrideUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
+                setUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
                 setTitle: (title: string) => void;
                 returnToHistoryIndex: () => boolean;
                 componentInstance: () => import('vue').ComponentPublicInstance | null;
@@ -351,6 +353,8 @@ export declare const ModalMixin: import('vue').DefineComponent<{}, {}, {}, {}, {
             initialComponents: import('./ComponentWithProperties').ComponentWithProperties[] | null;
             initialPresents: import('./PushOptions').PushOptions[] | null;
         }>;
+        isFocused(): boolean;
+        isNavigationControllerFocused(): boolean;
     }, {
         present(options: import('./PushOptions').PushOptions): void;
         returnToHistoryIndex(): boolean;
@@ -405,6 +409,7 @@ export declare const ModalMixin: import('vue').DefineComponent<{}, {}, {}, {}, {
                 reactive_navigation_can_pop: boolean;
                 reactive_navigation_dismiss: () => void;
                 reactive_navigation_can_dismiss: boolean;
+                reactive_navigation_focused: boolean;
             };
             show(component: import('./ComponentWithProperties').ComponentWithProperties): void;
             getFocusedComponent(): {
@@ -442,8 +447,8 @@ export declare const ModalMixin: import('vue').DefineComponent<{}, {}, {}, {}, {
                 assignHistoryIndex: () => void;
                 inheritHistoryIndex: (index: number) => void;
                 ownsHistoryIndex: () => boolean;
-                overrideUrl: (url: string, title?: string | undefined) => void;
-                setUrl: (url: string, title?: string | undefined) => void;
+                overrideUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
+                setUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
                 setTitle: (title: string) => void;
                 returnToHistoryIndex: () => boolean;
                 componentInstance: () => import('vue').ComponentPublicInstance | null;
@@ -476,6 +481,7 @@ export declare const ModalMixin: import('vue').DefineComponent<{}, {}, {}, {}, {
                 reactive_navigation_can_pop: boolean;
                 reactive_navigation_dismiss: () => void;
                 reactive_navigation_can_dismiss: boolean;
+                reactive_navigation_focused: boolean;
             };
             show(component: import('./ComponentWithProperties').ComponentWithProperties): void;
             getFocusedComponent(): {
@@ -513,8 +519,8 @@ export declare const ModalMixin: import('vue').DefineComponent<{}, {}, {}, {}, {
                 assignHistoryIndex: () => void;
                 inheritHistoryIndex: (index: number) => void;
                 ownsHistoryIndex: () => boolean;
-                overrideUrl: (url: string, title?: string | undefined) => void;
-                setUrl: (url: string, title?: string | undefined) => void;
+                overrideUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
+                setUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
                 setTitle: (title: string) => void;
                 returnToHistoryIndex: () => boolean;
                 componentInstance: () => import('vue').ComponentPublicInstance | null;
@@ -727,6 +733,8 @@ export declare const ModalMixin: import('vue').DefineComponent<{}, {}, {}, {}, {
             initialComponents: import('./ComponentWithProperties').ComponentWithProperties[] | null;
             initialPresents: import('./PushOptions').PushOptions[] | null;
         }>;
+        isFocused(): boolean;
+        isNavigationControllerFocused(): boolean;
     }, {
         present(options: import('./PushOptions').PushOptions): void;
         returnToHistoryIndex(): boolean;

package/dist/src/ModalStackComponent.vue.d.ts

@@ -28,6 +28,7 @@ declare const ModalStackComponent: import('vue').DefineComponent<{
             reactive_navigation_can_pop: boolean;
             reactive_navigation_dismiss: () => void;
             reactive_navigation_can_dismiss: boolean;
+            reactive_navigation_focused: boolean;
         };
         show(component: ComponentWithProperties): void;
         getFocusedComponent(): {
@@ -65,8 +66,8 @@ declare const ModalStackComponent: import('vue').DefineComponent<{
             assignHistoryIndex: () => void;
             inheritHistoryIndex: (index: number) => void;
             ownsHistoryIndex: () => boolean;
-            overrideUrl: (url: string, title?: string | undefined) => void;
-            setUrl: (url: string, title?: string | undefined) => void;
+            overrideUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
+            setUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
             setTitle: (title: string) => void;
             returnToHistoryIndex: () => boolean;
             componentInstance: () => import('vue').ComponentPublicInstance | null;
@@ -99,6 +100,7 @@ declare const ModalStackComponent: import('vue').DefineComponent<{
             reactive_navigation_can_pop: boolean;
             reactive_navigation_dismiss: () => void;
             reactive_navigation_can_dismiss: boolean;
+            reactive_navigation_focused: boolean;
         };
         show(component: ComponentWithProperties): void;
         getFocusedComponent(): {
@@ -136,8 +138,8 @@ declare const ModalStackComponent: import('vue').DefineComponent<{
             assignHistoryIndex: () => void;
             inheritHistoryIndex: (index: number) => void;
             ownsHistoryIndex: () => boolean;
-            overrideUrl: (url: string, title?: string | undefined) => void;
-            setUrl: (url: string, title?: string | undefined) => void;
+            overrideUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
+            setUrl: (url: import('./HistoryManager').HistoryUrl, title?: string | undefined) => void;
             setTitle: (title: string) => void;
             returnToHistoryIndex: () => boolean;
             componentInstance: () => import('vue').ComponentPublicInstance | null;
@@ -350,6 +352,8 @@ declare const ModalStackComponent: import('vue').DefineComponent<{
         initialComponents: ComponentWithProperties[] | null;
         initialPresents: PushOptions[] | null;
     }>;
+    isFocused(): boolean;
+    isNavigationControllerFocused(): boolean;
 }, {
     present(options: PushOptions): void;
     returnToHistoryIndex(): boolean;

package/dist/src/StackComponent.vue.d.ts

@@ -8,6 +8,7 @@ declare const StackComponent: import('vue').DefineComponent<{}, {}, {
         reactive_navigation_can_pop: boolean;
         reactive_navigation_dismiss: () => void;
         reactive_navigation_can_dismiss: boolean;
+        reactive_navigation_focused: boolean;
     };
     show(component: ComponentWithProperties): void;
     getFocusedComponent(): {
@@ -45,8 +46,8 @@ declare const StackComponent: import('vue').DefineComponent<{}, {}, {
         assignHistoryIndex: () => void;
         inheritHistoryIndex: (index: number) => void;
         ownsHistoryIndex: () => boolean;
-        overrideUrl: (url: string, title?: string | undefined) => void;
-        setUrl: (url: string, title?: string | undefined) => void;
+        overrideUrl: (url: import('./HistoryManager.ts').HistoryUrl, title?: string | undefined) => void;
+        setUrl: (url: import('./HistoryManager.ts').HistoryUrl, title?: string | undefined) => void;
         setTitle: (title: string) => void;
         returnToHistoryIndex: () => boolean;
         componentInstance: () => import('vue').ComponentPublicInstance | null;

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

@@ -1,6 +1,7 @@
 import { UrlMatchResult, UrlParamsConstructors } from './UrlHelper';
 import { PushOptions } from '../PushOptions';
 import { PopOptions } from '../PopOptions';
+import { HistoryUrl } from '../HistoryManager';
 import { ComponentWithProperties } from '../ComponentWithProperties';
 import { ComponentOptions, Ref } from 'vue';
 
@@ -79,14 +80,14 @@ export declare function usePresent(): (options: PushOptions | ComponentWithPrope
 export declare function useDismiss(): (options?: PopOptions) => Promise<void>;
 export declare function useCanPop(): Ref<boolean>;
 export declare function useCanDismiss(): Ref<boolean>;
-export declare function useFocused(): boolean | Ref<boolean>;
+export declare function useFocused(): import('vue').ComputedRef<boolean>;
 /**
  * Add a url 'prefix' to the current url and all its children
  */
 export declare function extendUrl(url: string | Ref<string>): void;
 export declare function setTitleSuffix(title: string): void;
 export declare function setTitle(title: string): void;
-export declare function setUrl(url: string, title?: string): void;
+export declare function setUrl(url: HistoryUrl, title?: string): void;
 export declare function useUrl(): {
     getUrl(): string;
     /**
@@ -96,5 +97,5 @@ export declare function useUrl(): {
     extendUrl(url: string): string;
     match<Params>(template: string, params?: UrlParamsConstructors<Params>): UrlMatchResult<Params> | undefined;
     matchCurrent<Params_1>(template: string, params?: UrlParamsConstructors<Params_1> | undefined): UrlMatchResult<Params_1> | undefined;
-    overrideUrl(url: string, title?: string): void;
+    overrideUrl(url: HistoryUrl, title?: string): void;
 };

package/dist/test/EditWebshopMixin.d.ts

@@ -92,6 +92,7 @@ declare const EditWebshopMixin_base: new (...args: any) => import('../src/class-
                 reactive_navigation_can_pop: boolean;
                 reactive_navigation_dismiss: () => void;
                 reactive_navigation_can_dismiss: boolean;
+                reactive_navigation_focused: boolean;
             };
             show(component: import('..').ComponentWithProperties): void;
             getFocusedComponent(): {
@@ -129,8 +130,8 @@ declare const EditWebshopMixin_base: new (...args: any) => import('../src/class-
                 assignHistoryIndex: () => void;
                 inheritHistoryIndex: (index: number) => void;
                 ownsHistoryIndex: () => boolean;
-                overrideUrl: (url: string, title?: string | undefined) => void;
-                setUrl: (url: string, title?: string | undefined) => void;
+                overrideUrl: (url: import('..').HistoryUrl, title?: string | undefined) => void;
+                setUrl: (url: import('..').HistoryUrl, title?: string | undefined) => void;
                 setTitle: (title: string) => void;
                 returnToHistoryIndex: () => boolean;
                 componentInstance: () => import('vue').ComponentPublicInstance | null;
@@ -163,6 +164,7 @@ declare const EditWebshopMixin_base: new (...args: any) => import('../src/class-
                 reactive_navigation_can_pop: boolean;
                 reactive_navigation_dismiss: () => void;
                 reactive_navigation_can_dismiss: boolean;
+                reactive_navigation_focused: boolean;
             };
             show(component: import('..').ComponentWithProperties): void;
             getFocusedComponent(): {
@@ -200,8 +202,8 @@ declare const EditWebshopMixin_base: new (...args: any) => import('../src/class-
                 assignHistoryIndex: () => void;
                 inheritHistoryIndex: (index: number) => void;
                 ownsHistoryIndex: () => boolean;
-                overrideUrl: (url: string, title?: string | undefined) => void;
-                setUrl: (url: string, title?: string | undefined) => void;
+                overrideUrl: (url: import('..').HistoryUrl, title?: string | undefined) => void;
+                setUrl: (url: import('..').HistoryUrl, title?: string | undefined) => void;
                 setTitle: (title: string) => void;
                 returnToHistoryIndex: () => boolean;
                 componentInstance: () => import('vue').ComponentPublicInstance | null;
@@ -414,6 +416,8 @@ declare const EditWebshopMixin_base: new (...args: any) => import('../src/class-
             initialComponents: import('..').ComponentWithProperties[] | null;
             initialPresents: import('..').PushOptions[] | null;
         }>;
+        isFocused(): boolean;
+        isNavigationControllerFocused(): boolean;
     }, {
         present(options: import('..').PushOptions): void;
         returnToHistoryIndex(): boolean;
@@ -468,6 +472,7 @@ declare const EditWebshopMixin_base: new (...args: any) => import('../src/class-
                 reactive_navigation_can_pop: boolean;
                 reactive_navigation_dismiss: () => void;
                 reactive_navigation_can_dismiss: boolean;
+                reactive_navigation_focused: boolean;
             };
             show(component: import('..').ComponentWithProperties): void;
             getFocusedComponent(): {
@@ -505,8 +510,8 @@ declare const EditWebshopMixin_base: new (...args: any) => import('../src/class-
                 assignHistoryIndex: () => void;
                 inheritHistoryIndex: (index: number) => void;
                 ownsHistoryIndex: () => boolean;
-                overrideUrl: (url: string, title?: string | undefined) => void;
-                setUrl: (url: string, title?: string | undefined) => void;
+                overrideUrl: (url: import('..').HistoryUrl, title?: string | undefined) => void;
+                setUrl: (url: import('..').HistoryUrl, title?: string | undefined) => void;
                 setTitle: (title: string) => void;
                 returnToHistoryIndex: () => boolean;
                 componentInstance: () => import('vue').ComponentPublicInstance | null;
@@ -539,6 +544,7 @@ declare const EditWebshopMixin_base: new (...args: any) => import('../src/class-
                 reactive_navigation_can_pop: boolean;
                 reactive_navigation_dismiss: () => void;
                 reactive_navigation_can_dismiss: boolean;
+                reactive_navigation_focused: boolean;
             };
             show(component: import('..').ComponentWithProperties): void;
             getFocusedComponent(): {
@@ -576,8 +582,8 @@ declare const EditWebshopMixin_base: new (...args: any) => import('../src/class-
                 assignHistoryIndex: () => void;
                 inheritHistoryIndex: (index: number) => void;
                 ownsHistoryIndex: () => boolean;
-                overrideUrl: (url: string, title?: string | undefined) => void;
-                setUrl: (url: string, title?: string | undefined) => void;
+                overrideUrl: (url: import('..').HistoryUrl, title?: string | undefined) => void;
+                setUrl: (url: import('..').HistoryUrl, title?: string | undefined) => void;
                 setTitle: (title: string) => void;
                 returnToHistoryIndex: () => boolean;
                 componentInstance: () => import('vue').ComponentPublicInstance | null;
@@ -790,6 +796,8 @@ declare const EditWebshopMixin_base: new (...args: any) => import('../src/class-
             initialComponents: import('..').ComponentWithProperties[] | null;
             initialPresents: import('..').PushOptions[] | null;
         }>;
+        isFocused(): boolean;
+        isNavigationControllerFocused(): boolean;
     }, {
         present(options: import('..').PushOptions): void;
         returnToHistoryIndex(): boolean;
@@ -1537,7 +1545,7 @@ declare const EditWebshopMixin_base: new (...args: any) => import('../src/class-
         extendUrl(url: string): string;
         match<Params>(template: string, params?: import('..').UrlParamsConstructors<Params> | undefined): import('..').UrlMatchResult<Params> | undefined;
         matchCurrent<Params_1>(template: string, params?: import('..').UrlParamsConstructors<Params_1> | undefined): import('..').UrlMatchResult<Params_1> | undefined;
-        overrideUrl(url: string, title?: string | undefined): void;
+        overrideUrl(url: import('..').HistoryUrl, title?: string | undefined): void;
     };
     $navigate: <Params_2 extends Record<string, unknown>>(prop1: string | import('..').Route<Params_2, unknown>, prop2?: import('..').RouteNavigationOptions<Params_2> | undefined) => Promise<void>;
 }, {}, {

package/package.json

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