@leafer/core 1.5.0 → 1.5.2

package/lib/core.cjs

@@ -118,8 +118,9 @@ const MathHelper = {
         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);
@@ -1692,6 +1693,9 @@ const emptyData = {};
 function isNull(value) {
     return value === undefined || value === null;
 }
+function isEmptyData(value) {
+    return JSON.stringify(value) === '{}';
+}
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -2031,13 +2035,11 @@ class LeaferCanvasBase extends Canvas {
         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();
     }
@@ -2234,7 +2236,7 @@ class LeaferCanvasBase extends Canvas {
             tempBounds.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));
@@ -2349,7 +2351,7 @@ const RectHelper = {
 const { sin: sin$1, cos: cos$1, atan2: atan2$1, ceil, abs: abs$1, PI, 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$1 = {};
 const BezierHelper = {
     points(data, originPoints, curve, close) {
@@ -2384,7 +2386,7 @@ const BezierHelper = {
                         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;
@@ -2489,7 +2491,7 @@ const BezierHelper = {
             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;
@@ -2503,7 +2505,7 @@ const BezierHelper = {
             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);
@@ -2611,7 +2613,7 @@ const EllipseHelper = {
     }
 };
 
-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$1, roundRect: roundRect$2, arcTo: arcTo$3, arc: arc$3, ellipse: ellipse$3, quadraticCurveTo: quadraticCurveTo$1 } = BezierHelper;
 const { ellipticalArc } = EllipseHelper;
 const debug$7 = Debug.get('PathConvert');
@@ -2739,14 +2741,14 @@ const PathConvert = {
                     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:
@@ -2756,13 +2758,13 @@ const PathConvert = {
                     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:
@@ -2873,7 +2875,7 @@ const PathConvert = {
                     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);
@@ -2900,7 +2902,7 @@ const PathConvert = {
 };
 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 } = Math;
 const startPoint = {};
@@ -2915,7 +2917,7 @@ const PathCommandDataHelper = {
         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);
@@ -3077,7 +3079,7 @@ class PathCreator {
     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$6 = Debug.get('PathDrawer');
 const PathDrawer = {
     drawPathByData(drawer, data) {
@@ -3096,7 +3098,7 @@ const PathDrawer = {
                     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;
@@ -3148,7 +3150,7 @@ const PathDrawer = {
     }
 };
 
-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 } = BezierHelper;
 const { addPointBounds, copy: copy$4, addPoint, setPoint, addBounds, toBounds: toBounds$1 } = TwoPointBoundsHelper;
 const debug$5 = Debug.get('PathBounds');
@@ -3169,7 +3171,7 @@ const PathBounds = {
         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 {
@@ -3184,7 +3186,7 @@ const PathBounds = {
                     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);
@@ -3266,12 +3268,12 @@ const PathBounds = {
     }
 };
 
-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 = [];
@@ -3308,15 +3310,16 @@ const PathCorner = {
                     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) {
@@ -4075,33 +4078,45 @@ function defineDataProcessor(target, key, defaultValue) {
     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;
@@ -4528,7 +4543,12 @@ class LeafLayout {
             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') {
@@ -6053,7 +6073,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.5.0";
+const version = "1.5.2";
 
 exports.AlignHelper = AlignHelper;
 exports.AroundHelper = AroundHelper;
@@ -6148,6 +6168,7 @@ exports.getDescriptor = getDescriptor;
 exports.getMatrixData = getMatrixData;
 exports.getPointData = getPointData;
 exports.hitType = hitType;
+exports.isEmptyData = isEmptyData;
 exports.isNull = isNull;
 exports.layoutProcessor = layoutProcessor;
 exports.maskType = maskType;