@nmmty/lazycanvas 0.3.4 → 0.3.5

package/dist/structures/managers/LayersManager.d.ts

@@ -7,9 +7,9 @@ export declare class LayersManager implements ILayersManager {
     constructor(debug?: boolean);
     /**
      * Add a layer to the map
-     * @param layers {AnyLayer[] | Group[]} - The `layer` or `group` to add to the map
+     * @param layers {AnyLayer[]} - The `layer` or `group` to add to the map
      */
-    add(...layers: AnyLayer[] | Group[]): this;
+    add(...layers: AnyLayer[]): this;
     /**
      * Remove a layer from the map
      * @param ids {string[]} - The `id` of the layer or group to remove
@@ -22,8 +22,9 @@ export declare class LayersManager implements ILayersManager {
     /**
      * Get a layer from the map
      * @param id {string} - The `id` of the layer or group to get
+     * @param cross {boolean} - Whether to search in groups or not
      */
-    get(id: string): AnyLayer | Group | undefined;
+    get(id: string, cross?: boolean): AnyLayer | undefined;
     /**
      * Check if a layer exists in the map
      * @param id {string} - The `id` of the layer or group to check
@@ -36,7 +37,7 @@ export declare class LayersManager implements ILayersManager {
     /**
      * Get the values of the map
      */
-    values(): IterableIterator<AnyLayer | Group>;
+    values(): IterableIterator<AnyLayer>;
     /**
      * Get the keys of the map
      */
@@ -44,12 +45,12 @@ export declare class LayersManager implements ILayersManager {
     /**
      * Get the entries of the map
      */
-    entries(): IterableIterator<[string, AnyLayer | Group]>;
+    entries(): IterableIterator<[string, AnyLayer]>;
     /**
      * For each layer in the map
      * @param callbackfn {Function} - The `callback` function to execute
      */
-    forEach(callbackfn: (value: AnyLayer | Group, key: string, map: Map<string, AnyLayer | Group>) => void): this;
+    forEach(callbackfn: (value: AnyLayer, key: string, map: Map<string, AnyLayer>) => void): this;
     /**
      * Convert the map to a JSON object
      */
@@ -62,11 +63,12 @@ export declare class LayersManager implements ILayersManager {
     /**
      * Convert the map to an array
      */
-    toArray(): Array<AnyLayer | Group>;
+    toArray(): Array<AnyLayer>;
     /**
      * Convert an array to the map
-     * @param array {Array<AnyLayer | Group>} - The `array` to convert
+     * @param array {Array<AnyLayer>} - The `array` to convert
      */
-    fromArray(array: Array<AnyLayer | Group>): this;
+    fromArray(array: Array<AnyLayer>): this;
     sort(): void;
+    private crossSearch;
 }

package/dist/structures/managers/LayersManager.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayersManager = void 0;
+const Group_1 = require("../components/Group");
 const LazyUtil_1 = require("../../utils/LazyUtil");
 class LayersManager {
     map;
@@ -11,7 +12,7 @@ class LayersManager {
     }
     /**
      * Add a layer to the map
-     * @param layers {AnyLayer[] | Group[]} - The `layer` or `group` to add to the map
+     * @param layers {AnyLayer[]} - The `layer` or `group` to add to the map
      */
     add(...layers) {
         if (this.debug)
@@ -48,9 +49,13 @@ class LayersManager {
     /**
      * Get a layer from the map
      * @param id {string} - The `id` of the layer or group to get
+     * @param cross {boolean} - Whether to search in groups or not
      */
-    get(id) {
-        return this.map.get(id);
+    get(id, cross = false) {
+        if (cross)
+            return this.crossSearch(id);
+        else
+            return this.map.get(id);
     }
     /**
      * Check if a layer exists in the map
@@ -113,7 +118,7 @@ class LayersManager {
     }
     /**
      * Convert an array to the map
-     * @param array {Array<AnyLayer | Group>} - The `array` to convert
+     * @param array {Array<AnyLayer>} - The `array` to convert
      */
     fromArray(array) {
         this.map = new Map(array.map(l => [l.id, l]));
@@ -122,5 +127,17 @@ class LayersManager {
     sort() {
         this.fromArray(this.toArray().sort((a, b) => a.zIndex - b.zIndex));
     }
+    crossSearch(id) {
+        for (const layer of this.map.values()) {
+            if (layer.id === id)
+                return layer;
+            if (layer instanceof Group_1.Group) {
+                const result = layer.components.find(l => l.id === id);
+                if (result)
+                    return result;
+            }
+        }
+        return undefined;
+    }
 }
 exports.LayersManager = LayersManager;

package/dist/utils/utils.js

@@ -35,6 +35,7 @@ const Group_1 = require("../structures/components/Group");
 const LineLayer_1 = require("../structures/components/LineLayer");
 const BezierLayer_1 = require("../structures/components/BezierLayer");
 const QuadraticLayer_1 = require("../structures/components/QuadraticLayer");
+const TextLayer_1 = require("../structures/components/TextLayer");
 function generateID(type) {
     return `${type}-${Math.random().toString(36).substr(2, 9)}`;
 }
@@ -149,7 +150,7 @@ function parseToNormal(v, ctx, canvas, layer = { width: 0, height: 0 }, options
             let match = v.match(linkReg);
             if (!manager)
                 return 0;
-            let anyLayer = manager.get(match[2]);
+            let anyLayer = manager.get(match[2], true);
             const parcer = parser(ctx, canvas, manager);
             switch (match[1]) {
                 case 'link-w':
@@ -157,6 +158,9 @@ function parseToNormal(v, ctx, canvas, layer = { width: 0, height: 0 }, options
                         if (anyLayer instanceof LineLayer_1.LineLayer || anyLayer instanceof BezierLayer_1.BezierLayer || anyLayer instanceof QuadraticLayer_1.QuadraticLayer) {
                             return anyLayer.getBoundingBox(ctx, canvas, manager).width + (parseInt(match[3]) || 0);
                         }
+                        else if (anyLayer instanceof TextLayer_1.TextLayer) {
+                            return anyLayer.measureText(ctx, canvas).width + (parseInt(match[3]) || 0);
+                        }
                         else {
                             return (parcer.parse(anyLayer.props.size.width) || 0) + (parseInt(match[3]) || 0);
                         }
@@ -170,6 +174,9 @@ function parseToNormal(v, ctx, canvas, layer = { width: 0, height: 0 }, options
                         if (anyLayer instanceof LineLayer_1.LineLayer || anyLayer instanceof BezierLayer_1.BezierLayer || anyLayer instanceof QuadraticLayer_1.QuadraticLayer) {
                             return anyLayer.getBoundingBox(ctx, canvas, manager).height + (parseInt(match[3]) || 0);
                         }
+                        else if (anyLayer instanceof TextLayer_1.TextLayer) {
+                            return anyLayer.measureText(ctx, canvas).height + (parseInt(match[3]) || 0);
+                        }
                         else {
                             return (parcer.parse(anyLayer.props.size.height, LazyUtil_1.defaultArg.wh(parcer.parse(anyLayer.props.size.width)), LazyUtil_1.defaultArg.vl(true)) || 0) + (parseInt(match[3]) || 0);
                         }
@@ -200,7 +207,7 @@ function parseToNormal(v, ctx, canvas, layer = { width: 0, height: 0 }, options
     else if (v instanceof Link_1.Link) {
         if (!manager)
             return 0;
-        let anyLayer = manager.get(v.source);
+        let anyLayer = manager.get(v.source, true);
         const parcer = parser(ctx, canvas, manager);
         switch (v.type) {
             case enum_1.LinkType.Width:
@@ -209,6 +216,9 @@ function parseToNormal(v, ctx, canvas, layer = { width: 0, height: 0 }, options
                     if (anyLayer instanceof LineLayer_1.LineLayer || anyLayer instanceof BezierLayer_1.BezierLayer || anyLayer instanceof QuadraticLayer_1.QuadraticLayer) {
                         return anyLayer.getBoundingBox(ctx, canvas, manager).width + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
                     }
+                    else if (anyLayer instanceof TextLayer_1.TextLayer) {
+                        return anyLayer.measureText(ctx, canvas).width + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
+                    }
                     else {
                         return (parcer.parse(anyLayer.props.size.width) || 0) + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
                     }
@@ -223,6 +233,9 @@ function parseToNormal(v, ctx, canvas, layer = { width: 0, height: 0 }, options
                     if (anyLayer instanceof LineLayer_1.LineLayer || anyLayer instanceof BezierLayer_1.BezierLayer || anyLayer instanceof QuadraticLayer_1.QuadraticLayer) {
                         return anyLayer.getBoundingBox(ctx, canvas, manager).height + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
                     }
+                    else if (anyLayer instanceof TextLayer_1.TextLayer) {
+                        return anyLayer.measureText(ctx, canvas).height + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
+                    }
                     else {
                         return (parcer.parse(anyLayer.props.size.height, LazyUtil_1.defaultArg.wh(parcer.parse(anyLayer.props.size.width)), LazyUtil_1.defaultArg.vl(true)) || 0) + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nmmty/lazycanvas",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "A simple way to interact with @napi-rs/canvas in an advanced way!",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",