leafer-draw 2.1.4 → 2.1.6

package/dist/web.module.js

@@ -260,7 +260,7 @@ const IncrementId = {
     RUNTIME: "runtime",
     LEAF: "leaf",
     TASK: "task",
-    CNAVAS: "canvas",
+    CANVAS: "canvas",
     IMAGE: "image",
     types: {},
     create(typeName) {
@@ -914,7 +914,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;
     }
 };
 
@@ -1123,6 +1123,7 @@ class Matrix {
     }
     reset() {
         MatrixHelper.reset(this);
+        return this;
     }
 }
 
@@ -2346,7 +2347,7 @@ class LeaferCanvasBase extends Canvas$1 {
         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;
@@ -2496,6 +2497,7 @@ class LeaferCanvasBase extends Canvas$1 {
     }
     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) {
@@ -3720,7 +3722,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;
@@ -3729,6 +3731,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;
@@ -3739,6 +3746,8 @@ const PathCorner = {
                 } else {
                     smooth.push(M, startX, startY);
                 }
+                startXIndex = smoothLen + 1;
+                startYIndex = smoothLen + 2;
                 break;
 
               case L$1:
@@ -3777,8 +3786,8 @@ const PathCorner = {
             lastCommand = command;
         }
         if (command !== Z) {
-            smooth[1] = startX;
-            smooth[2] = startY;
+            smooth[startXIndex] = startX;
+            smooth[startYIndex] = startY;
         }
         return smooth;
     }
@@ -5519,6 +5528,7 @@ class LeafLayout {
         this.renderChanged = true;
         this.renderSpread || (this.renderSpread = 1);
         this.boundsChanged = true;
+        this.hitCanvasChanged = true;
     }
     scaleChange() {
         this.scaleChanged = true;
@@ -6459,10 +6469,6 @@ let Leaf = class Leaf {
             }
         }
     }
-    set(_data, _isTemp) {}
-    get(_name) {
-        return undefined;
-    }
     setAttr(name, value) {
         this[name] = value;
     }
@@ -6479,37 +6485,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();
     }
@@ -6525,27 +6504,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);
     }
@@ -6559,7 +6517,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 = {};
@@ -6715,76 +6672,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);
     }
@@ -7090,7 +6983,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.1.4";
+const version = "2.1.6";
 
 const debug$4 = Debug.get("LeaferCanvas");
 
@@ -8571,17 +8464,12 @@ let UI = UI_1 = class UI extends Leaf {
         if (!path) this.__drawPathByBox(pen);
         return pen;
     }
-    reset(_data) {}
     set(data, _transition) {
         if (data) Object.assign(this, data);
     }
     get(name) {
         return isString(name) ? this.__.__getInput(name) : this.__.__getInputData(name);
     }
-    createProxyData() {
-        return undefined;
-    }
-    clearProxyData() {}
     find(_condition, _options) {
         return Plugin.need("find");
     }
@@ -8619,6 +8507,7 @@ let UI = UI_1 = class UI extends Leaf {
             data.lazy && !this.__inLazyBounds && !Export.running ? data.__needComputePaint = true : data.__computePaint();
         }
     }
+    __updatePath() {}
     __updateRenderPath(updateCache) {
         const data = this.__;
         if (data.path) {
@@ -8654,7 +8543,6 @@ let UI = UI_1 = class UI extends Leaf {
         this.set(keyframe);
         return Plugin.need("animate");
     }
-    killAnimate(_type, _nextStyle) {}
     export(_filename, _options) {
         return Plugin.need("export");
     }
@@ -8830,8 +8718,6 @@ __decorate([ dataType(100) ], UI.prototype, "placeholderDelay", void 0);
 
 __decorate([ dataType({}) ], UI.prototype, "data", void 0);
 
-__decorate([ rewrite(Leaf.prototype.reset) ], UI.prototype, "reset", null);
-
 UI = UI_1 = __decorate([ useModule(UIBounds), useModule(UIRender), rewriteAble() ], UI);
 
 let Group = class Group extends UI {
@@ -8868,9 +8754,6 @@ let Group = class Group extends UI {
         }
         return data;
     }
-    pick(_hitPoint, _options) {
-        return undefined;
-    }
     addAt(child, index) {
         this.add(child, index);
     }
@@ -8880,11 +8763,6 @@ let Group = class Group extends UI {
     addBefore(child, before) {
         this.add(child, this.children.indexOf(before));
     }
-    add(_child, _index) {}
-    addMany(..._children) {}
-    remove(_child, _destroy) {}
-    removeAll(_destroy) {}
-    clear() {}
 };
 
 __decorate([ dataProcessor(GroupData) ], Group.prototype, "__", void 0);
@@ -9858,51 +9736,6 @@ let Pen = class Pen extends Group {
         this.add(path);
         return this;
     }
-    beginPath() {
-        return this;
-    }
-    moveTo(_x, _y) {
-        return this;
-    }
-    lineTo(_x, _y) {
-        return this;
-    }
-    bezierCurveTo(_x1, _y1, _x2, _y2, _x, _y) {
-        return this;
-    }
-    quadraticCurveTo(_x1, _y1, _x, _y) {
-        return this;
-    }
-    closePath() {
-        return this;
-    }
-    rect(_x, _y, _width, _height) {
-        return this;
-    }
-    roundRect(_x, _y, _width, _height, _cornerRadius) {
-        return this;
-    }
-    ellipse(_x, _y, _radiusX, _radiusY, _rotation, _startAngle, _endAngle, _anticlockwise) {
-        return this;
-    }
-    arc(_x, _y, _radius, _startAngle, _endAngle, _anticlockwise) {
-        return this;
-    }
-    arcTo(_x1, _y1, _x2, _y2, _radius) {
-        return this;
-    }
-    drawEllipse(_x, _y, _radiusX, _radiusY, _rotation, _startAngle, _endAngle, _anticlockwise) {
-        return this;
-    }
-    drawArc(_x, _y, _radius, _startAngle, _endAngle, _anticlockwise) {
-        return this;
-    }
-    drawPoints(_points, _curve, _close) {
-        return this;
-    }
-    clearPath() {
-        return this;
-    }
     paint() {
         const {pathElement: pathElement} = this;
         if (!pathElement.__layout.boxChanged) pathElement.forceUpdate("path");
@@ -10368,7 +10201,7 @@ function checkSizeAndCreateData(ui, attrName, paint, image, leafPaint, boxBounds
             needUpdate = false;
         }
     }
-    if (paint.mode === "brush") PaintImage.brush(leafPaint, ui);
+    if (paint.mode === "brush") PaintImage.brush(leafPaint, ui, attrName);
     if (!leafPaint.data) {
         PaintImage.createData(leafPaint, image, paint, boxBounds);
         const {transform: transform} = leafPaint.data, {opacity: opacity} = paint;
@@ -10463,8 +10296,9 @@ function getPatternData(paint, box, image) {
         break;
 
       case "repeat":
-      case "brush":
         if (!sameBox || scaleX || rotation || skew) PaintImage.repeatMode(data, box, width, height, tempImage.x, tempImage.y, scaleX, scaleY, rotation, skew, align, paint.freeTransform);
+
+      case "brush":
         if (!repeat) data.repeat = "repeat";
         const count = isObject(repeat);
         if (gap || count) data.gap = getGapData(gap, count && repeat, tempImage.width, tempImage.height, box);
@@ -10475,7 +10309,7 @@ function getPatternData(paint, box, image) {
       default:
         if (scaleX) PaintImage.fillOrFitMode(data, box, tempImage.x, tempImage.y, scaleX, scaleY, rotation);
     }
-    if (!data.transform) {
+    if (!data.transform && mode !== "brush") {
         if (box.x || box.y) translate$1(data.transform = get$3(), box.x, box.y);
     }
     if (scaleX) {
@@ -10604,8 +10438,9 @@ function createPattern(paint, ui, canvas, renderOptions) {
     let {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = paint.film ? paint.nowIndex : scaleX + "-" + scaleY;
     if (paint.patternId !== id && !ui.destroyed) {
         if (!(Platform.image.isLarge(paint.image, scaleX, scaleY) && !paint.data.repeat)) {
-            const {image: image, brush: brush, data: data} = paint, {opacity: opacity} = paint.originPaint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
-            let imageMatrix, xGap, yGap, {width: width, height: height} = image;
+            const {image: image, brush: brush, data: data} = paint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
+            let imageMatrix, xGap, yGap, {width: width, height: height} = image, {opacity: opacity} = paint.originPaint;
+            if (brush || opacity === 1) opacity = undefined;
             if (fixScale) scaleX *= fixScale, scaleY *= fixScale;
             width *= scaleX;
             height *= scaleY;