leafer-draw 2.1.3 → 2.1.5

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$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;
         }
     };
     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) {
@@ -2850,7 +2852,8 @@ var LeaferUI = function(exports) {
                     current.length = PathCommandLengthMap[char];
                     current.index = 0;
                     pushData(data, current.name);
-                    if (char === "m") current.name = PathCommandMap["l"]; else if (char === "M") current.name = PathCommandMap["L"]; else if (!needConvert && convertCommand[char]) needConvert = true;
+                    if (char === "m") current.name = PathCommandMap["l"]; else if (char === "M") current.name = PathCommandMap["L"];
+                    if (!needConvert && convertCommand[char]) needConvert = true;
                 } else {
                     if (char === "-" || char === "+") {
                         if (lastChar === "e" || lastChar === "E") {
@@ -2926,8 +2929,8 @@ var LeaferUI = function(exports) {
 
                   case S:
                     smooth = lastCommand === C$3 || lastCommand === S;
-                    x1 = smooth ? x * 2 - controlX : old[i + 1];
-                    y1 = smooth ? y * 2 - controlY : old[i + 2];
+                    x1 = smooth ? x * 2 - controlX : x;
+                    y1 = smooth ? y * 2 - controlY : y;
                     controlX = old[i + 1];
                     controlY = old[i + 2];
                     x = old[i + 3];
@@ -2961,8 +2964,8 @@ var LeaferUI = function(exports) {
 
                   case T:
                     smooth = lastCommand === Q$3 || lastCommand === T;
-                    controlX = smooth ? x * 2 - controlX : old[i + 1];
-                    controlY = smooth ? y * 2 - controlY : old[i + 2];
+                    controlX = smooth ? x * 2 - controlX : x;
+                    controlY = smooth ? y * 2 - controlY : y;
                     curveMode ? quadraticCurveTo$1(data, x, y, controlX, controlY, old[i + 1], old[i + 2]) : data.push(Q$3, controlX, controlY, old[i + 1], old[i + 2]);
                     x = old[i + 1];
                     y = old[i + 2];
@@ -4568,10 +4571,10 @@ var LeaferUI = function(exports) {
                 y: y
             }, transition) : (t.x = x, t.y = y);
         },
-        zoomOfWorld(t, origin, scaleX, scaleY, resize, transition) {
-            L.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize, transition);
+        zoomOfWorld(t, origin, scaleX, scaleY, resize, transition, boundsType) {
+            L.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize, transition, boundsType);
         },
-        zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize, transition) {
+        zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize, transition, boundsType) {
             const o = t.__localMatrix;
             if (!isNumber(scaleY)) {
                 if (scaleY) transition = scaleY;
@@ -4580,7 +4583,7 @@ var LeaferUI = function(exports) {
             copy$5(matrix, o);
             scaleOfOuter$2(matrix, origin, scaleX, scaleY);
             if (L.hasHighPosition(t)) {
-                L.setTransform(t, matrix, resize, transition);
+                L.setTransform(t, matrix, resize, transition, boundsType);
             } else {
                 const x = t.x + matrix.e - o.e, y = t.y + matrix.f - o.f;
                 if (transition && !resize) t.animate({
@@ -4588,7 +4591,7 @@ var LeaferUI = function(exports) {
                     y: y,
                     scaleX: t.scaleX * scaleX,
                     scaleY: t.scaleY * scaleY
-                }, transition); else t.x = x, t.y = y, t.scaleResize(scaleX, scaleY, resize !== true);
+                }, transition); else t.x = x, t.y = y, t.scaleResize(scaleX, scaleY, resize !== true, boundsType);
             }
         },
         rotateOfWorld(t, origin, angle, transition) {
@@ -4612,18 +4615,18 @@ var LeaferUI = function(exports) {
             skewOfOuter(matrix, origin, skewX, skewY);
             L.setTransform(t, matrix, resize, transition);
         },
-        transformWorld(t, transform, resize, transition) {
+        transformWorld(t, transform, resize, transition, boundsType) {
             copy$5(matrix, t.worldTransform);
             multiplyParent$3(matrix, transform);
             if (t.parent) divideParent(matrix, t.parent.scrollWorldTransform);
-            L.setTransform(t, matrix, resize, transition);
+            L.setTransform(t, matrix, resize, transition, boundsType);
         },
-        transform(t, transform, resize, transition) {
+        transform(t, transform, resize, transition, boundsType) {
             copy$5(matrix, t.localTransform);
             multiplyParent$3(matrix, transform);
-            L.setTransform(t, matrix, resize, transition);
+            L.setTransform(t, matrix, resize, transition, boundsType);
         },
-        setTransform(t, transform, resize, transition) {
+        setTransform(t, transform, resize, transition, boundsType) {
             const data = t.__, originPoint = data.origin && L.getInnerOrigin(t, data.origin);
             const layout = getLayout(transform, originPoint, data.around && L.getInnerOrigin(t, data.around));
             if (L.hasOffset(t)) {
@@ -4639,7 +4642,7 @@ var LeaferUI = function(exports) {
                     PointHelper.move(layout, originPoint.x - changedPoint.x, originPoint.y - changedPoint.y);
                 }
                 t.set(layout);
-                t.scaleResize(scaleX, scaleY, false);
+                t.scaleResize(scaleX, scaleY, false, boundsType);
             } else t.set(layout, transition);
         },
         getFlipTransform(t, axis) {
@@ -5206,6 +5209,7 @@ var LeaferUI = function(exports) {
             this.renderChanged = true;
             this.renderSpread || (this.renderSpread = 1);
             this.boundsChanged = true;
+            this.hitCanvasChanged = true;
         }
         scaleChange() {
             this.scaleChanged = true;
@@ -6052,10 +6056,6 @@ var LeaferUI = function(exports) {
                 }
             }
         }
-        set(_data, _isTemp) {}
-        get(_name) {
-            return undefined;
-        }
         setAttr(name, value) {
             this[name] = value;
         }
@@ -6072,37 +6072,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();
         }
@@ -6118,27 +6091,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);
         }
@@ -6152,7 +6104,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 = {};
@@ -6269,11 +6220,11 @@ var LeaferUI = function(exports) {
             const layer = this.leafer ? this.leafer.zoomLayer : this;
             return layer.getWorldPoint(page, relative, distance, change);
         }
-        setTransform(matrix, resize, transition) {
-            setTransform(this, matrix, resize, transition);
+        setTransform(matrix, resize, transition, boundsType) {
+            setTransform(this, matrix, resize, transition, boundsType);
         }
-        transform(matrix, resize, transition) {
-            transform(this, matrix, resize, transition);
+        transform(matrix, resize, transition, boundsType) {
+            transform(this, matrix, resize, transition, boundsType);
         }
         move(x, y, transition) {
             moveLocal(this, x, y, transition);
@@ -6281,8 +6232,8 @@ var LeaferUI = function(exports) {
         moveInner(x, y, transition) {
             moveWorld(this, x, y, true, transition);
         }
-        scaleOf(origin, scaleX, scaleY, resize, transition) {
-            zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize, transition);
+        scaleOf(origin, scaleX, scaleY, resize, transition, boundsType) {
+            zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize, transition, boundsType);
         }
         rotateOf(origin, rotation, transition) {
             rotateOfLocal(this, getLocalOrigin(this, origin), rotation, transition);
@@ -6290,14 +6241,14 @@ var LeaferUI = function(exports) {
         skewOf(origin, skewX, skewY, resize, transition) {
             skewOfLocal(this, getLocalOrigin(this, origin), skewX, skewY, resize, transition);
         }
-        transformWorld(worldTransform, resize, transition) {
-            transformWorld(this, worldTransform, resize, transition);
+        transformWorld(worldTransform, resize, transition, boundsType) {
+            transformWorld(this, worldTransform, resize, transition, boundsType);
         }
         moveWorld(x, y, transition) {
             moveWorld(this, x, y, false, transition);
         }
-        scaleOfWorld(worldOrigin, scaleX, scaleY, resize, transition) {
-            zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize, transition);
+        scaleOfWorld(worldOrigin, scaleX, scaleY, resize, transition, boundsType) {
+            zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize, transition, boundsType);
         }
         rotateOfWorld(worldOrigin, rotation) {
             rotateOfWorld(this, worldOrigin, rotation);
@@ -6308,76 +6259,12 @@ var LeaferUI = function(exports) {
         flip(axis, transition) {
             transform(this, getFlipTransform(this, axis), false, transition);
         }
-        scaleResize(scaleX, scaleY = scaleX, _noResize) {
-            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);
         }
@@ -6673,7 +6560,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.1.3";
+    const version = "2.1.5";
     const debug$4 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -8078,17 +7965,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");
         }
@@ -8126,6 +8008,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) {
@@ -8161,7 +8044,6 @@ var LeaferUI = function(exports) {
             this.set(keyframe);
             return Plugin.need("animate");
         }
-        killAnimate(_type, _nextStyle) {}
         export(_filename, _options) {
             return Plugin.need("export");
         }
@@ -8264,7 +8146,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() {
@@ -8300,9 +8181,6 @@ var LeaferUI = function(exports) {
             }
             return data;
         }
-        pick(_hitPoint, _options) {
-            return undefined;
-        }
         addAt(child, index) {
             this.add(child, index);
         }
@@ -8312,11 +8190,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);
@@ -9170,51 +9043,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");
@@ -9650,7 +9478,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;