@simonbackx/vue-app-navigation 2.8.1 → 2.9.0

package/dist/index.js

@@ -137,9 +137,9 @@ const _UrlHelper = class _UrlHelper {
     return matchPath(this.getParts(), this.getSearchParams(), template, params);
   }
 };
-/** 
+/**
  * Use this for the universal fixed prefix
- * 
+ *
  * Always remove this prefix when getting an url, and add it when doing setUrl.
  * When you want to host an app in a subdirectory
  * Slashes are added automatically on the sides if needed
@@ -235,6 +235,13 @@ class HistoryManagerStatic {
       this.runQueue();
     }
   }
+  waitForQueue() {
+    return new Promise((resolve) => {
+      this.addToQueue(() => {
+        resolve();
+      });
+    });
+  }
   runQueue() {
     this.isQueueRunning = true;
     const action = this.historyQueue.shift();
@@ -304,6 +311,7 @@ class HistoryManagerStatic {
       }
       const didJustLoadPage = Date.now() - this.pageLoadedAt < 1e3 * 5;
       this.changeUrlTimeout = setTimeout(() => {
+        this.changeUrlTimeout = null;
         if (this.counter !== count || state.url !== url) {
           return;
         }
@@ -341,18 +349,24 @@ class HistoryManagerStatic {
     }
   }
   // Call this when url formatting or prefix has changed
-  updateUrl() {
+  async updateUrl() {
     if (!this.active) {
       return;
     }
     if (this.changeUrlTimeout) {
+      await this.waitForQueue();
       return;
     }
+    const state = this.states[this.states.length - 1];
+    const count = state.index;
     this.addToQueue(() => {
-      const lastState = this.states[this.states.length - 1];
-      const formattedUrl = this.resolveUrl(lastState.index);
-      history.replaceState({ counter: this.counter }, "", formattedUrl);
+      if (this.counter !== count) {
+        return;
+      }
+      const formattedUrl = this.resolveUrl(count);
+      history.replaceState({ counter: count }, "", formattedUrl);
     });
+    await this.waitForQueue();
   }
   formatTitle(title) {
     return title + (this.titleSuffix ? " | " + this.titleSuffix : "");
@@ -2198,7 +2212,6 @@ function useUrl() {
     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);
@@ -2372,7 +2385,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       }
       const style = options.modalDisplayStyle ?? component.modalDisplayStyle ?? "cover";
       component.setDisplayStyle(style);
-      console.log("ModalStackComponent present", options);
       if ((style === "popup" || style === "sheet" || style === "side-view") && ((_a = stackComponent.value) == null ? void 0 : _a.$el).offsetWidth > 800 || style === "sheet" && ((_b = stackComponent.value) == null ? void 0 : _b.$el).offsetWidth > 700) {
         const c = new ComponentWithProperties(_sfc_main, {
           root: component,
@@ -2380,8 +2392,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           style: options.modalCssStyle ?? void 0
         });
         c.inheritFromDisplayer(component);
-        console.log("before history index", c.historyIndex);
-        console.log("before history index", component.historyIndex);
         const adjustHistory = (options == null ? void 0 : options.adjustHistory) ?? true;
         HistoryManager.pushState(void 0, adjustHistory ? async (canAnimate) => {
           var _a2;
@@ -2391,8 +2401,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           invalid: options.invalidHistory ?? false
         });
         c.assignHistoryIndex();
-        console.log("after history index", c.historyIndex);
-        console.log("after history index", component.historyIndex);
         (_c = stackComponent.value) == null ? void 0 : _c.show(c);
         return;
       }

package/dist/src/ComponentWithProperties.d.ts

@@ -1,7 +1,7 @@
 import { HistoryUrl } from './HistoryManager';
 import { ComponentInternalInstance, ComponentPublicInstance, Raw, VNode } from 'vue';
 
-export type ModalDisplayStyle = "cover" | "popup" | "overlay" | "sheet" | "side-view";
+export type ModalDisplayStyle = 'cover' | 'popup' | 'overlay' | 'sheet' | 'side-view';
 export declare function useCurrentComponent(): ComponentWithPropertiesType | null;
 export declare function getExposeProxy(instance: ComponentInternalInstance | null | undefined): ComponentPublicInstance | undefined;
 export declare function forAllRoots(root: ComponentWithProperties, handler: (root: ComponentWithPropertiesType) => void, alreadyProcessed?: Set<ComponentWithPropertiesType>): void;

package/dist/src/HistoryManager.d.ts

@@ -28,12 +28,13 @@ declare class HistoryManagerStatic {
     removeListener(owner: unknown): void;
     callListeners(): void;
     private addToQueue;
+    private waitForQueue;
     private runQueue;
     private go;
     getStateUrl(index: number): string;
     resolveUrl(index: number): string;
     setUrl(url: HistoryUrl, title?: string, index?: number): void;
-    updateUrl(): void;
+    updateUrl(): Promise<void>;
     formatTitle(title: string): string;
     /**
      * Set the saved title for a given state. If that state is the current one, it will also get set immediately

package/package.json

@@ -2,7 +2,7 @@
     "name": "@simonbackx/vue-app-navigation",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
-    "version": "2.8.1",
+    "version": "2.9.0",
     "exports": {
         ".": {
             "import": "./dist/index.js",
@@ -24,22 +24,20 @@
         "build": "vite build",
         "dev": "vite serve test --mode development",
         "build:dev": "vite build --mode development",
-        "lint": "eslint . --ext .js,.ts"
+        "lint": "eslint"
     },
     "files": [
         "dist"
     ],
     "type": "module",
     "devDependencies": {
+        "@eslint/js": "^9.11.1",
         "@types/node": "^20.12.7",
-        "@typescript-eslint/eslint-plugin": "^7.7.1",
-        "@typescript-eslint/parser": "^7.7.1",
         "@vitejs/plugin-vue": "^5.0.4",
         "@vue/eslint-config-typescript": "^13.0.0",
         "@vue/runtime-core": "^3.5.12",
-        "eslint": "^8",
-        "eslint-plugin-simple-import-sort": "^12.1.0",
-        "eslint-plugin-vue": "^9.25.0",
+        "eslint": "^9.11.1",
+        "eslint-plugin-stamhoofd": "^2.74.0",
         "sass": "^1.32.4",
         "tslib": "^2.6.2",
         "typescript": "^5.6.2",