leafer-ui 1.3.1 → 1.3.3

package/dist/web.module.js

@@ -1533,10 +1533,10 @@ const DataHelper = {
         Object.keys(merge).forEach(key => {
             var _a, _b;
             value = merge[key];
-            if ((value === null || value === void 0 ? void 0 : value.constructor) === Object && ((_a = t[key]) === null || _a === void 0 ? void 0 : _a.constructor) === Object)
+            if ((value === null || value === undefined ? undefined : value.constructor) === Object && ((_a = t[key]) === null || _a === undefined ? undefined : _a.constructor) === Object)
                 return assign(t[key], merge[key], exclude && exclude[key]);
             if (exclude && (key in exclude)) {
-                if (((_b = exclude[key]) === null || _b === void 0 ? void 0 : _b.constructor) === Object)
+                if (((_b = exclude[key]) === null || _b === undefined ? undefined : _b.constructor) === Object)
                     assign(t[key] = {}, merge[key], exclude[key]);
                 return;
             }
@@ -1705,7 +1705,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
 
 function __decorate(decorators, target, key, desc) {
@@ -1773,7 +1773,7 @@ let Canvas$1 = class Canvas {
     }
     setTransform(_a, _b, _c, _d, _e, _f) { }
     resetTransform() { }
-    getTransform() { return void 0; }
+    getTransform() { return undefined; }
     save() { }
     restore() { }
     transform(a, b, c, d, e, f) {
@@ -1830,12 +1830,12 @@ let Canvas$1 = class Canvas {
     ellipse(_x, _y, _radiusX, _radiusY, _rotation, _startAngle, _endAngle, _anticlockwise) { }
     rect(_x, _y, _width, _height) { }
     roundRect(_x, _y, _width, _height, _radius) { }
-    createConicGradient(_startAngle, _x, _y) { return void 0; }
-    createLinearGradient(_x0, _y0, _x1, _y1) { return void 0; }
-    createPattern(_image, _repetition) { return void 0; }
-    createRadialGradient(_x0, _y0, _r0, _x1, _y1, _r1) { return void 0; }
+    createConicGradient(_startAngle, _x, _y) { return undefined; }
+    createLinearGradient(_x0, _y0, _x1, _y1) { return undefined; }
+    createPattern(_image, _repetition) { return undefined; }
+    createRadialGradient(_x0, _y0, _r0, _x1, _y1, _r1) { return undefined; }
     fillText(_text, _x, _y, _maxWidth) { }
-    measureText(_text) { return void 0; }
+    measureText(_text) { return undefined; }
     strokeText(_text, _x, _y, _maxWidth) { }
     destroy() {
         this.context = null;
@@ -1843,79 +1843,79 @@ let Canvas$1 = class Canvas {
 };
 __decorate([
     contextAttr('imageSmoothingEnabled')
-], Canvas$1.prototype, "smooth", void 0);
+], Canvas$1.prototype, "smooth", undefined);
 __decorate([
     contextAttr('imageSmoothingQuality')
-], Canvas$1.prototype, "smoothLevel", void 0);
+], Canvas$1.prototype, "smoothLevel", undefined);
 __decorate([
     contextAttr('globalAlpha')
-], Canvas$1.prototype, "opacity", void 0);
+], Canvas$1.prototype, "opacity", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "fillStyle", void 0);
+], Canvas$1.prototype, "fillStyle", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "strokeStyle", void 0);
+], Canvas$1.prototype, "strokeStyle", undefined);
 __decorate([
     contextAttr('lineWidth')
-], Canvas$1.prototype, "strokeWidth", void 0);
+], Canvas$1.prototype, "strokeWidth", undefined);
 __decorate([
     contextAttr('lineCap')
-], Canvas$1.prototype, "strokeCap", void 0);
+], Canvas$1.prototype, "strokeCap", undefined);
 __decorate([
     contextAttr('lineJoin')
-], Canvas$1.prototype, "strokeJoin", void 0);
+], Canvas$1.prototype, "strokeJoin", undefined);
 __decorate([
     contextAttr('lineDashOffset')
-], Canvas$1.prototype, "dashOffset", void 0);
+], Canvas$1.prototype, "dashOffset", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "miterLimit", void 0);
+], Canvas$1.prototype, "miterLimit", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "shadowBlur", void 0);
+], Canvas$1.prototype, "shadowBlur", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "shadowColor", void 0);
+], Canvas$1.prototype, "shadowColor", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "shadowOffsetX", void 0);
+], Canvas$1.prototype, "shadowOffsetX", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "shadowOffsetY", void 0);
+], Canvas$1.prototype, "shadowOffsetY", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "filter", void 0);
+], Canvas$1.prototype, "filter", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "font", void 0);
+], Canvas$1.prototype, "font", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "fontKerning", void 0);
+], Canvas$1.prototype, "fontKerning", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "fontStretch", void 0);
+], Canvas$1.prototype, "fontStretch", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "fontVariantCaps", void 0);
+], Canvas$1.prototype, "fontVariantCaps", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "textAlign", void 0);
+], Canvas$1.prototype, "textAlign", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "textBaseline", void 0);
+], Canvas$1.prototype, "textBaseline", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "textRendering", void 0);
+], Canvas$1.prototype, "textRendering", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "wordSpacing", void 0);
+], Canvas$1.prototype, "wordSpacing", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "letterSpacing", void 0);
+], Canvas$1.prototype, "letterSpacing", undefined);
 __decorate([
     contextAttr()
-], Canvas$1.prototype, "direction", void 0);
+], Canvas$1.prototype, "direction", undefined);
 __decorate([
     contextMethod()
 ], Canvas$1.prototype, "setTransform", null);
@@ -3384,7 +3384,7 @@ class TaskItem {
         this.task = task;
     }
     run() {
-        return __awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, undefined, undefined, function* () {
             try {
                 if (this.task && !this.isComplete && this.parent.running)
                     yield this.task();
@@ -3696,7 +3696,7 @@ class LeaferImage {
     load(onSuccess, onError) {
         if (!this.loading) {
             this.loading = true;
-            ImageManager.tasker.add(() => __awaiter(this, void 0, void 0, function* () {
+            ImageManager.tasker.add(() => __awaiter(this, undefined, undefined, function* () {
                 return yield Platform.origin.loadImage(this.url).then((img) => {
                     this.ready = true;
                     this.width = img.naturalWidth || img.width;
@@ -5175,8 +5175,7 @@ const LeafBounds = {
     __updateAutoLayout() {
         this.__layout.matrixChanged = true;
         if (this.isBranch) {
-            if (this.leaferIsReady)
-                this.leafer.layouter.addExtra(this);
+            this.__extraUpdate();
             if (this.__.flow) {
                 if (this.__layout.boxChanged)
                     this.__updateFlowLayout();
@@ -5329,7 +5328,7 @@ let Leaf = class Leaf {
     get __worldFlipped() { return this.__world.scaleX < 0 || this.__world.scaleY < 0; }
     get __onlyHitMask() { return this.__hasMask && !this.__.hitChildren; }
     get __ignoreHitWorld() { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren; }
-    get __inLazyBounds() { const { leafer } = this; return leafer && leafer.created && leafer.lazyBounds.hit(this.__world); }
+    get __inLazyBounds() { return this.leaferIsCreated && this.leafer.lazyBounds.hit(this.__world); }
     get pathInputed() { return this.__.__pathInputed; }
     set event(map) { this.on(map); }
     constructor(data) {
@@ -5440,6 +5439,10 @@ let Leaf = class Leaf {
     forceRender(_bounds, _sync) {
         this.forceUpdate('surface');
     }
+    __extraUpdate() {
+        if (this.leaferIsReady)
+            this.leafer.layouter.addExtra(this);
+    }
     __updateWorldMatrix() { }
     __updateLocalMatrix() { }
     __updateWorldBounds() { }
@@ -6007,7 +6010,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.3.1";
+const version = "1.3.3";
 
 const debug$5 = Debug.get('LeaferCanvas');
 class LeaferCanvas extends LeaferCanvasBase {
@@ -6226,7 +6229,7 @@ function useCanvas(_canvasType, _power) {
         },
         loadImage(src) {
             return new Promise((resolve, reject) => {
-                const img = new Image();
+                const img = new Platform.origin.Image();
                 const { crossOrigin } = Platform.image;
                 if (crossOrigin) {
                     img.setAttribute('crossOrigin', crossOrigin);
@@ -6236,7 +6239,10 @@ function useCanvas(_canvasType, _power) {
                 img.onerror = (e) => { reject(e); };
                 img.src = Platform.image.getRealURL(src);
             });
-        }
+        },
+        Image,
+        PointerEvent,
+        DragEvent
     };
     Platform.event = {
         stopDefault(origin) { origin.preventDefault(); },
@@ -6525,7 +6531,7 @@ class Layouter {
     }
     partLayout() {
         var _a;
-        if (!((_a = this.__updatedList) === null || _a === void 0 ? void 0 : _a.length))
+        if (!((_a = this.__updatedList) === null || _a === undefined ? undefined : _a.length))
             return;
         const t = Run.start('PartLayout');
         const { target, __updatedList: updateList } = this;
@@ -6712,7 +6718,7 @@ class Renderer {
     partRender() {
         const { canvas, updateBlocks: list } = this;
         if (!list)
-            return debug$3.warn('PartRender: need update attr');
+            return;
         this.mergeBlocks();
         list.forEach(block => { if (canvas.bounds.hit(block) && !block.isEmpty())
             this.clipRender(block); });
@@ -7096,6 +7102,7 @@ class UIData extends LeafData {
         return t.fill && this.__hasStroke;
     }
     get __clipAfterFill() { const t = this; return (t.cornerRadius || t.innerShadow || t.__pathInputed); }
+    get __hasSurface() { const t = this; return (t.fill || t.stroke); }
     get __autoWidth() { return !this._width; }
     get __autoHeight() { return !this._height; }
     get __autoSide() { return !this._width || !this._height; }
@@ -7568,7 +7575,7 @@ let UI = UI_1 = class UI extends Leaf {
     animate(_keyframe, _options, _type, _isTemp) {
         return Plugin.need('animate');
     }
-    killAnimate(_type, _killStyle) { }
+    killAnimate(_type, _nextStyle) { }
     export(_filename, _options) {
         return Plugin.need('export');
     }
@@ -7599,199 +7606,199 @@ let UI = UI_1 = class UI extends Leaf {
 };
 __decorate([
     dataProcessor(UIData)
-], UI.prototype, "__", void 0);
+], UI.prototype, "__", undefined);
 __decorate([
     zoomLayerType()
-], UI.prototype, "zoomLayer", void 0);
+], UI.prototype, "zoomLayer", undefined);
 __decorate([
     dataType('')
-], UI.prototype, "id", void 0);
+], UI.prototype, "id", undefined);
 __decorate([
     dataType('')
-], UI.prototype, "name", void 0);
+], UI.prototype, "name", undefined);
 __decorate([
     dataType('')
-], UI.prototype, "className", void 0);
+], UI.prototype, "className", undefined);
 __decorate([
     surfaceType('pass-through')
-], UI.prototype, "blendMode", void 0);
+], UI.prototype, "blendMode", undefined);
 __decorate([
     opacityType(1)
-], UI.prototype, "opacity", void 0);
+], UI.prototype, "opacity", undefined);
 __decorate([
     visibleType(true)
-], UI.prototype, "visible", void 0);
+], UI.prototype, "visible", undefined);
 __decorate([
     surfaceType(false)
-], UI.prototype, "locked", void 0);
+], UI.prototype, "locked", undefined);
 __decorate([
     sortType(0)
-], UI.prototype, "zIndex", void 0);
+], UI.prototype, "zIndex", undefined);
 __decorate([
     maskType(false)
-], UI.prototype, "mask", void 0);
+], UI.prototype, "mask", undefined);
 __decorate([
     eraserType(false)
-], UI.prototype, "eraser", void 0);
+], UI.prototype, "eraser", undefined);
 __decorate([
     positionType(0, true)
-], UI.prototype, "x", void 0);
+], UI.prototype, "x", undefined);
 __decorate([
     positionType(0, true)
-], UI.prototype, "y", void 0);
+], UI.prototype, "y", undefined);
 __decorate([
     boundsType(100, true)
-], UI.prototype, "width", void 0);
+], UI.prototype, "width", undefined);
 __decorate([
     boundsType(100, true)
-], UI.prototype, "height", void 0);
+], UI.prototype, "height", undefined);
 __decorate([
     scaleType(1, true)
-], UI.prototype, "scaleX", void 0);
+], UI.prototype, "scaleX", undefined);
 __decorate([
     scaleType(1, true)
-], UI.prototype, "scaleY", void 0);
+], UI.prototype, "scaleY", undefined);
 __decorate([
     rotationType(0, true)
-], UI.prototype, "rotation", void 0);
+], UI.prototype, "rotation", undefined);
 __decorate([
     rotationType(0, true)
-], UI.prototype, "skewX", void 0);
+], UI.prototype, "skewX", undefined);
 __decorate([
     rotationType(0, true)
-], UI.prototype, "skewY", void 0);
+], UI.prototype, "skewY", undefined);
 __decorate([
     positionType(0, true)
-], UI.prototype, "offsetX", void 0);
+], UI.prototype, "offsetX", undefined);
 __decorate([
     positionType(0, true)
-], UI.prototype, "offsetY", void 0);
+], UI.prototype, "offsetY", undefined);
 __decorate([
     positionType(0, true)
-], UI.prototype, "scrollX", void 0);
+], UI.prototype, "scrollX", undefined);
 __decorate([
     positionType(0, true)
-], UI.prototype, "scrollY", void 0);
+], UI.prototype, "scrollY", undefined);
 __decorate([
     autoLayoutType()
-], UI.prototype, "origin", void 0);
+], UI.prototype, "origin", undefined);
 __decorate([
     autoLayoutType()
-], UI.prototype, "around", void 0);
+], UI.prototype, "around", undefined);
 __decorate([
     dataType(false)
-], UI.prototype, "lazy", void 0);
+], UI.prototype, "lazy", undefined);
 __decorate([
     naturalBoundsType(1)
-], UI.prototype, "pixelRatio", void 0);
+], UI.prototype, "pixelRatio", undefined);
 __decorate([
     pathInputType()
-], UI.prototype, "path", void 0);
+], UI.prototype, "path", undefined);
 __decorate([
     pathType()
-], UI.prototype, "windingRule", void 0);
+], UI.prototype, "windingRule", undefined);
 __decorate([
     pathType(true)
-], UI.prototype, "closed", void 0);
+], UI.prototype, "closed", undefined);
 __decorate([
     boundsType(0)
-], UI.prototype, "padding", void 0);
+], UI.prototype, "padding", undefined);
 __decorate([
     boundsType(false)
-], UI.prototype, "lockRatio", void 0);
+], UI.prototype, "lockRatio", undefined);
 __decorate([
     boundsType()
-], UI.prototype, "widthRange", void 0);
+], UI.prototype, "widthRange", undefined);
 __decorate([
     boundsType()
-], UI.prototype, "heightRange", void 0);
+], UI.prototype, "heightRange", undefined);
 __decorate([
     dataType(false)
-], UI.prototype, "draggable", void 0);
+], UI.prototype, "draggable", undefined);
 __decorate([
     dataType()
-], UI.prototype, "dragBounds", void 0);
+], UI.prototype, "dragBounds", undefined);
 __decorate([
     dataType(false)
-], UI.prototype, "editable", void 0);
+], UI.prototype, "editable", undefined);
 __decorate([
     hitType(true)
-], UI.prototype, "hittable", void 0);
+], UI.prototype, "hittable", undefined);
 __decorate([
     hitType('path')
-], UI.prototype, "hitFill", void 0);
+], UI.prototype, "hitFill", undefined);
 __decorate([
     strokeType('path')
-], UI.prototype, "hitStroke", void 0);
+], UI.prototype, "hitStroke", undefined);
 __decorate([
     hitType(false)
-], UI.prototype, "hitBox", void 0);
+], UI.prototype, "hitBox", undefined);
 __decorate([
     hitType(true)
-], UI.prototype, "hitChildren", void 0);
+], UI.prototype, "hitChildren", undefined);
 __decorate([
     hitType(true)
-], UI.prototype, "hitSelf", void 0);
+], UI.prototype, "hitSelf", undefined);
 __decorate([
     hitType()
-], UI.prototype, "hitRadius", void 0);
+], UI.prototype, "hitRadius", undefined);
 __decorate([
     cursorType('')
-], UI.prototype, "cursor", void 0);
+], UI.prototype, "cursor", undefined);
 __decorate([
     surfaceType()
-], UI.prototype, "fill", void 0);
+], UI.prototype, "fill", undefined);
 __decorate([
     strokeType()
-], UI.prototype, "stroke", void 0);
+], UI.prototype, "stroke", undefined);
 __decorate([
     strokeType('inside')
-], UI.prototype, "strokeAlign", void 0);
+], UI.prototype, "strokeAlign", undefined);
 __decorate([
     strokeType(1)
-], UI.prototype, "strokeWidth", void 0);
+], UI.prototype, "strokeWidth", undefined);
 __decorate([
     strokeType(false)
-], UI.prototype, "strokeWidthFixed", void 0);
+], UI.prototype, "strokeWidthFixed", undefined);
 __decorate([
     strokeType('none')
-], UI.prototype, "strokeCap", void 0);
+], UI.prototype, "strokeCap", undefined);
 __decorate([
     strokeType('miter')
-], UI.prototype, "strokeJoin", void 0);
+], UI.prototype, "strokeJoin", undefined);
 __decorate([
     strokeType()
-], UI.prototype, "dashPattern", void 0);
+], UI.prototype, "dashPattern", undefined);
 __decorate([
     strokeType()
-], UI.prototype, "dashOffset", void 0);
+], UI.prototype, "dashOffset", undefined);
 __decorate([
     strokeType(10)
-], UI.prototype, "miterLimit", void 0);
+], UI.prototype, "miterLimit", undefined);
 __decorate([
     pathType(0)
-], UI.prototype, "cornerRadius", void 0);
+], UI.prototype, "cornerRadius", undefined);
 __decorate([
     pathType()
-], UI.prototype, "cornerSmoothing", void 0);
+], UI.prototype, "cornerSmoothing", undefined);
 __decorate([
     effectType()
-], UI.prototype, "shadow", void 0);
+], UI.prototype, "shadow", undefined);
 __decorate([
     effectType()
-], UI.prototype, "innerShadow", void 0);
+], UI.prototype, "innerShadow", undefined);
 __decorate([
     effectType()
-], UI.prototype, "blur", void 0);
+], UI.prototype, "blur", undefined);
 __decorate([
     effectType()
-], UI.prototype, "backgroundBlur", void 0);
+], UI.prototype, "backgroundBlur", undefined);
 __decorate([
     effectType()
-], UI.prototype, "grayscale", void 0);
+], UI.prototype, "grayscale", undefined);
 __decorate([
     dataType({})
-], UI.prototype, "data", void 0);
+], UI.prototype, "data", undefined);
 __decorate([
     rewrite(Leaf.prototype.reset)
 ], UI.prototype, "reset", null);
@@ -7852,7 +7859,7 @@ let Group = class Group extends UI {
 };
 __decorate([
     dataProcessor(GroupData)
-], Group.prototype, "__", void 0);
+], Group.prototype, "__", undefined);
 Group = __decorate([
     useModule(Branch),
     registerUI()
@@ -8023,8 +8030,6 @@ let Leafer = Leafer_1 = class Leafer extends Group {
     __setAttr(attrName, newValue) {
         if (this.canvas) {
             if (canvasSizeAttrs.includes(attrName)) {
-                if (!newValue)
-                    debug$1.warn(attrName + ' is 0');
                 this.__changeCanvasSize(attrName, newValue);
             }
             else if (attrName === 'fill') {
@@ -8064,8 +8069,6 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         this.created = true;
     }
     __onReady() {
-        if (this.ready)
-            return;
         this.ready = true;
         this.emitLeafer(LeaferEvent.BEFORE_READY);
         this.emitLeafer(LeaferEvent.READY);
@@ -8079,6 +8082,20 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         this.emitLeafer(LeaferEvent.VIEW_READY);
         WaitHelper.run(this.__viewReadyWait);
     }
+    __onLayoutEnd() {
+        const { grow, growWidth, growHeight } = this.config;
+        if (grow) {
+            let { width, height, pixelRatio } = this;
+            const bounds = grow === 'box' ? this.worldBoxBounds : this.__world;
+            if (growWidth !== false)
+                width = Math.max(1, bounds.x + bounds.width);
+            if (growHeight !== false)
+                height = Math.max(1, bounds.y + bounds.height);
+            this.__doResize({ width, height, pixelRatio });
+        }
+        if (!this.ready)
+            this.__onReady();
+    }
     __onNextRender() {
         if (this.viewReady) {
             WaitHelper.run(this.__nextRenderWait);
@@ -8172,10 +8189,9 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         const runId = Run.start('FirstCreate ' + this.innerName);
         this.once(LeaferEvent.START, () => Run.end(runId));
         this.once(LayoutEvent.START, () => this.updateLazyBounds());
-        this.once(LayoutEvent.END, () => this.__onReady());
         this.once(RenderEvent.START, () => this.__onCreated());
         this.once(RenderEvent.END, () => this.__onViewReady());
-        this.__eventIds.push(this.on_(WatchEvent.DATA, this.__onWatchData, this), this.on_(RenderEvent.NEXT, this.__onNextRender, this));
+        this.__eventIds.push(this.on_(WatchEvent.DATA, this.__onWatchData, this), this.on_(LayoutEvent.END, this.__onLayoutEnd, this), this.on_(RenderEvent.NEXT, this.__onNextRender, this));
     }
     __removeListenEvents() {
         this.off_(this.__eventIds);
@@ -8216,10 +8232,10 @@ let Leafer = Leafer_1 = class Leafer extends Group {
 Leafer.list = new LeafList();
 __decorate([
     dataProcessor(LeaferData)
-], Leafer.prototype, "__", void 0);
+], Leafer.prototype, "__", undefined);
 __decorate([
     boundsType()
-], Leafer.prototype, "pixelRatio", void 0);
+], Leafer.prototype, "pixelRatio", undefined);
 Leafer = Leafer_1 = __decorate([
     registerUI()
 ], Leafer);
@@ -8232,7 +8248,7 @@ let Rect = class Rect extends UI {
 };
 __decorate([
     dataProcessor(RectData)
-], Rect.prototype, "__", void 0);
+], Rect.prototype, "__", undefined);
 Rect = __decorate([
     useModule(RectRender),
     rewriteAble(),
@@ -8257,6 +8273,8 @@ let Box = class Box extends Group {
         const data = this.__;
         if (this.children.length) {
             if (data.__autoSide) {
+                if (data.__hasSurface)
+                    this.__extraUpdate();
                 super.__updateBoxBounds();
                 const { boxBounds } = this.__layout;
                 if (!data.__autoSize) {
@@ -8321,13 +8339,13 @@ let Box = class Box extends Group {
 };
 __decorate([
     dataProcessor(BoxData)
-], Box.prototype, "__", void 0);
+], Box.prototype, "__", undefined);
 __decorate([
     dataType(false)
-], Box.prototype, "resizeChildren", void 0);
+], Box.prototype, "resizeChildren", undefined);
 __decorate([
     affectRenderBoundsType('show')
-], Box.prototype, "overflow", void 0);
+], Box.prototype, "overflow", undefined);
 __decorate([
     rewrite(rect$1.__updateStrokeSpread)
 ], Box.prototype, "__updateStrokeSpread", null);
@@ -8366,13 +8384,13 @@ let Frame = class Frame extends Box {
 };
 __decorate([
     dataProcessor(FrameData)
-], Frame.prototype, "__", void 0);
+], Frame.prototype, "__", undefined);
 __decorate([
     surfaceType('#FFFFFF')
-], Frame.prototype, "fill", void 0);
+], Frame.prototype, "fill", undefined);
 __decorate([
     affectRenderBoundsType('hide')
-], Frame.prototype, "overflow", void 0);
+], Frame.prototype, "overflow", undefined);
 Frame = __decorate([
     registerUI()
 ], Frame);
@@ -8419,16 +8437,16 @@ let Ellipse = class Ellipse extends UI {
 };
 __decorate([
     dataProcessor(EllipseData)
-], Ellipse.prototype, "__", void 0);
+], Ellipse.prototype, "__", undefined);
 __decorate([
     pathType(0)
-], Ellipse.prototype, "innerRadius", void 0);
+], Ellipse.prototype, "innerRadius", undefined);
 __decorate([
     pathType(0)
-], Ellipse.prototype, "startAngle", void 0);
+], Ellipse.prototype, "startAngle", undefined);
 __decorate([
     pathType(0)
-], Ellipse.prototype, "endAngle", void 0);
+], Ellipse.prototype, "endAngle", undefined);
 Ellipse = __decorate([
     registerUI()
 ], Ellipse);
@@ -8487,22 +8505,22 @@ let Line = class Line extends UI {
 };
 __decorate([
     dataProcessor(LineData)
-], Line.prototype, "__", void 0);
+], Line.prototype, "__", undefined);
 __decorate([
     affectStrokeBoundsType('center')
-], Line.prototype, "strokeAlign", void 0);
+], Line.prototype, "strokeAlign", undefined);
 __decorate([
     boundsType(0)
-], Line.prototype, "height", void 0);
+], Line.prototype, "height", undefined);
 __decorate([
     pathType()
-], Line.prototype, "points", void 0);
+], Line.prototype, "points", undefined);
 __decorate([
     pathType(0)
-], Line.prototype, "curve", void 0);
+], Line.prototype, "curve", undefined);
 __decorate([
     pathType(false)
-], Line.prototype, "closed", void 0);
+], Line.prototype, "closed", undefined);
 Line = __decorate([
     registerUI()
 ], Line);
@@ -8535,16 +8553,16 @@ let Polygon = class Polygon extends UI {
 };
 __decorate([
     dataProcessor(PolygonData)
-], Polygon.prototype, "__", void 0);
+], Polygon.prototype, "__", undefined);
 __decorate([
     pathType(3)
-], Polygon.prototype, "sides", void 0);
+], Polygon.prototype, "sides", undefined);
 __decorate([
     pathType()
-], Polygon.prototype, "points", void 0);
+], Polygon.prototype, "points", undefined);
 __decorate([
     pathType(0)
-], Polygon.prototype, "curve", void 0);
+], Polygon.prototype, "curve", undefined);
 __decorate([
     rewrite(line.__updateRenderPath)
 ], Polygon.prototype, "__updateRenderPath", null);
@@ -8576,13 +8594,13 @@ let Star = class Star extends UI {
 };
 __decorate([
     dataProcessor(StarData)
-], Star.prototype, "__", void 0);
+], Star.prototype, "__", undefined);
 __decorate([
     pathType(5)
-], Star.prototype, "corners", void 0);
+], Star.prototype, "corners", undefined);
 __decorate([
     pathType(0.382)
-], Star.prototype, "innerRadius", void 0);
+], Star.prototype, "innerRadius", undefined);
 Star = __decorate([
     registerUI()
 ], Star);
@@ -8604,10 +8622,10 @@ let Image$1 = class Image extends Rect {
 };
 __decorate([
     dataProcessor(ImageData)
-], Image$1.prototype, "__", void 0);
+], Image$1.prototype, "__", undefined);
 __decorate([
     boundsType('')
-], Image$1.prototype, "url", void 0);
+], Image$1.prototype, "url", undefined);
 Image$1 = __decorate([
     registerUI()
 ], Image$1);
@@ -8670,25 +8688,25 @@ let Canvas = class Canvas extends Rect {
 };
 __decorate([
     dataProcessor(CanvasData)
-], Canvas.prototype, "__", void 0);
+], Canvas.prototype, "__", undefined);
 __decorate([
     resizeType(100)
-], Canvas.prototype, "width", void 0);
+], Canvas.prototype, "width", undefined);
 __decorate([
     resizeType(100)
-], Canvas.prototype, "height", void 0);
+], Canvas.prototype, "height", undefined);
 __decorate([
     resizeType(1)
-], Canvas.prototype, "pixelRatio", void 0);
+], Canvas.prototype, "pixelRatio", undefined);
 __decorate([
     resizeType(true)
-], Canvas.prototype, "smooth", void 0);
+], Canvas.prototype, "smooth", undefined);
 __decorate([
     dataType(false)
-], Canvas.prototype, "safeResize", void 0);
+], Canvas.prototype, "safeResize", undefined);
 __decorate([
     resizeType()
-], Canvas.prototype, "contextSettings", void 0);
+], Canvas.prototype, "contextSettings", undefined);
 Canvas = __decorate([
     registerUI()
 ], Canvas);
@@ -8779,76 +8797,76 @@ let Text = class Text extends UI {
 };
 __decorate([
     dataProcessor(TextData)
-], Text.prototype, "__", void 0);
+], Text.prototype, "__", undefined);
 __decorate([
     boundsType(0)
-], Text.prototype, "width", void 0);
+], Text.prototype, "width", undefined);
 __decorate([
     boundsType(0)
-], Text.prototype, "height", void 0);
+], Text.prototype, "height", undefined);
 __decorate([
     dataType(false)
-], Text.prototype, "resizeFontSize", void 0);
+], Text.prototype, "resizeFontSize", undefined);
 __decorate([
     surfaceType('#000000')
-], Text.prototype, "fill", void 0);
+], Text.prototype, "fill", undefined);
 __decorate([
     affectStrokeBoundsType('outside')
-], Text.prototype, "strokeAlign", void 0);
+], Text.prototype, "strokeAlign", undefined);
 __decorate([
     hitType('all')
-], Text.prototype, "hitFill", void 0);
+], Text.prototype, "hitFill", undefined);
 __decorate([
     boundsType('')
-], Text.prototype, "text", void 0);
+], Text.prototype, "text", undefined);
 __decorate([
-    boundsType('L')
-], Text.prototype, "fontFamily", void 0);
+    boundsType('caption')
+], Text.prototype, "fontFamily", undefined);
 __decorate([
     boundsType(12)
-], Text.prototype, "fontSize", void 0);
+], Text.prototype, "fontSize", undefined);
 __decorate([
     boundsType('normal')
-], Text.prototype, "fontWeight", void 0);
+], Text.prototype, "fontWeight", undefined);
 __decorate([
     boundsType(false)
-], Text.prototype, "italic", void 0);
+], Text.prototype, "italic", undefined);
 __decorate([
     boundsType('none')
-], Text.prototype, "textCase", void 0);
+], Text.prototype, "textCase", undefined);
 __decorate([
     boundsType('none')
-], Text.prototype, "textDecoration", void 0);
+], Text.prototype, "textDecoration", undefined);
 __decorate([
     boundsType(0)
-], Text.prototype, "letterSpacing", void 0);
+], Text.prototype, "letterSpacing", undefined);
 __decorate([
     boundsType({ type: 'percent', value: 1.5 })
-], Text.prototype, "lineHeight", void 0);
+], Text.prototype, "lineHeight", undefined);
 __decorate([
     boundsType(0)
-], Text.prototype, "paraIndent", void 0);
+], Text.prototype, "paraIndent", undefined);
 __decorate([
     boundsType(0)
-], Text.prototype, "paraSpacing", void 0);
+], Text.prototype, "paraSpacing", undefined);
 __decorate([
     boundsType('x')
-], Text.prototype, "writingMode", void 0);
+], Text.prototype, "writingMode", undefined);
 __decorate([
     boundsType('left')
-], Text.prototype, "textAlign", void 0);
+], Text.prototype, "textAlign", undefined);
 __decorate([
     boundsType('top')
-], Text.prototype, "verticalAlign", void 0);
+], Text.prototype, "verticalAlign", undefined);
 __decorate([
     boundsType(true)
-], Text.prototype, "autoSizeAlign", void 0);
+], Text.prototype, "autoSizeAlign", undefined);
 __decorate([
     boundsType('normal')
-], Text.prototype, "textWrap", void 0);
+], Text.prototype, "textWrap", undefined);
 __decorate([
     boundsType('show')
-], Text.prototype, "textOverflow", void 0);
+], Text.prototype, "textOverflow", undefined);
 Text = __decorate([
     registerUI()
 ], Text);
@@ -8861,10 +8879,10 @@ let Path = class Path extends UI {
 };
 __decorate([
     dataProcessor(PathData)
-], Path.prototype, "__", void 0);
+], Path.prototype, "__", undefined);
 __decorate([
     affectStrokeBoundsType('center')
-], Path.prototype, "strokeAlign", void 0);
+], Path.prototype, "strokeAlign", undefined);
 Path = __decorate([
     registerUI()
 ], Path);
@@ -8903,10 +8921,10 @@ let Pen = class Pen extends Group {
 };
 __decorate([
     dataProcessor(PenData)
-], Pen.prototype, "__", void 0);
+], Pen.prototype, "__", undefined);
 __decorate([
     penPathType()
-], Pen.prototype, "path", void 0);
+], Pen.prototype, "path", undefined);
 Pen = __decorate([
     useModule(PathCreator, ['set', 'path', 'paint']),
     registerUI()
@@ -9104,34 +9122,34 @@ class UIEvent extends Event {
     }
 }
 
-let PointerEvent = class PointerEvent extends UIEvent {
+let PointerEvent$1 = class PointerEvent extends UIEvent {
 };
-PointerEvent.POINTER = 'pointer';
-PointerEvent.BEFORE_DOWN = 'pointer.before_down';
-PointerEvent.BEFORE_MOVE = 'pointer.before_move';
-PointerEvent.BEFORE_UP = 'pointer.before_up';
-PointerEvent.DOWN = 'pointer.down';
-PointerEvent.MOVE = 'pointer.move';
-PointerEvent.UP = 'pointer.up';
-PointerEvent.OVER = 'pointer.over';
-PointerEvent.OUT = 'pointer.out';
-PointerEvent.ENTER = 'pointer.enter';
-PointerEvent.LEAVE = 'pointer.leave';
-PointerEvent.TAP = 'tap';
-PointerEvent.DOUBLE_TAP = 'double_tap';
-PointerEvent.CLICK = 'click';
-PointerEvent.DOUBLE_CLICK = 'double_click';
-PointerEvent.LONG_PRESS = 'long_press';
-PointerEvent.LONG_TAP = 'long_tap';
-PointerEvent.MENU = 'pointer.menu';
-PointerEvent.MENU_TAP = 'pointer.menu_tap';
-PointerEvent = __decorate([
+PointerEvent$1.POINTER = 'pointer';
+PointerEvent$1.BEFORE_DOWN = 'pointer.before_down';
+PointerEvent$1.BEFORE_MOVE = 'pointer.before_move';
+PointerEvent$1.BEFORE_UP = 'pointer.before_up';
+PointerEvent$1.DOWN = 'pointer.down';
+PointerEvent$1.MOVE = 'pointer.move';
+PointerEvent$1.UP = 'pointer.up';
+PointerEvent$1.OVER = 'pointer.over';
+PointerEvent$1.OUT = 'pointer.out';
+PointerEvent$1.ENTER = 'pointer.enter';
+PointerEvent$1.LEAVE = 'pointer.leave';
+PointerEvent$1.TAP = 'tap';
+PointerEvent$1.DOUBLE_TAP = 'double_tap';
+PointerEvent$1.CLICK = 'click';
+PointerEvent$1.DOUBLE_CLICK = 'double_click';
+PointerEvent$1.LONG_PRESS = 'long_press';
+PointerEvent$1.LONG_TAP = 'long_tap';
+PointerEvent$1.MENU = 'pointer.menu';
+PointerEvent$1.MENU_TAP = 'pointer.menu_tap';
+PointerEvent$1 = __decorate([
     registerUIEvent()
-], PointerEvent);
-const MyPointerEvent = PointerEvent;
+], PointerEvent$1);
+const MyPointerEvent = PointerEvent$1;
 
 const tempMove = {};
-let DragEvent = class DragEvent extends PointerEvent {
+let DragEvent$1 = class DragEvent extends PointerEvent$1 {
     static setList(data) {
         this.list = data instanceof LeafList ? data : new LeafList(data);
     }
@@ -9212,25 +9230,25 @@ let DragEvent = class DragEvent extends PointerEvent {
         tempMove.y = total ? this.totalY : this.moveY;
     }
 };
-DragEvent.BEFORE_DRAG = 'drag.before_drag';
-DragEvent.START = 'drag.start';
-DragEvent.DRAG = 'drag';
-DragEvent.END = 'drag.end';
-DragEvent.OVER = 'drag.over';
-DragEvent.OUT = 'drag.out';
-DragEvent.ENTER = 'drag.enter';
-DragEvent.LEAVE = 'drag.leave';
-DragEvent = __decorate([
+DragEvent$1.BEFORE_DRAG = 'drag.before_drag';
+DragEvent$1.START = 'drag.start';
+DragEvent$1.DRAG = 'drag';
+DragEvent$1.END = 'drag.end';
+DragEvent$1.OVER = 'drag.over';
+DragEvent$1.OUT = 'drag.out';
+DragEvent$1.ENTER = 'drag.enter';
+DragEvent$1.LEAVE = 'drag.leave';
+DragEvent$1 = __decorate([
     registerUIEvent()
-], DragEvent);
-const MyDragEvent = DragEvent;
+], DragEvent$1);
+const MyDragEvent = DragEvent$1;
 
-let DropEvent = class DropEvent extends PointerEvent {
+let DropEvent = class DropEvent extends PointerEvent$1 {
     static setList(data) {
-        DragEvent.setList(data);
+        DragEvent$1.setList(data);
     }
     static setData(data) {
-        DragEvent.setData(data);
+        DragEvent$1.setData(data);
     }
 };
 DropEvent.DROP = 'drop';
@@ -9238,7 +9256,7 @@ DropEvent = __decorate([
     registerUIEvent()
 ], DropEvent);
 
-let MoveEvent = class MoveEvent extends DragEvent {
+let MoveEvent = class MoveEvent extends DragEvent$1 {
 };
 MoveEvent.BEFORE_MOVE = 'move.before_move';
 MoveEvent.START = 'move.start';
@@ -9258,7 +9276,7 @@ RotateEvent = __decorate([
     registerUIEvent()
 ], RotateEvent);
 
-let SwipeEvent = class SwipeEvent extends DragEvent {
+let SwipeEvent = class SwipeEvent extends DragEvent$1 {
 };
 SwipeEvent.SWIPE = 'swipe';
 SwipeEvent.LEFT = 'swipe.left';
@@ -9338,7 +9356,7 @@ const InteractionHelper = {
         return find;
     },
     pathCanDrag(path) {
-        return path && path.list.some(item => item.draggable || item.editable || (!item.isLeafer && item.hasEvent(DragEvent.DRAG)));
+        return path && path.list.some(item => item.draggable || item.editable || (!item.isLeafer && item.hasEvent(DragEvent$1.DRAG)));
     },
     pathHasOutside(path) {
         return path && path.list.some(item => item.isOutside);
@@ -9361,7 +9379,7 @@ class Dragger {
     }
     getList(realDraggable, hover) {
         const { proxy } = this.interaction.selector;
-        const hasProxyList = proxy && proxy.list.length, dragList = DragEvent.list || this.draggableList || emptyList;
+        const hasProxyList = proxy && proxy.list.length, dragList = DragEvent$1.list || this.draggableList || emptyList;
         return this.dragging && (hasProxyList ? (realDraggable ? emptyList : new LeafList(hover ? [...proxy.list, ...proxy.dragHoverExclude] : proxy.list)) : dragList);
     }
     checkDrag(data, canDrag) {
@@ -9385,7 +9403,7 @@ class Dragger {
         if (!this.dragging) {
             this.dragging = canDrag && PointerButton.left(data);
             if (this.dragging) {
-                this.interaction.emit(DragEvent.START, this.dragData);
+                this.interaction.emit(DragEvent$1.START, this.dragData);
                 this.getDraggableList(this.dragData.path);
                 this.setDragStartPoints(this.realDraggableList = this.getList(true));
             }
@@ -9419,8 +9437,8 @@ class Dragger {
         }
         else if (this.dragging) {
             this.dragReal();
-            interaction.emit(DragEvent.BEFORE_DRAG, this.dragData);
-            interaction.emit(DragEvent.DRAG, this.dragData);
+            interaction.emit(DragEvent$1.BEFORE_DRAG, this.dragData);
+            interaction.emit(DragEvent$1.DRAG, this.dragData);
         }
     }
     dragReal() {
@@ -9428,7 +9446,7 @@ class Dragger {
         const list = this.realDraggableList;
         if (list.length && running) {
             const { totalX, totalY } = this.dragData;
-            list.forEach(leaf => leaf.draggable && leaf.move(DragEvent.getValidMove(leaf, this.dragStartPoints[leaf.innerId], { x: totalX, y: totalY })));
+            list.forEach(leaf => leaf.draggable && leaf.move(DragEvent$1.getValidMove(leaf, this.dragStartPoints[leaf.innerId], { x: totalX, y: totalY })));
         }
     }
     dragOverOrOut(data) {
@@ -9438,19 +9456,19 @@ class Dragger {
         this.dragOverPath = path;
         if (dragOverPath) {
             if (path.indexAt(0) !== dragOverPath.indexAt(0)) {
-                interaction.emit(DragEvent.OUT, data, dragOverPath);
-                interaction.emit(DragEvent.OVER, data, path);
+                interaction.emit(DragEvent$1.OUT, data, dragOverPath);
+                interaction.emit(DragEvent$1.OVER, data, path);
             }
         }
         else
-            interaction.emit(DragEvent.OVER, data, path);
+            interaction.emit(DragEvent$1.OVER, data, path);
     }
     dragEnterOrLeave(data) {
         const { interaction } = this;
         const { dragEnterPath } = this;
         const { path } = data;
-        interaction.emit(DragEvent.LEAVE, data, dragEnterPath, path);
-        interaction.emit(DragEvent.ENTER, data, path, dragEnterPath);
+        interaction.emit(DragEvent$1.LEAVE, data, dragEnterPath, path);
+        interaction.emit(DragEvent$1.ENTER, data, path, dragEnterPath);
         this.dragEnterPath = path;
     }
     dragEnd(data, speed) {
@@ -9477,7 +9495,7 @@ class Dragger {
         if (this.dragging) {
             const dropList = this.getList();
             this.dragging = false;
-            interaction.emit(DragEvent.END, endDragData);
+            interaction.emit(DragEvent$1.END, endDragData);
             this.swipe(data, downData, dragData, endDragData);
             this.drop(data, dropList, this.dragEnterPath);
         }
@@ -9493,13 +9511,13 @@ class Dragger {
         }
     }
     drop(data, dropList, dragEnterPath) {
-        const dropData = getDropEventData(data, dropList, DragEvent.data);
+        const dropData = getDropEventData(data, dropList, DragEvent$1.data);
         dropData.path = dragEnterPath;
         this.interaction.emit(DropEvent.DROP, dropData);
-        this.interaction.emit(DragEvent.LEAVE, data, dragEnterPath);
+        this.interaction.emit(DragEvent$1.LEAVE, data, dragEnterPath);
     }
     dragReset() {
-        DragEvent.list = DragEvent.data = this.draggableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null;
+        DragEvent$1.list = DragEvent$1.data = this.draggableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null;
     }
     checkDragEndAnimate(_data, _speed) { return false; }
     animate(_func, _off) { }
@@ -9646,8 +9664,8 @@ class InteractionBase {
         this.updateDownData(data);
         this.checkPath(data, useDefaultPath);
         this.downTime = Date.now();
-        this.emit(PointerEvent.BEFORE_DOWN, data);
-        this.emit(PointerEvent.DOWN, data);
+        this.emit(PointerEvent$1.BEFORE_DOWN, data);
+        this.emit(PointerEvent$1.DOWN, data);
         if (PointerButton.left(data)) {
             this.tapWait();
             this.longPressWait(data);
@@ -9674,7 +9692,7 @@ class InteractionBase {
     }
     pointerMoveReal(data) {
         const { dragHover, dragDistance } = this.p;
-        this.emit(PointerEvent.BEFORE_MOVE, data, this.defaultPath);
+        this.emit(PointerEvent$1.BEFORE_MOVE, data, this.defaultPath);
         if (this.downData) {
             const canDrag = PointHelper.getDistance(this.downData, data) > dragDistance;
             if (canDrag) {
@@ -9687,7 +9705,7 @@ class InteractionBase {
         if (!this.dragger.moving) {
             this.updateHoverData(data);
             this.checkPath(data);
-            this.emit(PointerEvent.MOVE, data);
+            this.emit(PointerEvent$1.MOVE, data);
             if (!(this.dragging && !dragHover))
                 this.pointerHover(data);
             if (this.dragger.dragging) {
@@ -9710,8 +9728,8 @@ class InteractionBase {
         data.path.addList(downData.path.list);
         this.checkPath(data);
         this.downData = null;
-        this.emit(PointerEvent.BEFORE_UP, data);
-        this.emit(PointerEvent.UP, data);
+        this.emit(PointerEvent$1.BEFORE_UP, data);
+        this.emit(PointerEvent$1.UP, data);
         this.touchLeave(data);
         if (!data.isCancel) {
             this.tap(data);
@@ -9727,14 +9745,14 @@ class InteractionBase {
     }
     menu(data) {
         this.findPath(data);
-        this.emit(PointerEvent.MENU, data);
+        this.emit(PointerEvent$1.MENU, data);
         this.waitMenuTap = true;
         if (!this.downData && this.waitRightTap)
             this.menuTap(data);
     }
     menuTap(data) {
         if (this.waitRightTap && this.waitMenuTap) {
-            this.emit(PointerEvent.MENU_TAP, data);
+            this.emit(PointerEvent$1.MENU_TAP, data);
             this.waitRightTap = this.waitMenuTap = false;
         }
     }
@@ -9782,12 +9800,12 @@ class InteractionBase {
         this.overPath = path;
         if (overPath) {
             if (path.indexAt(0) !== overPath.indexAt(0)) {
-                this.emit(PointerEvent.OUT, data, overPath);
-                this.emit(PointerEvent.OVER, data, path);
+                this.emit(PointerEvent$1.OUT, data, overPath);
+                this.emit(PointerEvent$1.OVER, data, path);
             }
         }
         else {
-            this.emit(PointerEvent.OVER, data, path);
+            this.emit(PointerEvent$1.OVER, data, path);
         }
     }
     pointerEnterOrLeave(data) {
@@ -9798,13 +9816,13 @@ class InteractionBase {
         }
         const { enterPath } = this;
         this.enterPath = path;
-        this.emit(PointerEvent.LEAVE, data, enterPath, path);
-        this.emit(PointerEvent.ENTER, data, path, enterPath);
+        this.emit(PointerEvent$1.LEAVE, data, enterPath, path);
+        this.emit(PointerEvent$1.ENTER, data, path, enterPath);
     }
     touchLeave(data) {
         if (data.pointerType === 'touch') {
             if (this.enterPath) {
-                this.emit(PointerEvent.LEAVE, data);
+                this.emit(PointerEvent$1.LEAVE, data);
                 if (this.dragger.dragging)
                     this.emit(DropEvent.LEAVE, data);
             }
@@ -9820,7 +9838,7 @@ class InteractionBase {
         if (pointer.tapMore)
             this.emitTap(data);
         const useTime = Date.now() - this.downTime;
-        const hasDouble = [PointerEvent.DOUBLE_TAP, PointerEvent.DOUBLE_CLICK].some(type => pathHasEventType(data.path, type));
+        const hasDouble = [PointerEvent$1.DOUBLE_TAP, PointerEvent$1.DOUBLE_CLICK].some(type => pathHasEventType(data.path, type));
         if (useTime < pointer.tapTime + 50 && hasDouble) {
             this.tapCount++;
             if (this.tapCount === 2) {
@@ -9904,7 +9922,7 @@ class InteractionBase {
             data = this.hoverData;
         if (!data)
             return;
-        this.findPath(data, { exclude: this.dragger.getList(false, true), name: PointerEvent.MOVE });
+        this.findPath(data, { exclude: this.dragger.getList(false, true), name: PointerEvent$1.MOVE });
         this.hoverData = data;
     }
     updateCursor(data) {
@@ -9940,12 +9958,12 @@ class InteractionBase {
         return { x: clientPoint.clientX - clientBounds.x, y: clientPoint.clientY - clientBounds.y };
     }
     emitTap(data) {
-        this.emit(PointerEvent.TAP, data);
-        this.emit(PointerEvent.CLICK, data);
+        this.emit(PointerEvent$1.TAP, data);
+        this.emit(PointerEvent$1.CLICK, data);
     }
     emitDoubleTap(data) {
-        this.emit(PointerEvent.DOUBLE_TAP, data);
-        this.emit(PointerEvent.DOUBLE_CLICK, data);
+        this.emit(PointerEvent$1.DOUBLE_TAP, data);
+        this.emit(PointerEvent$1.DOUBLE_CLICK, data);
     }
     pointerWaitCancel() {
         this.tapWaitCancel();
@@ -9964,14 +9982,14 @@ class InteractionBase {
         clearTimeout(this.longPressTimer);
         this.longPressTimer = setTimeout(() => {
             this.longPressed = true;
-            this.emit(PointerEvent.LONG_PRESS, data);
+            this.emit(PointerEvent$1.LONG_PRESS, data);
         }, this.p.longPressTime);
     }
     longTap(data) {
         let hasLong;
         if (this.longPressed) {
-            this.emit(PointerEvent.LONG_TAP, data);
-            if (pathHasEventType(data.path, PointerEvent.LONG_TAP) || pathHasEventType(data.path, PointerEvent.LONG_PRESS))
+            this.emit(PointerEvent$1.LONG_TAP, data);
+            if (pathHasEventType(data.path, PointerEvent$1.LONG_TAP) || pathHasEventType(data.path, PointerEvent$1.LONG_PRESS))
                 hasLong = true;
         }
         this.longPressWaitCancel();
@@ -10091,9 +10109,9 @@ leaf.__hitWorld = function (point) {
     }
     return this.__hit(inner);
 };
-leaf.__hitFill = function (inner) { var _a; return (_a = this.__hitCanvas) === null || _a === void 0 ? void 0 : _a.hitFill(inner, this.__.windingRule); };
-leaf.__hitStroke = function (inner, strokeWidth) { var _a; return (_a = this.__hitCanvas) === null || _a === void 0 ? void 0 : _a.hitStroke(inner, strokeWidth); };
-leaf.__hitPixel = function (inner) { var _a; return (_a = this.__hitCanvas) === null || _a === void 0 ? void 0 : _a.hitPixel(inner, this.__layout.renderBounds, this.__hitCanvas.hitScale); };
+leaf.__hitFill = function (inner) { var _a; return (_a = this.__hitCanvas) === null || _a === undefined ? undefined : _a.hitFill(inner, this.__.windingRule); };
+leaf.__hitStroke = function (inner, strokeWidth) { var _a; return (_a = this.__hitCanvas) === null || _a === undefined ? undefined : _a.hitStroke(inner, strokeWidth); };
+leaf.__hitPixel = function (inner) { var _a; return (_a = this.__hitCanvas) === null || _a === undefined ? undefined : _a.hitPixel(inner, this.__layout.renderBounds, this.__hitCanvas.hitScale); };
 leaf.__drawHitPath = function (canvas) { if (canvas)
     this.__drawRenderPath(canvas); };
 
@@ -11132,7 +11150,7 @@ function checkImage(ui, canvas, paint, allowPaint) {
             }
             else {
                 if (!paint.patternTask) {
-                    paint.patternTask = ImageManager.patternTasker.add(() => __awaiter(this, void 0, void 0, function* () {
+                    paint.patternTask = ImageManager.patternTasker.add(() => __awaiter(this, undefined, undefined, function* () {
                         paint.patternTask = null;
                         if (canvas.bounds.hit(ui.__nowWorld))
                             createPattern(ui, paint, pixelRatio);
@@ -11288,7 +11306,7 @@ function shadow(ui, current, shape) {
     const end = shadow.length - 1;
     toOffsetOutBounds$1(bounds, offsetOutBounds$1);
     shadow.forEach((item, index) => {
-        other.setWorldShadow((offsetOutBounds$1.offsetX + item.x * scaleX), (offsetOutBounds$1.offsetY + item.y * scaleY), item.blur * scaleX, item.color);
+        other.setWorldShadow((offsetOutBounds$1.offsetX + item.x * scaleX), (offsetOutBounds$1.offsetY + item.y * scaleY), item.blur * scaleX, ColorConvert.string(item.color));
         spreadScale = item.spread ? 1 + item.spread * 2 / (__layout.boxBounds.width + (__layout.strokeBoxSpread || 0) * 2) : 0;
         drawWorldShadow(other, offsetOutBounds$1, spreadScale, shape);
         copyBounds = bounds;
@@ -11364,7 +11382,7 @@ function innerShadow(ui, current, shape) {
             other.copyWorld(shape.canvas, shapeBounds, bounds, 'source-out');
             copyBounds = bounds;
         }
-        other.fillWorld(copyBounds, item.color, 'source-in');
+        other.fillWorld(copyBounds, ColorConvert.string(item.color), 'source-in');
         if (ui.__worldFlipped) {
             current.copyWorldByReset(other, copyBounds, nowWorld, item.blendMode);
         }
@@ -11726,7 +11744,7 @@ function layoutChar(drawData, style, width, _height) {
     rows.forEach(row => {
         if (row.words) {
             indentWidth = paraIndent && row.paraStart ? paraIndent : 0;
-            addWordWidth = (width && textAlign === 'justify' && row.words.length > 1) ? (width - row.width - indentWidth) / (row.words.length - 1) : 0;
+            addWordWidth = (width && (textAlign === 'justify' || textAlign === 'both') && row.words.length > 1) ? (width - row.width - indentWidth) / (row.words.length - 1) : 0;
             mode = (letterSpacing || row.isOverflow) ? CharMode : (addWordWidth > 0.01 ? WordMode : TextMode);
             if (row.isOverflow && !letterSpacing)
                 row.textMode = true;
@@ -11748,7 +11766,7 @@ function layoutChar(drawData, style, width, _height) {
                     else {
                         charX = toChar(word.data, charX, row.data, row.isOverflow);
                     }
-                    if (!row.paraEnd && addWordWidth) {
+                    if (addWordWidth && (!row.paraEnd || textAlign === 'both')) {
                         charX += addWordWidth;
                         row.width += addWordWidth;
                     }
@@ -12004,4 +12022,4 @@ Object.assign(Creator, {
 });
 useCanvas();
 
-export { AlignHelper, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Frame, FrameData, Group, GroupData, HitCanvasManager, Image$1 as Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isNull, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$3 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };
+export { AlignHelper, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragEvent$1 as DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Frame, FrameData, Group, GroupData, HitCanvasManager, Image$1 as Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent$1 as PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isNull, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$3 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };