leafer-ui 1.0.0-rc.22 → 1.0.0-rc.23

package/dist/web.js

@@ -6,7 +6,7 @@ var LeaferUI = (function (exports) {
             hitCanvasSize: 100,
             maxCacheSize: 2560 * 1600,
             maxPatternSize: 4096 * 2160,
-            suffix: 'leaf',
+            suffix: '',
             crossOrigin: 'anonymous'
         }
     };
@@ -36,24 +36,12 @@ var LeaferUI = (function (exports) {
     const { round, pow: pow$1, PI: PI$4 } = Math;
     const MathHelper = {
         within(value, min, max) {
-            if (value < min)
+            if (min !== undefined && value < min)
                 value = min;
-            if (value > max)
+            if (max !== undefined && value > max)
                 value = max;
             return value;
         },
-        minus(value, isFourNumber) {
-            if (value instanceof Array) {
-                if (isFourNumber)
-                    value = MathHelper.fourNumber(value, 0);
-                for (let i = 0; i < value.length; i++)
-                    value[i] = -value[i];
-            }
-            else {
-                value = -value;
-            }
-            return value;
-        },
         fourNumber(num, maxValue) {
             let data;
             if (num instanceof Array) {
@@ -150,9 +138,11 @@ var LeaferUI = (function (exports) {
             t.e += x;
             t.f += y;
         },
-        translateInner(t, x, y) {
+        translateInner(t, x, y, isMoveOrigin) {
             t.e += t.a * x + t.c * y;
             t.f += t.b * x + t.d * y;
+            if (isMoveOrigin)
+                t.e -= x, t.f -= y;
         },
         scale(t, scaleX, scaleY = scaleX) {
             t.a *= scaleX;
@@ -219,8 +209,10 @@ var LeaferUI = (function (exports) {
             t.e = child.e * a + child.f * c + e;
             t.f = child.e * b + child.f * d + f;
         },
-        multiplyParent(t, parent, to, abcdChanged, childScaleData) {
-            const { e, f } = t;
+        multiplyParent(t, parent, to, abcdChanged, childScaleData, scrollData) {
+            let { e, f } = t;
+            if (scrollData)
+                e += scrollData.scrollX, f += scrollData.scrollY;
             to || (to = t);
             if (abcdChanged === undefined)
                 abcdChanged = t.a !== 1 || t.b || t.c || t.d !== 1;
@@ -341,7 +333,7 @@ var LeaferUI = (function (exports) {
             t.e = x;
             t.f = y;
             if (origin)
-                M$6.translateInner(t, -origin.x, -origin.y);
+                M$6.translateInner(t, -origin.x, -origin.y, true);
         },
         getLayout(t, origin, firstSkewY) {
             const { a, b, c, d, e, f } = t;
@@ -761,7 +753,7 @@ var LeaferUI = (function (exports) {
     const { floor, ceil: ceil$2 } = Math;
     let right$1, bottom$1, boundsRight, boundsBottom;
     const point = {};
-    const toPoint$1 = {};
+    const toPoint$2 = {};
     const BoundsHelper = {
         tempBounds: {},
         set(t, x = 0, y = 0, width = 0, height = 0) {
@@ -776,15 +768,17 @@ var LeaferUI = (function (exports) {
             t.width = bounds.width;
             t.height = bounds.height;
         },
-        copyAndSpread(t, bounds, spreadX, spreadY) {
-            if (spreadX instanceof Array) {
-                const four = fourNumber(spreadX);
-                B.set(t, bounds.x - four[3], bounds.y - four[0], bounds.width + four[1] + four[3], bounds.height + four[2] + four[0]);
+        copyAndSpread(t, bounds, spread, isShrink) {
+            if (spread instanceof Array) {
+                const four = fourNumber(spread);
+                isShrink
+                    ? B.set(t, bounds.x + four[3], bounds.y + four[0], bounds.width - four[1] - four[3], bounds.height - four[2] - four[0])
+                    : B.set(t, bounds.x - four[3], bounds.y - four[0], bounds.width + four[1] + four[3], bounds.height + four[2] + four[0]);
             }
             else {
-                if (!spreadY)
-                    spreadY = spreadX;
-                B.set(t, bounds.x - spreadX, bounds.y - spreadY, bounds.width + spreadX * 2, bounds.height + spreadY * 2);
+                if (isShrink)
+                    spread = -spread;
+                B.set(t, bounds.x - spread, bounds.y - spread, bounds.width + spread * 2, bounds.height + spread * 2);
             }
         },
         minX(t) { return t.width > 0 ? t.x : t.x + t.width; },
@@ -861,17 +855,17 @@ var LeaferUI = (function (exports) {
             else {
                 point.x = t.x;
                 point.y = t.y;
-                toOuterPoint$1(matrix, point, toPoint$1);
-                setPoint$3(tempPointBounds$1, toPoint$1.x, toPoint$1.y);
+                toOuterPoint$1(matrix, point, toPoint$2);
+                setPoint$3(tempPointBounds$1, toPoint$2.x, toPoint$2.y);
                 point.x = t.x + t.width;
-                toOuterPoint$1(matrix, point, toPoint$1);
-                addPoint$3(tempPointBounds$1, toPoint$1.x, toPoint$1.y);
+                toOuterPoint$1(matrix, point, toPoint$2);
+                addPoint$3(tempPointBounds$1, toPoint$2.x, toPoint$2.y);
                 point.y = t.y + t.height;
-                toOuterPoint$1(matrix, point, toPoint$1);
-                addPoint$3(tempPointBounds$1, toPoint$1.x, toPoint$1.y);
+                toOuterPoint$1(matrix, point, toPoint$2);
+                addPoint$3(tempPointBounds$1, toPoint$2.x, toPoint$2.y);
                 point.x = t.x;
-                toOuterPoint$1(matrix, point, toPoint$1);
-                addPoint$3(tempPointBounds$1, toPoint$1.x, toPoint$1.y);
+                toOuterPoint$1(matrix, point, toPoint$2);
+                addPoint$3(tempPointBounds$1, toPoint$2.x, toPoint$2.y);
                 toBounds$4(tempPointBounds$1, to);
             }
         },
@@ -884,13 +878,16 @@ var LeaferUI = (function (exports) {
             const scale = Math.min(baseScale, Math.min(t.width / put.width, t.height / put.height));
             return new Matrix(scale, 0, 0, scale, -put.x * scale, -put.y * scale);
         },
-        getSpread(t, spreadX, spreadY) {
+        getSpread(t, spread) {
             const n = {};
-            B.copyAndSpread(n, t, spreadX, spreadY);
+            B.copyAndSpread(n, t, spread);
             return n;
         },
-        spread(t, spreadX, spreadY = spreadX) {
-            B.copyAndSpread(t, t, spreadX, spreadY);
+        spread(t, spread) {
+            B.copyAndSpread(t, t, spread);
+        },
+        shrink(t, shrink) {
+            B.copyAndSpread(t, t, shrink, true);
         },
         ceil(t) {
             const { x, y } = t;
@@ -1070,12 +1067,12 @@ var LeaferUI = (function (exports) {
         getFitMatrix(put, baseScale) {
             return BoundsHelper.getFitMatrix(this, put, baseScale);
         }
-        spread(fourNumber, spreadY) {
-            BoundsHelper.spread(this, fourNumber, spreadY);
+        spread(fourNumber) {
+            BoundsHelper.spread(this, fourNumber);
             return this;
         }
         shrink(fourNumber) {
-            BoundsHelper.spread(this, MathHelper.minus(fourNumber, true));
+            BoundsHelper.shrink(this, fourNumber);
             return this;
         }
         ceil() {
@@ -1192,6 +1189,10 @@ var LeaferUI = (function (exports) {
         Direction9[Direction9["bottomLeft"] = 6] = "bottomLeft";
         Direction9[Direction9["left"] = 7] = "left";
         Direction9[Direction9["center"] = 8] = "center";
+        Direction9[Direction9["top-left"] = 0] = "top-left";
+        Direction9[Direction9["top-right"] = 2] = "top-right";
+        Direction9[Direction9["bottom-right"] = 4] = "bottom-right";
+        Direction9[Direction9["bottom-left"] = 6] = "bottom-left";
     })(exports.Direction9 || (exports.Direction9 = {}));
 
     const directionData = [
@@ -1205,6 +1206,7 @@ var LeaferUI = (function (exports) {
         { x: 0, y: 0.5 },
         { x: 0.5, y: 0.5 }
     ];
+    directionData.forEach(item => item.type = 'percent');
     const AroundHelper = {
         directionData,
         tempPoint: {},
@@ -1212,15 +1214,19 @@ var LeaferUI = (function (exports) {
         toPoint(around, bounds, to, onlySize, pointBounds) {
             to || (to = {});
             const point = get$5(around);
-            to.x = point.x * bounds.width;
-            to.y = point.y * bounds.height;
-            if (pointBounds) {
-                to.x -= pointBounds.x;
-                to.y -= pointBounds.y;
-                if (point.x)
-                    to.x -= (point.x === 1) ? pointBounds.width : (point.x === 0.5 ? point.x * pointBounds.width : 0);
-                if (point.y)
-                    to.y -= (point.y === 1) ? pointBounds.height : (point.y === 0.5 ? point.y * pointBounds.height : 0);
+            to.x = point.x;
+            to.y = point.y;
+            if (point.type === 'percent') {
+                to.x *= bounds.width;
+                to.y *= bounds.height;
+                if (pointBounds) {
+                    to.x -= pointBounds.x;
+                    to.y -= pointBounds.y;
+                    if (point.x)
+                        to.x -= (point.x === 1) ? pointBounds.width : (point.x === 0.5 ? point.x * pointBounds.width : 0);
+                    if (point.y)
+                        to.y -= (point.y === 1) ? pointBounds.height : (point.y === 0.5 ? point.y * pointBounds.height : 0);
+                }
             }
             if (!onlySize) {
                 to.x += bounds.x;
@@ -1232,6 +1238,13 @@ var LeaferUI = (function (exports) {
         return typeof around === 'string' ? directionData[exports.Direction9[around]] : around;
     }
 
+    const { toPoint: toPoint$1 } = AroundHelper;
+    const AlignHelper = {
+        toPoint(align, contentBounds, bounds, to, onlySize) {
+            toPoint$1(align, bounds, to, onlySize, contentBounds);
+        }
+    };
+
     const StringNumberMap = {
         '0': 1,
         '1': 1,
@@ -1464,13 +1477,19 @@ var LeaferUI = (function (exports) {
         },
         clone(data) {
             return JSON.parse(JSON.stringify(data));
+        },
+        toMap(list) {
+            const map = {};
+            for (let i = 0, len = list.length; i < len; i++)
+                map[list[i]] = true;
+            return map;
         }
     };
     const { assign } = DataHelper;
 
     class LeafData {
         get __blendMode() {
-            if (this.eraser)
+            if (this.eraser && this.eraser !== 'path')
                 return 'destination-out';
             const { blendMode } = this;
             return blendMode === 'pass-through' ? null : blendMode;
@@ -2100,7 +2119,7 @@ var LeaferUI = (function (exports) {
         }
         clear() {
             const { pixelRatio } = this;
-            this.clearRect(0, 0, this.width * pixelRatio, this.height * pixelRatio);
+            this.clearRect(0, 0, this.width * pixelRatio + 2, this.height * pixelRatio + 2);
         }
         isSameSize(size) {
             return this.width === size.width && this.height === size.height && this.pixelRatio === size.pixelRatio;
@@ -3756,6 +3775,8 @@ var LeaferUI = (function (exports) {
                 this.__setAttr(key, value);
                 this.__layout.boxChanged || this.__layout.boxChange();
                 this.waitParent(() => { this.parent.__updateMask(value); });
+                if (typeof value === 'string')
+                    this.maskType = value;
             }
         }));
     }
@@ -4185,11 +4206,19 @@ var LeaferUI = (function (exports) {
 
     const { getRelativeWorld: getRelativeWorld$1 } = LeafHelper;
     const { toOuterOf: toOuterOf$2, getPoints, copy: copy$6 } = BoundsHelper;
+    const localContent = '_localContentBounds';
+    const worldContent = '_worldContentBounds', worldBox = '_worldBoxBounds', worldStroke = '_worldStrokeBounds';
     class LeafLayout {
+        get contentBounds() { return this._contentBounds || this.boxBounds; }
+        set contentBounds(bounds) { this._contentBounds = bounds; }
         get strokeBounds() { return this._strokeBounds || this.boxBounds; }
         get renderBounds() { return this._renderBounds || this.boxBounds; }
+        get localContentBounds() { toOuterOf$2(this.contentBounds, this.leaf.__localMatrix, this[localContent] || (this[localContent] = {})); return this[localContent]; }
         get localStrokeBounds() { return this._localStrokeBounds || this; }
         get localRenderBounds() { return this._localRenderBounds || this; }
+        get worldContentBounds() { toOuterOf$2(this.contentBounds, this.leaf.__world, this[worldContent] || (this[worldContent] = {})); return this[worldContent]; }
+        get worldBoxBounds() { toOuterOf$2(this.boxBounds, this.leaf.__world, this[worldBox] || (this[worldBox] = {})); return this[worldBox]; }
+        get worldStrokeBounds() { toOuterOf$2(this.strokeBounds, this.leaf.__world, this[worldStroke] || (this[worldStroke] = {})); return this[worldStroke]; }
         get a() { return 1; }
         get b() { return 0; }
         get c() { return 0; }
@@ -4272,7 +4301,6 @@ var LeaferUI = (function (exports) {
                 case 'content':
                     if (this.contentBounds)
                         return this.contentBounds;
-                case 'margin':
                 case 'box':
                     return this.boxBounds;
                 case 'stroke':
@@ -4285,8 +4313,9 @@ var LeaferUI = (function (exports) {
                     return this.localRenderBounds;
                 case 'stroke':
                     return this.localStrokeBounds;
-                case 'margin':
                 case 'content':
+                    if (this.contentBounds)
+                        return this.localContentBounds;
                 case 'box':
                     return this.leaf.__localBoxBounds;
             }
@@ -4295,15 +4324,13 @@ var LeaferUI = (function (exports) {
             switch (type) {
                 case 'render':
                     return this.leaf.__world;
+                case 'stroke':
+                    return this.worldStrokeBounds;
                 case 'content':
                     if (this.contentBounds)
-                        return this.getWorldContentBounds();
-                case 'margin':
+                        return this.worldContentBounds;
                 case 'box':
-                    return this.getWorldBoxBounds();
-                case 'margin':
-                case 'stroke':
-                    return this.getWorldStrokeBounds();
+                    return this.worldBoxBounds;
             }
         }
         getLayoutBounds(type, relative = 'world', unscale) {
@@ -4366,20 +4393,24 @@ var LeaferUI = (function (exports) {
                 points.forEach(point => leaf.innerToWorld(point, null, false, relativeLeaf));
             return points;
         }
-        getWorldContentBounds() {
-            this._worldContentBounds || (this._worldContentBounds = {});
-            toOuterOf$2(this.contentBounds, this.leaf.__world, this._worldContentBounds);
-            return this._worldContentBounds;
+        shrinkContent() {
+            const { x, y, width, height } = this.boxBounds;
+            this._contentBounds = { x, y, width, height };
+        }
+        spreadStroke() {
+            const { x, y, width, height } = this.strokeBounds;
+            this._strokeBounds = { x, y, width, height };
+            this._localStrokeBounds = { x, y, width, height };
+            if (!this.renderSpread)
+                this.spreadRenderCancel();
         }
-        getWorldBoxBounds() {
-            this._worldBoxBounds || (this._worldBoxBounds = {});
-            toOuterOf$2(this.boxBounds, this.leaf.__world, this._worldBoxBounds);
-            return this._worldBoxBounds;
+        spreadRender() {
+            const { x, y, width, height } = this.renderBounds;
+            this._renderBounds = { x, y, width, height };
+            this._localRenderBounds = { x, y, width, height };
         }
-        getWorldStrokeBounds() {
-            this._worldStrokeBounds || (this._worldStrokeBounds = {});
-            toOuterOf$2(this.strokeBounds, this.leaf.__world, this._worldStrokeBounds);
-            return this._worldStrokeBounds;
+        shrinkContentCancel() {
+            this._contentBounds = undefined;
         }
         spreadStrokeCancel() {
             const same = this.renderBounds === this.strokeBounds;
@@ -4392,18 +4423,6 @@ var LeaferUI = (function (exports) {
             this._renderBounds = this._strokeBounds;
             this._localRenderBounds = this._localStrokeBounds;
         }
-        spreadStroke() {
-            const { x, y, width, height } = this.strokeBounds;
-            this._strokeBounds = { x, y, width, height };
-            this._localStrokeBounds = { x, y, width, height };
-            if (!this.renderSpread)
-                this.spreadRenderCancel();
-        }
-        spreadRender() {
-            const { x, y, width, height } = this.renderBounds;
-            this._renderBounds = { x, y, width, height };
-            this._localRenderBounds = { x, y, width, height };
-        }
         boxChange() {
             this.boxChanged = true;
             this.localBoxChanged || this.localBoxChange();
@@ -4490,24 +4509,40 @@ var LeaferUI = (function (exports) {
             });
         },
         off(type, listener, options) {
-            let capture;
-            if (options)
-                capture = typeof options === 'boolean' ? options : options.capture;
-            let events, index;
-            const map = __getListenerMap(this, capture);
-            const typeList = typeof type === 'string' ? type.split(' ') : type;
-            typeList.forEach(type => {
-                if (type) {
-                    events = map[type];
-                    if (events) {
-                        index = events.findIndex(item => item.listener === listener);
-                        if (index > -1)
-                            events.splice(index, 1);
-                        if (!events.length)
-                            delete map[type];
-                    }
+            if (type) {
+                const typeList = typeof type === 'string' ? type.split(' ') : type;
+                if (listener) {
+                    let capture;
+                    if (options)
+                        capture = typeof options === 'boolean' ? options : options.capture;
+                    let events, index;
+                    const map = __getListenerMap(this, capture);
+                    typeList.forEach(type => {
+                        if (type) {
+                            events = map[type];
+                            if (events) {
+                                index = events.findIndex(item => item.listener === listener);
+                                if (index > -1)
+                                    events.splice(index, 1);
+                                if (!events.length)
+                                    delete map[type];
+                            }
+                        }
+                    });
                 }
-            });
+                else {
+                    const { __bubbleMap: b, __captureMap: c } = this;
+                    typeList.forEach(type => {
+                        if (b)
+                            delete b[type];
+                        if (c)
+                            delete c[type];
+                    });
+                }
+            }
+            else {
+                this.__bubbleMap = this.__captureMap = undefined;
+            }
         },
         on_(type, listener, bind, options) {
             if (bind)
@@ -4774,7 +4809,7 @@ var LeaferUI = (function (exports) {
     const { toPoint, tempPoint: tempPoint$1 } = AroundHelper;
     const LeafMatrix = {
         __updateWorldMatrix() {
-            multiplyParent$1(this.__local || this.__layout, this.parent ? this.parent.__world : defaultWorld, this.__world, !!this.__layout.affectScaleOrRotation, this.__);
+            multiplyParent$1(this.__local || this.__layout, this.parent ? this.parent.__world : defaultWorld, this.__world, !!this.__layout.affectScaleOrRotation, this.__, this.parent && this.parent.__);
         },
         __updateLocalMatrix() {
             if (this.__local) {
@@ -4785,11 +4820,11 @@ var LeaferUI = (function (exports) {
                         layout.scaleChanged = layout.rotationChanged = false;
                     }
                 }
-                local.e = data.x;
-                local.f = data.y;
-                if (data.around) {
-                    toPoint(data.around, layout.boxBounds, tempPoint$1);
-                    translateInner(local, -tempPoint$1.x, -tempPoint$1.y);
+                local.e = data.x + data.offsetX;
+                local.f = data.y + data.offsetY;
+                if (data.around || data.origin) {
+                    toPoint(data.around || data.origin, layout.boxBounds, tempPoint$1);
+                    translateInner(local, -tempPoint$1.x, -tempPoint$1.y, data.origin);
                 }
             }
             this.__layout.matrixChanged = false;
@@ -4895,6 +4930,8 @@ var LeaferUI = (function (exports) {
             if (this.isBranch) {
                 if (this.leafer)
                     this.leafer.layouter.addExtra(this);
+                if (this.__.flow)
+                    this.__updateFlowLayout();
                 if (hasParentAutoLayout(this)) {
                     updateMatrix$1(this);
                 }
@@ -4927,6 +4964,8 @@ var LeaferUI = (function (exports) {
                 canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
                 canvas.opacity = this.__.opacity;
                 if (this.__.__single) {
+                    if (this.__.eraser === 'path')
+                        return this.__renderEraser(canvas, options);
                     const tempCanvas = canvas.getSameCanvas(true, true);
                     this.__draw(tempCanvas, options);
                     if (this.__worldFlipped) {
@@ -4969,6 +5008,8 @@ var LeaferUI = (function (exports) {
         __render(canvas, options) {
             if (this.__worldOpacity) {
                 if (this.__.__single) {
+                    if (this.__.eraser === 'path')
+                        return this.__renderEraser(canvas, options);
                     const tempCanvas = canvas.getSameCanvas(false, true);
                     this.__renderBranch(tempCanvas, options);
                     const nowWorld = this.__getNowWorld(options);
@@ -5108,7 +5149,9 @@ var LeaferUI = (function (exports) {
         setProxyAttr(_attrName, _newValue) { }
         getProxyAttr(_attrName) { return undefined; }
         find(_condition, _options) { return undefined; }
+        findTag(_tag) { return undefined; }
         findOne(_condition, _options) { return undefined; }
+        findId(_id) { return undefined; }
         focus(_value) { }
         forceUpdate(attrName) {
             if (attrName === undefined)
@@ -5130,9 +5173,11 @@ var LeaferUI = (function (exports) {
         __updateLocalStrokeBounds() { }
         __updateLocalRenderBounds() { }
         __updateBoxBounds() { }
+        __updateContentBounds() { }
         __updateStrokeBounds() { }
         __updateRenderBounds() { }
         __updateAutoLayout() { }
+        __updateFlowLayout() { }
         __updateNaturalSize() { }
         __updateStrokeSpread() { return 0; }
         __updateRenderSpread() { return 0; }
@@ -5140,6 +5185,13 @@ var LeaferUI = (function (exports) {
         __updateEraser(value) {
             this.__hasEraser = value ? true : this.children.some(item => item.__.eraser);
         }
+        __renderEraser(canvas, options) {
+            canvas.save();
+            this.__clip(canvas, options);
+            const { renderBounds: r } = this.__layout;
+            canvas.clearRect(r.x, r.y, r.width, r.height);
+            canvas.restore();
+        }
         __updateMask(value) {
             this.__hasMask = value ? true : this.children.some(item => item.__.mask);
         }
@@ -5320,8 +5372,8 @@ var LeaferUI = (function (exports) {
         emit(_type, _event, _capture) { }
         emitEvent(_event, _capture) { }
         hasEvent(_type, _capture) { return false; }
-        static changeAttr(attrName, defaultValue) {
-            defineDataProcessor(this.prototype, attrName, defaultValue);
+        static changeAttr(attrName, defaultValue, fn) {
+            fn ? this.addAttr(attrName, defaultValue, fn) : defineDataProcessor(this.prototype, attrName, defaultValue);
         }
         static addAttr(attrName, defaultValue, fn) {
             if (!fn)
@@ -5818,7 +5870,7 @@ var LeaferUI = (function (exports) {
                     }
                     img.onload = () => { resolve(img); };
                     img.onerror = (e) => { reject(e); };
-                    if (!src.startsWith('data:') && !src.startsWith('blob:') && suffix)
+                    if (suffix && !src.startsWith('data:') && !src.startsWith('blob:'))
                         src += (src.includes("?") ? "&" : "?") + suffix;
                     img.src = src;
                 });
@@ -6380,8 +6432,11 @@ var LeaferUI = (function (exports) {
                 if (!bounds.includes(this.target.__world) || this.needFill || !e.samePixelRatio) {
                     this.addBlock(this.canvas.bounds);
                     this.target.forceUpdate('surface');
+                    return;
                 }
             }
+            this.addBlock(new Bounds(0, 0, 1, 1));
+            this.changed = true;
         }
         __onLayoutEnd(event) {
             if (event.data)
@@ -6554,6 +6609,7 @@ var LeaferUI = (function (exports) {
     }
 
     const { Yes, NoAndSkip, YesAndSkip } = exports.Answer;
+    const idCondition = {}, classNameCondition = {}, tagCondition = {};
     class Selector {
         constructor(target, userConfig) {
             this.config = {};
@@ -6563,7 +6619,8 @@ var LeaferUI = (function (exports) {
                 id: (leaf, name) => leaf.id === name ? (this.idMap[name] = leaf, 1) : 0,
                 innerId: (leaf, innerId) => leaf.innerId === innerId ? (this.innerIdMap[innerId] = leaf, 1) : 0,
                 className: (leaf, name) => leaf.className === name ? 1 : 0,
-                tag: (leaf, name) => leaf.__tag === name ? 1 : 0
+                tag: (leaf, name) => leaf.__tag === name ? 1 : 0,
+                tags: (leaf, nameMap) => nameMap[leaf.__tag] ? 1 : 0
             };
             this.target = target;
             if (userConfig)
@@ -6579,12 +6636,25 @@ var LeaferUI = (function (exports) {
                 case 'string':
                     switch (condition[0]) {
                         case '#':
-                            const leaf = this.getById(condition.substring(1), branch);
-                            return one ? leaf : (leaf ? [leaf] : []);
+                            idCondition.id = condition.substring(1), condition = idCondition;
+                            break;
                         case '.':
-                            return this.getByMethod(this.methods.className, branch, one, condition.substring(1));
+                            classNameCondition.className = condition.substring(1), condition = classNameCondition;
+                            break;
                         default:
-                            return this.getByMethod(this.methods.tag, branch, one, condition);
+                            tagCondition.tag = condition, condition = tagCondition;
+                    }
+                case 'object':
+                    if (condition.id !== undefined) {
+                        const leaf = this.getById(condition.id, branch);
+                        return one ? leaf : (leaf ? [leaf] : []);
+                    }
+                    else if (condition.tag) {
+                        const { tag } = condition, isArray = tag instanceof Array;
+                        return this.getByMethod(isArray ? this.methods.tags : this.methods.tag, branch, one, isArray ? DataHelper.toMap(tag) : tag);
+                    }
+                    else {
+                        return this.getByMethod(this.methods.className, branch, one, condition.className);
                     }
                 case 'function':
                     return this.getByMethod(condition, branch, one, options);
@@ -6883,7 +6953,7 @@ var LeaferUI = (function (exports) {
     const UnitConvert = {
         number(value, percentRefer) {
             if (typeof value === 'object')
-                return value.type === 'percent' ? value.value / 100 * percentRefer : value.value;
+                return value.type === 'percent' ? (value.value > 49 ? value.value / 100 : value.value) * percentRefer : value.value;
             return value;
         }
     };
@@ -7164,7 +7234,9 @@ var LeaferUI = (function (exports) {
         }
         createProxyData() { return undefined; }
         find(_condition, _options) { return undefined; }
+        findTag(tag) { return this.find({ tag }); }
         findOne(_condition, _options) { return undefined; }
+        findId(id) { return this.findOne({ id }); }
         getPath(curve, pathForRender) {
             this.__layout.update();
             let path = pathForRender ? this.__.__pathForRender : this.__.path;
@@ -7315,9 +7387,75 @@ var LeaferUI = (function (exports) {
     __decorate([
         rotationType(0, true)
     ], exports.UI.prototype, "skewY", void 0);
+    __decorate([
+        positionType(0, true)
+    ], exports.UI.prototype, "offsetX", void 0);
+    __decorate([
+        positionType(0, true)
+    ], exports.UI.prototype, "offsetY", void 0);
+    __decorate([
+        positionType(0, true)
+    ], exports.UI.prototype, "scrollX", void 0);
+    __decorate([
+        positionType(0, true)
+    ], exports.UI.prototype, "scrollY", void 0);
+    __decorate([
+        autoLayoutType()
+    ], exports.UI.prototype, "origin", void 0);
     __decorate([
         autoLayoutType()
     ], exports.UI.prototype, "around", void 0);
+    __decorate([
+        dataType(false)
+    ], exports.UI.prototype, "lazy", void 0);
+    __decorate([
+        naturalBoundsType(1)
+    ], exports.UI.prototype, "pixelRatio", void 0);
+    __decorate([
+        pathInputType()
+    ], exports.UI.prototype, "path", void 0);
+    __decorate([
+        pathType()
+    ], exports.UI.prototype, "windingRule", void 0);
+    __decorate([
+        pathType(true)
+    ], exports.UI.prototype, "closed", void 0);
+    __decorate([
+        autoLayoutType(false)
+    ], exports.UI.prototype, "flow", void 0);
+    __decorate([
+        boundsType(0)
+    ], exports.UI.prototype, "padding", void 0);
+    __decorate([
+        boundsType(0)
+    ], exports.UI.prototype, "gap", void 0);
+    __decorate([
+        boundsType('top-left')
+    ], exports.UI.prototype, "align", void 0);
+    __decorate([
+        boundsType(false)
+    ], exports.UI.prototype, "wrap", void 0);
+    __decorate([
+        boundsType('box')
+    ], exports.UI.prototype, "itemBox", void 0);
+    __decorate([
+        boundsType(true)
+    ], exports.UI.prototype, "inFlow", void 0);
+    __decorate([
+        boundsType()
+    ], exports.UI.prototype, "autoWidth", void 0);
+    __decorate([
+        boundsType()
+    ], exports.UI.prototype, "autoHeight", void 0);
+    __decorate([
+        boundsType()
+    ], exports.UI.prototype, "autoBox", void 0);
+    __decorate([
+        boundsType()
+    ], exports.UI.prototype, "widthRange", void 0);
+    __decorate([
+        boundsType()
+    ], exports.UI.prototype, "heightRange", void 0);
     __decorate([
         dataType(false)
     ], exports.UI.prototype, "draggable", void 0);
@@ -7327,9 +7465,6 @@ var LeaferUI = (function (exports) {
     __decorate([
         dataType(false)
     ], exports.UI.prototype, "editable", void 0);
-    __decorate([
-        dataType('size')
-    ], exports.UI.prototype, "editSize", void 0);
     __decorate([
         hitType(true)
     ], exports.UI.prototype, "hittable", void 0);
@@ -7384,21 +7519,6 @@ var LeaferUI = (function (exports) {
     __decorate([
         strokeType(10)
     ], exports.UI.prototype, "miterLimit", void 0);
-    __decorate([
-        dataType(false)
-    ], exports.UI.prototype, "lazy", void 0);
-    __decorate([
-        naturalBoundsType(1)
-    ], exports.UI.prototype, "pixelRatio", void 0);
-    __decorate([
-        pathInputType()
-    ], exports.UI.prototype, "path", void 0);
-    __decorate([
-        pathType()
-    ], exports.UI.prototype, "windingRule", void 0);
-    __decorate([
-        pathType(true)
-    ], exports.UI.prototype, "closed", void 0);
     __decorate([
         arrowType('none')
     ], exports.UI.prototype, "startArrow", void 0);
@@ -7632,9 +7752,6 @@ var LeaferUI = (function (exports) {
             const data = DataHelper.copyAttrs({}, size, canvasSizeAttrs);
             Object.keys(data).forEach(key => this[key] = data[key]);
         }
-        forceFullRender() {
-            this.forceRender();
-        }
         forceRender(bounds) {
             this.renderer.addBlock(bounds ? new Bounds(bounds) : this.canvas.bounds);
             if (this.viewReady)
@@ -7712,7 +7829,7 @@ var LeaferUI = (function (exports) {
                 this.canvas.backgroundColor = newValue;
             }
             else {
-                this.forceFullRender();
+                this.forceRender();
             }
         }
         __onCreated() {
@@ -7923,6 +8040,8 @@ var LeaferUI = (function (exports) {
             else {
                 this.__updateRectBoxBounds();
             }
+            if (data.flow)
+                this.__updateContentBounds();
         }
         __updateStrokeBounds() { }
         __updateRenderBounds() {
@@ -8332,7 +8451,7 @@ var LeaferUI = (function (exports) {
         registerUI()
     ], exports.Canvas);
 
-    const { copyAndSpread, includes, spread, setList } = BoundsHelper;
+    const { copyAndSpread, includes, isSame: isSame$1, spread, setList } = BoundsHelper;
     exports.Text = class Text extends exports.UI {
         get __tag() { return 'Text'; }
         get editInner() { return 'TextEditor'; }
@@ -8405,7 +8524,7 @@ var LeaferUI = (function (exports) {
             if (italic)
                 b.width += fontSize * 0.16;
             const contentBounds = includes(b, bounds) ? b : bounds;
-            if (contentBounds !== layout.contentBounds) {
+            if (!isSame$1(contentBounds, layout.contentBounds)) {
                 layout.contentBounds = contentBounds;
                 layout.renderChanged = true;
                 setList(data.__textBoxBounds = {}, [b, bounds]);
@@ -8433,9 +8552,6 @@ var LeaferUI = (function (exports) {
     __decorate([
         boundsType(0)
     ], exports.Text.prototype, "height", void 0);
-    __decorate([
-        boundsType(0)
-    ], exports.Text.prototype, "padding", void 0);
     __decorate([
         surfaceType('#000000')
     ], exports.Text.prototype, "fill", void 0);
@@ -8564,7 +8680,7 @@ var LeaferUI = (function (exports) {
         };
     }
 
-    const version = "1.0.0-rc.21";
+    const version = "1.0.0-rc.23";
 
     exports.App = class App extends exports.Leafer {
         get __tag() { return 'App'; }
@@ -8658,8 +8774,10 @@ var LeaferUI = (function (exports) {
                 this.renderer.update();
         }
         __render(canvas, options) {
-            if (options.matrix)
-                canvas.setWorld(options.matrix);
+            if (options.matrix) {
+                const { a, b, c, d, e, f } = options.matrix;
+                canvas.setTransform(a, b, c, d, e, f);
+            }
             this.children.forEach(leafer => canvas.copyWorld(leafer.canvas));
         }
         __onResize(event) {
@@ -10622,7 +10740,7 @@ var LeaferUI = (function (exports) {
         }
         else {
             const { renderShapeSpread: spread } = ui.__layout;
-            const worldClipBounds = getIntersectData(spread ? getSpread(current.bounds, spread * scaleX, spread * scaleY) : current.bounds, nowWorld);
+            const worldClipBounds = getIntersectData(spread ? getSpread(current.bounds, scaleX === scaleY ? spread * scaleX : [spread * scaleY, spread * scaleX]) : current.bounds, nowWorld);
             fitMatrix = current.bounds.getFitMatrix(worldClipBounds);
             let { a: fitScaleX, d: fitScaleY } = fitMatrix;
             if (fitMatrix.a < 1) {
@@ -10722,10 +10840,10 @@ var LeaferUI = (function (exports) {
             rotate(transform, rotation);
         data.transform = transform;
     }
-    function repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation, around) {
+    function repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation, align) {
         const transform = get$4();
         if (rotation) {
-            if (around === 'center') {
+            if (align === 'center') {
                 rotateOfOuter$2(transform, { x: width / 2, y: height / 2 }, rotation);
             }
             else {
@@ -10758,12 +10876,12 @@ var LeaferUI = (function (exports) {
         let { width, height } = image;
         if (paint.padding)
             box = tempBox.set(box).shrink(paint.padding);
-        const { opacity, mode, around, offset, scale, size, rotation, blendMode, repeat } = paint;
+        const { opacity, mode, align, offset, scale, size, rotation, blendMode, repeat } = paint;
         const sameBox = box.width === width && box.height === height;
         if (blendMode)
             leafPaint.blendMode = blendMode;
         const data = leafPaint.data = { mode };
-        const swapSize = around !== 'center' && (rotation || 0) % 180 === 90;
+        const swapSize = align !== 'center' && (rotation || 0) % 180 === 90;
         const swapWidth = swapSize ? height : width, swapHeight = swapSize ? width : height;
         let x = 0, y = 0, scaleX, scaleY;
         if (!mode || mode === 'cover' || mode === 'fit') {
@@ -10781,11 +10899,11 @@ var LeaferUI = (function (exports) {
             scaleX = typeof scale === 'number' ? scale : scale.x;
             scaleY = typeof scale === 'number' ? scale : scale.y;
         }
-        if (around) {
+        if (align) {
             const imageBounds = { x, y, width: swapWidth, height: swapHeight };
             if (scaleX)
                 imageBounds.width *= scaleX, imageBounds.height *= scaleY;
-            AroundHelper.toPoint(around, box, tempPoint, true, imageBounds);
+            AlignHelper.toPoint(align, imageBounds, box, tempPoint, true);
             x += tempPoint.x, y += tempPoint.y;
         }
         if (offset)
@@ -10802,7 +10920,7 @@ var LeaferUI = (function (exports) {
                 break;
             case 'repeat':
                 if (!sameBox || scaleX || rotation)
-                    repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation, around);
+                    repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation, align);
                 if (!repeat)
                     data.repeat = 'repeat';
                 break;
@@ -11719,11 +11837,13 @@ var LeaferUI = (function (exports) {
         const { rows, overflow } = drawData;
         let { textOverflow } = style;
         rows.splice(overflow);
-        if (textOverflow !== 'hide') {
-            if (textOverflow === 'ellipsis')
+        if (textOverflow && textOverflow !== 'show') {
+            if (textOverflow === 'hide')
+                textOverflow = '';
+            else if (textOverflow === 'ellipsis')
                 textOverflow = '...';
             let char, charRight;
-            const ellipsisWidth = Platform.canvas.measureText(textOverflow).width;
+            const ellipsisWidth = textOverflow ? Platform.canvas.measureText(textOverflow).width : 0;
             const right = style.x + style.width - ellipsisWidth;
             const list = style.textWrap === 'none' ? rows : [rows[overflow - 1]];
             list.forEach(row => {
@@ -11891,8 +12011,12 @@ var LeaferUI = (function (exports) {
                         let renderBounds, trimBounds, scaleX = 1, scaleY = 1;
                         const { worldTransform, isLeafer, isFrame } = leaf;
                         const { slice, trim, onCanvas } = options;
-                        const scale = options.scale || 1;
-                        const pixelRatio = options.pixelRatio || 1;
+                        let scale = options.scale || 1;
+                        let pixelRatio = options.pixelRatio || 1;
+                        if (leaf.isApp) {
+                            scale *= pixelRatio;
+                            pixelRatio = leaf.app.pixelRatio;
+                        }
                         const screenshot = options.screenshot || leaf.isApp;
                         const fill = (isLeafer && screenshot) ? (options.fill === undefined ? leaf.fill : options.fill) : options.fill;
                         const needFill = FileHelper.isOpaqueImage(filename) || fill, matrix = new Matrix();
@@ -12033,6 +12157,7 @@ var LeaferUI = (function (exports) {
         ImageManager.destroy();
     });
 
+    exports.AlignHelper = AlignHelper;
     exports.AnimateEvent = AnimateEvent;
     exports.AroundHelper = AroundHelper;
     exports.AutoBounds = AutoBounds;