@vc-shell/framework 1.0.64 → 1.0.65

package/dist/framework.mjs

@@ -47891,8 +47891,8 @@ const Gj = To(zj), qj = /* @__PURE__ */ Ne({
           maximized: d(w.idx),
           options: w.bladeOptions,
           "onOpen:blade": (_) => c(_, w.idx),
-          "onClose:blade": (_) => a(w.idx),
-          "onClose:children": (_) => m.$emit("onClose", w.idx + 1),
+          "onClose:blade": (_) => a(x),
+          "onClose:children": (_) => m.$emit("onClose", x + 1),
           "onParent:call": (_) => m.$emit("onParentCall", { id: x, args: _ }),
           "onExpand:blade": (_) => u(w.idx, !0),
           "onCollapse:blade": (_) => u(w.idx, !1),
@@ -47921,7 +47921,7 @@ function WU() {
   async function i({ parentBlade: l, component: o, param: a, bladeOptions: c, onOpen: p, onClose: m }, v, y) {
     console.debug("openBlade called.");
     const w = H(l), x = H(o), _ = d(x);
-    if (w && w.url && (await s(1), !r.value))
+    if (w && w.url && (await s(0), !r.value))
       if (Ip.value = H(c), Np.value = H(a), y && typeof y == "function")
         try {
           await y();
@@ -47932,23 +47932,22 @@ function WU() {
         }
       else
         y || await t.push(w.url);
-    x && (_ === void 0 ? x.idx = v + 1 : _ && (await s(hr.value.find((b) => b.idx === _.idx).idx), x.idx = _.idx), await f(x, a, c, p, m, v));
+    x && (_ === void 0 ? x.idx = v + 1 : _ && (await s(hr.value.findIndex((b) => b.idx === _.idx)), x.idx = _.idx), await f(x, a, c, p, m, v));
   }
   async function s(l) {
-    if (l < ea.value.length) {
-      const o = ea.value.slice(l).reverse();
+    const o = l + 1;
+    if (o < ea.value.length) {
+      const a = ea.value.slice(o).reverse();
       r.value = !1;
-      for (let a = 0; a < o.length; a++)
-        if (o[a]?.exposed.onBeforeClose && typeof o[a].exposed.onBeforeClose == "function" && await o[a].exposed.onBeforeClose() === !1) {
+      for (let c = 0; c < a.length; c++)
+        if (a[c]?.exposed.onBeforeClose && typeof a[c].exposed.onBeforeClose == "function" && await a[c].exposed.onBeforeClose() === !1) {
           r.value = !0;
           break;
         }
-      if (r.value)
+      if (!r.value)
+        typeof hr.value[l]?.onClose == "function" && hr.value[l]?.onClose?.(), hr.value.splice(l);
+      else
         throw "Closing prevented";
-      {
-        const a = hr.value.find((c) => c.idx === l);
-        a && typeof a.onClose == "function" && a.onClose?.(), hr.value.splice(hr.value.indexOf(a));
-      }
     }
   }
   async function f(l, o, a, c, p, m) {

package/dist/shared/components/blade-navigation/composables/useBladeNavigation/index.d.ts

@@ -6,8 +6,8 @@ interface IUseBladeNavigation {
     readonly parentBladeOptions: Ref<Record<string, unknown>>;
     readonly parentBladeParam: Ref<string>;
     bladesRefs: Ref<IBladeRef[]>;
-    openBlade: ({ parentBlade, component, param, bladeOptions, onOpen, onClose }: IBladeEvent, idx?: number, navigationCb?: () => Promise<void | NavigationFailure>) => void;
-    closeBlade: (idx: number) => void;
+    openBlade: ({ parentBlade, component, param, bladeOptions, onOpen, onClose }: IBladeEvent, index?: number, navigationCb?: () => Promise<void | NavigationFailure>) => void;
+    closeBlade: (index: number) => void;
     onParentCall: (index: number, args: IParentCallArgs) => void;
 }
 export declare function useBladeNavigation(): IUseBladeNavigation;

package/dist/shared/components/blade-navigation/composables/useBladeNavigation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../shared/components/blade-navigation/composables/useBladeNavigation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,GAAG,EAAc,MAAM,KAAK,CAAC;AAEnE,OAAO,EAAuB,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpE,OAAO,EAAqB,eAAe,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE1G,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC;IACxC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvC,UAAU,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;IAC7B,SAAS,EAAE,CACT,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,WAAW,EAC7E,GAAG,CAAC,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC,KACnD,IAAI,CAAC;IACV,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,KAAK,IAAI,CAAC;CAC9D;AAOD,wBAAgB,kBAAkB,IAAI,mBAAmB,CAkKxD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../shared/components/blade-navigation/composables/useBladeNavigation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,GAAG,EAAc,MAAM,KAAK,CAAC;AAEnE,OAAO,EAAuB,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpE,OAAO,EAAqB,eAAe,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE1G,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC;IACxC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvC,UAAU,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;IAC7B,SAAS,EAAE,CACT,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,WAAW,EAC7E,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC,KACnD,IAAI,CAAC;IACV,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,KAAK,IAAI,CAAC;CAC9D;AAOD,wBAAgB,kBAAkB,IAAI,mBAAmB,CAkKxD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.64",
+  "version": "1.0.65",
   "main": "./dist/framework.mjs",
   "module": "./dist/framework.mjs",
   "types": "./dist/index.d.ts",
@@ -54,8 +54,8 @@
     "vue3-touch-events": "^4.1.0"
   },
   "devDependencies": {
-    "@vc-shell/api-client-generator": "^1.0.64",
-    "@vc-shell/config-generator": "^1.0.64",
+    "@vc-shell/api-client-generator": "^1.0.65",
+    "@vc-shell/config-generator": "^1.0.65",
     "sass": "^1.49.0",
     "typescript": "^4.9.5",
     "url-pattern": "^1.0.3"
@@ -64,5 +64,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "2b19eaf7e0642927756da9b562b5b1265133f701"
+  "gitHead": "da9dd24de0a4bcbc2ed3a68409771e5b40eda1ce"
 }

package/shared/components/blade-navigation/components/vc-blade-navigation/vc-blade-navigation.vue

@@ -28,8 +28,8 @@
     :maximized="findStateById(blade.idx)"
     :options="blade.bladeOptions"
     @open:blade="onBladeOpen($event, blade.idx)"
-    @close:blade="onBladeClose(blade.idx)"
-    @close:children="$emit('onClose', blade.idx + 1)"
+    @close:blade="onBladeClose(i)"
+    @close:children="$emit('onClose', i + 1)"
     @parent:call="$emit('onParentCall', { id: i, args: $event })"
     @expand:blade="handleMaximizeBlade(blade.idx, true)"
     @collapse:blade="handleMaximizeBlade(blade.idx, false)"
@@ -105,8 +105,8 @@ function setBladesRef(el: IBladeElement, blade: IBladeContainer) {
   }
 }
 
-function onBladeClose(idx: number) {
-  emit("onClose", idx);
+function onBladeClose(index: number) {
+  emit("onClose", index);
 }
 
 function onBladeOpen(event: IBladeEvent, idx: number) {

package/shared/components/blade-navigation/composables/useBladeNavigation/index.ts

@@ -11,10 +11,10 @@ interface IUseBladeNavigation {
   bladesRefs: Ref<IBladeRef[]>;
   openBlade: (
     { parentBlade, component, param, bladeOptions, onOpen, onClose }: IBladeEvent,
-    idx?: number,
+    index?: number,
     navigationCb?: () => Promise<void | NavigationFailure>
   ) => void;
-  closeBlade: (idx: number) => void;
+  closeBlade: (index: number) => void;
   onParentCall: (index: number, args: IParentCallArgs) => void;
 }
 
@@ -49,7 +49,7 @@ export function useBladeNavigation(): IUseBladeNavigation {
 
   async function openBlade(
     { parentBlade, component: blade, param, bladeOptions, onOpen, onClose }: IBladeEvent,
-    idx?: number,
+    index?: number,
     navigationCb?: () => Promise<void | NavigationFailure>
   ) {
     console.debug(`openBlade called.`);
@@ -59,7 +59,7 @@ export function useBladeNavigation(): IUseBladeNavigation {
     const existingChild = findBlade(child);
 
     if (parent && parent.url) {
-      await closeBlade(1);
+      await closeBlade(0);
 
       if (!isPrevented.value) {
         parentBladeOptions.value = unref(bladeOptions);
@@ -80,19 +80,20 @@ export function useBladeNavigation(): IUseBladeNavigation {
 
     if (child) {
       if (existingChild === undefined) {
-        child.idx = idx + 1;
+        child.idx = index + 1;
       } else if (existingChild) {
-        await closeBlade(blades.value.find((x) => x.idx === existingChild.idx).idx);
+        await closeBlade(blades.value.findIndex((x) => x.idx === existingChild.idx));
         child.idx = existingChild.idx;
       }
 
-      await addBlade(child, param, bladeOptions, onOpen, onClose, idx);
+      await addBlade(child, param, bladeOptions, onOpen, onClose, index);
     }
   }
 
-  async function closeBlade(idx: number) {
-    if (idx < bladesRefs.value.length) {
-      const children = bladesRefs.value.slice(idx).reverse();
+  async function closeBlade(index: number) {
+    const refsIndex = index + 1;
+    if (refsIndex < bladesRefs.value.length) {
+      const children = bladesRefs.value.slice(refsIndex).reverse();
 
       isPrevented.value = false;
       for (let i = 0; i < children.length; i++) {
@@ -105,11 +106,10 @@ export function useBladeNavigation(): IUseBladeNavigation {
         }
       }
       if (!isPrevented.value) {
-        const blade = blades.value.find((x) => x.idx === idx);
-        if (blade && typeof blade.onClose === "function") {
-          blade.onClose?.();
+        if (typeof blades.value[index]?.onClose === "function") {
+          blades.value[index]?.onClose?.();
         }
-        blades.value.splice(blades.value.indexOf(blade));
+        blades.value.splice(index);
       } else {
         throw "Closing prevented";
       }