modern-canvas 0.1.1 → 0.1.2

package/README.md

@@ -53,6 +53,7 @@ loadFallbackFont().then(() => {
     })
       .addChild(
         new Text2D({
+          fonts,
           style: {
             fontSize: 30,
           },

package/dist/index.cjs

@@ -3,6 +3,7 @@
 const colord = require('colord');
 const namesPlugin = require('colord/plugins/names');
 const earcut = require('earcut');
+const modernIdoc = require('modern-idoc');
 const modernText = require('modern-text');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -6263,61 +6264,22 @@ function getComputedFilterColorMatrix() {
   return m;
 }
 
-class Style2DOffsetModule extends Style2DModule {
-  install(Style2D) {
-    defineProperty(Style2D, "offsetPath");
-    defineProperty(Style2D, "offsetAnchor");
-    defineProperty(Style2D, "offsetDistance");
-    defineProperty(Style2D, "offsetPosition");
-    Style2D.prototype.getComputedOffset = getComputedOffset;
-  }
-}
-function getComputedOffset() {
-  const offsetPath = this.offsetPath;
-  if (!offsetPath)
-    return;
-  if (offsetPath.startsWith("path")) {
-    const path = offsetPath.match(/path\(["'](.+)["']\)/)?.[1];
-    if (!path)
-      return;
-    path.split(" ").forEach((arg) => {
-    });
-  } else if (offsetPath.startsWith("ray")) ; else if (offsetPath.startsWith("url")) ; else if (offsetPath.startsWith("circle")) ; else if (offsetPath.startsWith("ellipse")) ; else if (offsetPath.startsWith("insett")) ; else if (offsetPath.startsWith("polygon")) ; else if (offsetPath.startsWith("rect")) ; else if (offsetPath.startsWith("xywh")) ;
-}
-
 class Style2DTextModule extends Style2DModule {
   install(Style2D) {
-    defineProperty(Style2D, "color", { default: "#000000" });
-    defineProperty(Style2D, "fontSize", { default: 14 });
-    defineProperty(Style2D, "fontWeight", { default: "normal" });
-    defineProperty(Style2D, "fontFamily", { default: "sans-serif" });
-    defineProperty(Style2D, "fontStyle", { default: "normal" });
-    defineProperty(Style2D, "fontKerning", { default: "normal" });
-    defineProperty(Style2D, "textWrap", { default: "wrap" });
-    defineProperty(Style2D, "textAlign", { default: "start" });
-    defineProperty(Style2D, "verticalAlign", { default: "middle" });
-    defineProperty(Style2D, "textTransform", { default: "none" });
-    defineProperty(Style2D, "textDecoration", { default: null });
-    defineProperty(Style2D, "textStrokeWidth", { default: 0 });
-    defineProperty(Style2D, "textStrokeColor", { default: "#000000" });
+    const style = modernIdoc.getDefaultTextStyle();
+    for (const key in style) {
+      defineProperty(Style2D, key, { default: style[key] });
+    }
     defineProperty(Style2D, "direction", { default: "inherit" });
-    defineProperty(Style2D, "lineHeight", { default: 1 });
-    defineProperty(Style2D, "letterSpacing", { default: 0 });
-    defineProperty(Style2D, "writingMode", { default: "horizontal-tb" });
   }
 }
 
 class Style2DTransformModule extends Style2DModule {
   install(Style2D) {
-    defineProperty(Style2D, "left", { default: 0 });
-    defineProperty(Style2D, "top", { default: 0 });
-    defineProperty(Style2D, "width", { default: 0 });
-    defineProperty(Style2D, "height", { default: 0 });
-    defineProperty(Style2D, "rotate", { default: 0 });
-    defineProperty(Style2D, "scaleX", { default: 1 });
-    defineProperty(Style2D, "scaleY", { default: 1 });
-    defineProperty(Style2D, "transform");
-    defineProperty(Style2D, "transformOrigin", { default: "center" });
+    const style = modernIdoc.getDefaultTransformStyle();
+    for (const key in style) {
+      defineProperty(Style2D, key, { default: style[key] });
+    }
     Style2D.prototype.getComputedTransform = getComputedTransform;
     Style2D.prototype.getComputedTransformOrigin = getComputedTransformOrigin;
   }
@@ -6326,7 +6288,11 @@ function getComputedTransform() {
   const transform = new Transform2D();
   const transform3d = new Transform2D(false);
   const transform2d = new Transform2D(false).scale(this.scaleX, this.scaleY).translate(this.left, this.top).rotate(this.rotate * DEG_TO_RAD);
-  parseCssFunctions(this.transform ?? "", { width: this.width, height: this.height }).forEach(({ name, args }) => {
+  let _transform = this.transform;
+  if (!_transform || _transform === "none") {
+    _transform = "";
+  }
+  parseCssFunctions(_transform, { width: this.width, height: this.height }).forEach(({ name, args }) => {
     const values = args.map((arg) => arg.normalizedIntValue);
     transform.identity();
     switch (name) {
@@ -6437,15 +6403,6 @@ function getComputedTransformOrigin() {
   });
 }
 
-const modules = {
-  __proto__: null,
-  Style2DBackgroundModule: Style2DBackgroundModule,
-  Style2DFilterModule: Style2DFilterModule,
-  Style2DOffsetModule: Style2DOffsetModule,
-  Style2DTextModule: Style2DTextModule,
-  Style2DTransformModule: Style2DTransformModule
-};
-
 var __defProp$r = Object.defineProperty;
 var __decorateClass$r = (decorators, target, key, kind) => {
   var result = void 0 ;
@@ -6499,7 +6456,12 @@ __decorateClass$r([
 __decorateClass$r([
   property({ default: "visible" })
 ], Style2D.prototype, "overflow");
-Object.values(modules).forEach((Module) => {
+[
+  Style2DBackgroundModule,
+  Style2DFilterModule,
+  Style2DTextModule,
+  Style2DTransformModule
+].forEach((Module) => {
   new Module().install(Style2D);
 });
 
@@ -7558,6 +7520,9 @@ var __decorateClass$k = (decorators, target, key, kind) => {
 const textStyles = new Set(Object.keys(modernText.textDefaultStyle));
 exports.Text2D = class Text2D extends exports.Node2D {
   effects;
+  measureDom;
+  fonts;
+  text = new modernText.Text();
   texture = new Texture(document.createElement("canvas"));
   _subTextsCount = 0;
   constructor(options) {
@@ -7568,6 +7533,8 @@ exports.Text2D = class Text2D extends exports.Node2D {
     super._onUpdateProperty(key, value, oldValue);
     switch (key) {
       case "content":
+      case "effects":
+      case "fonts":
       case "split":
         this._updateSplit();
         this.requestRedraw();
@@ -7579,6 +7546,13 @@ exports.Text2D = class Text2D extends exports.Node2D {
       });
     }
   }
+  _updateText() {
+    this.text.style = this.style.toJSON();
+    this.text.content = this.content ?? "";
+    this.text.effects = this.effects;
+    this.text.fonts = this.fonts;
+    this.text.measureDom = this.measureDom;
+  }
   _onUpdateStyleProperty(key, value, oldValue) {
     if (key === "height")
       return;
@@ -7622,13 +7596,8 @@ exports.Text2D = class Text2D extends exports.Node2D {
     }
   }
   measure() {
-    const result = modernText.measureText({
-      content: this.content,
-      style: {
-        ...this.style.toJSON(),
-        height: void 0
-      }
-    });
+    this._updateText();
+    const result = this.text.measure();
     if (!this.style.width)
       this.style.width = result.boundingBox.width;
     if (!this.style.height)
@@ -7672,12 +7641,10 @@ exports.Text2D = class Text2D extends exports.Node2D {
       if (onText2DRender) {
         onText2DRender();
       } else {
-        modernText.renderText({
-          view: this.texture.source,
+        this._updateText();
+        this.text.render({
           pixelRatio: this.pixelRatio,
-          content: this.content,
-          effects: this.effects,
-          style: this.style.toJSON()
+          view: this.texture.source
         });
       }
       this.texture.requestUpload();
@@ -7702,6 +7669,12 @@ __decorateClass$k([
 __decorateClass$k([
   property()
 ], exports.Text2D.prototype, "effects", 2);
+__decorateClass$k([
+  protectedProperty()
+], exports.Text2D.prototype, "measureDom", 2);
+__decorateClass$k([
+  protectedProperty()
+], exports.Text2D.prototype, "fonts", 2);
 exports.Text2D = __decorateClass$k([
   customNode("Text2D")
 ], exports.Text2D);
@@ -13725,7 +13698,8 @@ class Engine extends SceneTree {
     } else {
       this.resize(
         width || this.gl.drawingBufferWidth || this.view?.clientWidth || 200,
-        height || this.gl.drawingBufferHeight || this.view?.clientHeight || 200
+        height || this.gl.drawingBufferHeight || this.view?.clientHeight || 200,
+        !view
       );
     }
   }
@@ -13936,7 +13910,6 @@ exports.Style2D = Style2D;
 exports.Style2DBackgroundModule = Style2DBackgroundModule;
 exports.Style2DFilterModule = Style2DFilterModule;
 exports.Style2DModule = Style2DModule;
-exports.Style2DOffsetModule = Style2DOffsetModule;
 exports.Style2DTextModule = Style2DTextModule;
 exports.Style2DTransformModule = Style2DTransformModule;
 exports.TextLoader = TextLoader;

package/dist/index.d.cts

@@ -1,7 +1,7 @@
-import { Visibility, Overflow, FontWeight, FontStyle, FontKerning, TextWrap, TextAlign, VerticalAlign, TextTransform, TextDecoration, WritingMode, IDOCTextContent, IDOCStyleDeclaration } from 'modern-idoc';
+import { Visibility, Overflow, IDOCTextStyleDeclaration, IDOCTransformStyleDeclaration } from 'modern-idoc';
 import { AnyColor, Colord } from 'colord';
 import { AnimationItem } from 'lottie-web';
-import { MeasureResult } from 'modern-text';
+import { TextOptions, Text, MeasureResult } from 'modern-text';
 import { Font } from 'modern-font';
 
 interface CssFunctionArg {
@@ -1846,7 +1846,7 @@ declare class CanvasContext {
     toBatchables(): CanvasBatchable[];
 }
 
-interface Style2DOptions extends Partial<Style2DBackgroundProperties>, Partial<Style2DFilterProperties>, Partial<Style2DOffsetProperties>, Partial<Style2DTextProperties>, Partial<Style2DTransformProperties> {
+interface Style2DOptions extends Partial<Style2DBackgroundProperties>, Partial<Style2DFilterProperties>, Partial<Style2DTextProperties>, Partial<Style2DTransformProperties> {
     shadowColor?: string;
     shadowOffsetX?: number;
     shadowOffsetY?: number;
@@ -1855,7 +1855,7 @@ interface Style2DOptions extends Partial<Style2DBackgroundProperties>, Partial<S
     borderRadius?: number;
     overflow?: Overflow;
 }
-interface Style2D extends Style2DBackgroundExtend, Style2DFilterExtend, Style2DOffsetExtend, Style2DTextExtend, Style2DTransformExtend {
+interface Style2D extends Style2DBackgroundExtend, Style2DFilterExtend, Style2DTextExtend, Style2DTransformExtend {
 }
 declare class Style2D extends _Object {
     shadowColor: string;
@@ -1900,45 +1900,8 @@ declare class Style2DFilterModule extends Style2DModule {
 declare function getComputedFilter(this: Style2D): Style2DFilter;
 declare function getComputedFilterColorMatrix(this: Style2D): ColorMatrix;
 
-interface Style2DOffsetProperties {
-    offsetPath?: string;
-    offsetAnchor?: string | number;
-    offsetDistance?: string | number;
-    offsetPosition?: string | number;
-}
-interface Style2DOffsetExtend extends Style2DOffsetProperties {
-    getComputedOffset: typeof getComputedOffset;
-}
-declare module '../Style2D' {
-    interface Style2DOptions extends Partial<Style2DOffsetProperties> {
-    }
-    interface Style2D extends Style2DOffsetProperties {
-        getComputedOffset: typeof getComputedOffset;
-    }
-}
-declare class Style2DOffsetModule extends Style2DModule {
-    install(Style2D: new () => Style2D): void;
-}
-declare function getComputedOffset(this: Style2D): void;
-
-interface Style2DTextProperties {
-    color: string;
-    fontSize: number;
-    fontWeight: FontWeight;
-    fontFamily: string;
-    fontStyle: FontStyle;
-    fontKerning: FontKerning;
-    textWrap: TextWrap;
-    textAlign: TextAlign;
-    verticalAlign: VerticalAlign;
-    textTransform: TextTransform;
-    textDecoration: TextDecoration | null;
-    textStrokeWidth: number;
-    textStrokeColor: string;
+interface Style2DTextProperties extends IDOCTextStyleDeclaration {
     direction: 'inherit' | 'ltr' | 'rtl';
-    lineHeight: number;
-    letterSpacing: number;
-    writingMode: WritingMode;
 }
 interface Style2DTextExtend extends Style2DTextProperties {
 }
@@ -1946,16 +1909,7 @@ declare class Style2DTextModule extends Style2DModule {
     install(Style2D: new () => Style2D): void;
 }
 
-interface Style2DTransformProperties {
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-    rotate: number;
-    scaleX: number;
-    scaleY: number;
-    transform?: string;
-    transformOrigin: string;
+interface Style2DTransformProperties extends IDOCTransformStyleDeclaration {
 }
 interface Style2DTransformExtend extends Style2DTransformProperties {
     getComputedTransform: typeof getComputedTransform;
@@ -2113,11 +2067,9 @@ declare class Lottie2D extends Node2D {
     protected _drawContent(): void;
 }
 
-interface Text2DOptions extends Node2DOptions {
+interface Text2DOptions extends Node2DOptions, Omit<TextOptions, 'style'> {
     pixelRatio?: number;
     split?: boolean;
-    content?: IDOCTextContent;
-    effects?: Partial<IDOCStyleDeclaration>[];
 }
 /**
  * @example
@@ -2132,12 +2084,16 @@ interface Text2DOptions extends Node2DOptions {
 declare class Text2D extends Node2D {
     pixelRatio: number;
     split: boolean;
-    content: IDOCTextContent;
-    effects?: Partial<IDOCStyleDeclaration>[];
+    content: TextOptions['content'];
+    effects?: TextOptions['effects'];
+    measureDom?: TextOptions['measureDom'];
+    fonts?: TextOptions['fonts'];
+    text: Text;
     readonly texture: Texture<HTMLCanvasElement>;
     protected _subTextsCount: number;
     constructor(options?: Text2DOptions);
     protected _onUpdateProperty(key: PropertyKey, value: any, oldValue: any): void;
+    protected _updateText(): void;
     protected _onUpdateStyleProperty(key: PropertyKey, value: any, oldValue: any): void;
     protected _getSubTexts(): Text2D[];
     protected _updateSubTexts(): void;
@@ -3112,4 +3068,4 @@ interface RenderOptions {
 }
 declare function render(options: RenderOptions): Promise<HTMLCanvasElement>;
 
-export { Animation2D, type AnimationOptions, type AssetHandler, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, type AudioWaveformOptions, type Batchable2D, BlurEffect, Bounds, type BoundsData, type CanvasBatchable, CanvasContext, CanvasItem, type CanvasItemOptions, Circle, Color, ColorAdjustEffect, ColorFilterEffect, type ColorFilterEffectOptions, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, type ColorValue, type CssFunction, type CssFunctionArg, type Cursor, type CustomNodeOptions, DEG_TO_RAD, DEVICE_PIXEL_RATIO, type Easing, Effect, type EffectContext, EffectMaterial, type EffectMode, type EffectOptions, Ellipse, EmbossEffect, Engine, type EngineOptions, EventEmitter, type EventListener, type EventListenerOptions, type EventListenerValue, type FilledGraphics, FontLoader, Geometry, type GeometryOptions, GifLoader, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, type IAudioContext, type IAudioNode, IN_BROWSER, type IPlayOptions, Image2D, type Image2DOptions, Image2DResource, type ImageFrame, ImageTexture, type ImageTextureOptions, IndexBuffer, type IndexBufferOptions, Input, InternalMode, JsonLoader, KawaseEffect, type Keyframe, LeftEraseEffect, type LineCap, type LineJoin, type LineStyle, Loader, Lottie2D, LottieLoader, type LottieOptions, MainLoop, type MainLoopEventMap, type MaskColor, type MaskData, MaskEffect, type MaskEffectOptions, type MaskObject, type MaskRect, type Maskable, Material, type MaterialOptions, Matrix, Matrix2, Matrix3, Matrix4, type MatrixLike, type MatrixOperateOutput, MouseInputEvent, Node, Node2D, type Node2DOptions, type NodeEventMap, type NodeOptions, type NormalizedKeyframe, PI, PI_2, Path2D, type Path2DCall, type Path2DCallMethod, type Path2DShape, PixelateEffect, PixelsTexture, type PlatformAudio, type PlatformSound, Point, type PointData, type PointLike, PointerInputEvent, Polygon, Projection2D, type PropertyDeclaration, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, Rectangle, Reference, type ReferenceEventMap, type RenderCall, type RenderOptions, RenderStack, type Renderable, Renderer, Resource, type ResourceEventMap, RoundedRectangle, SUPPORTS_AUDIO_CONTEXT, SUPPORTS_CLICK_EVENTS, SUPPORTS_CREATE_IMAGE_BITMAP, SUPPORTS_IMAGE_BITMAP, SUPPORTS_MOUSE_EVENTS, SUPPORTS_OFFLINE_AUDIO_CONTEXT, SUPPORTS_POINTER_EVENTS, SUPPORTS_RESIZE_OBSERVER, SUPPORTS_TOUCH_EVENTS, SUPPORTS_WEBGL2, SUPPORTS_WEBKIT_AUDIO_CONTEXT, SUPPORTS_WEBKIT_OFFLINE_AUDIO_CONTEXT, SUPPORTS_WEB_AUDIO, SUPPORTS_WHEEL_EVENTS, SVGPath, type SVGPathDefine, type SVGPathDefineCommand, SceneTree, type SceneTreeEventMap, type Shape, type ShapeBuildCommand, Star, type StrokedGraphics, Style2D, type Style2DBackgroundExtend, Style2DBackgroundModule, type Style2DBackgroundProperties, type Style2DFilter, type Style2DFilterExtend, type Style2DFilterKey, Style2DFilterModule, type Style2DFilterProperties, Style2DModule, type Style2DOffsetExtend, Style2DOffsetModule, type Style2DOffsetProperties, type Style2DOptions, type Style2DTextExtend, Style2DTextModule, type Style2DTextProperties, type Style2DTransformExtend, Style2DTransformModule, type Style2DTransformProperties, Text2D, type Text2DOptions, TextLoader, Texture, type TextureFilterMode, TextureLoader, type TexturePixelsSource, type TextureSource, type TextureWrapMode, Ticker, TiltShiftEffect, Timer, type TimerEventMap, type TimerOptions, type TimingFunctions, Transform2D, type Transform2DObject, Triangle, TwistEffect, UIInputEvent, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, type VectorLike, type VectorOperateOutput, VertexAttribute, type VertexAttributeOptions, VertexBuffer, type VertexBufferOptions, Video2D, type Video2DOptions, VideoLoader, VideoTexture, type VideoTextureOptions, type VideoTextureSource, Viewport, type ViewportFramebuffer, ViewportTexture, WebAudio, WebAudioContext, WebGLBatch2DModule, WebGLBlendMode, type WebGLBufferMeta, WebGLBufferModule, type WebGLBufferOptions, type WebGLBufferTarget, type WebGLBufferUsage, type WebGLDrawMode, type WebGLDrawOptions, type WebGLExtensions, type WebGLFramebufferMeta, WebGLFramebufferModule, type WebGLFramebufferOptions, WebGLMaskModule, WebGLModule, type WebGLProgramMeta, WebGLProgramModule, type WebGLProgramOptions, WebGLRenderer, WebGLScissorModule, WebGLState, WebGLStateModule, WebGLStencilModule, type WebGLTarget, type WebGLTextureFilterMode, type WebGLTextureLocation, type WebGLTextureMeta, WebGLTextureModule, type WebGLTextureOptions, type WebGLTextureSource, type WebGLTextureTarget, type WebGLTextureWrapMode, WebGLVertexArrayModule, type WebGLVertexArrayObjectMeta, type WebGLVertexArrayObjectOptions, type WebGLVertexAttrib, type WebGLVertexAttribType, type WebGLViewport, WebGLViewportModule, WebSound, WheelInputEvent, ZoomBlurEffect, _Object, type _ObjectEventMap, assets, buildAdaptiveBezier, buildAdaptiveQuadratic, buildArc, buildArcTo, buildArcToSvg, buildCircle, buildLine, buildPolygon, buildRectangle, buildTriangle, clamp, closePointEps, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curveEps, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCssFunctions, parseCssProperty, property, protectedProperty, render, squaredDistanceToLineSegment, timingFunctions, uid };
+export { Animation2D, type AnimationOptions, type AssetHandler, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, type AudioWaveformOptions, type Batchable2D, BlurEffect, Bounds, type BoundsData, type CanvasBatchable, CanvasContext, CanvasItem, type CanvasItemOptions, Circle, Color, ColorAdjustEffect, ColorFilterEffect, type ColorFilterEffectOptions, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, type ColorValue, type CssFunction, type CssFunctionArg, type Cursor, type CustomNodeOptions, DEG_TO_RAD, DEVICE_PIXEL_RATIO, type Easing, Effect, type EffectContext, EffectMaterial, type EffectMode, type EffectOptions, Ellipse, EmbossEffect, Engine, type EngineOptions, EventEmitter, type EventListener, type EventListenerOptions, type EventListenerValue, type FilledGraphics, FontLoader, Geometry, type GeometryOptions, GifLoader, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, type IAudioContext, type IAudioNode, IN_BROWSER, type IPlayOptions, Image2D, type Image2DOptions, Image2DResource, type ImageFrame, ImageTexture, type ImageTextureOptions, IndexBuffer, type IndexBufferOptions, Input, InternalMode, JsonLoader, KawaseEffect, type Keyframe, LeftEraseEffect, type LineCap, type LineJoin, type LineStyle, Loader, Lottie2D, LottieLoader, type LottieOptions, MainLoop, type MainLoopEventMap, type MaskColor, type MaskData, MaskEffect, type MaskEffectOptions, type MaskObject, type MaskRect, type Maskable, Material, type MaterialOptions, Matrix, Matrix2, Matrix3, Matrix4, type MatrixLike, type MatrixOperateOutput, MouseInputEvent, Node, Node2D, type Node2DOptions, type NodeEventMap, type NodeOptions, type NormalizedKeyframe, PI, PI_2, Path2D, type Path2DCall, type Path2DCallMethod, type Path2DShape, PixelateEffect, PixelsTexture, type PlatformAudio, type PlatformSound, Point, type PointData, type PointLike, PointerInputEvent, Polygon, Projection2D, type PropertyDeclaration, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, Rectangle, Reference, type ReferenceEventMap, type RenderCall, type RenderOptions, RenderStack, type Renderable, Renderer, Resource, type ResourceEventMap, RoundedRectangle, SUPPORTS_AUDIO_CONTEXT, SUPPORTS_CLICK_EVENTS, SUPPORTS_CREATE_IMAGE_BITMAP, SUPPORTS_IMAGE_BITMAP, SUPPORTS_MOUSE_EVENTS, SUPPORTS_OFFLINE_AUDIO_CONTEXT, SUPPORTS_POINTER_EVENTS, SUPPORTS_RESIZE_OBSERVER, SUPPORTS_TOUCH_EVENTS, SUPPORTS_WEBGL2, SUPPORTS_WEBKIT_AUDIO_CONTEXT, SUPPORTS_WEBKIT_OFFLINE_AUDIO_CONTEXT, SUPPORTS_WEB_AUDIO, SUPPORTS_WHEEL_EVENTS, SVGPath, type SVGPathDefine, type SVGPathDefineCommand, SceneTree, type SceneTreeEventMap, type Shape, type ShapeBuildCommand, Star, type StrokedGraphics, Style2D, type Style2DBackgroundExtend, Style2DBackgroundModule, type Style2DBackgroundProperties, type Style2DFilter, type Style2DFilterExtend, type Style2DFilterKey, Style2DFilterModule, type Style2DFilterProperties, Style2DModule, type Style2DOptions, type Style2DTextExtend, Style2DTextModule, type Style2DTextProperties, type Style2DTransformExtend, Style2DTransformModule, type Style2DTransformProperties, Text2D, type Text2DOptions, TextLoader, Texture, type TextureFilterMode, TextureLoader, type TexturePixelsSource, type TextureSource, type TextureWrapMode, Ticker, TiltShiftEffect, Timer, type TimerEventMap, type TimerOptions, type TimingFunctions, Transform2D, type Transform2DObject, Triangle, TwistEffect, UIInputEvent, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, type VectorLike, type VectorOperateOutput, VertexAttribute, type VertexAttributeOptions, VertexBuffer, type VertexBufferOptions, Video2D, type Video2DOptions, VideoLoader, VideoTexture, type VideoTextureOptions, type VideoTextureSource, Viewport, type ViewportFramebuffer, ViewportTexture, WebAudio, WebAudioContext, WebGLBatch2DModule, WebGLBlendMode, type WebGLBufferMeta, WebGLBufferModule, type WebGLBufferOptions, type WebGLBufferTarget, type WebGLBufferUsage, type WebGLDrawMode, type WebGLDrawOptions, type WebGLExtensions, type WebGLFramebufferMeta, WebGLFramebufferModule, type WebGLFramebufferOptions, WebGLMaskModule, WebGLModule, type WebGLProgramMeta, WebGLProgramModule, type WebGLProgramOptions, WebGLRenderer, WebGLScissorModule, WebGLState, WebGLStateModule, WebGLStencilModule, type WebGLTarget, type WebGLTextureFilterMode, type WebGLTextureLocation, type WebGLTextureMeta, WebGLTextureModule, type WebGLTextureOptions, type WebGLTextureSource, type WebGLTextureTarget, type WebGLTextureWrapMode, WebGLVertexArrayModule, type WebGLVertexArrayObjectMeta, type WebGLVertexArrayObjectOptions, type WebGLVertexAttrib, type WebGLVertexAttribType, type WebGLViewport, WebGLViewportModule, WebSound, WheelInputEvent, ZoomBlurEffect, _Object, type _ObjectEventMap, assets, buildAdaptiveBezier, buildAdaptiveQuadratic, buildArc, buildArcTo, buildArcToSvg, buildCircle, buildLine, buildPolygon, buildRectangle, buildTriangle, clamp, closePointEps, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curveEps, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCssFunctions, parseCssProperty, property, protectedProperty, render, squaredDistanceToLineSegment, timingFunctions, uid };

package/dist/index.d.mts

@@ -1,7 +1,7 @@
-import { Visibility, Overflow, FontWeight, FontStyle, FontKerning, TextWrap, TextAlign, VerticalAlign, TextTransform, TextDecoration, WritingMode, IDOCTextContent, IDOCStyleDeclaration } from 'modern-idoc';
+import { Visibility, Overflow, IDOCTextStyleDeclaration, IDOCTransformStyleDeclaration } from 'modern-idoc';
 import { AnyColor, Colord } from 'colord';
 import { AnimationItem } from 'lottie-web';
-import { MeasureResult } from 'modern-text';
+import { TextOptions, Text, MeasureResult } from 'modern-text';
 import { Font } from 'modern-font';
 
 interface CssFunctionArg {
@@ -1846,7 +1846,7 @@ declare class CanvasContext {
     toBatchables(): CanvasBatchable[];
 }
 
-interface Style2DOptions extends Partial<Style2DBackgroundProperties>, Partial<Style2DFilterProperties>, Partial<Style2DOffsetProperties>, Partial<Style2DTextProperties>, Partial<Style2DTransformProperties> {
+interface Style2DOptions extends Partial<Style2DBackgroundProperties>, Partial<Style2DFilterProperties>, Partial<Style2DTextProperties>, Partial<Style2DTransformProperties> {
     shadowColor?: string;
     shadowOffsetX?: number;
     shadowOffsetY?: number;
@@ -1855,7 +1855,7 @@ interface Style2DOptions extends Partial<Style2DBackgroundProperties>, Partial<S
     borderRadius?: number;
     overflow?: Overflow;
 }
-interface Style2D extends Style2DBackgroundExtend, Style2DFilterExtend, Style2DOffsetExtend, Style2DTextExtend, Style2DTransformExtend {
+interface Style2D extends Style2DBackgroundExtend, Style2DFilterExtend, Style2DTextExtend, Style2DTransformExtend {
 }
 declare class Style2D extends _Object {
     shadowColor: string;
@@ -1900,45 +1900,8 @@ declare class Style2DFilterModule extends Style2DModule {
 declare function getComputedFilter(this: Style2D): Style2DFilter;
 declare function getComputedFilterColorMatrix(this: Style2D): ColorMatrix;
 
-interface Style2DOffsetProperties {
-    offsetPath?: string;
-    offsetAnchor?: string | number;
-    offsetDistance?: string | number;
-    offsetPosition?: string | number;
-}
-interface Style2DOffsetExtend extends Style2DOffsetProperties {
-    getComputedOffset: typeof getComputedOffset;
-}
-declare module '../Style2D' {
-    interface Style2DOptions extends Partial<Style2DOffsetProperties> {
-    }
-    interface Style2D extends Style2DOffsetProperties {
-        getComputedOffset: typeof getComputedOffset;
-    }
-}
-declare class Style2DOffsetModule extends Style2DModule {
-    install(Style2D: new () => Style2D): void;
-}
-declare function getComputedOffset(this: Style2D): void;
-
-interface Style2DTextProperties {
-    color: string;
-    fontSize: number;
-    fontWeight: FontWeight;
-    fontFamily: string;
-    fontStyle: FontStyle;
-    fontKerning: FontKerning;
-    textWrap: TextWrap;
-    textAlign: TextAlign;
-    verticalAlign: VerticalAlign;
-    textTransform: TextTransform;
-    textDecoration: TextDecoration | null;
-    textStrokeWidth: number;
-    textStrokeColor: string;
+interface Style2DTextProperties extends IDOCTextStyleDeclaration {
     direction: 'inherit' | 'ltr' | 'rtl';
-    lineHeight: number;
-    letterSpacing: number;
-    writingMode: WritingMode;
 }
 interface Style2DTextExtend extends Style2DTextProperties {
 }
@@ -1946,16 +1909,7 @@ declare class Style2DTextModule extends Style2DModule {
     install(Style2D: new () => Style2D): void;
 }
 
-interface Style2DTransformProperties {
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-    rotate: number;
-    scaleX: number;
-    scaleY: number;
-    transform?: string;
-    transformOrigin: string;
+interface Style2DTransformProperties extends IDOCTransformStyleDeclaration {
 }
 interface Style2DTransformExtend extends Style2DTransformProperties {
     getComputedTransform: typeof getComputedTransform;
@@ -2113,11 +2067,9 @@ declare class Lottie2D extends Node2D {
     protected _drawContent(): void;
 }
 
-interface Text2DOptions extends Node2DOptions {
+interface Text2DOptions extends Node2DOptions, Omit<TextOptions, 'style'> {
     pixelRatio?: number;
     split?: boolean;
-    content?: IDOCTextContent;
-    effects?: Partial<IDOCStyleDeclaration>[];
 }
 /**
  * @example
@@ -2132,12 +2084,16 @@ interface Text2DOptions extends Node2DOptions {
 declare class Text2D extends Node2D {
     pixelRatio: number;
     split: boolean;
-    content: IDOCTextContent;
-    effects?: Partial<IDOCStyleDeclaration>[];
+    content: TextOptions['content'];
+    effects?: TextOptions['effects'];
+    measureDom?: TextOptions['measureDom'];
+    fonts?: TextOptions['fonts'];
+    text: Text;
     readonly texture: Texture<HTMLCanvasElement>;
     protected _subTextsCount: number;
     constructor(options?: Text2DOptions);
     protected _onUpdateProperty(key: PropertyKey, value: any, oldValue: any): void;
+    protected _updateText(): void;
     protected _onUpdateStyleProperty(key: PropertyKey, value: any, oldValue: any): void;
     protected _getSubTexts(): Text2D[];
     protected _updateSubTexts(): void;
@@ -3112,4 +3068,4 @@ interface RenderOptions {
 }
 declare function render(options: RenderOptions): Promise<HTMLCanvasElement>;
 
-export { Animation2D, type AnimationOptions, type AssetHandler, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, type AudioWaveformOptions, type Batchable2D, BlurEffect, Bounds, type BoundsData, type CanvasBatchable, CanvasContext, CanvasItem, type CanvasItemOptions, Circle, Color, ColorAdjustEffect, ColorFilterEffect, type ColorFilterEffectOptions, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, type ColorValue, type CssFunction, type CssFunctionArg, type Cursor, type CustomNodeOptions, DEG_TO_RAD, DEVICE_PIXEL_RATIO, type Easing, Effect, type EffectContext, EffectMaterial, type EffectMode, type EffectOptions, Ellipse, EmbossEffect, Engine, type EngineOptions, EventEmitter, type EventListener, type EventListenerOptions, type EventListenerValue, type FilledGraphics, FontLoader, Geometry, type GeometryOptions, GifLoader, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, type IAudioContext, type IAudioNode, IN_BROWSER, type IPlayOptions, Image2D, type Image2DOptions, Image2DResource, type ImageFrame, ImageTexture, type ImageTextureOptions, IndexBuffer, type IndexBufferOptions, Input, InternalMode, JsonLoader, KawaseEffect, type Keyframe, LeftEraseEffect, type LineCap, type LineJoin, type LineStyle, Loader, Lottie2D, LottieLoader, type LottieOptions, MainLoop, type MainLoopEventMap, type MaskColor, type MaskData, MaskEffect, type MaskEffectOptions, type MaskObject, type MaskRect, type Maskable, Material, type MaterialOptions, Matrix, Matrix2, Matrix3, Matrix4, type MatrixLike, type MatrixOperateOutput, MouseInputEvent, Node, Node2D, type Node2DOptions, type NodeEventMap, type NodeOptions, type NormalizedKeyframe, PI, PI_2, Path2D, type Path2DCall, type Path2DCallMethod, type Path2DShape, PixelateEffect, PixelsTexture, type PlatformAudio, type PlatformSound, Point, type PointData, type PointLike, PointerInputEvent, Polygon, Projection2D, type PropertyDeclaration, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, Rectangle, Reference, type ReferenceEventMap, type RenderCall, type RenderOptions, RenderStack, type Renderable, Renderer, Resource, type ResourceEventMap, RoundedRectangle, SUPPORTS_AUDIO_CONTEXT, SUPPORTS_CLICK_EVENTS, SUPPORTS_CREATE_IMAGE_BITMAP, SUPPORTS_IMAGE_BITMAP, SUPPORTS_MOUSE_EVENTS, SUPPORTS_OFFLINE_AUDIO_CONTEXT, SUPPORTS_POINTER_EVENTS, SUPPORTS_RESIZE_OBSERVER, SUPPORTS_TOUCH_EVENTS, SUPPORTS_WEBGL2, SUPPORTS_WEBKIT_AUDIO_CONTEXT, SUPPORTS_WEBKIT_OFFLINE_AUDIO_CONTEXT, SUPPORTS_WEB_AUDIO, SUPPORTS_WHEEL_EVENTS, SVGPath, type SVGPathDefine, type SVGPathDefineCommand, SceneTree, type SceneTreeEventMap, type Shape, type ShapeBuildCommand, Star, type StrokedGraphics, Style2D, type Style2DBackgroundExtend, Style2DBackgroundModule, type Style2DBackgroundProperties, type Style2DFilter, type Style2DFilterExtend, type Style2DFilterKey, Style2DFilterModule, type Style2DFilterProperties, Style2DModule, type Style2DOffsetExtend, Style2DOffsetModule, type Style2DOffsetProperties, type Style2DOptions, type Style2DTextExtend, Style2DTextModule, type Style2DTextProperties, type Style2DTransformExtend, Style2DTransformModule, type Style2DTransformProperties, Text2D, type Text2DOptions, TextLoader, Texture, type TextureFilterMode, TextureLoader, type TexturePixelsSource, type TextureSource, type TextureWrapMode, Ticker, TiltShiftEffect, Timer, type TimerEventMap, type TimerOptions, type TimingFunctions, Transform2D, type Transform2DObject, Triangle, TwistEffect, UIInputEvent, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, type VectorLike, type VectorOperateOutput, VertexAttribute, type VertexAttributeOptions, VertexBuffer, type VertexBufferOptions, Video2D, type Video2DOptions, VideoLoader, VideoTexture, type VideoTextureOptions, type VideoTextureSource, Viewport, type ViewportFramebuffer, ViewportTexture, WebAudio, WebAudioContext, WebGLBatch2DModule, WebGLBlendMode, type WebGLBufferMeta, WebGLBufferModule, type WebGLBufferOptions, type WebGLBufferTarget, type WebGLBufferUsage, type WebGLDrawMode, type WebGLDrawOptions, type WebGLExtensions, type WebGLFramebufferMeta, WebGLFramebufferModule, type WebGLFramebufferOptions, WebGLMaskModule, WebGLModule, type WebGLProgramMeta, WebGLProgramModule, type WebGLProgramOptions, WebGLRenderer, WebGLScissorModule, WebGLState, WebGLStateModule, WebGLStencilModule, type WebGLTarget, type WebGLTextureFilterMode, type WebGLTextureLocation, type WebGLTextureMeta, WebGLTextureModule, type WebGLTextureOptions, type WebGLTextureSource, type WebGLTextureTarget, type WebGLTextureWrapMode, WebGLVertexArrayModule, type WebGLVertexArrayObjectMeta, type WebGLVertexArrayObjectOptions, type WebGLVertexAttrib, type WebGLVertexAttribType, type WebGLViewport, WebGLViewportModule, WebSound, WheelInputEvent, ZoomBlurEffect, _Object, type _ObjectEventMap, assets, buildAdaptiveBezier, buildAdaptiveQuadratic, buildArc, buildArcTo, buildArcToSvg, buildCircle, buildLine, buildPolygon, buildRectangle, buildTriangle, clamp, closePointEps, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curveEps, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCssFunctions, parseCssProperty, property, protectedProperty, render, squaredDistanceToLineSegment, timingFunctions, uid };
+export { Animation2D, type AnimationOptions, type AssetHandler, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, type AudioWaveformOptions, type Batchable2D, BlurEffect, Bounds, type BoundsData, type CanvasBatchable, CanvasContext, CanvasItem, type CanvasItemOptions, Circle, Color, ColorAdjustEffect, ColorFilterEffect, type ColorFilterEffectOptions, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, type ColorValue, type CssFunction, type CssFunctionArg, type Cursor, type CustomNodeOptions, DEG_TO_RAD, DEVICE_PIXEL_RATIO, type Easing, Effect, type EffectContext, EffectMaterial, type EffectMode, type EffectOptions, Ellipse, EmbossEffect, Engine, type EngineOptions, EventEmitter, type EventListener, type EventListenerOptions, type EventListenerValue, type FilledGraphics, FontLoader, Geometry, type GeometryOptions, GifLoader, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, type IAudioContext, type IAudioNode, IN_BROWSER, type IPlayOptions, Image2D, type Image2DOptions, Image2DResource, type ImageFrame, ImageTexture, type ImageTextureOptions, IndexBuffer, type IndexBufferOptions, Input, InternalMode, JsonLoader, KawaseEffect, type Keyframe, LeftEraseEffect, type LineCap, type LineJoin, type LineStyle, Loader, Lottie2D, LottieLoader, type LottieOptions, MainLoop, type MainLoopEventMap, type MaskColor, type MaskData, MaskEffect, type MaskEffectOptions, type MaskObject, type MaskRect, type Maskable, Material, type MaterialOptions, Matrix, Matrix2, Matrix3, Matrix4, type MatrixLike, type MatrixOperateOutput, MouseInputEvent, Node, Node2D, type Node2DOptions, type NodeEventMap, type NodeOptions, type NormalizedKeyframe, PI, PI_2, Path2D, type Path2DCall, type Path2DCallMethod, type Path2DShape, PixelateEffect, PixelsTexture, type PlatformAudio, type PlatformSound, Point, type PointData, type PointLike, PointerInputEvent, Polygon, Projection2D, type PropertyDeclaration, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, Rectangle, Reference, type ReferenceEventMap, type RenderCall, type RenderOptions, RenderStack, type Renderable, Renderer, Resource, type ResourceEventMap, RoundedRectangle, SUPPORTS_AUDIO_CONTEXT, SUPPORTS_CLICK_EVENTS, SUPPORTS_CREATE_IMAGE_BITMAP, SUPPORTS_IMAGE_BITMAP, SUPPORTS_MOUSE_EVENTS, SUPPORTS_OFFLINE_AUDIO_CONTEXT, SUPPORTS_POINTER_EVENTS, SUPPORTS_RESIZE_OBSERVER, SUPPORTS_TOUCH_EVENTS, SUPPORTS_WEBGL2, SUPPORTS_WEBKIT_AUDIO_CONTEXT, SUPPORTS_WEBKIT_OFFLINE_AUDIO_CONTEXT, SUPPORTS_WEB_AUDIO, SUPPORTS_WHEEL_EVENTS, SVGPath, type SVGPathDefine, type SVGPathDefineCommand, SceneTree, type SceneTreeEventMap, type Shape, type ShapeBuildCommand, Star, type StrokedGraphics, Style2D, type Style2DBackgroundExtend, Style2DBackgroundModule, type Style2DBackgroundProperties, type Style2DFilter, type Style2DFilterExtend, type Style2DFilterKey, Style2DFilterModule, type Style2DFilterProperties, Style2DModule, type Style2DOptions, type Style2DTextExtend, Style2DTextModule, type Style2DTextProperties, type Style2DTransformExtend, Style2DTransformModule, type Style2DTransformProperties, Text2D, type Text2DOptions, TextLoader, Texture, type TextureFilterMode, TextureLoader, type TexturePixelsSource, type TextureSource, type TextureWrapMode, Ticker, TiltShiftEffect, Timer, type TimerEventMap, type TimerOptions, type TimingFunctions, Transform2D, type Transform2DObject, Triangle, TwistEffect, UIInputEvent, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, type VectorLike, type VectorOperateOutput, VertexAttribute, type VertexAttributeOptions, VertexBuffer, type VertexBufferOptions, Video2D, type Video2DOptions, VideoLoader, VideoTexture, type VideoTextureOptions, type VideoTextureSource, Viewport, type ViewportFramebuffer, ViewportTexture, WebAudio, WebAudioContext, WebGLBatch2DModule, WebGLBlendMode, type WebGLBufferMeta, WebGLBufferModule, type WebGLBufferOptions, type WebGLBufferTarget, type WebGLBufferUsage, type WebGLDrawMode, type WebGLDrawOptions, type WebGLExtensions, type WebGLFramebufferMeta, WebGLFramebufferModule, type WebGLFramebufferOptions, WebGLMaskModule, WebGLModule, type WebGLProgramMeta, WebGLProgramModule, type WebGLProgramOptions, WebGLRenderer, WebGLScissorModule, WebGLState, WebGLStateModule, WebGLStencilModule, type WebGLTarget, type WebGLTextureFilterMode, type WebGLTextureLocation, type WebGLTextureMeta, WebGLTextureModule, type WebGLTextureOptions, type WebGLTextureSource, type WebGLTextureTarget, type WebGLTextureWrapMode, WebGLVertexArrayModule, type WebGLVertexArrayObjectMeta, type WebGLVertexArrayObjectOptions, type WebGLVertexAttrib, type WebGLVertexAttribType, type WebGLViewport, WebGLViewportModule, WebSound, WheelInputEvent, ZoomBlurEffect, _Object, type _ObjectEventMap, assets, buildAdaptiveBezier, buildAdaptiveQuadratic, buildArc, buildArcTo, buildArcToSvg, buildCircle, buildLine, buildPolygon, buildRectangle, buildTriangle, clamp, closePointEps, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curveEps, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCssFunctions, parseCssProperty, property, protectedProperty, render, squaredDistanceToLineSegment, timingFunctions, uid };