@acorex/core 21.0.2-next.51 → 21.0.2-next.54

package/fesm2022/acorex-core-z-index.mjs

@@ -4,12 +4,15 @@ import { Injectable } from '@angular/core';
 const BASE_Z_INDEX = 1000;
 class AXZIndexService {
     constructor() {
-        this.current = BASE_Z_INDEX;
+        this.stacks = new Map();
         this.active = new Map();
     }
-    acquire() {
+    acquire(baseZIndex = BASE_Z_INDEX) {
         const id = `z-${Date.now()}-${Math.random()}`;
-        const token = { id, zIndex: ++this.current };
+        const floor = baseZIndex ?? BASE_Z_INDEX;
+        const zIndex = (this.stacks.get(floor) ?? floor) + 1;
+        this.stacks.set(floor, zIndex);
+        const token = { id, zIndex, baseZIndex: floor };
         this.active.set(id, token);
         return token;
     }
@@ -17,16 +20,19 @@ class AXZIndexService {
         if (!token)
             return;
         this.active.delete(token.id);
-        if (this.active.size === 0) {
-            this.current = BASE_Z_INDEX;
+        const floor = token.baseZIndex ?? BASE_Z_INDEX;
+        const hasTierActive = [...this.active.values()].some((t) => (t.baseZIndex ?? BASE_Z_INDEX) === floor);
+        if (!hasTierActive) {
+            this.stacks.delete(floor);
         }
     }
     bringToFront(token) {
+        const floor = token.baseZIndex ?? BASE_Z_INDEX;
         this.release(token);
-        return this.acquire();
+        return this.acquire(floor);
     }
     lastIndex() {
-        return this.current;
+        return Math.max(BASE_Z_INDEX, ...this.stacks.values());
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXZIndexService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXZIndexService, providedIn: 'root' }); }

package/fesm2022/acorex-core-z-index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"acorex-core-z-index.mjs","sources":["../../../../packages/core/z-index/src/lib/z-index.service.ts","../../../../packages/core/z-index/src/acorex-core-z-index.ts"],"sourcesContent":["import { Injectable } from '@angular/core';\nimport { AXZToken } from './z-index.type';\n\nconst BASE_Z_INDEX = 1000;\n\n@Injectable({ providedIn: 'root' })\nexport class AXZIndexService {\n  private current = BASE_Z_INDEX;\n  private active = new Map<string, AXZToken>();\n\n  acquire(): AXZToken {\n    const id = `z-${Date.now()}-${Math.random()}`;\n    const token: AXZToken = { id, zIndex: ++this.current };\n    this.active.set(id, token);\n    return token;\n  }\n\n  release(token?: AXZToken | null): void {\n    if (!token) return;\n    this.active.delete(token.id);\n    if (this.active.size === 0) {\n      this.current = BASE_Z_INDEX;\n    }\n  }\n\n  bringToFront(token: AXZToken): AXZToken {\n    this.release(token);\n    return this.acquire();\n  }\n\n  lastIndex(): number {\n    return this.current;\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;AAGA,MAAM,YAAY,GAAG,IAAI;MAGZ,eAAe,CAAA;AAD5B,IAAA,WAAA,GAAA;QAEU,IAAA,CAAA,OAAO,GAAG,YAAY;AACtB,QAAA,IAAA,CAAA,MAAM,GAAG,IAAI,GAAG,EAAoB;AAyB7C,IAAA;IAvBC,OAAO,GAAA;AACL,QAAA,MAAM,EAAE,GAAG,CAAA,EAAA,EAAK,IAAI,CAAC,GAAG,EAAE,CAAA,CAAA,EAAI,IAAI,CAAC,MAAM,EAAE,EAAE;AAC7C,QAAA,MAAM,KAAK,GAAa,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE;QACtD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC;AAC1B,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,OAAO,CAAC,KAAuB,EAAA;AAC7B,QAAA,IAAI,CAAC,KAAK;YAAE;QACZ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE;AAC1B,YAAA,IAAI,CAAC,OAAO,GAAG,YAAY;QAC7B;IACF;AAEA,IAAA,YAAY,CAAC,KAAe,EAAA;AAC1B,QAAA,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;AACnB,QAAA,OAAO,IAAI,CAAC,OAAO,EAAE;IACvB;IAEA,SAAS,GAAA;QACP,OAAO,IAAI,CAAC,OAAO;IACrB;8GA1BW,eAAe,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;AAAf,IAAA,SAAA,IAAA,CAAA,KAAA,GAAA,EAAA,CAAA,qBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,eAAe,cADF,MAAM,EAAA,CAAA,CAAA;;2FACnB,eAAe,EAAA,UAAA,EAAA,CAAA;kBAD3B,UAAU;mBAAC,EAAE,UAAU,EAAE,MAAM,EAAE;;;ACLlC;;AAEG;;;;"}
+{"version":3,"file":"acorex-core-z-index.mjs","sources":["../../../../packages/core/z-index/src/lib/z-index.service.ts","../../../../packages/core/z-index/src/acorex-core-z-index.ts"],"sourcesContent":["import { Injectable } from '@angular/core';\nimport { AXZToken } from './z-index.type';\n\nconst BASE_Z_INDEX = 1000;\n\n@Injectable({ providedIn: 'root' })\nexport class AXZIndexService {\n  private stacks = new Map<number, number>();\n  private active = new Map<string, AXZToken>();\n\n  acquire(baseZIndex = BASE_Z_INDEX): AXZToken {\n    const id = `z-${Date.now()}-${Math.random()}`;\n    const floor = baseZIndex ?? BASE_Z_INDEX;\n    const zIndex = (this.stacks.get(floor) ?? floor) + 1;\n\n    this.stacks.set(floor, zIndex);\n    const token: AXZToken = { id, zIndex, baseZIndex: floor };\n    this.active.set(id, token);\n    return token;\n  }\n\n  release(token?: AXZToken | null): void {\n    if (!token) return;\n    this.active.delete(token.id);\n\n    const floor = token.baseZIndex ?? BASE_Z_INDEX;\n    const hasTierActive = [...this.active.values()].some((t) => (t.baseZIndex ?? BASE_Z_INDEX) === floor);\n    if (!hasTierActive) {\n      this.stacks.delete(floor);\n    }\n  }\n\n  bringToFront(token: AXZToken): AXZToken {\n    const floor = token.baseZIndex ?? BASE_Z_INDEX;\n    this.release(token);\n    return this.acquire(floor);\n  }\n\n  lastIndex(): number {\n    return Math.max(BASE_Z_INDEX, ...this.stacks.values());\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;AAGA,MAAM,YAAY,GAAG,IAAI;MAGZ,eAAe,CAAA;AAD5B,IAAA,WAAA,GAAA;AAEU,QAAA,IAAA,CAAA,MAAM,GAAG,IAAI,GAAG,EAAkB;AAClC,QAAA,IAAA,CAAA,MAAM,GAAG,IAAI,GAAG,EAAoB;AAiC7C,IAAA;IA/BC,OAAO,CAAC,UAAU,GAAG,YAAY,EAAA;AAC/B,QAAA,MAAM,EAAE,GAAG,CAAA,EAAA,EAAK,IAAI,CAAC,GAAG,EAAE,CAAA,CAAA,EAAI,IAAI,CAAC,MAAM,EAAE,EAAE;AAC7C,QAAA,MAAM,KAAK,GAAG,UAAU,IAAI,YAAY;AACxC,QAAA,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;QAEpD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC;QAC9B,MAAM,KAAK,GAAa,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE;QACzD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC;AAC1B,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,OAAO,CAAC,KAAuB,EAAA;AAC7B,QAAA,IAAI,CAAC,KAAK;YAAE;QACZ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;AAE5B,QAAA,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,IAAI,YAAY;AAC9C,QAAA,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,IAAI,YAAY,MAAM,KAAK,CAAC;QACrG,IAAI,CAAC,aAAa,EAAE;AAClB,YAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAC3B;IACF;AAEA,IAAA,YAAY,CAAC,KAAe,EAAA;AAC1B,QAAA,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,IAAI,YAAY;AAC9C,QAAA,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;AACnB,QAAA,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B;IAEA,SAAS,GAAA;AACP,QAAA,OAAO,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IACxD;8GAlCW,eAAe,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;AAAf,IAAA,SAAA,IAAA,CAAA,KAAA,GAAA,EAAA,CAAA,qBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,eAAe,cADF,MAAM,EAAA,CAAA,CAAA;;2FACnB,eAAe,EAAA,UAAA,EAAA,CAAA;kBAD3B,UAAU;mBAAC,EAAE,UAAU,EAAE,MAAM,EAAE;;;ACLlC;;AAEG;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acorex/core",
-  "version": "21.0.2-next.51",
+  "version": "21.0.2-next.54",
   "peerDependencies": {
     "lodash-es": ">=4.17.21",
     "memoizee": ">=0.4.15",

package/types/acorex-core-z-index.d.ts

@@ -3,12 +3,13 @@ import * as i0 from '@angular/core';
 interface AXZToken {
     id: string;
     zIndex: number;
+    baseZIndex?: number;
 }
 
 declare class AXZIndexService {
-    private current;
+    private stacks;
     private active;
-    acquire(): AXZToken;
+    acquire(baseZIndex?: number): AXZToken;
     release(token?: AXZToken | null): void;
     bringToFront(token: AXZToken): AXZToken;
     lastIndex(): number;