leafer-draw 1.5.0 → 1.5.2

package/dist/web.js

@@ -119,8 +119,9 @@ var LeaferUI = (function (exports) {
             if (!scaleData)
                 scaleData = {};
             if (size) {
-                scaleData.scaleX = (typeof size === 'number' ? size : size.width) / originSize.width;
-                scaleData.scaleY = (typeof size === 'number' ? size : size.height) / originSize.height;
+                const scaleX = (typeof size === 'number' ? size : size.width || 0) / originSize.width, scaleY = (typeof size === 'number' ? size : size.height || 0) / originSize.height;
+                scaleData.scaleX = scaleX || scaleY || 1;
+                scaleData.scaleY = scaleY || scaleX || 1;
             }
             else if (scale)
                 MathHelper.assignScale(scaleData, scale);
@@ -1693,6 +1694,9 @@ var LeaferUI = (function (exports) {
     function isNull(value) {
         return value === undefined || value === null;
     }
+    function isEmptyData(value) {
+        return JSON.stringify(value) === '{}';
+    }
 
     /******************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -2032,13 +2036,11 @@ var LeaferUI = (function (exports) {
             this.worldTransform = {};
             if (!config)
                 config = minSize;
-            if (!config.pixelRatio)
-                config.pixelRatio = Platform.devicePixelRatio;
             this.manager = manager;
             this.innerId = IncrementId.create(IncrementId.CNAVAS);
             const { width, height, pixelRatio } = config;
             this.autoLayout = !width || !height;
-            this.size.pixelRatio = pixelRatio;
+            this.size.pixelRatio = pixelRatio | Platform.devicePixelRatio;
             this.config = config;
             this.init();
         }
@@ -2235,7 +2237,7 @@ var LeaferUI = (function (exports) {
                 tempBounds$1.ceil();
         }
         isSameSize(size) {
-            return this.width === size.width && this.height === size.height && this.pixelRatio === size.pixelRatio;
+            return this.width === size.width && this.height === size.height && (!size.pixelRatio || this.pixelRatio === size.pixelRatio);
         }
         getSameCanvas(useSameWorldTransform, useSameSmooth) {
             const canvas = this.manager ? this.manager.get(this.size) : Creator.canvas(Object.assign({}, this.size));
@@ -2350,7 +2352,7 @@ var LeaferUI = (function (exports) {
     const { sin: sin$3, cos: cos$3, atan2: atan2$1, ceil: ceil$1, abs: abs$3, PI: PI$2, sqrt: sqrt$1, pow } = Math;
     const { setPoint: setPoint$1, addPoint: addPoint$1 } = TwoPointBoundsHelper;
     const { set, toNumberPoints } = PointHelper;
-    const { M: M$5, L: L$6, C: C$5, Q: Q$4, Z: Z$5 } = PathCommandMap;
+    const { M: M$5, L: L$6, C: C$4, Q: Q$4, Z: Z$5 } = PathCommandMap;
     const tempPoint$2 = {};
     const BezierHelper = {
         points(data, originPoints, curve, close) {
@@ -2385,7 +2387,7 @@ var LeaferUI = (function (exports) {
                             data.push(Q$4, c1X, c1Y, bX, bY);
                     }
                     else {
-                        data.push(C$5, c2X, c2Y, c1X, c1Y, bX, bY);
+                        data.push(C$4, c2X, c2Y, c1X, c1Y, bX, bY);
                     }
                     c2X = bX + cb * cX;
                     c2Y = bY + cb * cY;
@@ -2490,7 +2492,7 @@ var LeaferUI = (function (exports) {
                 x2 = cx + x + control * (rotationCos * radiusX * endSin + rotationSin * radiusY * endCos);
                 y2 = cy + y + control * (rotationSin * radiusX * endSin - rotationCos * radiusY * endCos);
                 if (data)
-                    data.push(C$5, x1, y1, x2, y2, cx + x, cy + y);
+                    data.push(C$4, x1, y1, x2, y2, cx + x, cy + y);
                 if (setPointBounds)
                     toTwoPointBounds$1(cx + startX, cy + startY, x1, y1, x2, y2, cx + x, cy + y, setPointBounds, true);
                 startX = x;
@@ -2504,7 +2506,7 @@ var LeaferUI = (function (exports) {
                 set(setEndPoint, cx + x, cy + y);
         },
         quadraticCurveTo(data, fromX, fromY, x1, y1, toX, toY) {
-            data.push(C$5, (fromX + 2 * x1) / 3, (fromY + 2 * y1) / 3, (toX + 2 * x1) / 3, (toY + 2 * y1) / 3, toX, toY);
+            data.push(C$4, (fromX + 2 * x1) / 3, (fromY + 2 * y1) / 3, (toX + 2 * x1) / 3, (toY + 2 * y1) / 3, toX, toY);
         },
         toTwoPointBoundsByQuadraticCurve(fromX, fromY, x1, y1, toX, toY, pointBounds, addMode) {
             toTwoPointBounds$1(fromX, fromY, (fromX + 2 * x1) / 3, (fromY + 2 * y1) / 3, (toX + 2 * x1) / 3, (toY + 2 * y1) / 3, toX, toY, pointBounds, addMode);
@@ -2612,7 +2614,7 @@ var LeaferUI = (function (exports) {
         }
     };
 
-    const { M: M$4, m, L: L$5, l, H, h, V, v, C: C$4, c, S, s, Q: Q$3, q, T, t, A, a, Z: Z$4, z, N: N$3, D: D$3, X: X$3, G: G$3, F: F$4, O: O$3, P: P$3, U: U$3 } = PathCommandMap;
+    const { M: M$4, m, L: L$5, l, H, h, V, v, C: C$3, c, S, s, Q: Q$3, q, T, t, A, a, Z: Z$4, z, N: N$3, D: D$3, X: X$3, G: G$3, F: F$4, O: O$3, P: P$3, U: U$3 } = PathCommandMap;
     const { rect: rect$2, roundRect: roundRect$2, arcTo: arcTo$3, arc: arc$3, ellipse: ellipse$4, quadraticCurveTo: quadraticCurveTo$1 } = BezierHelper;
     const { ellipticalArc } = EllipseHelper;
     const debug$c = Debug.get('PathConvert');
@@ -2740,14 +2742,14 @@ var LeaferUI = (function (exports) {
                         old[i + 4] += y;
                         command = S;
                     case S:
-                        smooth = (lastCommand === C$4) || (lastCommand === S);
+                        smooth = (lastCommand === C$3) || (lastCommand === S);
                         x1 = smooth ? (x * 2 - controlX) : old[i + 1];
                         y1 = smooth ? (y * 2 - controlY) : old[i + 2];
                         controlX = old[i + 1];
                         controlY = old[i + 2];
                         x = old[i + 3];
                         y = old[i + 4];
-                        data.push(C$4, x1, y1, controlX, controlY, x, y);
+                        data.push(C$3, x1, y1, controlX, controlY, x, y);
                         i += 5;
                         break;
                     case c:
@@ -2757,13 +2759,13 @@ var LeaferUI = (function (exports) {
                         old[i + 4] += y;
                         old[i + 5] += x;
                         old[i + 6] += y;
-                        command = C$4;
-                    case C$4:
+                        command = C$3;
+                    case C$3:
                         controlX = old[i + 3];
                         controlY = old[i + 4];
                         x = old[i + 5];
                         y = old[i + 6];
-                        data.push(C$4, old[i + 1], old[i + 2], controlX, controlY, x, y);
+                        data.push(C$3, old[i + 1], old[i + 2], controlX, controlY, x, y);
                         i += 7;
                         break;
                     case t:
@@ -2874,7 +2876,7 @@ var LeaferUI = (function (exports) {
                         data.push(L$5, item.x, item.y);
                         break;
                     case 'C':
-                        data.push(C$4, item.x1, item.y1, item.x2, item.y2, item.x, item.y);
+                        data.push(C$3, item.x1, item.y1, item.x2, item.y2, item.x, item.y);
                         break;
                     case 'Q':
                         data.push(Q$3, item.x1, item.y1, item.x, item.y);
@@ -2901,7 +2903,7 @@ var LeaferUI = (function (exports) {
     };
     const { current, pushData, copyData } = PathConvert;
 
-    const { M: M$3, L: L$4, C: C$3, Q: Q$2, Z: Z$3, N: N$2, D: D$2, X: X$2, G: G$2, F: F$3, O: O$2, P: P$2, U: U$2 } = PathCommandMap;
+    const { M: M$3, L: L$4, C: C$2, Q: Q$2, Z: Z$3, N: N$2, D: D$2, X: X$2, G: G$2, F: F$3, O: O$2, P: P$2, U: U$2 } = PathCommandMap;
     const { getMinDistanceFrom, getRadianFrom } = PointHelper;
     const { tan, min, abs: abs$2 } = Math;
     const startPoint = {};
@@ -2916,7 +2918,7 @@ var LeaferUI = (function (exports) {
             data.push(L$4, x, y);
         },
         bezierCurveTo(data, x1, y1, x2, y2, x, y) {
-            data.push(C$3, x1, y1, x2, y2, x, y);
+            data.push(C$2, x1, y1, x2, y2, x, y);
         },
         quadraticCurveTo(data, x1, y1, x, y) {
             data.push(Q$2, x1, y1, x, y);
@@ -3078,7 +3080,7 @@ var LeaferUI = (function (exports) {
         paint() { }
     }
 
-    const { M: M$2, L: L$3, C: C$2, Q: Q$1, Z: Z$2, N: N$1, D: D$1, X: X$1, G: G$1, F: F$2, O: O$1, P: P$1, U: U$1 } = PathCommandMap;
+    const { M: M$2, L: L$3, C: C$1, Q: Q$1, Z: Z$2, N: N$1, D: D$1, X: X$1, G: G$1, F: F$2, O: O$1, P: P$1, U: U$1 } = PathCommandMap;
     const debug$b = Debug.get('PathDrawer');
     const PathDrawer = {
         drawPathByData(drawer, data) {
@@ -3097,7 +3099,7 @@ var LeaferUI = (function (exports) {
                         drawer.lineTo(data[i + 1], data[i + 2]);
                         i += 3;
                         break;
-                    case C$2:
+                    case C$1:
                         drawer.bezierCurveTo(data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6]);
                         i += 7;
                         break;
@@ -3149,7 +3151,7 @@ var LeaferUI = (function (exports) {
         }
     };
 
-    const { M: M$1, L: L$2, C: C$1, Q, Z: Z$1, N, D, X, G, F: F$1, O, P, U } = PathCommandMap;
+    const { M: M$1, L: L$2, C, Q, Z: Z$1, N, D, X, G, F: F$1, O, P, U } = PathCommandMap;
     const { toTwoPointBounds, toTwoPointBoundsByQuadraticCurve, arcTo: arcTo$1, arc, ellipse: ellipse$1 } = BezierHelper;
     const { addPointBounds, copy: copy$7, addPoint, setPoint, addBounds, toBounds: toBounds$2 } = TwoPointBoundsHelper;
     const debug$a = Debug.get('PathBounds');
@@ -3170,7 +3172,7 @@ var LeaferUI = (function (exports) {
             while (i < len) {
                 command = data[i];
                 if (i === 0) {
-                    if (command === Z$1 || command === C$1 || command === Q) {
+                    if (command === Z$1 || command === C || command === Q) {
                         setPoint(setPointBounds, x, y);
                     }
                     else {
@@ -3185,7 +3187,7 @@ var LeaferUI = (function (exports) {
                         addPoint(setPointBounds, x, y);
                         i += 3;
                         break;
-                    case C$1:
+                    case C:
                         toX = data[i + 5];
                         toY = data[i + 6];
                         toTwoPointBounds(x, y, data[i + 1], data[i + 2], data[i + 3], data[i + 4], toX, toY, tempPointBounds);
@@ -3267,12 +3269,12 @@ var LeaferUI = (function (exports) {
         }
     };
 
-    const { M, L: L$1, C, Z } = PathCommandMap;
+    const { M, L: L$1, Z } = PathCommandMap;
     const { getCenterX, getCenterY } = PointHelper;
     const { arcTo } = PathCommandDataHelper;
     const PathCorner = {
         smooth(data, cornerRadius, _cornerSmoothing) {
-            let command;
+            let command, commandLen;
             let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
             const len = data.length;
             const smooth = [];
@@ -3309,15 +3311,16 @@ var LeaferUI = (function (exports) {
                         lastX = x;
                         lastY = y;
                         break;
-                    case C:
-                        smooth.push(C, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6]);
-                        i += 7;
-                        break;
                     case Z:
                         arcTo(smooth, startX, startY, secondX, secondY, cornerRadius, lastX, lastY);
                         smooth.push(Z);
                         i += 1;
                         break;
+                    default:
+                        commandLen = PathNumberCommandLengthMap[command];
+                        for (let j = 0; j < commandLen; j++)
+                            smooth.push(data[i + j]);
+                        i += commandLen;
                 }
             }
             if (command !== Z) {
@@ -4076,33 +4079,45 @@ var LeaferUI = (function (exports) {
         else if (typeof defaultValue === 'function') {
             property.get = function () {
                 let v = this[computedKey];
-                if (v === undefined)
-                    this[computedKey] = v = defaultValue(this.__leaf);
-                return v;
+                return v === undefined ? defaultValue(this.__leaf) : v;
             };
         }
+        else if (typeof defaultValue === 'object') {
+            const isEmpty = isEmptyData(defaultValue);
+            property.get = function () {
+                let v = this[computedKey];
+                return v === undefined ? this[computedKey] = isEmpty ? {} : DataHelper.clone(defaultValue) : v;
+            };
+        }
+        const isBox = target.isBranchLeaf;
         if (key === 'width') {
             property.get = function () {
                 const v = this[computedKey];
                 if (v === undefined) {
-                    const t = this;
-                    return t._height && t.__naturalWidth && t.__useNaturalRatio ? t._height * t.__naturalWidth / t.__naturalHeight : t.__naturalWidth || defaultValue;
+                    const t = this, naturalWidth = t.__naturalWidth, leaf = t.__leaf;
+                    if (!defaultValue || leaf.pathInputed)
+                        return leaf.boxBounds.width;
+                    if (naturalWidth)
+                        return t._height && t.__useNaturalRatio ? t._height * naturalWidth / t.__naturalHeight : naturalWidth;
+                    return (isBox && leaf.children.length) ? leaf.boxBounds.width : defaultValue;
                 }
-                else {
+                else
                     return v;
-                }
             };
         }
         else if (key === 'height') {
             property.get = function () {
                 const v = this[computedKey];
                 if (v === undefined) {
-                    const t = this;
-                    return t._width && t.__naturalHeight && t.__useNaturalRatio ? t._width * t.__naturalHeight / t.__naturalWidth : t.__naturalHeight || defaultValue;
+                    const t = this, naturalHeight = t.__naturalHeight, leaf = t.__leaf;
+                    if (!defaultValue || leaf.pathInputed)
+                        return leaf.boxBounds.height;
+                    if (naturalHeight)
+                        return t._width && t.__useNaturalRatio ? t._width * naturalHeight / t.__naturalWidth : naturalHeight;
+                    return (isBox && leaf.children.length) ? leaf.boxBounds.height : defaultValue;
                 }
-                else {
+                else
                     return v;
-                }
             };
         }
         let descriptor, find = data;
@@ -4529,7 +4544,12 @@ var LeaferUI = (function (exports) {
                 while (root.parent && !root.parent.leafer) {
                     root = root.parent;
                 }
-                Platform.layout(root);
+                const r = root;
+                if (r.__fullLayouting)
+                    return;
+                r.__fullLayouting = true;
+                Platform.layout(r);
+                delete r.__fullLayouting;
             }
         }
         getTransform(relative = 'world') {
@@ -6054,7 +6074,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.5.0";
+    const version = "1.5.2";
 
     const debug$4 = Debug.get('LeaferCanvas');
     class LeaferCanvas extends LeaferCanvasBase {
@@ -6176,7 +6196,7 @@ var LeaferUI = (function (exports) {
             else {
                 window.addEventListener('resize', this.windowListener = () => {
                     const pixelRatio = Platform.devicePixelRatio;
-                    if (this.pixelRatio !== pixelRatio) {
+                    if (!this.config.pixelRatio && this.pixelRatio !== pixelRatio) {
                         const { width, height } = this;
                         this.emitResize({ width, height, pixelRatio });
                     }
@@ -6193,7 +6213,7 @@ var LeaferUI = (function (exports) {
         checkAutoBounds(parentSize) {
             const view = this.view;
             const { x, y, width, height } = this.autoBounds.getBoundsFrom(parentSize);
-            const size = { width, height, pixelRatio: Platform.devicePixelRatio };
+            const size = { width, height, pixelRatio: this.config.pixelRatio ? this.pixelRatio : Platform.devicePixelRatio };
             if (!this.isSameSize(size)) {
                 const { style } = view;
                 style.marginLeft = x + 'px';
@@ -7668,7 +7688,7 @@ var LeaferUI = (function (exports) {
         strokeType()
     ], exports.UI.prototype, "dashPattern", void 0);
     __decorate([
-        strokeType()
+        strokeType(0)
     ], exports.UI.prototype, "dashOffset", void 0);
     __decorate([
         strokeType(10)
@@ -7761,6 +7781,12 @@ var LeaferUI = (function (exports) {
     __decorate([
         dataProcessor(GroupData)
     ], exports.Group.prototype, "__", void 0);
+    __decorate([
+        boundsType(0)
+    ], exports.Group.prototype, "width", void 0);
+    __decorate([
+        boundsType(0)
+    ], exports.Group.prototype, "height", void 0);
     exports.Group = __decorate([
         useModule(exports.Branch),
         registerUI()
@@ -8176,7 +8202,7 @@ var LeaferUI = (function (exports) {
         __updateRectBoxBounds() { }
         __updateBoxBounds(_secondLayout) {
             const data = this.__;
-            if (this.children.length) {
+            if (this.children.length && !this.pathInputed) {
                 if (data.__autoSide) {
                     if (data.__hasSurface)
                         this.__extraUpdate();
@@ -8245,6 +8271,12 @@ var LeaferUI = (function (exports) {
     __decorate([
         dataProcessor(BoxData)
     ], exports.Box.prototype, "__", void 0);
+    __decorate([
+        boundsType(100)
+    ], exports.Box.prototype, "width", void 0);
+    __decorate([
+        boundsType(100)
+    ], exports.Box.prototype, "height", void 0);
     __decorate([
         dataType(false)
     ], exports.Box.prototype, "resizeChildren", void 0);
@@ -8843,16 +8875,20 @@ var LeaferUI = (function (exports) {
     }
 
     function fillText(ui, canvas) {
-        let row;
-        const { rows, decorationY, decorationHeight } = ui.__.__textDrawData;
+        let row, data = ui.__.__textDrawData;
+        const { rows, decorationY } = data;
         for (let i = 0, len = rows.length; i < len; i++) {
             row = rows[i];
             if (row.text)
                 canvas.fillText(row.text, row.x, row.y);
             else if (row.data)
                 row.data.forEach(charData => { canvas.fillText(charData.char, charData.x, row.y); });
-            if (decorationY)
-                canvas.fillRect(row.x, row.y + decorationY, row.width, decorationHeight);
+        }
+        if (decorationY) {
+            const { decorationColor, decorationHeight } = data;
+            if (decorationColor)
+                canvas.fillStyle = decorationColor;
+            rows.forEach(row => decorationY.forEach(value => canvas.fillRect(row.x, row.y + value, row.width, decorationHeight)));
         }
     }
 
@@ -8923,16 +8959,18 @@ var LeaferUI = (function (exports) {
         out.recycle(ui.__nowWorld);
     }
     function drawTextStroke(ui, canvas) {
-        let row;
-        const { rows, decorationY, decorationHeight } = ui.__.__textDrawData;
+        let row, data = ui.__.__textDrawData;
+        const { rows, decorationY } = data;
         for (let i = 0, len = rows.length; i < len; i++) {
             row = rows[i];
             if (row.text)
                 canvas.strokeText(row.text, row.x, row.y);
             else if (row.data)
                 row.data.forEach(charData => { canvas.strokeText(charData.char, charData.x, row.y); });
-            if (decorationY)
-                canvas.strokeRect(row.x, row.y + decorationY, row.width, decorationHeight);
+        }
+        if (decorationY) {
+            const { decorationHeight } = data;
+            rows.forEach(row => decorationY.forEach(value => canvas.strokeRect(row.x, row.y + value, row.width, decorationHeight)));
         }
     }
     function drawStrokesStyle(strokes, isText, ui, canvas) {
@@ -9498,6 +9536,8 @@ var LeaferUI = (function (exports) {
                         }
                         image.unload(paints[i].loadId, !input.some((item) => item.url === url));
                     }
+                    else
+                        paints[i].style = null;
                 }
             }
             return recycleMap;
@@ -10230,14 +10270,25 @@ var LeaferUI = (function (exports) {
     }
 
     function decorationText(drawData, style) {
-        const { fontSize } = style;
+        let type;
+        const { fontSize, textDecoration } = style;
         drawData.decorationHeight = fontSize / 11;
-        switch (style.textDecoration) {
+        if (typeof textDecoration === 'object') {
+            type = textDecoration.type;
+            if (textDecoration.color)
+                drawData.decorationColor = ColorConvert.string(textDecoration.color);
+        }
+        else
+            type = textDecoration;
+        switch (type) {
             case 'under':
-                drawData.decorationY = fontSize * 0.15;
+                drawData.decorationY = [fontSize * 0.15];
                 break;
             case 'delete':
-                drawData.decorationY = -fontSize * 0.35;
+                drawData.decorationY = [-fontSize * 0.35];
+                break;
+            case 'under-delete':
+                drawData.decorationY = [fontSize * 0.15, -fontSize * 0.35];
         }
     }
 
@@ -10462,6 +10513,7 @@ var LeaferUI = (function (exports) {
     exports.getMatrixData = getMatrixData;
     exports.getPointData = getPointData;
     exports.hitType = hitType;
+    exports.isEmptyData = isEmptyData;
     exports.isNull = isNull;
     exports.layoutProcessor = layoutProcessor;
     exports.maskType = maskType;