modern-canvas 0.4.12 → 0.4.14

package/dist/index.cjs

@@ -8642,38 +8642,20 @@ class BaseElement2DStyle extends Resource {
     return this._backgroundColor;
   }
   async loadBackgroundImage() {
-    if (this.backgroundImage !== "none") {
+    if (this.backgroundImage && this.backgroundImage !== "none") {
       return await assets.texture.load(this.backgroundImage);
     }
   }
 }
-const defaultStyles$2 = {
-  ...modernIdoc.getDefaultTransformStyle(),
-  ...modernIdoc.getDefaultTextStyle(),
-  backgroundColor: "none",
-  backgroundImage: "none",
-  filter: "none",
-  boxShadow: "none",
-  maskImage: "none",
-  opacity: 1,
-  borderWidth: 0,
-  borderRadius: 0,
-  borderColor: "#000000",
-  borderStyle: "none",
-  outlineWidth: 0,
-  outlineOffset: 0,
-  outlineColor: "#000000",
-  outlineStyle: "none",
-  visibility: "visible",
-  overflow: "visible",
-  pointerEvents: "auto"
-};
-delete defaultStyles$2.top;
-delete defaultStyles$2.left;
-delete defaultStyles$2.width;
-delete defaultStyles$2.height;
-for (const key in defaultStyles$2) {
-  defineProperty(BaseElement2DStyle, key, { default: defaultStyles$2[key] });
+const defaultStyles$1 = modernIdoc.getDefaultStyle();
+delete defaultStyles$1.top;
+delete defaultStyles$1.left;
+delete defaultStyles$1.width;
+delete defaultStyles$1.height;
+for (const key in defaultStyles$1) {
+  defineProperty(BaseElement2DStyle, key, {
+    default: defaultStyles$1[key]
+  });
 }
 
 var __getOwnPropDesc$m = Object.getOwnPropertyDescriptor;
@@ -9095,14 +9077,14 @@ class Element2DStyle extends BaseElement2DStyle {
     this.setProperties(properties);
   }
 }
-const defaultStyles$1 = {
+const defaultStyles = {
   left: 0,
   top: 0,
   width: 0,
   height: 0
 };
-for (const key in defaultStyles$1) {
-  defineProperty(Element2DStyle, key, { default: defaultStyles$1[key] });
+for (const key in defaultStyles) {
+  defineProperty(Element2DStyle, key, { default: defaultStyles[key] });
 }
 
 var __getOwnPropDesc$k = Object.getOwnPropertyDescriptor;
@@ -9135,19 +9117,19 @@ exports.Element2D = class Element2D extends exports.BaseElement2D {
     super._updateStyleProperty(key, value, oldValue, declaration);
     switch (key) {
       case "left":
-        this.position.x = this.style.left;
+        this.position.x = Number(value);
         this.requestRelayout();
         break;
       case "top":
-        this.position.y = this.style.top;
+        this.position.y = Number(value);
         this.requestRelayout();
         break;
       case "width":
-        this.size.width = this.style.width;
+        this.size.width = Number(value);
         this.requestRelayout();
         break;
       case "height":
-        this.size.height = this.style.height;
+        this.size.height = Number(value);
         this.requestRelayout();
         break;
     }
@@ -9163,52 +9145,6 @@ class FlexElement2DStyle extends BaseElement2DStyle {
     this.setProperties(properties);
   }
 }
-const defaultStyles = {
-  alignContent: "stretch",
-  alignItems: "stretch",
-  alignSelf: "auto",
-  borderTop: "none",
-  borderLeft: "none",
-  borderRight: "none",
-  borderBottom: "none",
-  borderWidth: 0,
-  border: "none",
-  direction: "inherit",
-  display: "flex",
-  flex: 0,
-  flexBasis: "auto",
-  flexDirection: "row",
-  flexGrow: 0,
-  flexShrink: 1,
-  flexWrap: "nowrap",
-  height: "auto",
-  justifyContent: "flex-start",
-  gap: 0,
-  marginTop: 0,
-  marginLeft: 0,
-  marginRight: 0,
-  marginBottom: 0,
-  margin: 0,
-  maxHeight: 0,
-  maxWidth: 0,
-  minHeight: 0,
-  minWidth: 0,
-  paddingTop: 0,
-  paddingLeft: 0,
-  paddingRight: 0,
-  paddingBottom: 0,
-  padding: 0,
-  top: 0,
-  bottom: 0,
-  left: 0,
-  right: 0,
-  position: "static",
-  boxSizing: "content-box",
-  width: "auto"
-};
-for (const key in defaultStyles) {
-  defineProperty(FlexElement2DStyle, key, { default: defaultStyles[key] });
-}
 
 const alignMap = {
   "auto": load.Align.Auto,
@@ -9298,13 +9234,19 @@ class FlexLayout {
   updateStyleProperty(key, value, oldValue, declaration) {
     switch (key) {
       case "alignContent":
-        this._node.setAlignContent(alignMap[this._style.alignContent]);
+        this._node.setAlignContent(
+          value ? alignMap[value] : alignMap["flex-start"]
+        );
         break;
       case "alignItems":
-        this._node.setAlignItems(alignMap[this._style.alignItems]);
+        this._node.setAlignItems(
+          value ? alignMap[value] : alignMap["flex-start"]
+        );
         break;
       case "alignSelf":
-        this._node.setAlignSelf(alignMap[this._style.alignSelf]);
+        this._node.setAlignSelf(
+          value ? alignMap[value] : alignMap["flex-start"]
+        );
         break;
       case "aspectRatio":
         this._node.setAspectRatio(value);
@@ -9325,10 +9267,14 @@ class FlexLayout {
         this._node.setBorder(load.Edge.All, this._style.borderWidth);
         break;
       case "direction":
-        this._node.setDirection(directionMap[this._style.direction]);
+        this._node.setDirection(
+          value ? directionMap[value] : directionMap.inherit
+        );
         break;
       case "display":
-        this._node.setDisplay(displayMap[this._style.display]);
+        this._node.setDisplay(
+          value ? displayMap[value] : displayMap.flex
+        );
         break;
       case "flex":
         this._node.setFlex(this._style.flex);
@@ -9337,7 +9283,9 @@ class FlexLayout {
         this._node.setFlexBasis(this._style.flexBasis);
         break;
       case "flexDirection":
-        this._node.setFlexDirection(flexDirectionMap[this._style.flexDirection]);
+        this._node.setFlexDirection(
+          value ? flexDirectionMap[value] : flexDirectionMap.row
+        );
         break;
       case "flexGrow":
         this._node.setFlexGrow(this._style.flexGrow);
@@ -9346,37 +9294,41 @@ class FlexLayout {
         this._node.setFlexShrink(this._style.flexShrink);
         break;
       case "flexWrap":
-        this._node.setFlexWrap(flexWrapMap[this._style.flexWrap]);
+        this._node.setFlexWrap(
+          value ? flexWrapMap[value] : flexWrapMap.wrap
+        );
         break;
       case "height":
         this._node.setHeight(this._style.height);
         break;
       case "justifyContent":
-        this._node.setJustifyContent(justifyMap[this._style.justifyContent]);
+        this._node.setJustifyContent(
+          value ? justifyMap[value] : justifyMap["flex-start"]
+        );
         break;
       case "gap":
-        this._node.setGap(load.Gutter.All, this._style.gap);
+        value !== void 0 && this._node.setGap(load.Gutter.All, value);
         break;
       case "marginTop":
-        this._node.setMargin(load.Edge.Top, this._style.marginTop);
+        this._node.setMargin(load.Edge.Top, value);
         break;
       case "marginBottom":
-        this._node.setMargin(load.Edge.Top, this._style.marginBottom);
+        this._node.setMargin(load.Edge.Top, value);
         break;
       case "marginLeft":
-        this._node.setMargin(load.Edge.Left, this._style.marginLeft);
+        this._node.setMargin(load.Edge.Left, value);
         break;
       case "marginRight":
-        this._node.setMargin(load.Edge.Top, this._style.marginRight);
+        this._node.setMargin(load.Edge.Top, value);
         break;
       case "margin":
-        this._node.setMargin(load.Edge.All, this._style.margin);
+        this._node.setMargin(load.Edge.All, value);
         break;
       case "maxHeight":
-        this._node.setMaxHeight(this._style.maxHeight);
+        this._node.setMaxHeight(value);
         break;
       case "maxWidth":
-        this._node.setMaxWidth(this._style.maxWidth);
+        this._node.setMaxWidth(value);
         break;
       //   setDirtiedFunc(dirtiedFunc: DirtiedFunction | null): void;
       //   setMeasureFunc(measureFunc: MeasureFunction | null): void;
@@ -9387,7 +9339,9 @@ class FlexLayout {
         this._node.setMinWidth(this._style.minWidth);
         break;
       case "overflow":
-        this._node.setOverflow(overflowMap[this._style.overflow]);
+        this._node.setOverflow(
+          value ? overflowMap[value] : overflowMap.visible
+        );
         break;
       case "paddingTop":
         this._node.setPadding(load.Edge.Top, this._style.paddingTop);
@@ -9417,10 +9371,14 @@ class FlexLayout {
         this._node.setPosition(load.Edge.Right, this._style.right);
         break;
       case "position":
-        this._node.setPositionType(positionTypeMap[this._style.position]);
+        this._node.setPositionType(
+          value ? positionTypeMap[value] : positionTypeMap.static
+        );
         break;
       case "boxSizing":
-        this._node.setBoxSizing(boxSizingMap[this._style.boxSizing]);
+        this._node.setBoxSizing(
+          value ? boxSizingMap[value] : boxSizingMap["content-box"]
+        );
         break;
       case "width":
         this._node.setWidth(this._style.width);
@@ -10394,6 +10352,10 @@ exports.Animation = class Animation extends exports.TimelineNode {
   _getDiffValue(name, previous, current, weight, context) {
     let from;
     let to;
+    if (previous === "none")
+      previous = void 0;
+    if (current === "none")
+      current = void 0;
     if (previous === void 0 || current === void 0) {
       if (previous !== void 0) {
         from = parseCssProperty(name, String(previous), context);

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import { Font } from 'modern-font';
 import { AnimationItem } from 'lottie-web';
 import { AnyColor, Colord } from 'colord';
 import { Path2D, LineCap, LineJoin, LineStyle } from 'modern-path2d';
-import { TextStyleDeclaration, ElementStyleDeclaration, ImageRect } from 'modern-idoc';
+import { StyleDeclaration, ImageSource, ImageSourceRect } from 'modern-idoc';
 import { Node as Node$1, Direction } from 'yoga-layout/load';
 import { TextOptions, Text, MeasureResult } from 'modern-text';
 
@@ -1864,14 +1864,14 @@ declare class Transition extends Effect {
     constructor(properties?: Partial<TransitionProperties>, children?: Node[]);
 }
 
-interface BaseElement2DStyleProperties extends TextStyleDeclaration, Omit<ElementStyleDeclaration, 'left' | 'top' | 'width' | 'height' | 'backgroundColor' | 'borderColor'> {
+interface BaseElement2DStyleProperties extends Omit<StyleDeclaration, 'left' | 'top' | 'width' | 'height' | 'backgroundColor' | 'borderColor' | 'outlineColor'> {
+    left: number;
+    top: number;
+    width: number;
+    height: number;
     backgroundColor: 'none' | ColorValue;
-    maskImage: 'none' | string;
     borderColor: 'none' | ColorValue;
-    outlineWidth: number;
-    outlineOffset: number;
     outlineColor: 'none' | ColorValue;
-    outlineStyle: string;
 }
 interface BaseElement2DStyle extends BaseElement2DStyleProperties {
 }
@@ -1988,56 +1988,7 @@ declare class Element2D extends BaseElement2D {
     protected _updateStyleProperty(key: PropertyKey, value: any, oldValue: any, declaration?: PropertyDeclaration): void;
 }
 
-type Align = 'auto' | 'flex-start' | 'center' | 'flex-end' | 'stretch' | 'baseline' | 'space-between' | 'space-around' | 'space-evenly';
-type FlexDirection = 'column' | 'column-reverse' | 'row' | 'row-reverse';
-type FlexWrap = 'nowrap' | 'wrap' | 'Wrap-reverse';
-type Justify = 'flex-start' | 'center' | 'flex-end' | 'space-between' | 'space-around' | 'space-evenly';
-type Position = 'static' | 'relative' | 'absolute';
-type BoxSizing = 'border-box' | 'content-box';
-interface LayoutStyleDeclaration {
-    alignContent: Align;
-    alignItems: Align;
-    alignSelf: Align;
-    borderTop: string;
-    borderLeft: string;
-    borderRight: string;
-    borderBottom: string;
-    borderWidth: number;
-    border: string;
-    direction: 'inherit' | 'ltr' | 'rtl';
-    display: 'none' | 'flex' | 'contents';
-    flex: number;
-    flexBasis: number | 'auto' | `${number}%`;
-    flexDirection: FlexDirection;
-    flexGrow: number;
-    flexShrink: number;
-    flexWrap: FlexWrap;
-    height: number | 'auto' | `${number}%`;
-    justifyContent: Justify;
-    gap: number | `${number}%`;
-    marginTop: number | 'auto' | `${number}%`;
-    marginLeft: number | 'auto' | `${number}%`;
-    marginRight: number | 'auto' | `${number}%`;
-    marginBottom: number | 'auto' | `${number}%`;
-    margin: number | 'auto' | `${number}%`;
-    maxHeight: number | `${number}%`;
-    maxWidth: number | `${number}%`;
-    minHeight: number | `${number}%`;
-    minWidth: number | `${number}%`;
-    paddingTop: number | `${number}%`;
-    paddingLeft: number | `${number}%`;
-    paddingRight: number | `${number}%`;
-    paddingBottom: number | `${number}%`;
-    padding: number | `${number}%`;
-    top: number | `${number}%`;
-    bottom: number | `${number}%`;
-    left: number | `${number}%`;
-    right: number | `${number}%`;
-    position: Position;
-    boxSizing: BoxSizing;
-    width: number | 'auto' | `${number}%`;
-}
-interface FlexElement2DStyleProperties extends BaseElement2DStyleProperties, LayoutStyleDeclaration {
+interface FlexElement2DStyleProperties extends BaseElement2DStyleProperties {
 }
 interface FlexElement2DStyle extends FlexElement2DStyleProperties {
 }
@@ -2123,13 +2074,13 @@ declare class Graphics2D extends Node2D {
 }
 
 interface Image2DProperties extends Element2DProperties {
-    src: string;
-    srcRect: ImageRect;
+    src: ImageSource;
+    srcRect: ImageSourceRect;
     gif: boolean;
 }
 declare class Image2D extends Element2D {
     texture?: AnimatedTexture;
-    srcRect: ImageRect;
+    srcRect: ImageSourceRect;
     src: string;
     gif: boolean;
     get currentFrameTexture(): Texture2D | undefined;
@@ -3066,4 +3017,4 @@ interface RenderOptions {
 }
 declare function render(options: RenderOptions): Promise<HTMLCanvasElement>;
 
-export { type Align, AnimatedTexture, Animation, type AnimationEffectMode, type AnimationProperties, type AssetHandler, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, type AudioWaveformProperties, BaseElement2D, type BaseElement2DEventMap, type BaseElement2DProperties, BaseElement2DStyle, type BaseElement2DStyleProperties, type Batchable2D, BlurEffect, type BoxSizing, type CSSFilterKey, type CSSFilters, type CanvasBatchable, CanvasContext, CanvasItem, CanvasItemEditor, type CanvasItemEventMap, type CanvasItemProperties, CanvasTexture, Color, ColorAdjustEffect, ColorFilterEffect, type ColorFilterEffectProperties, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, type ColorValue, type ComputedLayout, Control, type ControlEventMap, type ControlProperties, CoreObject, type CoreObjectEventMap, type CssFunction, type CssFunctionArg, type Cursor, DEG_TO_RAD, DEVICE_PIXEL_RATIO, type Easing, Effect, type EffectContext, EffectMaterial, type EffectMode, type EffectProperties, Element2D, type Element2DEventMap, type Element2DProperties, Element2DStyle, type Element2DStyleProperties, EmbossEffect, Engine, type EngineOptions, EventEmitter, type EventListener, type EventListenerOptions, type EventListenerValue, type FillDraw, type FlexBaseElement2DEventMap, type FlexDirection, FlexElement2D, type FlexElement2DProperties, FlexElement2DStyle, type FlexElement2DStyleProperties, FlexLayout, type FlexWrap, FontLoader, GIFLoader, Geometry, type GeometryOptions, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, type IAudioContext, type IAudioNode, IN_BROWSER, type IPlayOptions, Image2D, type Image2DProperties, type ImageFrame, ImageTexture, type ImageTextureOptions, IndexBuffer, type IndexBufferOptions, Input, InputEvent, type InputEventKey, type InputEventMap, type InternalMode, JSONLoader, type Justify, KawaseTransition, type Keyframe, type LayoutStyleDeclaration, LeftEraseTransition, Loader, Lottie2D, type Lottie2DProperties, LottieLoader, MainLoop, type MainLoopEventMap, type MaskColor, type MaskData, MaskEffect, type MaskEffectProperties, type MaskObject, type MaskRect, type Maskable, Material, type MaterialOptions, Matrix, Matrix2, Matrix3, Matrix4, type MatrixLike, type MatrixOperateOutput, MouseInputEvent, Node, Node2D, type Node2DProperties, type NodeEventMap, type NodeProperties, type NormalizedKeyframe, PI, PI_2, PixelateEffect, PixelsTexture, type PlatformAudio, type PlatformSound, PointerInputEvent, type Position, type ProcessMode, Projection2D, type PropertyDeclaration, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, Range, type RangeProperties, RawWeakMap, Rect2, type Rectangulable, type RectangulableEventMap, RefCounted, type RefCountedEventMap, type RenderMode, type RenderOptions, type Renderable, Renderer, Resource, type ResourceEventMap, Ruler, type RulerProperties, 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, Scaler, type ScalerEventMap, type ScalerProperties, SceneTree, type SceneTreeEventMap, ScrollBar, type ScrollBarProperties, ShadowEffect, type StrokeDraw, Text2D, type Text2DProperties, TextLoader, Texture2D, type Texture2DFilterMode, type Texture2DPixelsSource, type Texture2DSource, type Texture2DWrapMode, TextureLoader, TextureRect2D, type TextureRect2DProperties, Ticker, TiltShiftTransition, Timeline, type TimelineEventMap, TimelineNode, type TimelineNodeEventMap, type TimelineNodeProperties, type TimelineProperties, type TimingFunctions, Transform2D, type Transform2DObject, TransformRect2D, type TransformRect2DProperties, Transition, type TransitionProperties, TwistTransition, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, type VectorLike, type VectorOperateOutput, VertexAttribute, type VertexAttributeOptions, VertexBuffer, type VertexBufferOptions, Video2D, type Video2DProperties, VideoLoader, VideoTexture, type VideoTextureOptions, type VideoTextureSource, Viewport, type ViewportEventMap, 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, XScrollBar, type XScrollBarProperties, YScrollBar, type YScrollBarProperties, ZoomBlurEffect, assets, clamp, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCSSFilter, parseCSSTransform, parseCSSTransformOrigin, parseCssFunctions, parseCssProperty, property, protectedProperty, render, timingFunctions, uid };
+export { AnimatedTexture, Animation, type AnimationEffectMode, type AnimationProperties, type AssetHandler, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, type AudioWaveformProperties, BaseElement2D, type BaseElement2DEventMap, type BaseElement2DProperties, BaseElement2DStyle, type BaseElement2DStyleProperties, type Batchable2D, BlurEffect, type CSSFilterKey, type CSSFilters, type CanvasBatchable, CanvasContext, CanvasItem, CanvasItemEditor, type CanvasItemEventMap, type CanvasItemProperties, CanvasTexture, Color, ColorAdjustEffect, ColorFilterEffect, type ColorFilterEffectProperties, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, type ColorValue, type ComputedLayout, Control, type ControlEventMap, type ControlProperties, CoreObject, type CoreObjectEventMap, type CssFunction, type CssFunctionArg, type Cursor, DEG_TO_RAD, DEVICE_PIXEL_RATIO, type Easing, Effect, type EffectContext, EffectMaterial, type EffectMode, type EffectProperties, Element2D, type Element2DEventMap, type Element2DProperties, Element2DStyle, type Element2DStyleProperties, EmbossEffect, Engine, type EngineOptions, EventEmitter, type EventListener, type EventListenerOptions, type EventListenerValue, type FillDraw, type FlexBaseElement2DEventMap, FlexElement2D, type FlexElement2DProperties, FlexElement2DStyle, type FlexElement2DStyleProperties, FlexLayout, FontLoader, GIFLoader, Geometry, type GeometryOptions, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, type IAudioContext, type IAudioNode, IN_BROWSER, type IPlayOptions, Image2D, type Image2DProperties, type ImageFrame, ImageTexture, type ImageTextureOptions, IndexBuffer, type IndexBufferOptions, Input, InputEvent, type InputEventKey, type InputEventMap, type InternalMode, JSONLoader, KawaseTransition, type Keyframe, LeftEraseTransition, Loader, Lottie2D, type Lottie2DProperties, LottieLoader, MainLoop, type MainLoopEventMap, type MaskColor, type MaskData, MaskEffect, type MaskEffectProperties, type MaskObject, type MaskRect, type Maskable, Material, type MaterialOptions, Matrix, Matrix2, Matrix3, Matrix4, type MatrixLike, type MatrixOperateOutput, MouseInputEvent, Node, Node2D, type Node2DProperties, type NodeEventMap, type NodeProperties, type NormalizedKeyframe, PI, PI_2, PixelateEffect, PixelsTexture, type PlatformAudio, type PlatformSound, PointerInputEvent, type ProcessMode, Projection2D, type PropertyDeclaration, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, Range, type RangeProperties, RawWeakMap, Rect2, type Rectangulable, type RectangulableEventMap, RefCounted, type RefCountedEventMap, type RenderMode, type RenderOptions, type Renderable, Renderer, Resource, type ResourceEventMap, Ruler, type RulerProperties, 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, Scaler, type ScalerEventMap, type ScalerProperties, SceneTree, type SceneTreeEventMap, ScrollBar, type ScrollBarProperties, ShadowEffect, type StrokeDraw, Text2D, type Text2DProperties, TextLoader, Texture2D, type Texture2DFilterMode, type Texture2DPixelsSource, type Texture2DSource, type Texture2DWrapMode, TextureLoader, TextureRect2D, type TextureRect2DProperties, Ticker, TiltShiftTransition, Timeline, type TimelineEventMap, TimelineNode, type TimelineNodeEventMap, type TimelineNodeProperties, type TimelineProperties, type TimingFunctions, Transform2D, type Transform2DObject, TransformRect2D, type TransformRect2DProperties, Transition, type TransitionProperties, TwistTransition, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, type VectorLike, type VectorOperateOutput, VertexAttribute, type VertexAttributeOptions, VertexBuffer, type VertexBufferOptions, Video2D, type Video2DProperties, VideoLoader, VideoTexture, type VideoTextureOptions, type VideoTextureSource, Viewport, type ViewportEventMap, 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, XScrollBar, type XScrollBarProperties, YScrollBar, type YScrollBarProperties, ZoomBlurEffect, assets, clamp, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCSSFilter, parseCSSTransform, parseCSSTransformOrigin, parseCssFunctions, parseCssProperty, property, protectedProperty, render, timingFunctions, uid };

package/dist/index.d.mts

@@ -2,7 +2,7 @@ import { Font } from 'modern-font';
 import { AnimationItem } from 'lottie-web';
 import { AnyColor, Colord } from 'colord';
 import { Path2D, LineCap, LineJoin, LineStyle } from 'modern-path2d';
-import { TextStyleDeclaration, ElementStyleDeclaration, ImageRect } from 'modern-idoc';
+import { StyleDeclaration, ImageSource, ImageSourceRect } from 'modern-idoc';
 import { Node as Node$1, Direction } from 'yoga-layout/load';
 import { TextOptions, Text, MeasureResult } from 'modern-text';
 
@@ -1864,14 +1864,14 @@ declare class Transition extends Effect {
     constructor(properties?: Partial<TransitionProperties>, children?: Node[]);
 }
 
-interface BaseElement2DStyleProperties extends TextStyleDeclaration, Omit<ElementStyleDeclaration, 'left' | 'top' | 'width' | 'height' | 'backgroundColor' | 'borderColor'> {
+interface BaseElement2DStyleProperties extends Omit<StyleDeclaration, 'left' | 'top' | 'width' | 'height' | 'backgroundColor' | 'borderColor' | 'outlineColor'> {
+    left: number;
+    top: number;
+    width: number;
+    height: number;
     backgroundColor: 'none' | ColorValue;
-    maskImage: 'none' | string;
     borderColor: 'none' | ColorValue;
-    outlineWidth: number;
-    outlineOffset: number;
     outlineColor: 'none' | ColorValue;
-    outlineStyle: string;
 }
 interface BaseElement2DStyle extends BaseElement2DStyleProperties {
 }
@@ -1988,56 +1988,7 @@ declare class Element2D extends BaseElement2D {
     protected _updateStyleProperty(key: PropertyKey, value: any, oldValue: any, declaration?: PropertyDeclaration): void;
 }
 
-type Align = 'auto' | 'flex-start' | 'center' | 'flex-end' | 'stretch' | 'baseline' | 'space-between' | 'space-around' | 'space-evenly';
-type FlexDirection = 'column' | 'column-reverse' | 'row' | 'row-reverse';
-type FlexWrap = 'nowrap' | 'wrap' | 'Wrap-reverse';
-type Justify = 'flex-start' | 'center' | 'flex-end' | 'space-between' | 'space-around' | 'space-evenly';
-type Position = 'static' | 'relative' | 'absolute';
-type BoxSizing = 'border-box' | 'content-box';
-interface LayoutStyleDeclaration {
-    alignContent: Align;
-    alignItems: Align;
-    alignSelf: Align;
-    borderTop: string;
-    borderLeft: string;
-    borderRight: string;
-    borderBottom: string;
-    borderWidth: number;
-    border: string;
-    direction: 'inherit' | 'ltr' | 'rtl';
-    display: 'none' | 'flex' | 'contents';
-    flex: number;
-    flexBasis: number | 'auto' | `${number}%`;
-    flexDirection: FlexDirection;
-    flexGrow: number;
-    flexShrink: number;
-    flexWrap: FlexWrap;
-    height: number | 'auto' | `${number}%`;
-    justifyContent: Justify;
-    gap: number | `${number}%`;
-    marginTop: number | 'auto' | `${number}%`;
-    marginLeft: number | 'auto' | `${number}%`;
-    marginRight: number | 'auto' | `${number}%`;
-    marginBottom: number | 'auto' | `${number}%`;
-    margin: number | 'auto' | `${number}%`;
-    maxHeight: number | `${number}%`;
-    maxWidth: number | `${number}%`;
-    minHeight: number | `${number}%`;
-    minWidth: number | `${number}%`;
-    paddingTop: number | `${number}%`;
-    paddingLeft: number | `${number}%`;
-    paddingRight: number | `${number}%`;
-    paddingBottom: number | `${number}%`;
-    padding: number | `${number}%`;
-    top: number | `${number}%`;
-    bottom: number | `${number}%`;
-    left: number | `${number}%`;
-    right: number | `${number}%`;
-    position: Position;
-    boxSizing: BoxSizing;
-    width: number | 'auto' | `${number}%`;
-}
-interface FlexElement2DStyleProperties extends BaseElement2DStyleProperties, LayoutStyleDeclaration {
+interface FlexElement2DStyleProperties extends BaseElement2DStyleProperties {
 }
 interface FlexElement2DStyle extends FlexElement2DStyleProperties {
 }
@@ -2123,13 +2074,13 @@ declare class Graphics2D extends Node2D {
 }
 
 interface Image2DProperties extends Element2DProperties {
-    src: string;
-    srcRect: ImageRect;
+    src: ImageSource;
+    srcRect: ImageSourceRect;
     gif: boolean;
 }
 declare class Image2D extends Element2D {
     texture?: AnimatedTexture;
-    srcRect: ImageRect;
+    srcRect: ImageSourceRect;
     src: string;
     gif: boolean;
     get currentFrameTexture(): Texture2D | undefined;
@@ -3066,4 +3017,4 @@ interface RenderOptions {
 }
 declare function render(options: RenderOptions): Promise<HTMLCanvasElement>;
 
-export { type Align, AnimatedTexture, Animation, type AnimationEffectMode, type AnimationProperties, type AssetHandler, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, type AudioWaveformProperties, BaseElement2D, type BaseElement2DEventMap, type BaseElement2DProperties, BaseElement2DStyle, type BaseElement2DStyleProperties, type Batchable2D, BlurEffect, type BoxSizing, type CSSFilterKey, type CSSFilters, type CanvasBatchable, CanvasContext, CanvasItem, CanvasItemEditor, type CanvasItemEventMap, type CanvasItemProperties, CanvasTexture, Color, ColorAdjustEffect, ColorFilterEffect, type ColorFilterEffectProperties, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, type ColorValue, type ComputedLayout, Control, type ControlEventMap, type ControlProperties, CoreObject, type CoreObjectEventMap, type CssFunction, type CssFunctionArg, type Cursor, DEG_TO_RAD, DEVICE_PIXEL_RATIO, type Easing, Effect, type EffectContext, EffectMaterial, type EffectMode, type EffectProperties, Element2D, type Element2DEventMap, type Element2DProperties, Element2DStyle, type Element2DStyleProperties, EmbossEffect, Engine, type EngineOptions, EventEmitter, type EventListener, type EventListenerOptions, type EventListenerValue, type FillDraw, type FlexBaseElement2DEventMap, type FlexDirection, FlexElement2D, type FlexElement2DProperties, FlexElement2DStyle, type FlexElement2DStyleProperties, FlexLayout, type FlexWrap, FontLoader, GIFLoader, Geometry, type GeometryOptions, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, type IAudioContext, type IAudioNode, IN_BROWSER, type IPlayOptions, Image2D, type Image2DProperties, type ImageFrame, ImageTexture, type ImageTextureOptions, IndexBuffer, type IndexBufferOptions, Input, InputEvent, type InputEventKey, type InputEventMap, type InternalMode, JSONLoader, type Justify, KawaseTransition, type Keyframe, type LayoutStyleDeclaration, LeftEraseTransition, Loader, Lottie2D, type Lottie2DProperties, LottieLoader, MainLoop, type MainLoopEventMap, type MaskColor, type MaskData, MaskEffect, type MaskEffectProperties, type MaskObject, type MaskRect, type Maskable, Material, type MaterialOptions, Matrix, Matrix2, Matrix3, Matrix4, type MatrixLike, type MatrixOperateOutput, MouseInputEvent, Node, Node2D, type Node2DProperties, type NodeEventMap, type NodeProperties, type NormalizedKeyframe, PI, PI_2, PixelateEffect, PixelsTexture, type PlatformAudio, type PlatformSound, PointerInputEvent, type Position, type ProcessMode, Projection2D, type PropertyDeclaration, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, Range, type RangeProperties, RawWeakMap, Rect2, type Rectangulable, type RectangulableEventMap, RefCounted, type RefCountedEventMap, type RenderMode, type RenderOptions, type Renderable, Renderer, Resource, type ResourceEventMap, Ruler, type RulerProperties, 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, Scaler, type ScalerEventMap, type ScalerProperties, SceneTree, type SceneTreeEventMap, ScrollBar, type ScrollBarProperties, ShadowEffect, type StrokeDraw, Text2D, type Text2DProperties, TextLoader, Texture2D, type Texture2DFilterMode, type Texture2DPixelsSource, type Texture2DSource, type Texture2DWrapMode, TextureLoader, TextureRect2D, type TextureRect2DProperties, Ticker, TiltShiftTransition, Timeline, type TimelineEventMap, TimelineNode, type TimelineNodeEventMap, type TimelineNodeProperties, type TimelineProperties, type TimingFunctions, Transform2D, type Transform2DObject, TransformRect2D, type TransformRect2DProperties, Transition, type TransitionProperties, TwistTransition, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, type VectorLike, type VectorOperateOutput, VertexAttribute, type VertexAttributeOptions, VertexBuffer, type VertexBufferOptions, Video2D, type Video2DProperties, VideoLoader, VideoTexture, type VideoTextureOptions, type VideoTextureSource, Viewport, type ViewportEventMap, 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, XScrollBar, type XScrollBarProperties, YScrollBar, type YScrollBarProperties, ZoomBlurEffect, assets, clamp, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCSSFilter, parseCSSTransform, parseCSSTransformOrigin, parseCssFunctions, parseCssProperty, property, protectedProperty, render, timingFunctions, uid };
+export { AnimatedTexture, Animation, type AnimationEffectMode, type AnimationProperties, type AssetHandler, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, type AudioWaveformProperties, BaseElement2D, type BaseElement2DEventMap, type BaseElement2DProperties, BaseElement2DStyle, type BaseElement2DStyleProperties, type Batchable2D, BlurEffect, type CSSFilterKey, type CSSFilters, type CanvasBatchable, CanvasContext, CanvasItem, CanvasItemEditor, type CanvasItemEventMap, type CanvasItemProperties, CanvasTexture, Color, ColorAdjustEffect, ColorFilterEffect, type ColorFilterEffectProperties, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, type ColorValue, type ComputedLayout, Control, type ControlEventMap, type ControlProperties, CoreObject, type CoreObjectEventMap, type CssFunction, type CssFunctionArg, type Cursor, DEG_TO_RAD, DEVICE_PIXEL_RATIO, type Easing, Effect, type EffectContext, EffectMaterial, type EffectMode, type EffectProperties, Element2D, type Element2DEventMap, type Element2DProperties, Element2DStyle, type Element2DStyleProperties, EmbossEffect, Engine, type EngineOptions, EventEmitter, type EventListener, type EventListenerOptions, type EventListenerValue, type FillDraw, type FlexBaseElement2DEventMap, FlexElement2D, type FlexElement2DProperties, FlexElement2DStyle, type FlexElement2DStyleProperties, FlexLayout, FontLoader, GIFLoader, Geometry, type GeometryOptions, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, type IAudioContext, type IAudioNode, IN_BROWSER, type IPlayOptions, Image2D, type Image2DProperties, type ImageFrame, ImageTexture, type ImageTextureOptions, IndexBuffer, type IndexBufferOptions, Input, InputEvent, type InputEventKey, type InputEventMap, type InternalMode, JSONLoader, KawaseTransition, type Keyframe, LeftEraseTransition, Loader, Lottie2D, type Lottie2DProperties, LottieLoader, MainLoop, type MainLoopEventMap, type MaskColor, type MaskData, MaskEffect, type MaskEffectProperties, type MaskObject, type MaskRect, type Maskable, Material, type MaterialOptions, Matrix, Matrix2, Matrix3, Matrix4, type MatrixLike, type MatrixOperateOutput, MouseInputEvent, Node, Node2D, type Node2DProperties, type NodeEventMap, type NodeProperties, type NormalizedKeyframe, PI, PI_2, PixelateEffect, PixelsTexture, type PlatformAudio, type PlatformSound, PointerInputEvent, type ProcessMode, Projection2D, type PropertyDeclaration, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, Range, type RangeProperties, RawWeakMap, Rect2, type Rectangulable, type RectangulableEventMap, RefCounted, type RefCountedEventMap, type RenderMode, type RenderOptions, type Renderable, Renderer, Resource, type ResourceEventMap, Ruler, type RulerProperties, 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, Scaler, type ScalerEventMap, type ScalerProperties, SceneTree, type SceneTreeEventMap, ScrollBar, type ScrollBarProperties, ShadowEffect, type StrokeDraw, Text2D, type Text2DProperties, TextLoader, Texture2D, type Texture2DFilterMode, type Texture2DPixelsSource, type Texture2DSource, type Texture2DWrapMode, TextureLoader, TextureRect2D, type TextureRect2DProperties, Ticker, TiltShiftTransition, Timeline, type TimelineEventMap, TimelineNode, type TimelineNodeEventMap, type TimelineNodeProperties, type TimelineProperties, type TimingFunctions, Transform2D, type Transform2DObject, TransformRect2D, type TransformRect2DProperties, Transition, type TransitionProperties, TwistTransition, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, type VectorLike, type VectorOperateOutput, VertexAttribute, type VertexAttributeOptions, VertexBuffer, type VertexBufferOptions, Video2D, type Video2DProperties, VideoLoader, VideoTexture, type VideoTextureOptions, type VideoTextureSource, Viewport, type ViewportEventMap, 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, XScrollBar, type XScrollBarProperties, YScrollBar, type YScrollBarProperties, ZoomBlurEffect, assets, clamp, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCSSFilter, parseCSSTransform, parseCSSTransformOrigin, parseCssFunctions, parseCssProperty, property, protectedProperty, render, timingFunctions, uid };