modern-canvas 0.6.10 → 0.6.12

package/dist/index.cjs

@@ -5599,7 +5599,6 @@ function getNodeIid(key) {
   return iid;
 }
 exports.Node = class Node extends CoreObject {
-  meta = {};
   _readyed = false;
   constructor(properties, nodes = []) {
     super();
@@ -6054,18 +6053,21 @@ exports.Node = class Node extends CoreObject {
   toJSON() {
     return modernIdoc.clearUndef({
       ...super.toJSON(),
-      is: this.is,
       children: this._children.length ? [...this._children.map((child) => child.toJSON())] : void 0,
-      meta: Object.keys(this.meta).length ? { ...this.meta } : void 0
+      meta: {
+        ...this.meta,
+        inCanvasIs: this.is
+      }
     });
   }
   static parse(value) {
     if (Array.isArray(value)) {
       return value.map((val) => this.parse(val));
     }
-    const { is, props, children } = value;
-    const Class = customNodes.get(is) ?? exports.Node;
-    const node = new Class(props);
+    const { meta = {}, children, ...props } = value;
+    const { inCanvasIs = "Node" } = meta;
+    const Class = customNodes.get(inCanvasIs) ?? exports.Node;
+    const node = new Class({ ...props, meta });
     children?.forEach((child) => node.appendChild(this.parse(child)));
     return node;
   }
@@ -6088,6 +6090,9 @@ __decorateClass$R([
 __decorateClass$R([
   modernIdoc.property({ fallback: "default" })
 ], exports.Node.prototype, "internalMode", 2);
+__decorateClass$R([
+  modernIdoc.property({ default: () => ({}) })
+], exports.Node.prototype, "meta", 2);
 __decorateClass$R([
   modernIdoc.property({ protected: true })
 ], exports.Node.prototype, "mask", 2);
@@ -7104,7 +7109,19 @@ class CanvasContext extends modernPath2d.Path2D {
     if (!this.curves.length) {
       return;
     }
-    const strokeStyle = this.strokeStyle ?? (typeof this.style.stroke === "string" ? this.style.stroke : void 0);
+    let strokeStyle = this.strokeStyle;
+    if (!strokeStyle && this.style.stroke) {
+      switch (typeof this.style.stroke) {
+        case "string":
+          strokeStyle = this.style.stroke;
+          break;
+        case "object":
+          if (modernIdoc.isColorFillObject(this.style.stroke)) {
+            strokeStyle = this.style.stroke.color;
+          }
+          break;
+      }
+    }
     this._draws.push({
       ...options,
       type: "stroke",
@@ -7132,7 +7149,19 @@ class CanvasContext extends modernPath2d.Path2D {
     if (!this.curves.length) {
       return;
     }
-    const fillStyle = this.fillStyle ?? (typeof this.style.fill === "string" ? this.style.fill : void 0);
+    let fillStyle = this.fillStyle;
+    if (!fillStyle && this.style.fill) {
+      switch (typeof this.style.fill) {
+        case "string":
+          fillStyle = this.style.fill;
+          break;
+        case "object":
+          if (modernIdoc.isColorFillObject(this.style.fill)) {
+            fillStyle = this.style.fill.color;
+          }
+          break;
+      }
+    }
     this._draws.push({
       ...options,
       type: "fill",
@@ -9277,6 +9306,8 @@ class BaseElement2DText extends CoreObject {
       switch (args[0]) {
         case "content":
         case "effects":
+        case "fill":
+        case "outline":
           this.setter(args[0], args[1]);
           break;
       }
@@ -9293,12 +9324,14 @@ class BaseElement2DText extends CoreObject {
   _updateProperty(key, value, oldValue, declaration) {
     super._updateProperty(key, value, oldValue, declaration);
     switch (key) {
+      case "enabled":
       case "content":
       case "effects":
-      case "measureDOM":
+      case "measureDom":
       case "fonts":
+      case "fill":
+      case "outline":
       case "split":
-      case "enabled":
         this.parent.requestRedraw();
         break;
     }
@@ -9349,8 +9382,14 @@ __decorateClass$o([
   modernIdoc.property({ alias: "base.effects" })
 ], BaseElement2DText.prototype, "effects");
 __decorateClass$o([
-  modernIdoc.property({ protected: true, alias: "base.measureDOM" })
-], BaseElement2DText.prototype, "measureDOM");
+  modernIdoc.property({ alias: "base.fill" })
+], BaseElement2DText.prototype, "fill");
+__decorateClass$o([
+  modernIdoc.property({ alias: "base.outline" })
+], BaseElement2DText.prototype, "outline");
+__decorateClass$o([
+  modernIdoc.property({ protected: true, alias: "base.measureDom" })
+], BaseElement2DText.prototype, "measureDom");
 __decorateClass$o([
   modernIdoc.property({ protected: true, alias: "base.fonts" })
 ], BaseElement2DText.prototype, "fonts");

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { Font } from 'modern-font';
-import { EventListenerOptions, EventListenerValue, EventEmitter, PropertyDeclaration, ReactiveObject, ReactiveObjectPropertyAccessorContext, Color as Color$1, RawWeakMap as RawWeakMap$1, LinearGradient, RadialGradient, NormalizedFill, Fill, NormalizedBackground, Background, NormalizedForeground, Foreground, NormalizedOutline, Outline, NormalizedShadow, Shadow, NormalizedShape, Shape, NormalizedStyle, Text as Text$1, Style, ImageFillCropRect } from 'modern-idoc';
+import { EventListenerOptions, EventListenerValue, EventEmitter, PropertyDeclaration, ReactiveObject, ReactiveObjectPropertyAccessorContext, Color as Color$1, RawWeakMap as RawWeakMap$1, LinearGradient, RadialGradient, NormalizedFill, Fill, NormalizedBackground, Background, NormalizedForeground, Foreground, NormalizedOutline, Outline, NormalizedShadow, Shadow, NormalizedShape, Shape, FullStyle, Text as Text$1, Style, ImageFillCropRect } from 'modern-idoc';
 export { Color as ColorValue } from 'modern-idoc';
 import { AnimationItem } from 'lottie-web';
 import { Colord, RgbaColor, HslaColor, HsvaColor } from 'colord';
@@ -1607,6 +1607,7 @@ type ProcessSortMode = 'default' | 'parent_before';
 type RenderMode = 'inherit' | 'always' | 'disabled';
 type InternalMode = 'default' | 'front' | 'back';
 interface NodeProperties {
+    id: string;
     name: string;
     mask: Maskable;
     processMode: ProcessMode;
@@ -1629,8 +1630,8 @@ declare class Node extends CoreObject {
     processSortMode: ProcessSortMode;
     renderMode: RenderMode;
     internalMode: InternalMode;
+    meta: Record<string, any>;
     mask?: Maskable;
-    readonly meta: Record<string, any>;
     protected _readyed: boolean;
     constructor(properties?: Partial<NodeProperties>, nodes?: Node[]);
     setProperties(properties?: Record<string, any>): this;
@@ -1960,7 +1961,7 @@ declare class BaseElement2DShape extends CoreObject {
     drawRect(): void;
 }
 
-interface BaseElement2DStyleProperties extends Omit<NormalizedStyle, 'left' | 'top' | 'width' | 'height'> {
+interface BaseElement2DStyleProperties extends Omit<FullStyle, 'left' | 'top' | 'width' | 'height'> {
     left: number;
     top: number;
     width: number;
@@ -1977,7 +1978,9 @@ declare class BaseElement2DText extends CoreObject {
     enabled: boolean;
     content: Text['content'];
     effects: Text['effects'];
-    measureDOM: Text['measureDOM'];
+    fill: Text['fill'];
+    outline: Text['outline'];
+    measureDom: Text['measureDom'];
     fonts: Text['fonts'];
     readonly base: Text;
     measureResult?: MeasureResult;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { Font } from 'modern-font';
-import { EventListenerOptions, EventListenerValue, EventEmitter, PropertyDeclaration, ReactiveObject, ReactiveObjectPropertyAccessorContext, Color as Color$1, RawWeakMap as RawWeakMap$1, LinearGradient, RadialGradient, NormalizedFill, Fill, NormalizedBackground, Background, NormalizedForeground, Foreground, NormalizedOutline, Outline, NormalizedShadow, Shadow, NormalizedShape, Shape, NormalizedStyle, Text as Text$1, Style, ImageFillCropRect } from 'modern-idoc';
+import { EventListenerOptions, EventListenerValue, EventEmitter, PropertyDeclaration, ReactiveObject, ReactiveObjectPropertyAccessorContext, Color as Color$1, RawWeakMap as RawWeakMap$1, LinearGradient, RadialGradient, NormalizedFill, Fill, NormalizedBackground, Background, NormalizedForeground, Foreground, NormalizedOutline, Outline, NormalizedShadow, Shadow, NormalizedShape, Shape, FullStyle, Text as Text$1, Style, ImageFillCropRect } from 'modern-idoc';
 export { Color as ColorValue } from 'modern-idoc';
 import { AnimationItem } from 'lottie-web';
 import { Colord, RgbaColor, HslaColor, HsvaColor } from 'colord';
@@ -1607,6 +1607,7 @@ type ProcessSortMode = 'default' | 'parent_before';
 type RenderMode = 'inherit' | 'always' | 'disabled';
 type InternalMode = 'default' | 'front' | 'back';
 interface NodeProperties {
+    id: string;
     name: string;
     mask: Maskable;
     processMode: ProcessMode;
@@ -1629,8 +1630,8 @@ declare class Node extends CoreObject {
     processSortMode: ProcessSortMode;
     renderMode: RenderMode;
     internalMode: InternalMode;
+    meta: Record<string, any>;
     mask?: Maskable;
-    readonly meta: Record<string, any>;
     protected _readyed: boolean;
     constructor(properties?: Partial<NodeProperties>, nodes?: Node[]);
     setProperties(properties?: Record<string, any>): this;
@@ -1960,7 +1961,7 @@ declare class BaseElement2DShape extends CoreObject {
     drawRect(): void;
 }
 
-interface BaseElement2DStyleProperties extends Omit<NormalizedStyle, 'left' | 'top' | 'width' | 'height'> {
+interface BaseElement2DStyleProperties extends Omit<FullStyle, 'left' | 'top' | 'width' | 'height'> {
     left: number;
     top: number;
     width: number;
@@ -1977,7 +1978,9 @@ declare class BaseElement2DText extends CoreObject {
     enabled: boolean;
     content: Text['content'];
     effects: Text['effects'];
-    measureDOM: Text['measureDOM'];
+    fill: Text['fill'];
+    outline: Text['outline'];
+    measureDom: Text['measureDom'];
     fonts: Text['fonts'];
     readonly base: Text;
     measureResult?: MeasureResult;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Font } from 'modern-font';
-import { EventListenerOptions, EventListenerValue, EventEmitter, PropertyDeclaration, ReactiveObject, ReactiveObjectPropertyAccessorContext, Color as Color$1, RawWeakMap as RawWeakMap$1, LinearGradient, RadialGradient, NormalizedFill, Fill, NormalizedBackground, Background, NormalizedForeground, Foreground, NormalizedOutline, Outline, NormalizedShadow, Shadow, NormalizedShape, Shape, NormalizedStyle, Text as Text$1, Style, ImageFillCropRect } from 'modern-idoc';
+import { EventListenerOptions, EventListenerValue, EventEmitter, PropertyDeclaration, ReactiveObject, ReactiveObjectPropertyAccessorContext, Color as Color$1, RawWeakMap as RawWeakMap$1, LinearGradient, RadialGradient, NormalizedFill, Fill, NormalizedBackground, Background, NormalizedForeground, Foreground, NormalizedOutline, Outline, NormalizedShadow, Shadow, NormalizedShape, Shape, FullStyle, Text as Text$1, Style, ImageFillCropRect } from 'modern-idoc';
 export { Color as ColorValue } from 'modern-idoc';
 import { AnimationItem } from 'lottie-web';
 import { Colord, RgbaColor, HslaColor, HsvaColor } from 'colord';
@@ -1607,6 +1607,7 @@ type ProcessSortMode = 'default' | 'parent_before';
 type RenderMode = 'inherit' | 'always' | 'disabled';
 type InternalMode = 'default' | 'front' | 'back';
 interface NodeProperties {
+    id: string;
     name: string;
     mask: Maskable;
     processMode: ProcessMode;
@@ -1629,8 +1630,8 @@ declare class Node extends CoreObject {
     processSortMode: ProcessSortMode;
     renderMode: RenderMode;
     internalMode: InternalMode;
+    meta: Record<string, any>;
     mask?: Maskable;
-    readonly meta: Record<string, any>;
     protected _readyed: boolean;
     constructor(properties?: Partial<NodeProperties>, nodes?: Node[]);
     setProperties(properties?: Record<string, any>): this;
@@ -1960,7 +1961,7 @@ declare class BaseElement2DShape extends CoreObject {
     drawRect(): void;
 }
 
-interface BaseElement2DStyleProperties extends Omit<NormalizedStyle, 'left' | 'top' | 'width' | 'height'> {
+interface BaseElement2DStyleProperties extends Omit<FullStyle, 'left' | 'top' | 'width' | 'height'> {
     left: number;
     top: number;
     width: number;
@@ -1977,7 +1978,9 @@ declare class BaseElement2DText extends CoreObject {
     enabled: boolean;
     content: Text['content'];
     effects: Text['effects'];
-    measureDOM: Text['measureDOM'];
+    fill: Text['fill'];
+    outline: Text['outline'];
+    measureDom: Text['measureDom'];
     fonts: Text['fonts'];
     readonly base: Text;
     measureResult?: MeasureResult;