leafer-ui 2.1.4 → 2.1.6

package/dist/web.js

@@ -240,7 +240,7 @@ var LeaferUI = function(exports) {
         RUNTIME: "runtime",
         LEAF: "leaf",
         TASK: "task",
-        CNAVAS: "canvas",
+        CANVAS: "canvas",
         IMAGE: "image",
         types: {},
         create(typeName) {
@@ -869,7 +869,7 @@ var LeaferUI = function(exports) {
             return quick ? t.x === point.x && t.y === point.y : float$2(t.x) === float$2(point.x) && float$2(t.y) === float$2(point.y);
         },
         reset(t) {
-            P$5.reset(t);
+            t.x = t.y = 0;
         }
     };
     const P$5 = PointHelper;
@@ -1073,6 +1073,7 @@ var LeaferUI = function(exports) {
         }
         reset() {
             MatrixHelper.reset(this);
+            return this;
         }
     }
     const tempMatrix$2 = new Matrix;
@@ -2177,7 +2178,7 @@ var LeaferUI = function(exports) {
             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;
@@ -2327,6 +2328,7 @@ var LeaferUI = function(exports) {
         }
         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) {
@@ -3497,7 +3499,7 @@ var LeaferUI = function(exports) {
     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;
@@ -3506,6 +3508,11 @@ var LeaferUI = function(exports) {
                 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;
@@ -3516,6 +3523,8 @@ var LeaferUI = function(exports) {
                     } else {
                         smooth.push(M, startX, startY);
                     }
+                    startXIndex = smoothLen + 1;
+                    startYIndex = smoothLen + 2;
                     break;
 
                   case L$1:
@@ -3554,8 +3563,8 @@ var LeaferUI = function(exports) {
                 lastCommand = command;
             }
             if (command !== Z) {
-                smooth[1] = startX;
-                smooth[2] = startY;
+                smooth[startXIndex] = startX;
+                smooth[startYIndex] = startY;
             }
             return smooth;
         }
@@ -5207,6 +5216,7 @@ var LeaferUI = function(exports) {
             this.renderChanged = true;
             this.renderSpread || (this.renderSpread = 1);
             this.boundsChanged = true;
+            this.hitCanvasChanged = true;
         }
         scaleChange() {
             this.scaleChanged = true;
@@ -6053,10 +6063,6 @@ var LeaferUI = function(exports) {
                 }
             }
         }
-        set(_data, _isTemp) {}
-        get(_name) {
-            return undefined;
-        }
         setAttr(name, value) {
             this[name] = value;
         }
@@ -6073,37 +6079,10 @@ var LeaferUI = function(exports) {
         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();
         }
@@ -6119,27 +6098,6 @@ var LeaferUI = function(exports) {
         __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);
         }
@@ -6153,7 +6111,6 @@ var LeaferUI = function(exports) {
         __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 = {};
@@ -6309,76 +6266,12 @@ var LeaferUI = function(exports) {
         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);
         }
@@ -6674,7 +6567,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.1.4";
+    const version = "2.1.6";
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -8274,17 +8167,12 @@ var LeaferUI = function(exports) {
             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");
         }
@@ -8322,6 +8210,7 @@ var LeaferUI = function(exports) {
                 data.lazy && !this.__inLazyBounds && !Export.running ? data.__needComputePaint = true : data.__computePaint();
             }
         }
+        __updatePath() {}
         __updateRenderPath(updateCache) {
             const data = this.__;
             if (data.path) {
@@ -8357,7 +8246,6 @@ var LeaferUI = function(exports) {
             this.set(keyframe);
             return Plugin.need("animate");
         }
-        killAnimate(_type, _nextStyle) {}
         export(_filename, _options) {
             return Plugin.need("export");
         }
@@ -8460,7 +8348,6 @@ var LeaferUI = function(exports) {
     __decorate([ surfaceType() ], exports.UI.prototype, "placeholderColor", void 0);
     __decorate([ dataType(100) ], exports.UI.prototype, "placeholderDelay", void 0);
     __decorate([ dataType({}) ], exports.UI.prototype, "data", void 0);
-    __decorate([ rewrite(exports.Leaf.prototype.reset) ], exports.UI.prototype, "reset", null);
     exports.UI = UI_1 = __decorate([ useModule(UIBounds), useModule(UIRender), rewriteAble() ], exports.UI);
     exports.Group = class Group extends exports.UI {
         get __tag() {
@@ -8496,9 +8383,6 @@ var LeaferUI = function(exports) {
             }
             return data;
         }
-        pick(_hitPoint, _options) {
-            return undefined;
-        }
         addAt(child, index) {
             this.add(child, index);
         }
@@ -8508,11 +8392,6 @@ var LeaferUI = function(exports) {
         addBefore(child, before) {
             this.add(child, this.children.indexOf(before));
         }
-        add(_child, _index) {}
-        addMany(..._children) {}
-        remove(_child, _destroy) {}
-        removeAll(_destroy) {}
-        clear() {}
     };
     __decorate([ dataProcessor(GroupData) ], exports.Group.prototype, "__", void 0);
     __decorate([ boundsType(0) ], exports.Group.prototype, "width", void 0);
@@ -9366,51 +9245,6 @@ var LeaferUI = function(exports) {
             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");
@@ -11565,7 +11399,7 @@ var LeaferUI = function(exports) {
                 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;
@@ -11649,8 +11483,9 @@ var LeaferUI = function(exports) {
             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);
@@ -11661,7 +11496,7 @@ var LeaferUI = function(exports) {
           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) {
@@ -11777,8 +11612,9 @@ var LeaferUI = function(exports) {
         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;