@leafer/core 1.9.3 → 1.9.5

package/lib/core.cjs

@@ -56,7 +56,7 @@ function isUndefined(value) {
 }
 
 function isNull(value) {
-    return value === undefined || value === null;
+    return value == null;
 }
 
 function isString(value) {
@@ -138,6 +138,9 @@ class LeafData {
         const {path: path} = this;
         return path && path.length === 6 && path[0] === 1;
     }
+    get __usePathBox() {
+        return this.__pathInputed;
+    }
     get __blendMode() {
         if (this.eraser && this.eraser !== "path") return "destination-out";
         const {blendMode: blendMode} = this;
@@ -306,6 +309,9 @@ const MathHelper = {
         num = round$3(num * a) / a;
         return num === -0 ? 0 : num;
     },
+    sign(num) {
+        return num < 0 ? -1 : 1;
+    },
     getScaleData(scale, size, originSize, scaleData) {
         if (!scaleData) scaleData = {};
         if (size) {
@@ -2220,15 +2226,15 @@ class LeaferCanvasBase extends Canvas {
         DataHelper.copyAttrs(s, size, canvasSizeAttrs);
         canvasSizeAttrs.forEach(key => s[key] || (s[key] = 1));
         this.bounds = new Bounds(0, 0, this.width, this.height);
-        if (this.context && !this.unreal) {
-            this.updateViewSize();
-            this.smooth = this.config.smooth;
-        }
+        this.updateViewSize();
         this.updateClientBounds();
-        if (this.context && !this.unreal && takeCanvas) {
-            this.clearWorld(takeCanvas.bounds);
-            this.copyWorld(takeCanvas);
-            takeCanvas.recycle();
+        if (this.context) {
+            this.smooth = this.config.smooth;
+            if (!this.unreal && takeCanvas) {
+                this.clearWorld(takeCanvas.bounds);
+                this.copyWorld(takeCanvas);
+                takeCanvas.recycle();
+            }
         }
     }
     updateViewSize() {}
@@ -2542,7 +2548,7 @@ const RectHelper = {
     }
 };
 
-const {sin: sin$1, cos: cos$1, atan2: atan2$1, ceil: ceil, abs: abs$1, PI: PI, sqrt: sqrt$1, pow: pow} = Math;
+const {sin: sin$1, cos: cos$1, hypot: hypot, atan2: atan2$1, ceil: ceil, abs: abs$1, PI: PI, sqrt: sqrt$1, pow: pow} = Math;
 
 const {setPoint: setPoint$1, addPoint: addPoint$1} = TwoPointBoundsHelper;
 
@@ -2613,9 +2619,11 @@ const BezierHelper = {
         const CBy = toY - y1;
         let startRadian = atan2$1(BAy, BAx);
         let endRadian = atan2$1(CBy, CBx);
+        const lenBA = hypot(BAx, BAy);
+        const lenCB = hypot(CBx, CBy);
         let totalRadian = endRadian - startRadian;
         if (totalRadian < 0) totalRadian += PI2;
-        if (totalRadian === PI || abs$1(BAx + BAy) < 1e-12 || abs$1(CBx + CBy) < 1e-12) {
+        if (lenBA < 1e-12 || lenCB < 1e-12 || totalRadian < 1e-12 || abs$1(totalRadian - PI) < 1e-12) {
             if (data) data.push(L$6, x1, y1);
             if (setPointBounds) {
                 setPoint$1(setPointBounds, fromX, fromY);
@@ -3207,11 +3215,7 @@ class PathCreator {
         this.set(path);
     }
     set(path) {
-        if (path) {
-            this.__path = isString(path) ? PathHelper.parse(path) : path;
-        } else {
-            this.__path = [];
-        }
+        this.__path = path ? isString(path) ? PathHelper.parse(path) : path : [];
         return this;
     }
     beginPath() {
@@ -3581,14 +3585,18 @@ const PathCorner = {
     }
 };
 
-PathHelper.creator = new PathCreator;
+function path(path) {
+    return new PathCreator(path);
+}
+
+const pen = path();
+
+PathHelper.creator = path();
 
 PathHelper.parse = PathConvert.parse;
 
 PathHelper.convertToCanvasData = PathConvert.toCanvasData;
 
-const pen = new PathCreator;
-
 const {drawRoundRect: drawRoundRect} = RectHelper;
 
 function roundRect(drawer) {
@@ -3953,7 +3961,7 @@ const ImageManager = {
         return FileHelper.alphaPixelTypes.some(item => I.isFormat(item, config));
     },
     isFormat(format, config) {
-        if (config.format === format) return true;
+        if (config.format) return config.format === format;
         const {url: url} = config;
         if (url.startsWith("data:")) {
             if (url.startsWith("data:" + FileHelper.mineType(format))) return true;
@@ -4047,7 +4055,7 @@ class LeaferImage {
     getFull(_filters) {
         return this.view;
     }
-    getCanvas(width, height, opacity, _filters, xGap, yGap) {
+    getCanvas(width, height, opacity, _filters, xGap, yGap, smooth) {
         width || (width = this.width);
         height || (height = this.height);
         if (this.cache) {
@@ -4063,6 +4071,7 @@ class LeaferImage {
         const canvas = Platform.origin.createCanvas(max(floor(width + (xGap || 0)), 1), max(floor(height + (yGap || 0)), 1));
         const ctx = canvas.getContext("2d");
         if (opacity) ctx.globalAlpha = opacity;
+        ctx.imageSmoothingEnabled = smooth === false ? false : true;
         ctx.drawImage(this.view, 0, 0, width, height);
         this.cache = this.use > 1 ? {
             data: canvas,
@@ -4104,7 +4113,7 @@ function createDescriptor(key, defaultValue) {
     return {
         get() {
             const v = this[privateKey];
-            return isUndefined(v) ? defaultValue : v;
+            return v == null ? defaultValue : v;
         },
         set(value) {
             this[privateKey] = value;
@@ -4390,21 +4399,21 @@ function defineDataProcessor(target, key, defaultValue) {
         };
     } else if (typeof defaultValue === "function") {
         property.get = function() {
-            let v = this[computedKey];
-            return v === undefined ? defaultValue(this.__leaf) : v;
+            const v = this[computedKey];
+            return v == null ? defaultValue(this.__leaf) : v;
         };
     } else if (isObject(defaultValue)) {
         const isEmpty = isEmptyData(defaultValue);
         property.get = function() {
-            let v = this[computedKey];
-            return v === undefined ? this[computedKey] = isEmpty ? {} : DataHelper.clone(defaultValue) : v;
+            const v = this[computedKey];
+            return v == null ? this[computedKey] = isEmpty ? {} : DataHelper.clone(defaultValue) : v;
         };
     }
     const isBox = target.isBranchLeaf;
     if (key === "width") {
         property.get = function() {
             const v = this[computedKey];
-            if (v === undefined) {
+            if (v == null) {
                 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;
@@ -4414,7 +4423,7 @@ function defineDataProcessor(target, key, defaultValue) {
     } else if (key === "height") {
         property.get = function() {
             const v = this[computedKey];
-            if (v === undefined) {
+            if (v == null) {
                 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;
@@ -4714,8 +4723,9 @@ const L = LeafHelper;
 
 const {updateAllMatrix: updateAllMatrix$1, updateMatrix: updateMatrix$1, updateAllWorldOpacity: updateAllWorldOpacity, updateAllChange: updateAllChange, updateChange: updateChange} = L;
 
-function getTempLocal(t, world) {
-    return t.parent ? PointHelper.tempToInnerOf(world, t.parent.scrollWorldTransform) : world;
+function getTempLocal(t, worldPoint) {
+    t.updateLayout();
+    return t.parent ? PointHelper.tempToInnerOf(worldPoint, t.parent.scrollWorldTransform) : worldPoint;
 }
 
 const LeafBoundsHelper = {
@@ -5174,7 +5184,7 @@ class LeafLayout {
     }
     boxChange() {
         this.boxChanged = true;
-        this.localBoxChanged || this.localBoxChange();
+        this.localBoxChanged ? this.boundsChanged || (this.boundsChanged = true) : this.localBoxChange();
         this.hitCanvasChanged = true;
     }
     localBoxChange() {
@@ -5208,7 +5218,7 @@ class LeafLayout {
     }
     matrixChange() {
         this.matrixChanged = true;
-        this.localBoxChanged || this.localBoxChange();
+        this.localBoxChanged ? this.boundsChanged || (this.boundsChanged = true) : this.localBoxChange();
     }
     surfaceChange() {
         this.surfaceChanged = true;
@@ -5805,7 +5815,7 @@ const LeafBounds = {
     __updateBoxBounds(_secondLayout, _bounds) {
         const b = this.__layout.boxBounds;
         const data = this.__;
-        if (data.__pathInputed) {
+        if (data.__usePathBox) {
             toBounds(data.path, b);
         } else {
             b.x = 0;
@@ -6274,10 +6284,10 @@ exports.Leaf = class Leaf {
             relative.innerToWorld(world, to, distance);
             world = to ? to : world;
         }
-        toInnerPoint(this.worldTransform, world, to, distance);
+        toInnerPoint(this.scrollWorldTransform, world, to, distance);
     }
     innerToWorld(inner, to, distance, relative) {
-        toOuterPoint(this.worldTransform, inner, to, distance);
+        toOuterPoint(this.scrollWorldTransform, inner, to, distance);
         if (relative) relative.worldToInner(to ? to : inner, null, distance);
     }
     getBoxPoint(world, relative, distance, change) {
@@ -6741,7 +6751,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.9.3";
+const version = "1.9.5";
 
 exports.AlignHelper = AlignHelper;
 
@@ -6963,6 +6973,8 @@ exports.naturalBoundsType = naturalBoundsType;
 
 exports.opacityType = opacityType;
 
+exports.path = path;
+
 exports.pathInputType = pathInputType;
 
 exports.pathType = pathType;

package/lib/core.esm.js

@@ -54,7 +54,7 @@ function isUndefined(value) {
 }
 
 function isNull(value) {
-    return value === undefined || value === null;
+    return value == null;
 }
 
 function isString(value) {
@@ -136,6 +136,9 @@ class LeafData {
         const {path: path} = this;
         return path && path.length === 6 && path[0] === 1;
     }
+    get __usePathBox() {
+        return this.__pathInputed;
+    }
     get __blendMode() {
         if (this.eraser && this.eraser !== "path") return "destination-out";
         const {blendMode: blendMode} = this;
@@ -304,6 +307,9 @@ const MathHelper = {
         num = round$3(num * a) / a;
         return num === -0 ? 0 : num;
     },
+    sign(num) {
+        return num < 0 ? -1 : 1;
+    },
     getScaleData(scale, size, originSize, scaleData) {
         if (!scaleData) scaleData = {};
         if (size) {
@@ -2218,15 +2224,15 @@ class LeaferCanvasBase extends Canvas {
         DataHelper.copyAttrs(s, size, canvasSizeAttrs);
         canvasSizeAttrs.forEach(key => s[key] || (s[key] = 1));
         this.bounds = new Bounds(0, 0, this.width, this.height);
-        if (this.context && !this.unreal) {
-            this.updateViewSize();
-            this.smooth = this.config.smooth;
-        }
+        this.updateViewSize();
         this.updateClientBounds();
-        if (this.context && !this.unreal && takeCanvas) {
-            this.clearWorld(takeCanvas.bounds);
-            this.copyWorld(takeCanvas);
-            takeCanvas.recycle();
+        if (this.context) {
+            this.smooth = this.config.smooth;
+            if (!this.unreal && takeCanvas) {
+                this.clearWorld(takeCanvas.bounds);
+                this.copyWorld(takeCanvas);
+                takeCanvas.recycle();
+            }
         }
     }
     updateViewSize() {}
@@ -2540,7 +2546,7 @@ const RectHelper = {
     }
 };
 
-const {sin: sin$1, cos: cos$1, atan2: atan2$1, ceil: ceil, abs: abs$1, PI: PI, sqrt: sqrt$1, pow: pow} = Math;
+const {sin: sin$1, cos: cos$1, hypot: hypot, atan2: atan2$1, ceil: ceil, abs: abs$1, PI: PI, sqrt: sqrt$1, pow: pow} = Math;
 
 const {setPoint: setPoint$1, addPoint: addPoint$1} = TwoPointBoundsHelper;
 
@@ -2611,9 +2617,11 @@ const BezierHelper = {
         const CBy = toY - y1;
         let startRadian = atan2$1(BAy, BAx);
         let endRadian = atan2$1(CBy, CBx);
+        const lenBA = hypot(BAx, BAy);
+        const lenCB = hypot(CBx, CBy);
         let totalRadian = endRadian - startRadian;
         if (totalRadian < 0) totalRadian += PI2;
-        if (totalRadian === PI || abs$1(BAx + BAy) < 1e-12 || abs$1(CBx + CBy) < 1e-12) {
+        if (lenBA < 1e-12 || lenCB < 1e-12 || totalRadian < 1e-12 || abs$1(totalRadian - PI) < 1e-12) {
             if (data) data.push(L$6, x1, y1);
             if (setPointBounds) {
                 setPoint$1(setPointBounds, fromX, fromY);
@@ -3205,11 +3213,7 @@ class PathCreator {
         this.set(path);
     }
     set(path) {
-        if (path) {
-            this.__path = isString(path) ? PathHelper.parse(path) : path;
-        } else {
-            this.__path = [];
-        }
+        this.__path = path ? isString(path) ? PathHelper.parse(path) : path : [];
         return this;
     }
     beginPath() {
@@ -3579,14 +3583,18 @@ const PathCorner = {
     }
 };
 
-PathHelper.creator = new PathCreator;
+function path(path) {
+    return new PathCreator(path);
+}
+
+const pen = path();
+
+PathHelper.creator = path();
 
 PathHelper.parse = PathConvert.parse;
 
 PathHelper.convertToCanvasData = PathConvert.toCanvasData;
 
-const pen = new PathCreator;
-
 const {drawRoundRect: drawRoundRect} = RectHelper;
 
 function roundRect(drawer) {
@@ -3951,7 +3959,7 @@ const ImageManager = {
         return FileHelper.alphaPixelTypes.some(item => I.isFormat(item, config));
     },
     isFormat(format, config) {
-        if (config.format === format) return true;
+        if (config.format) return config.format === format;
         const {url: url} = config;
         if (url.startsWith("data:")) {
             if (url.startsWith("data:" + FileHelper.mineType(format))) return true;
@@ -4045,7 +4053,7 @@ class LeaferImage {
     getFull(_filters) {
         return this.view;
     }
-    getCanvas(width, height, opacity, _filters, xGap, yGap) {
+    getCanvas(width, height, opacity, _filters, xGap, yGap, smooth) {
         width || (width = this.width);
         height || (height = this.height);
         if (this.cache) {
@@ -4061,6 +4069,7 @@ class LeaferImage {
         const canvas = Platform.origin.createCanvas(max(floor(width + (xGap || 0)), 1), max(floor(height + (yGap || 0)), 1));
         const ctx = canvas.getContext("2d");
         if (opacity) ctx.globalAlpha = opacity;
+        ctx.imageSmoothingEnabled = smooth === false ? false : true;
         ctx.drawImage(this.view, 0, 0, width, height);
         this.cache = this.use > 1 ? {
             data: canvas,
@@ -4102,7 +4111,7 @@ function createDescriptor(key, defaultValue) {
     return {
         get() {
             const v = this[privateKey];
-            return isUndefined(v) ? defaultValue : v;
+            return v == null ? defaultValue : v;
         },
         set(value) {
             this[privateKey] = value;
@@ -4388,21 +4397,21 @@ function defineDataProcessor(target, key, defaultValue) {
         };
     } else if (typeof defaultValue === "function") {
         property.get = function() {
-            let v = this[computedKey];
-            return v === undefined ? defaultValue(this.__leaf) : v;
+            const v = this[computedKey];
+            return v == null ? defaultValue(this.__leaf) : v;
         };
     } else if (isObject(defaultValue)) {
         const isEmpty = isEmptyData(defaultValue);
         property.get = function() {
-            let v = this[computedKey];
-            return v === undefined ? this[computedKey] = isEmpty ? {} : DataHelper.clone(defaultValue) : v;
+            const v = this[computedKey];
+            return v == null ? this[computedKey] = isEmpty ? {} : DataHelper.clone(defaultValue) : v;
         };
     }
     const isBox = target.isBranchLeaf;
     if (key === "width") {
         property.get = function() {
             const v = this[computedKey];
-            if (v === undefined) {
+            if (v == null) {
                 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;
@@ -4412,7 +4421,7 @@ function defineDataProcessor(target, key, defaultValue) {
     } else if (key === "height") {
         property.get = function() {
             const v = this[computedKey];
-            if (v === undefined) {
+            if (v == null) {
                 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;
@@ -4712,8 +4721,9 @@ const L = LeafHelper;
 
 const {updateAllMatrix: updateAllMatrix$1, updateMatrix: updateMatrix$1, updateAllWorldOpacity: updateAllWorldOpacity, updateAllChange: updateAllChange, updateChange: updateChange} = L;
 
-function getTempLocal(t, world) {
-    return t.parent ? PointHelper.tempToInnerOf(world, t.parent.scrollWorldTransform) : world;
+function getTempLocal(t, worldPoint) {
+    t.updateLayout();
+    return t.parent ? PointHelper.tempToInnerOf(worldPoint, t.parent.scrollWorldTransform) : worldPoint;
 }
 
 const LeafBoundsHelper = {
@@ -5172,7 +5182,7 @@ class LeafLayout {
     }
     boxChange() {
         this.boxChanged = true;
-        this.localBoxChanged || this.localBoxChange();
+        this.localBoxChanged ? this.boundsChanged || (this.boundsChanged = true) : this.localBoxChange();
         this.hitCanvasChanged = true;
     }
     localBoxChange() {
@@ -5206,7 +5216,7 @@ class LeafLayout {
     }
     matrixChange() {
         this.matrixChanged = true;
-        this.localBoxChanged || this.localBoxChange();
+        this.localBoxChanged ? this.boundsChanged || (this.boundsChanged = true) : this.localBoxChange();
     }
     surfaceChange() {
         this.surfaceChanged = true;
@@ -5803,7 +5813,7 @@ const LeafBounds = {
     __updateBoxBounds(_secondLayout, _bounds) {
         const b = this.__layout.boxBounds;
         const data = this.__;
-        if (data.__pathInputed) {
+        if (data.__usePathBox) {
             toBounds(data.path, b);
         } else {
             b.x = 0;
@@ -6272,10 +6282,10 @@ let Leaf = class Leaf {
             relative.innerToWorld(world, to, distance);
             world = to ? to : world;
         }
-        toInnerPoint(this.worldTransform, world, to, distance);
+        toInnerPoint(this.scrollWorldTransform, world, to, distance);
     }
     innerToWorld(inner, to, distance, relative) {
-        toOuterPoint(this.worldTransform, inner, to, distance);
+        toOuterPoint(this.scrollWorldTransform, inner, to, distance);
         if (relative) relative.worldToInner(to ? to : inner, null, distance);
     }
     getBoxPoint(world, relative, distance, change) {
@@ -6739,6 +6749,6 @@ class LeafLevelList {
     }
 }
 
-const version = "1.9.3";
+const version = "1.9.5";
 
-export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferImage, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Plugin, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Resource, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, tryToNumber, useModule, version, visibleType };
+export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferImage, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Plugin, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Resource, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, tryToNumber, useModule, version, visibleType };