modern-canvas 0.9.0 → 0.9.2

package/dist/index.cjs

@@ -876,6 +876,9 @@ class Input extends modernIdoc.Observable {
 let IID = 0;
 class CoreObject extends modernIdoc.Reactivable {
   instanceId = ++IID;
+  get json() {
+    return this.toJSON();
+  }
   _nextTick() {
     return nextTick();
   }
@@ -9701,17 +9704,7 @@ class BaseElement2DText extends CoreObject {
   constructor(parent) {
     super();
     this.parent = parent;
-    this.base.on("updateProperty", (...args) => {
-      switch (args[0]) {
-        case "content":
-        case "effects":
-        case "fill":
-        case "outline":
-          this.setProperty(args[0], args[1]);
-          break;
-      }
-      this._updateProperty(...args);
-    });
+    this.base.setPropertyAccessor(this);
   }
   base = new modernText.Text();
   measureResult;
@@ -9737,17 +9730,8 @@ class BaseElement2DText extends CoreObject {
         break;
     }
   }
-  _update() {
-    this.base.style = {
-      justifyContent: "center",
-      alignItems: "center",
-      textAlign: "center",
-      ...this.parent.style.toJSON()
-    };
-    this.base.update();
-  }
   _updateTextureMap() {
-    this._update();
+    this.base.update();
     this._textureMap.clear();
     const pGlyphBoxs = [];
     this.base.paragraphs.forEach((p, pIndex) => {
@@ -9803,12 +9787,6 @@ class BaseElement2DText extends CoreObject {
     this.content = modernIdoc.normalizeTextContent(content);
   }
   measure() {
-    this.base.style = {
-      justifyContent: "center",
-      alignItems: "center",
-      textAlign: "center",
-      ...this.parent.style.toJSON()
-    };
     return this.base.measure();
   }
   updateMeasure() {
@@ -9831,7 +9809,7 @@ class BaseElement2DText extends CoreObject {
   }
   draw() {
     const ctx = this.parent.context;
-    this._update();
+    this.base.update();
     this.base.pathSets.forEach((pathSet) => {
       pathSet.paths.forEach((path) => {
         const meta = path.getMeta();
@@ -9902,22 +9880,25 @@ __decorateClass$m([
   modernIdoc.property({ fallback: true })
 ], BaseElement2DText.prototype, "enabled");
 __decorateClass$m([
-  modernIdoc.property({ alias: "base.content", fallback: () => [] })
+  modernIdoc.property({ fallback: () => [] })
 ], BaseElement2DText.prototype, "content");
 __decorateClass$m([
-  modernIdoc.property({ alias: "base.effects" })
+  modernIdoc.property({ alias: "parent.style.json" })
+], BaseElement2DText.prototype, "style");
+__decorateClass$m([
+  modernIdoc.property()
 ], BaseElement2DText.prototype, "effects");
 __decorateClass$m([
-  modernIdoc.property({ alias: "base.fill" })
+  modernIdoc.property()
 ], BaseElement2DText.prototype, "fill");
 __decorateClass$m([
-  modernIdoc.property({ alias: "base.outline" })
+  modernIdoc.property()
 ], BaseElement2DText.prototype, "outline");
 __decorateClass$m([
-  modernIdoc.property({ internal: true, alias: "base.measureDom" })
+  modernIdoc.property({ alias: "base.measureDom" })
 ], BaseElement2DText.prototype, "measureDom");
 __decorateClass$m([
-  modernIdoc.property({ internal: true, alias: "base.fonts" })
+  modernIdoc.property({ alias: "base.fonts" })
 ], BaseElement2DText.prototype, "fonts");
 
 var __getOwnPropDesc$k = Object.getOwnPropertyDescriptor;

package/dist/index.d.cts

@@ -255,6 +255,7 @@ interface CoreObject {
 }
 declare class CoreObject extends Reactivable {
     readonly instanceId: number;
+    get json(): Record<string, any>;
     protected _nextTick(): Promise<void>;
     equal(target: CoreObject | undefined | null): boolean;
 }
@@ -1985,7 +1986,7 @@ declare class BaseElement2DFill extends CoreObject {
     opacity: NormalizedFill['opacity'];
     protected _texture?: Texture2D;
     constructor(parent: BaseElement2D);
-    protected _setProperties(properties?: Fill): this;
+    protected _setProperties(properties?: NormalizedFill): this;
     setProperties(properties?: Fill): this;
     protected _updateProperty(key: string, value: any, oldValue: any): void;
     loadTexture(): Promise<Texture2D | undefined>;
@@ -2063,6 +2064,7 @@ declare class BaseElement2DText extends CoreObject {
     parent: BaseElement2D;
     enabled: boolean;
     content: Text['content'];
+    style: Text['style'];
     effects: Text['effects'];
     fill: Text['fill'];
     outline: Text['outline'];
@@ -2077,7 +2079,6 @@ declare class BaseElement2DText extends CoreObject {
     constructor(parent: BaseElement2D);
     setProperties(properties?: Text$1): this;
     protected _updateProperty(key: string, value: any, oldValue: any): void;
-    protected _update(): void;
     protected _updateTextureMap(): void;
     protected _updateTexture(key: string, fill: NormalizedFill | undefined, box: any): Promise<void>;
     protected _loadTexture(fill: NormalizedFill, box: any): Promise<Texture2D | undefined>;

package/dist/index.d.mts

@@ -255,6 +255,7 @@ interface CoreObject {
 }
 declare class CoreObject extends Reactivable {
     readonly instanceId: number;
+    get json(): Record<string, any>;
     protected _nextTick(): Promise<void>;
     equal(target: CoreObject | undefined | null): boolean;
 }
@@ -1985,7 +1986,7 @@ declare class BaseElement2DFill extends CoreObject {
     opacity: NormalizedFill['opacity'];
     protected _texture?: Texture2D;
     constructor(parent: BaseElement2D);
-    protected _setProperties(properties?: Fill): this;
+    protected _setProperties(properties?: NormalizedFill): this;
     setProperties(properties?: Fill): this;
     protected _updateProperty(key: string, value: any, oldValue: any): void;
     loadTexture(): Promise<Texture2D | undefined>;
@@ -2063,6 +2064,7 @@ declare class BaseElement2DText extends CoreObject {
     parent: BaseElement2D;
     enabled: boolean;
     content: Text['content'];
+    style: Text['style'];
     effects: Text['effects'];
     fill: Text['fill'];
     outline: Text['outline'];
@@ -2077,7 +2079,6 @@ declare class BaseElement2DText extends CoreObject {
     constructor(parent: BaseElement2D);
     setProperties(properties?: Text$1): this;
     protected _updateProperty(key: string, value: any, oldValue: any): void;
-    protected _update(): void;
     protected _updateTextureMap(): void;
     protected _updateTexture(key: string, fill: NormalizedFill | undefined, box: any): Promise<void>;
     protected _loadTexture(fill: NormalizedFill, box: any): Promise<Texture2D | undefined>;

package/dist/index.d.ts

@@ -255,6 +255,7 @@ interface CoreObject {
 }
 declare class CoreObject extends Reactivable {
     readonly instanceId: number;
+    get json(): Record<string, any>;
     protected _nextTick(): Promise<void>;
     equal(target: CoreObject | undefined | null): boolean;
 }
@@ -1985,7 +1986,7 @@ declare class BaseElement2DFill extends CoreObject {
     opacity: NormalizedFill['opacity'];
     protected _texture?: Texture2D;
     constructor(parent: BaseElement2D);
-    protected _setProperties(properties?: Fill): this;
+    protected _setProperties(properties?: NormalizedFill): this;
     setProperties(properties?: Fill): this;
     protected _updateProperty(key: string, value: any, oldValue: any): void;
     loadTexture(): Promise<Texture2D | undefined>;
@@ -2063,6 +2064,7 @@ declare class BaseElement2DText extends CoreObject {
     parent: BaseElement2D;
     enabled: boolean;
     content: Text['content'];
+    style: Text['style'];
     effects: Text['effects'];
     fill: Text['fill'];
     outline: Text['outline'];
@@ -2077,7 +2079,6 @@ declare class BaseElement2DText extends CoreObject {
     constructor(parent: BaseElement2D);
     setProperties(properties?: Text$1): this;
     protected _updateProperty(key: string, value: any, oldValue: any): void;
-    protected _update(): void;
     protected _updateTextureMap(): void;
     protected _updateTexture(key: string, fill: NormalizedFill | undefined, box: any): Promise<void>;
     protected _loadTexture(fill: NormalizedFill, box: any): Promise<Texture2D | undefined>;