leafer-ui 1.0.9 → 1.1.0

package/dist/web.js

@@ -111,7 +111,7 @@ var LeaferUI = (function (exports) {
             return rotation - oldRotation;
         },
         float(num, maxLength) {
-            const a = maxLength ? pow$1(10, maxLength) : 1000000000000;
+            const a = maxLength !== undefined ? pow$1(10, maxLength) : 1000000000000;
             num = round(num * a) / a;
             return num === -0 ? 0 : num;
         },
@@ -1414,14 +1414,13 @@ var LeaferUI = (function (exports) {
         list: {},
         register(UI) {
             const { __tag: tag } = UI.prototype;
-            if (list$2[tag]) {
+            if (list$2[tag])
                 debug$f.repeat(tag);
-            }
-            else {
-                list$2[tag] = UI;
-            }
+            list$2[tag] = UI;
         },
         get(tag, data, x, y, width, height) {
+            if (!list$2[tag])
+                debug$f.error('not register ' + tag);
             const ui = new list$2[tag](data);
             if (x !== undefined) {
                 ui.x = x;
@@ -1445,7 +1444,7 @@ var LeaferUI = (function (exports) {
             Object.keys(Event).forEach(key => {
                 name = Event[key];
                 if (typeof name === 'string')
-                    nameList[name] ? debug$e.repeat(name) : nameList[name] = Event;
+                    nameList[name] && debug$e.repeat(name), nameList[name] = Event;
             });
         },
         changeName(oldName, newName) {
@@ -1647,7 +1646,7 @@ var LeaferUI = (function (exports) {
             const t = this;
             if (t.blendMode === 'pass-through') {
                 const leaf = this.__leaf;
-                if ((t.opacity < 1 && leaf.isBranch) || leaf.__hasEraser || t.eraser) {
+                if ((t.opacity < 1 && (leaf.isBranch || t.__hasMultiPaint)) || leaf.__hasEraser || t.eraser) {
                     t.__single = true;
                 }
                 else if (t.__single) {
@@ -2045,8 +2044,9 @@ var LeaferUI = (function (exports) {
                 takeCanvas = this.getSameCanvas();
                 takeCanvas.copyWorld(this);
             }
-            DataHelper.copyAttrs(this.size, size, canvasSizeAttrs);
-            this.size.pixelRatio || (this.size.pixelRatio = 1);
+            const s = this.size;
+            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();
@@ -2160,6 +2160,17 @@ var LeaferUI = (function (exports) {
             if (!onlyResetTransform)
                 this.useWorldTransform();
         }
+        useGrayscaleAlpha(bounds) {
+            this.setTempBounds(bounds, true, true);
+            let alpha, pixel;
+            const { context } = this, imageData = context.getImageData(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height), { data } = imageData;
+            for (let i = 0, len = data.length; i < len; i += 4) {
+                pixel = data[i] * 0.299 + data[i + 1] * 0.587 + data[i + 2] * 0.114;
+                if (alpha = data[i + 3])
+                    data[i + 3] = alpha === 255 ? pixel : alpha * (pixel / 255);
+            }
+            context.putImageData(imageData, tempBounds$1.x, tempBounds$1.y);
+        }
         useMask(maskCanvas, fromBounds, toBounds) {
             this.copyWorld(maskCanvas, fromBounds, toBounds, 'destination-in');
         }
@@ -2170,7 +2181,7 @@ var LeaferUI = (function (exports) {
             if (blendMode)
                 this.blendMode = blendMode;
             this.fillStyle = color;
-            tempBounds$1.set(bounds).scale(this.pixelRatio);
+            this.setTempBounds(bounds);
             this.fillRect(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
             if (blendMode)
                 this.blendMode = 'source-over';
@@ -2179,22 +2190,18 @@ var LeaferUI = (function (exports) {
             if (blendMode)
                 this.blendMode = blendMode;
             this.strokeStyle = color;
-            tempBounds$1.set(bounds).scale(this.pixelRatio);
+            this.setTempBounds(bounds);
             this.strokeRect(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
             if (blendMode)
                 this.blendMode = 'source-over';
         }
         clearWorld(bounds, ceilPixel) {
-            tempBounds$1.set(bounds).scale(this.pixelRatio);
-            if (ceilPixel)
-                tempBounds$1.ceil();
+            this.setTempBounds(bounds, ceilPixel);
             this.clearRect(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
         }
         clipWorld(bounds, ceilPixel) {
             this.beginPath();
-            tempBounds$1.set(bounds).scale(this.pixelRatio);
-            if (ceilPixel)
-                tempBounds$1.ceil();
+            this.setTempBounds(bounds, ceilPixel);
             this.rect(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
             this.clip();
         }
@@ -2202,6 +2209,14 @@ var LeaferUI = (function (exports) {
             const { pixelRatio } = this;
             this.clearRect(0, 0, this.width * pixelRatio + 2, this.height * pixelRatio + 2);
         }
+        setTempBounds(bounds, ceil, intersect) {
+            tempBounds$1.set(bounds);
+            if (intersect)
+                tempBounds$1.intersect(this.bounds);
+            tempBounds$1.scale(this.pixelRatio);
+            if (ceil)
+                tempBounds$1.ceil();
+        }
         isSameSize(size) {
             return this.width === size.width && this.height === size.height && this.pixelRatio === size.pixelRatio;
         }
@@ -4153,20 +4168,17 @@ var LeaferUI = (function (exports) {
             }
             return true;
         },
-        moveWorld(t, x, y = 0, isInnerPoint) {
+        moveWorld(t, x, y = 0, isInnerPoint, transition) {
             const local = typeof x === 'object' ? Object.assign({}, x) : { x, y };
             isInnerPoint ? toOuterPoint$1(t.localTransform, local, local, true) : (t.parent && toInnerPoint$1(t.parent.worldTransform, local, local, true));
-            L.moveLocal(t, local.x, local.y);
+            L.moveLocal(t, local.x, local.y, transition);
         },
-        moveLocal(t, x, y = 0) {
-            if (typeof x === 'object') {
-                t.x += x.x;
-                t.y += x.y;
-            }
-            else {
-                t.x += x;
-                t.y += y;
-            }
+        moveLocal(t, x, y = 0, transition) {
+            if (typeof x === 'object')
+                y = x.y, x = x.x;
+            x += t.x;
+            y += t.y;
+            transition ? t.animate({ x, y }, transition) : (t.x = x, t.y = y);
         },
         zoomOfWorld(t, origin, scaleX, scaleY, resize) {
             L.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize);
@@ -5215,13 +5227,14 @@ var LeaferUI = (function (exports) {
             this.__.__checkSingle();
         },
         __render(canvas, options) {
+            this.__nowWorld = this.__getNowWorld(options);
             if (this.__worldOpacity) {
                 if (this.__.__single) {
                     if (this.__.eraser === 'path')
                         return this.__renderEraser(canvas, options);
                     const tempCanvas = canvas.getSameCanvas(false, true);
                     this.__renderBranch(tempCanvas, options);
-                    const nowWorld = this.__getNowWorld(options);
+                    const nowWorld = this.__nowWorld;
                     canvas.opacity = this.__.opacity;
                     canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, this.__.__blendMode, true);
                     tempCanvas.recycle(nowWorld);
@@ -5545,11 +5558,11 @@ var LeaferUI = (function (exports) {
         transform(matrix, resize) {
             transform(this, matrix, resize);
         }
-        move(x, y) {
-            moveLocal(this, x, y);
+        move(x, y, transition) {
+            moveLocal(this, x, y, transition);
         }
-        moveInner(x, y) {
-            moveWorld(this, x, y, true);
+        moveInner(x, y, transition) {
+            moveWorld(this, x, y, true, transition);
         }
         scaleOf(origin, scaleX, scaleY, resize) {
             zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize);
@@ -5563,8 +5576,8 @@ var LeaferUI = (function (exports) {
         transformWorld(worldTransform, resize) {
             transformWorld(this, worldTransform, resize);
         }
-        moveWorld(x, y) {
-            moveWorld(this, x, y);
+        moveWorld(x, y, transition) {
+            moveWorld(this, x, y, false, transition);
         }
         scaleOfWorld(worldOrigin, scaleX, scaleY, resize) {
             zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize);
@@ -5962,7 +5975,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.0.9";
+    const version = "1.1.0";
 
     const debug$7 = Debug.get('LeaferCanvas');
     class LeaferCanvas extends LeaferCanvasBase {
@@ -6604,7 +6617,8 @@ var LeaferUI = (function (exports) {
             this.totalBounds = new Bounds();
             debug$5.log(target.innerName, '--->');
             try {
-                target.app.emit(RenderEvent.CHILD_START, target);
+                if (!target.isApp)
+                    target.app.emit(RenderEvent.CHILD_START, target);
                 this.emitRender(RenderEvent.START);
                 this.renderOnce(callback);
                 this.emitRender(RenderEvent.END, this.totalBounds);
@@ -7158,6 +7172,12 @@ var LeaferUI = (function (exports) {
                 return strokeWidth;
         }
         get __hasStroke() { return this.stroke && this.strokeWidth; }
+        get __hasMultiPaint() {
+            const t = this;
+            if ((t.__isFills && t.fill.length > 1) || (t.__isStrokes && t.stroke.length > 1) || t.__useEffect)
+                return true;
+            return t.fill && this.__hasStroke;
+        }
         get __clipAfterFill() { return (this.cornerRadius || this.__pathInputed); }
         get __autoWidth() { return !this._width; }
         get __autoHeight() { return !this._height; }
@@ -7527,9 +7547,8 @@ var LeaferUI = (function (exports) {
                             canvas.strokeRect(half, half, width, height);
                             canvas.restore();
                         }
-                        else {
+                        else
                             canvas.strokeRect(half, half, width, height);
-                        }
                         break;
                     case 'outside':
                         canvas.strokeRect(-half, -half, width + __strokeWidth, height + __strokeWidth);
@@ -7559,11 +7578,15 @@ var LeaferUI = (function (exports) {
             super(data);
         }
         reset(_data) { }
-        set(data, isTemp) {
-            if (isTemp) {
-                this.lockNormalStyle = true;
-                Object.assign(this, data);
-                this.lockNormalStyle = false;
+        set(data, transition) {
+            if (transition) {
+                if (transition === 'temp') {
+                    this.lockNormalStyle = true;
+                    Object.assign(this, data);
+                    this.lockNormalStyle = false;
+                }
+                else
+                    this.animate(data, transition);
             }
             else
                 Object.assign(this, data);
@@ -7754,6 +7777,15 @@ var LeaferUI = (function (exports) {
     __decorate([
         boundsType(0)
     ], exports.UI.prototype, "padding", void 0);
+    __decorate([
+        boundsType(false)
+    ], exports.UI.prototype, "lockRatio", void 0);
+    __decorate([
+        boundsType()
+    ], exports.UI.prototype, "widthRange", void 0);
+    __decorate([
+        boundsType()
+    ], exports.UI.prototype, "heightRange", void 0);
     __decorate([
         dataType(false)
     ], exports.UI.prototype, "draggable", void 0);
@@ -7864,17 +7896,17 @@ var LeaferUI = (function (exports) {
             if (!this.children)
                 this.children = [];
         }
-        set(data, isTemp) {
+        set(data, transition) {
             if (data.children) {
                 const { children } = data;
                 delete data.children;
                 this.children ? this.clear() : this.__setBranch();
-                super.set(data, isTemp);
+                super.set(data, transition);
                 children.forEach(child => this.add(child));
                 data.children = children;
             }
             else
-                super.set(data, isTemp);
+                super.set(data, transition);
         }
         toJSON(options) {
             const data = super.toJSON(options);
@@ -7987,8 +8019,8 @@ var LeaferUI = (function (exports) {
         }
         onInit() { }
         initType(_type) { }
-        set(data) {
-            this.waitInit(() => { super.set(data); });
+        set(data, transition) {
+            this.waitInit(() => { super.set(data, transition); });
         }
         start() {
             clearTimeout(this.__startTimer);
@@ -8045,8 +8077,6 @@ var LeaferUI = (function (exports) {
         __onResize(event) {
             this.emitEvent(event);
             DataHelper.copyAttrs(this.__, event, canvasSizeAttrs);
-            if (!event.width || !event.height)
-                debug$3.warn('w = 0 or h = 0');
             setTimeout(() => { if (this.canvasManager)
                 this.canvasManager.clearRecycled(); }, 0);
         }
@@ -8371,9 +8401,6 @@ var LeaferUI = (function (exports) {
     __decorate([
         dataType(false)
     ], exports.Box.prototype, "resizeChildren", void 0);
-    __decorate([
-        dataType(false)
-    ], exports.Box.prototype, "textBox", void 0);
     __decorate([
         affectRenderBoundsType('show')
     ], exports.Box.prototype, "overflow", void 0);
@@ -9128,19 +9155,13 @@ var LeaferUI = (function (exports) {
             Object.assign(this, params);
         }
         getBoxPoint(relative) {
-            if (!relative)
-                relative = this.current;
-            return relative.getBoxPoint(this);
+            return (relative || this.current).getBoxPoint(this);
         }
         getInnerPoint(relative) {
-            if (!relative)
-                relative = this.current;
-            return relative.getInnerPoint(this);
+            return (relative || this.current).getInnerPoint(this);
         }
         getLocalPoint(relative) {
-            if (!relative)
-                relative = this.current;
-            return relative.getLocalPoint(this);
+            return (relative || this.current).getLocalPoint(this);
         }
         getPagePoint() {
             return this.current.getPagePoint(this);
@@ -9188,10 +9209,8 @@ var LeaferUI = (function (exports) {
             this.data = data;
         }
         static getValidMove(leaf, start, total) {
-            const { draggable, dragBounds, x, y } = leaf;
-            const move = leaf.getLocalPoint(total, null, true);
-            move.x += start.x - x;
-            move.y += start.y - y;
+            const { draggable, dragBounds } = leaf, move = leaf.getLocalPoint(total, null, true);
+            PointHelper.move(move, start.x - leaf.x, start.y - leaf.y);
             if (dragBounds)
                 this.getMoveInDragBounds(leaf.__local, dragBounds === 'parent' ? leaf.parent.boxBounds : dragBounds, move, true);
             if (draggable === 'x')
@@ -9201,8 +9220,7 @@ var LeaferUI = (function (exports) {
             return move;
         }
         static getMoveInDragBounds(childBox, dragBounds, move, change) {
-            const x = childBox.x + move.x, y = childBox.y + move.y;
-            const right = x + childBox.width, bottom = y + childBox.height;
+            const x = childBox.x + move.x, y = childBox.y + move.y, right = x + childBox.width, bottom = y + childBox.height;
             const boundsRight = dragBounds.x + dragBounds.width, boundsBottom = dragBounds.y + dragBounds.height;
             if (!change)
                 move = Object.assign({}, move);
@@ -9254,9 +9272,7 @@ var LeaferUI = (function (exports) {
             return this.getLocalMove(relative, true);
         }
         getPageBounds() {
-            const total = this.getPageTotal();
-            const start = this.getPagePoint();
-            const bounds = {};
+            const total = this.getPageTotal(), start = this.getPagePoint(), bounds = {};
             BoundsHelper.set(bounds, start.x - total.x, start.y - total.y, total.x, total.y);
             BoundsHelper.unsign(bounds);
             return bounds;
@@ -9374,7 +9390,8 @@ var LeaferUI = (function (exports) {
     const LeaferTypeCreator = {
         list: {},
         register(name, fn) {
-            list[name] ? debug$2.repeat(name) : list[name] = fn;
+            list[name] && debug$2.repeat(name);
+            list[name] = fn;
         },
         run(name, leafer) {
             const fn = list[name];
@@ -10995,6 +11012,8 @@ var LeaferUI = (function (exports) {
                 case 'center':
                     canvas.setStroke(stroke, __strokeWidth, options);
                     canvas.stroke();
+                    if (options.__useArrow)
+                        strokeArrow(ui, canvas);
                     break;
                 case 'inside':
                     canvas.save();
@@ -11032,6 +11051,8 @@ var LeaferUI = (function (exports) {
                 case 'center':
                     canvas.setStroke(undefined, __strokeWidth, options);
                     drawStrokesStyle(strokes, false, ui, canvas);
+                    if (options.__useArrow)
+                        strokeArrow(ui, canvas);
                     break;
                 case 'inside':
                     canvas.save();
@@ -11057,6 +11078,14 @@ var LeaferUI = (function (exports) {
             }
         }
     }
+    function strokeArrow(ui, canvas) {
+        if (ui.__.dashPattern) {
+            canvas.beginPath();
+            ui.__drawPathByData(canvas, ui.__.__pathForArrow);
+            canvas.dashPattern = null;
+            canvas.stroke();
+        }
+    }
 
     const { getSpread, getOuterOf, getByMove, getIntersectData } = BoundsHelper;
     function shape(ui, current, options) {
@@ -11742,16 +11771,16 @@ var LeaferUI = (function (exports) {
 
     const { excludeRenderBounds } = LeafBoundsHelper;
     exports.Group.prototype.__renderMask = function (canvas, options) {
-        let child, maskCanvas, contentCanvas, maskOpacity, currentMask;
+        let child, maskCanvas, contentCanvas, maskOpacity, currentMask, mask;
         const { children } = this;
         for (let i = 0, len = children.length; i < len; i++) {
-            child = children[i];
-            if (child.__.mask) {
+            child = children[i], mask = child.__.mask;
+            if (mask) {
                 if (currentMask) {
                     maskEnd(this, currentMask, canvas, contentCanvas, maskCanvas, maskOpacity);
                     maskCanvas = contentCanvas = null;
                 }
-                if (child.__.mask === 'path') {
+                if (mask === 'path' || mask === 'clipping-path') {
                     if (child.opacity < 1) {
                         currentMask = 'opacity-path';
                         maskOpacity = child.opacity;
@@ -11765,14 +11794,14 @@ var LeaferUI = (function (exports) {
                     child.__clip(contentCanvas || canvas, options);
                 }
                 else {
-                    currentMask = 'alpha';
+                    currentMask = mask === 'grayscale' ? 'grayscale' : 'alpha';
                     if (!maskCanvas)
                         maskCanvas = getCanvas(canvas);
                     if (!contentCanvas)
                         contentCanvas = getCanvas(canvas);
                     child.__render(maskCanvas, options);
                 }
-                if (child.__.mask !== 'clipping')
+                if (!(mask === 'clipping' || mask === 'clipping-path'))
                     continue;
             }
             if (excludeRenderBounds(child, options))
@@ -11783,6 +11812,8 @@ var LeaferUI = (function (exports) {
     };
     function maskEnd(leaf, maskMode, canvas, contentCanvas, maskCanvas, maskOpacity) {
         switch (maskMode) {
+            case 'grayscale':
+                maskCanvas.useGrayscaleAlpha(leaf.__nowWorld);
             case 'alpha':
                 usePixelMask(leaf, canvas, contentCanvas, maskCanvas);
                 break;
@@ -12487,15 +12518,12 @@ var LeaferUI = (function (exports) {
     const debug = Debug.get('@leafer-ui/export');
     canvas.export = function (filename, options) {
         const { quality, blob } = FileHelper.getExportOptions(options);
-        if (filename.includes('.')) {
+        if (filename.includes('.'))
             return this.saveAs(filename, quality);
-        }
-        else if (blob) {
+        else if (blob)
             return this.toBlob(filename, quality);
-        }
-        else {
+        else
             return this.toDataURL(filename, quality);
-        }
     };
     canvas.toBlob = function (type, quality) {
         return new Promise((resolve) => {