@leafer/core 2.1.4 → 2.1.6

package/lib/core.cjs

@@ -214,7 +214,7 @@ const IncrementId = {
     RUNTIME: "runtime",
     LEAF: "leaf",
     TASK: "task",
-    CNAVAS: "canvas",
+    CANVAS: "canvas",
     IMAGE: "image",
     types: {},
     create(typeName) {
@@ -868,7 +868,7 @@ const PointHelper = {
         return quick ? t.x === point.x && t.y === point.y : float$1(t.x) === float$1(point.x) && float$1(t.y) === float$1(point.y);
     },
     reset(t) {
-        P$5.reset(t);
+        t.x = t.y = 0;
     }
 };
 
@@ -1077,6 +1077,7 @@ class Matrix {
     }
     reset() {
         MatrixHelper.reset(this);
+        return this;
     }
 }
 
@@ -2339,7 +2340,7 @@ class LeaferCanvasBase extends Canvas {
         this.worldTransform = {};
         if (!config) config = minSize;
         this.manager = manager;
-        this.innerId = IncrementId.create(IncrementId.CNAVAS);
+        this.innerId = IncrementId.create(IncrementId.CANVAS);
         const {width: width, height: height, pixelRatio: pixelRatio} = config;
         this.autoLayout = !width || !height;
         this.size.pixelRatio = pixelRatio || Platform.devicePixelRatio;
@@ -2489,6 +2490,7 @@ class LeaferCanvasBase extends Canvas {
     }
     useGrayscaleAlpha(bounds) {
         this.setTempPixelBounds(bounds, true, true);
+        if (!tempPixelBounds.width || !tempPixelBounds.height) return;
         let alpha, pixel;
         const {context: context} = this, imageData = context.getImageData(tempPixelBounds.x, tempPixelBounds.y, tempPixelBounds.width, tempPixelBounds.height), {data: data} = imageData;
         for (let i = 0, len = data.length; i < len; i += 4) {
@@ -3713,7 +3715,7 @@ const {arcTo: arcTo} = PathCommandDataHelper;
 
 const PathCorner = {
     smooth(data, cornerRadius, _cornerSmoothing) {
-        let command, lastCommand, commandLen;
+        let command, lastCommand, commandLen, startXIndex, startYIndex, smoothLen;
         let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
         if (isArray(cornerRadius)) cornerRadius = cornerRadius[0] || 0;
         const len = data.length, three = len === 9;
@@ -3722,6 +3724,11 @@ const PathCorner = {
             command = data[i];
             switch (command) {
               case M:
+                smoothLen = smooth.length;
+                if (smoothLen && lastCommand !== Z) {
+                    smooth[startXIndex] = startX;
+                    smooth[startYIndex] = startY;
+                }
                 startX = lastX = data[i + 1];
                 startY = lastY = data[i + 2];
                 i += 3;
@@ -3732,6 +3739,8 @@ const PathCorner = {
                 } else {
                     smooth.push(M, startX, startY);
                 }
+                startXIndex = smoothLen + 1;
+                startYIndex = smoothLen + 2;
                 break;
 
               case L$1:
@@ -3770,8 +3779,8 @@ const PathCorner = {
             lastCommand = command;
         }
         if (command !== Z) {
-            smooth[1] = startX;
-            smooth[2] = startY;
+            smooth[startXIndex] = startX;
+            smooth[startYIndex] = startY;
         }
         return smooth;
     }
@@ -5512,6 +5521,7 @@ class LeafLayout {
         this.renderChanged = true;
         this.renderSpread || (this.renderSpread = 1);
         this.boundsChanged = true;
+        this.hitCanvasChanged = true;
     }
     scaleChange() {
         this.scaleChanged = true;
@@ -6452,10 +6462,6 @@ exports.Leaf = class Leaf {
             }
         }
     }
-    set(_data, _isTemp) {}
-    get(_name) {
-        return undefined;
-    }
     setAttr(name, value) {
         this[name] = value;
     }
@@ -6472,37 +6478,10 @@ exports.Leaf = class Leaf {
     toString(options) {
         return JSON.stringify(this.toJSON(options));
     }
-    toSVG() {
-        return undefined;
-    }
-    __SVG(_data) {}
-    toHTML() {
-        return undefined;
-    }
-    __setAttr(_attrName, _newValue) {
-        return true;
-    }
-    __getAttr(_attrName) {
-        return undefined;
-    }
-    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;
+    scaleResize(scaleX, scaleY = scaleX, _noResize, _boundsType) {
+        this.scaleX *= scaleX;
+        this.scaleY *= scaleY;
     }
-    focus(_value) {}
-    updateState() {}
     updateLayout() {
         this.__layout.update();
     }
@@ -6518,27 +6497,6 @@ exports.Leaf = class Leaf {
     __extraUpdate() {
         if (this.leaferIsReady) this.leafer.layouter.addExtra(this);
     }
-    __updateWorldMatrix() {}
-    __updateLocalMatrix() {}
-    __updateWorldBounds() {}
-    __updateLocalBounds() {}
-    __updateLocalBoxBounds() {}
-    __updateLocalStrokeBounds() {}
-    __updateLocalRenderBounds() {}
-    __updateBoxBounds(_secondLayout, _bounds) {}
-    __updateContentBounds() {}
-    __updateStrokeBounds(_bounds) {}
-    __updateRenderBounds(_bounds) {}
-    __updateAutoLayout() {}
-    __updateFlowLayout() {}
-    __updateNaturalSize() {}
-    __updateStrokeSpread() {
-        return 0;
-    }
-    __updateRenderSpread() {
-        return 0;
-    }
-    __onUpdateSize() {}
     __updateEraser(value) {
         this.__hasEraser = value ? true : this.children.some(item => item.__.eraser);
     }
@@ -6552,7 +6510,6 @@ exports.Leaf = class Leaf {
     __updateMask(_value) {
         this.__hasMask = this.children.some(item => item.__.mask && item.__.visible && item.__.opacity);
     }
-    __renderMask(_canvas, _options) {}
     __getNowWorld(options) {
         if (options.matrix) {
             if (!this.__cameraWorld) this.__cameraWorld = {};
@@ -6708,76 +6665,12 @@ exports.Leaf = class Leaf {
     flip(axis, transition) {
         transform(this, getFlipTransform(this, axis), false, transition);
     }
-    scaleResize(scaleX, scaleY = scaleX, _noResize, _boundsType) {
-        this.scaleX *= scaleX;
-        this.scaleY *= scaleY;
-    }
-    __scaleResize(_scaleX, _scaleY) {}
-    resizeWidth(_width) {}
-    resizeHeight(_height) {}
-    hit(_world, _hitRadius) {
-        return true;
-    }
-    __hitWorld(_point, _forceHitFill) {
-        return true;
-    }
-    __hit(_local, _forceHitFill) {
-        return true;
-    }
-    __hitFill(_inner) {
-        return true;
-    }
-    __hitStroke(_inner, _strokeWidth) {
-        return true;
-    }
-    __hitPixel(_inner) {
-        return true;
-    }
-    __drawHitPath(_canvas) {}
-    __updateHitCanvas() {}
-    __render(_canvas, _options) {}
-    __drawFast(_canvas, _options) {}
-    __draw(_canvas, _options, _originCanvas) {}
-    __clip(_canvas, _options) {}
-    __renderShape(_canvas, _options) {}
-    __drawShape(_canvas, _options) {}
-    __updateWorldOpacity() {}
-    __updateChange() {}
-    __drawPath(_canvas) {}
-    __drawRenderPath(_canvas) {}
-    __updatePath() {}
-    __updateRenderPath(_updateCache) {}
-    getMotionPathData() {
-        return Plugin.need("path");
-    }
-    getMotionPoint(_motionDistance) {
-        return Plugin.need("path");
-    }
-    getMotionTotal() {
-        return 0;
-    }
-    __updateMotionPath() {}
-    __runAnimation(_type, _complete) {}
-    __updateSortChildren() {}
-    add(_child, _index) {}
     remove(_child, destroy) {
         if (this.parent) this.parent.remove(this, destroy);
     }
     dropTo(parent, index, resize) {
         drop(this, parent, index, resize);
     }
-    on(_type, _listener, _options) {}
-    off(_type, _listener, _options) {}
-    on_(_type, _listener, _bind, _options) {
-        return undefined;
-    }
-    off_(_id) {}
-    once(_type, _listener, _captureOrBind, _capture) {}
-    emit(_type, _event, _capture) {}
-    emitEvent(_event, _capture) {}
-    hasEvent(_type, _capture) {
-        return false;
-    }
     static changeAttr(attrName, defaultValue, fn) {
         fn ? this.addAttr(attrName, defaultValue, fn) : defineDataProcessor(this.prototype, attrName, defaultValue);
     }
@@ -7083,7 +6976,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.1.4";
+const version = "2.1.6";
 
 exports.AlignHelper = AlignHelper;
 

package/lib/core.esm.js

@@ -212,7 +212,7 @@ const IncrementId = {
     RUNTIME: "runtime",
     LEAF: "leaf",
     TASK: "task",
-    CNAVAS: "canvas",
+    CANVAS: "canvas",
     IMAGE: "image",
     types: {},
     create(typeName) {
@@ -866,7 +866,7 @@ const PointHelper = {
         return quick ? t.x === point.x && t.y === point.y : float$1(t.x) === float$1(point.x) && float$1(t.y) === float$1(point.y);
     },
     reset(t) {
-        P$5.reset(t);
+        t.x = t.y = 0;
     }
 };
 
@@ -1075,6 +1075,7 @@ class Matrix {
     }
     reset() {
         MatrixHelper.reset(this);
+        return this;
     }
 }
 
@@ -2337,7 +2338,7 @@ class LeaferCanvasBase extends Canvas {
         this.worldTransform = {};
         if (!config) config = minSize;
         this.manager = manager;
-        this.innerId = IncrementId.create(IncrementId.CNAVAS);
+        this.innerId = IncrementId.create(IncrementId.CANVAS);
         const {width: width, height: height, pixelRatio: pixelRatio} = config;
         this.autoLayout = !width || !height;
         this.size.pixelRatio = pixelRatio || Platform.devicePixelRatio;
@@ -2487,6 +2488,7 @@ class LeaferCanvasBase extends Canvas {
     }
     useGrayscaleAlpha(bounds) {
         this.setTempPixelBounds(bounds, true, true);
+        if (!tempPixelBounds.width || !tempPixelBounds.height) return;
         let alpha, pixel;
         const {context: context} = this, imageData = context.getImageData(tempPixelBounds.x, tempPixelBounds.y, tempPixelBounds.width, tempPixelBounds.height), {data: data} = imageData;
         for (let i = 0, len = data.length; i < len; i += 4) {
@@ -3711,7 +3713,7 @@ const {arcTo: arcTo} = PathCommandDataHelper;
 
 const PathCorner = {
     smooth(data, cornerRadius, _cornerSmoothing) {
-        let command, lastCommand, commandLen;
+        let command, lastCommand, commandLen, startXIndex, startYIndex, smoothLen;
         let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
         if (isArray(cornerRadius)) cornerRadius = cornerRadius[0] || 0;
         const len = data.length, three = len === 9;
@@ -3720,6 +3722,11 @@ const PathCorner = {
             command = data[i];
             switch (command) {
               case M:
+                smoothLen = smooth.length;
+                if (smoothLen && lastCommand !== Z) {
+                    smooth[startXIndex] = startX;
+                    smooth[startYIndex] = startY;
+                }
                 startX = lastX = data[i + 1];
                 startY = lastY = data[i + 2];
                 i += 3;
@@ -3730,6 +3737,8 @@ const PathCorner = {
                 } else {
                     smooth.push(M, startX, startY);
                 }
+                startXIndex = smoothLen + 1;
+                startYIndex = smoothLen + 2;
                 break;
 
               case L$1:
@@ -3768,8 +3777,8 @@ const PathCorner = {
             lastCommand = command;
         }
         if (command !== Z) {
-            smooth[1] = startX;
-            smooth[2] = startY;
+            smooth[startXIndex] = startX;
+            smooth[startYIndex] = startY;
         }
         return smooth;
     }
@@ -5510,6 +5519,7 @@ class LeafLayout {
         this.renderChanged = true;
         this.renderSpread || (this.renderSpread = 1);
         this.boundsChanged = true;
+        this.hitCanvasChanged = true;
     }
     scaleChange() {
         this.scaleChanged = true;
@@ -6450,10 +6460,6 @@ let Leaf = class Leaf {
             }
         }
     }
-    set(_data, _isTemp) {}
-    get(_name) {
-        return undefined;
-    }
     setAttr(name, value) {
         this[name] = value;
     }
@@ -6470,37 +6476,10 @@ let Leaf = class Leaf {
     toString(options) {
         return JSON.stringify(this.toJSON(options));
     }
-    toSVG() {
-        return undefined;
-    }
-    __SVG(_data) {}
-    toHTML() {
-        return undefined;
-    }
-    __setAttr(_attrName, _newValue) {
-        return true;
-    }
-    __getAttr(_attrName) {
-        return undefined;
-    }
-    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;
+    scaleResize(scaleX, scaleY = scaleX, _noResize, _boundsType) {
+        this.scaleX *= scaleX;
+        this.scaleY *= scaleY;
     }
-    focus(_value) {}
-    updateState() {}
     updateLayout() {
         this.__layout.update();
     }
@@ -6516,27 +6495,6 @@ let Leaf = class Leaf {
     __extraUpdate() {
         if (this.leaferIsReady) this.leafer.layouter.addExtra(this);
     }
-    __updateWorldMatrix() {}
-    __updateLocalMatrix() {}
-    __updateWorldBounds() {}
-    __updateLocalBounds() {}
-    __updateLocalBoxBounds() {}
-    __updateLocalStrokeBounds() {}
-    __updateLocalRenderBounds() {}
-    __updateBoxBounds(_secondLayout, _bounds) {}
-    __updateContentBounds() {}
-    __updateStrokeBounds(_bounds) {}
-    __updateRenderBounds(_bounds) {}
-    __updateAutoLayout() {}
-    __updateFlowLayout() {}
-    __updateNaturalSize() {}
-    __updateStrokeSpread() {
-        return 0;
-    }
-    __updateRenderSpread() {
-        return 0;
-    }
-    __onUpdateSize() {}
     __updateEraser(value) {
         this.__hasEraser = value ? true : this.children.some(item => item.__.eraser);
     }
@@ -6550,7 +6508,6 @@ let Leaf = class Leaf {
     __updateMask(_value) {
         this.__hasMask = this.children.some(item => item.__.mask && item.__.visible && item.__.opacity);
     }
-    __renderMask(_canvas, _options) {}
     __getNowWorld(options) {
         if (options.matrix) {
             if (!this.__cameraWorld) this.__cameraWorld = {};
@@ -6706,76 +6663,12 @@ let Leaf = class Leaf {
     flip(axis, transition) {
         transform(this, getFlipTransform(this, axis), false, transition);
     }
-    scaleResize(scaleX, scaleY = scaleX, _noResize, _boundsType) {
-        this.scaleX *= scaleX;
-        this.scaleY *= scaleY;
-    }
-    __scaleResize(_scaleX, _scaleY) {}
-    resizeWidth(_width) {}
-    resizeHeight(_height) {}
-    hit(_world, _hitRadius) {
-        return true;
-    }
-    __hitWorld(_point, _forceHitFill) {
-        return true;
-    }
-    __hit(_local, _forceHitFill) {
-        return true;
-    }
-    __hitFill(_inner) {
-        return true;
-    }
-    __hitStroke(_inner, _strokeWidth) {
-        return true;
-    }
-    __hitPixel(_inner) {
-        return true;
-    }
-    __drawHitPath(_canvas) {}
-    __updateHitCanvas() {}
-    __render(_canvas, _options) {}
-    __drawFast(_canvas, _options) {}
-    __draw(_canvas, _options, _originCanvas) {}
-    __clip(_canvas, _options) {}
-    __renderShape(_canvas, _options) {}
-    __drawShape(_canvas, _options) {}
-    __updateWorldOpacity() {}
-    __updateChange() {}
-    __drawPath(_canvas) {}
-    __drawRenderPath(_canvas) {}
-    __updatePath() {}
-    __updateRenderPath(_updateCache) {}
-    getMotionPathData() {
-        return Plugin.need("path");
-    }
-    getMotionPoint(_motionDistance) {
-        return Plugin.need("path");
-    }
-    getMotionTotal() {
-        return 0;
-    }
-    __updateMotionPath() {}
-    __runAnimation(_type, _complete) {}
-    __updateSortChildren() {}
-    add(_child, _index) {}
     remove(_child, destroy) {
         if (this.parent) this.parent.remove(this, destroy);
     }
     dropTo(parent, index, resize) {
         drop(this, parent, index, resize);
     }
-    on(_type, _listener, _options) {}
-    off(_type, _listener, _options) {}
-    on_(_type, _listener, _bind, _options) {
-        return undefined;
-    }
-    off_(_id) {}
-    once(_type, _listener, _captureOrBind, _capture) {}
-    emit(_type, _event, _capture) {}
-    emitEvent(_event, _capture) {}
-    hasEvent(_type, _capture) {
-        return false;
-    }
     static changeAttr(attrName, defaultValue, fn) {
         fn ? this.addAttr(attrName, defaultValue, fn) : defineDataProcessor(this.prototype, attrName, defaultValue);
     }
@@ -7081,6 +6974,6 @@ class LeafLevelList {
     }
 }
 
-const version = "2.1.4";
+const version = "2.1.6";
 
 export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, FourNumberHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferFilm, LeaferImage, LeaferVideo, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Plugin, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Resource, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, UnitConvertHelper, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, 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 };