modern-canvas 0.7.4 → 0.7.6

package/dist/index.cjs

@@ -752,10 +752,11 @@ class Input extends modernIdoc.EventEmitter {
   mapPositionToPoint(point, x, y) {
     if (!this.target)
       return;
-    const width = Number(this.target.getAttribute("width")) || 0;
-    const height = Number(this.target.getAttribute("height")) || 0;
+    const clientRect = this.target.isConnected ? this.target.getBoundingClientRect() : void 0;
     const pixelRatio = Number(this.target.getAttribute("data-pixel-ratio")) || 1;
-    const rect = this.target.isConnected ? this.target.getBoundingClientRect() : { width, height, left: 0, top: 0 };
+    const width = Number(this.target.getAttribute("width")) || (clientRect ? clientRect.width * pixelRatio : 0);
+    const height = Number(this.target.getAttribute("height")) || (clientRect ? clientRect.height * pixelRatio : 0);
+    const rect = clientRect ?? { width, height, left: 0, top: 0 };
     const multiplier = 1 / pixelRatio;
     point.x = (x - rect.left) * (width / rect.width) * multiplier;
     point.y = (y - rect.top) * (height / rect.height) * multiplier;
@@ -5454,7 +5455,7 @@ class CanvasContext extends modernPath2d.Path2D {
         miterLimit: this.miterLimit ?? 10
       }
     });
-    super.reset();
+    this.reset();
   }
   fillRect(x, y, width, height) {
     this.rect(x, y, width, height).fill();
@@ -5487,7 +5488,7 @@ class CanvasContext extends modernPath2d.Path2D {
       uvTransform: this.uvTransform,
       vertTransform: this.vertTransform
     });
-    super.reset();
+    this.resetStatus();
   }
   copy(source) {
     super.copy(source);
@@ -5502,7 +5503,7 @@ class CanvasContext extends modernPath2d.Path2D {
     this._draws = source._draws.slice();
     return this;
   }
-  reset() {
+  resetStatus() {
     super.reset();
     this.strokeStyle = void 0;
     this.fillStyle = void 0;
@@ -5512,6 +5513,9 @@ class CanvasContext extends modernPath2d.Path2D {
     this.lineJoin = void 0;
     this.lineWidth = void 0;
     this.miterLimit = void 0;
+  }
+  reset() {
+    this.resetStatus();
     this._draws.length = 0;
     return this;
   }
@@ -5561,9 +5565,9 @@ class CanvasContext extends modernPath2d.Path2D {
       }
       this.buildUvs(0, vertices, uvs, current.texture, current.uvTransform);
       batchables.push({
-        vertices,
-        indices,
-        uvs,
+        vertices: new Float32Array(vertices),
+        indices: new Float32Array(indices),
+        uvs: new Float32Array(uvs),
         texture: current.texture,
         type: current.type,
         disableWrapMode: current.disableWrapMode,
@@ -9572,7 +9576,6 @@ class BaseElement2DText extends CoreObject {
       case "fonts":
       case "fill":
       case "outline":
-      case "split":
         this.parent.requestRedraw();
         break;
     }
@@ -9586,6 +9589,9 @@ class BaseElement2DText extends CoreObject {
     };
     this.base.requestUpdate();
   }
+  setContent(content) {
+    this.content = modernIdoc.normalizeTextContent(content);
+  }
   measure() {
     this._updateText();
     return this.base.measure();
@@ -9606,8 +9612,6 @@ class BaseElement2DText extends CoreObject {
       pathSet.paths.forEach((path) => {
         ctx.addPath(path);
         ctx.style = { ...path.style };
-        ctx.fillStyle = void 0;
-        ctx.strokeStyle = void 0;
         ctx.fill();
       });
     });

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { Font } from 'modern-font';
-import { EventListenerOptions as EventListenerOptions$1, 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';
+import { EventListenerOptions as EventListenerOptions$1, 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, TextContent, Style, ImageFillCropRect } from 'modern-idoc';
 export { Color as ColorValue } from 'modern-idoc';
 import { AnimationItem } from 'lottie-web';
 import { Colord, RgbaColor, HslaColor, HsvaColor } from 'colord';
@@ -916,9 +916,9 @@ declare class WebGLStateModule extends WebGLModule {
 }
 
 interface Batchable2D {
-    vertices: number[];
-    indices: number[];
-    uvs?: number[];
+    vertices: Float32Array;
+    indices: Float32Array;
+    uvs?: Float32Array;
     texture?: WebGLTexture;
     backgroundColor?: number;
     modulate?: number;
@@ -1438,6 +1438,7 @@ declare class CanvasContext extends Path2D {
     strokeRect(x: number, y: number, width: number, height: number): void;
     fill(options?: Partial<FillDraw>): void;
     copy(source: CanvasContext): this;
+    resetStatus(): void;
     reset(): this;
     buildUvs(start: number, vertices: number[], uvs: number[], texture?: Texture2D, uvTransform?: UVTransform): void;
     toBatchables(): CanvasBatchable[];
@@ -1888,7 +1889,7 @@ declare class Node2D extends CanvasItem {
     getTransform(cb?: (transform: Transform2D) => void): Transform2D;
     updateTransform(): void;
     updateGlobalTransform(): void;
-    protected _transformVertices(vertices: number[], vertTransform?: VertTransform): number[];
+    protected _transformVertices(vertices: Float32Array, vertTransform?: VertTransform): Float32Array;
     protected _relayout(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _process(delta: number): void;
 }
@@ -2024,6 +2025,7 @@ declare class BaseElement2DText extends CoreObject {
     setProperties(properties?: Text$1): this;
     protected _updateProperty(key: string, value: any, oldValue: any, declaration?: PropertyDeclaration): void;
     protected _updateText(): void;
+    setContent(content: TextContent): void;
     measure(): MeasureResult;
     updateMeasure(): this;
     canDraw(): boolean;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { Font } from 'modern-font';
-import { EventListenerOptions as EventListenerOptions$1, 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';
+import { EventListenerOptions as EventListenerOptions$1, 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, TextContent, Style, ImageFillCropRect } from 'modern-idoc';
 export { Color as ColorValue } from 'modern-idoc';
 import { AnimationItem } from 'lottie-web';
 import { Colord, RgbaColor, HslaColor, HsvaColor } from 'colord';
@@ -916,9 +916,9 @@ declare class WebGLStateModule extends WebGLModule {
 }
 
 interface Batchable2D {
-    vertices: number[];
-    indices: number[];
-    uvs?: number[];
+    vertices: Float32Array;
+    indices: Float32Array;
+    uvs?: Float32Array;
     texture?: WebGLTexture;
     backgroundColor?: number;
     modulate?: number;
@@ -1438,6 +1438,7 @@ declare class CanvasContext extends Path2D {
     strokeRect(x: number, y: number, width: number, height: number): void;
     fill(options?: Partial<FillDraw>): void;
     copy(source: CanvasContext): this;
+    resetStatus(): void;
     reset(): this;
     buildUvs(start: number, vertices: number[], uvs: number[], texture?: Texture2D, uvTransform?: UVTransform): void;
     toBatchables(): CanvasBatchable[];
@@ -1888,7 +1889,7 @@ declare class Node2D extends CanvasItem {
     getTransform(cb?: (transform: Transform2D) => void): Transform2D;
     updateTransform(): void;
     updateGlobalTransform(): void;
-    protected _transformVertices(vertices: number[], vertTransform?: VertTransform): number[];
+    protected _transformVertices(vertices: Float32Array, vertTransform?: VertTransform): Float32Array;
     protected _relayout(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _process(delta: number): void;
 }
@@ -2024,6 +2025,7 @@ declare class BaseElement2DText extends CoreObject {
     setProperties(properties?: Text$1): this;
     protected _updateProperty(key: string, value: any, oldValue: any, declaration?: PropertyDeclaration): void;
     protected _updateText(): void;
+    setContent(content: TextContent): void;
     measure(): MeasureResult;
     updateMeasure(): this;
     canDraw(): boolean;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Font } from 'modern-font';
-import { EventListenerOptions as EventListenerOptions$1, 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';
+import { EventListenerOptions as EventListenerOptions$1, 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, TextContent, Style, ImageFillCropRect } from 'modern-idoc';
 export { Color as ColorValue } from 'modern-idoc';
 import { AnimationItem } from 'lottie-web';
 import { Colord, RgbaColor, HslaColor, HsvaColor } from 'colord';
@@ -916,9 +916,9 @@ declare class WebGLStateModule extends WebGLModule {
 }
 
 interface Batchable2D {
-    vertices: number[];
-    indices: number[];
-    uvs?: number[];
+    vertices: Float32Array;
+    indices: Float32Array;
+    uvs?: Float32Array;
     texture?: WebGLTexture;
     backgroundColor?: number;
     modulate?: number;
@@ -1438,6 +1438,7 @@ declare class CanvasContext extends Path2D {
     strokeRect(x: number, y: number, width: number, height: number): void;
     fill(options?: Partial<FillDraw>): void;
     copy(source: CanvasContext): this;
+    resetStatus(): void;
     reset(): this;
     buildUvs(start: number, vertices: number[], uvs: number[], texture?: Texture2D, uvTransform?: UVTransform): void;
     toBatchables(): CanvasBatchable[];
@@ -1888,7 +1889,7 @@ declare class Node2D extends CanvasItem {
     getTransform(cb?: (transform: Transform2D) => void): Transform2D;
     updateTransform(): void;
     updateGlobalTransform(): void;
-    protected _transformVertices(vertices: number[], vertTransform?: VertTransform): number[];
+    protected _transformVertices(vertices: Float32Array, vertTransform?: VertTransform): Float32Array;
     protected _relayout(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _process(delta: number): void;
 }
@@ -2024,6 +2025,7 @@ declare class BaseElement2DText extends CoreObject {
     setProperties(properties?: Text$1): this;
     protected _updateProperty(key: string, value: any, oldValue: any, declaration?: PropertyDeclaration): void;
     protected _updateText(): void;
+    setContent(content: TextContent): void;
     measure(): MeasureResult;
     updateMeasure(): this;
     canDraw(): boolean;