leafer-ui 1.0.0-rc.4 → 1.0.0-rc.5

package/dist/web.module.js

@@ -647,14 +647,14 @@ const BoundsHelper = {
     },
     getFitMatrix(t, put) {
         const scale = Math.min(1, Math.min(t.width / put.width, t.height / put.height));
-        return new Matrix(scale, 0, 0, scale, -Math.ceil(put.x * scale), -Math.ceil(put.y * scale));
+        return new Matrix(scale, 0, 0, scale, -put.x * scale, -put.y * scale);
     },
     getSpread(t, spreadX, spreadY) {
         const n = {};
         B.copyAndSpread(n, t, spreadX, spreadY);
         return n;
     },
-    spread(t, spreadX, spreadY) {
+    spread(t, spreadX, spreadY = spreadX) {
         B.copyAndSpread(t, t, spreadX, spreadY);
     },
     ceil(t) {
@@ -795,8 +795,8 @@ class Bounds {
     getFitMatrix(put) {
         return BoundsHelper.getFitMatrix(this, put);
     }
-    spread(size) {
-        BoundsHelper.spread(this, size);
+    spread(spreadX, spreadY) {
+        BoundsHelper.spread(this, spreadX, spreadY);
         return this;
     }
     ceil() {
@@ -1378,6 +1378,8 @@ class LeafData {
 }
 
 const FileHelper = {
+    opacityTypes: ['png', 'webp', 'svg'],
+    upperCaseTypeMap: {},
     mineType(type) {
         if (!type || type.startsWith('image'))
             return type;
@@ -1390,6 +1392,7 @@ const FileHelper = {
         return l[l.length - 1];
     }
 };
+FileHelper.opacityTypes.forEach(type => FileHelper.upperCaseTypeMap[type] = type.toUpperCase());
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -2330,7 +2333,7 @@ const EllipseHelper = {
         const centerX = fromX + halfX + rotationCos * cx - rotationSin * cy;
         const centerY = fromY + halfY + rotationSin * cx + rotationCos * cy;
         const anticlockwise = totalRadian < 0 ? 1 : 0;
-        if (curveMode) {
+        if (curveMode || Platform.name === 'node') {
             ellipse$5(data, centerX, centerY, radiusX, radiusY, rotation, startRadian / OneRadian, endRadian / OneRadian, anticlockwise);
         }
         else {
@@ -3257,6 +3260,23 @@ const ImageManager = {
             list.length = 0;
         }
     },
+    isPixel(config) {
+        return FileHelper.opacityTypes.some(item => I$1.isFormat(item, config));
+    },
+    isFormat(format, config) {
+        if (config.format === format)
+            return true;
+        const { url } = config;
+        if (url.startsWith('data:')) {
+            if (url.startsWith('data:' + FileHelper.mineType(format)))
+                return true;
+        }
+        else {
+            if (url.includes('.' + format) || url.includes('.' + FileHelper.upperCaseTypeMap[format]))
+                return true;
+        }
+        return false;
+    },
     destroy() {
         I$1.map = {};
     }
@@ -3272,17 +3292,7 @@ class LeaferImage {
         this.waitComplete = [];
         this.innerId = create$1(IMAGE);
         this.config = config || { url: '' };
-        const { url } = config;
-        if (url.startsWith('data:')) {
-            if (url.startsWith('data:image/svg'))
-                this.isSVG = true;
-        }
-        else {
-            if (url.includes('.svg'))
-                this.isSVG = true;
-        }
-        if (this.config.format === 'svg')
-            this.isSVG = true;
+        this.isSVG = ImageManager.isFormat('svg', config);
     }
     load(onSuccess, onError) {
         if (!this.loading) {
@@ -3355,13 +3365,19 @@ class Event {
     }
     stopDefault() {
         this.isStopDefault = true;
+        if (this.origin)
+            Platform.event.stopDefault(this.origin);
     }
     stopNow() {
         this.isStopNow = true;
         this.isStop = true;
+        if (this.origin)
+            Platform.event.stopNow(this.origin);
     }
     stop() {
         this.isStop = true;
+        if (this.origin)
+            Platform.event.stop(this.origin);
     }
 }
 
@@ -3423,20 +3439,6 @@ class ResizeEvent extends Event {
 }
 ResizeEvent.RESIZE = 'resize';
 
-class TransformEvent extends Event {
-    constructor(type, params) {
-        super(type);
-        if (params)
-            Object.assign(this, params);
-    }
-}
-TransformEvent.START = 'transform.start';
-TransformEvent.CHANGE = 'transform.change';
-TransformEvent.END = 'transform.end';
-TransformEvent.BEFORE_START = 'transform.before_start';
-TransformEvent.BEFORE_CHANGE = 'transform.before_change';
-TransformEvent.BEFORE_END = 'transform.before_end';
-
 class WatchEvent extends Event {
     constructor(type, data) {
         super(type);
@@ -3537,15 +3539,15 @@ class UIEvent extends Event {
         this.bubbles = true;
         Object.assign(this, params);
     }
-    getInner(target) {
-        if (!target)
-            target = this.current;
-        return target.getInnerPoint(this);
+    getInner(relative) {
+        if (!relative)
+            relative = this.current;
+        return relative.getInnerPoint(this);
     }
-    getLocal(target) {
-        if (!target)
-            target = this.current;
-        return target.getLocalPoint(this);
+    getLocal(relative) {
+        if (!relative)
+            relative = this.current;
+        return relative.getLocalPoint(this);
     }
     static changeName(oldName, newName) {
         EventCreator.changeName(oldName, newName);
@@ -3592,7 +3594,7 @@ function positionType(defaultValue) {
         defineLeafAttr(target, key, defaultValue, {
             set(value) {
                 this.__setAttr(key, value);
-                this.__layout.positionChanged || this.__layout.positionChange();
+                this.__layout.matrixChanged || this.__layout.matrixChange();
             }
         });
     };
@@ -3624,7 +3626,7 @@ function boundsType(defaultValue) {
                 this.__setAttr(key, value);
                 this.__layout.boxChanged || this.__layout.boxChange();
                 if (this.__.around)
-                    this.__layout.positionChanged || this.__layout.positionChange();
+                    this.__layout.matrixChanged || this.__layout.matrixChange();
             }
         });
     };
@@ -3860,29 +3862,36 @@ PointerEvent.CLICK = 'click';
 PointerEvent.DOUBLE_CLICK = 'double_click';
 PointerEvent.LONG_PRESS = 'long_press';
 PointerEvent.LONG_TAP = 'long_tap';
+PointerEvent.MENU = 'pointer.menu';
 PointerEvent = __decorate([
     registerUIEvent()
 ], PointerEvent);
 
 const move = {};
 let DragEvent = class DragEvent extends PointerEvent {
-    getInnerMove(target, total) {
-        if (!target)
-            target = this.current;
+    static setList(data) {
+        this.list = data instanceof LeafList ? data : new LeafList(data);
+    }
+    static setData(data) {
+        this.data = data;
+    }
+    getInnerMove(relative, total) {
+        if (!relative)
+            relative = this.current;
         this.assignMove(total);
-        return target.getInnerPoint(move, null, true);
+        return relative.getInnerPoint(move, null, true);
     }
-    getLocalMove(target, total) {
-        if (!target)
-            target = this.current;
+    getLocalMove(relative, total) {
+        if (!relative)
+            relative = this.current;
         this.assignMove(total);
-        return target.getLocalPoint(move, null, true);
+        return relative.getLocalPoint(move, null, true);
     }
-    getInnerTotal(target) {
-        return this.getInnerMove(target, true);
+    getInnerTotal(relative) {
+        return this.getInnerMove(relative, true);
     }
-    getLocalTotal(target) {
-        return this.getLocalMove(target, true);
+    getLocalTotal(relative) {
+        return this.getLocalMove(relative, true);
     }
     assignMove(total) {
         move.x = total ? this.totalX : this.moveX;
@@ -3901,17 +3910,16 @@ DragEvent = __decorate([
     registerUIEvent()
 ], DragEvent);
 
-var DropEvent_1;
-let DropEvent = DropEvent_1 = class DropEvent extends PointerEvent {
+let DropEvent = class DropEvent extends PointerEvent {
     static setList(data) {
-        DropEvent_1.dragList = data instanceof LeafList ? data : new LeafList(data);
+        DragEvent.setList(data);
     }
     static setData(data) {
-        this.dragData = data;
+        DragEvent.setData(data);
     }
 };
 DropEvent.DROP = 'drop';
-DropEvent = DropEvent_1 = __decorate([
+DropEvent = __decorate([
     registerUIEvent()
 ], DropEvent);
 
@@ -4018,7 +4026,6 @@ class Transformer {
         this.moveEnd();
         this.zoomEnd();
         this.rotateEnd();
-        this.transformMode = null;
     }
     moveEnd() {
         if (this.moveData) {
@@ -4043,7 +4050,7 @@ class Transformer {
     }
 }
 
-const { copy: copy$5, translate: translate$2, toInnerPoint: toInnerPoint$1, scaleOfOuter: scaleOfOuter$3, rotateOfOuter: rotateOfOuter$3, skewOfOuter } = MatrixHelper;
+const { copy: copy$5, toInnerPoint: toInnerPoint$1, scaleOfOuter: scaleOfOuter$3, rotateOfOuter: rotateOfOuter$3, skewOfOuter } = MatrixHelper;
 const matrix = {};
 const LeafHelper = {
     updateAllWorldMatrix(leaf) {
@@ -4086,63 +4093,41 @@ const LeafHelper = {
         return true;
     },
     moveWorld(t, x, y) {
-        t.__layout.checkUpdate();
         const local = { x, y };
         if (t.parent)
-            toInnerPoint$1(t.parent.__world, local, local, true);
+            toInnerPoint$1(t.parent.worldTransform, local, local, true);
         L.moveLocal(t, local.x, local.y);
     },
     moveLocal(t, x, y = 0) {
         t.x += x;
         t.y += y;
     },
-    zoomOfWorld(t, origin, scaleX, scaleY, moveLayer) {
-        t.__layout.checkUpdate();
-        const local = t.parent ? PointHelper.tempToInnerOf(origin, t.parent.__world) : origin;
-        this.zoomOfLocal(t, local, scaleX, scaleY, moveLayer);
+    zoomOfWorld(t, origin, scaleX, scaleY) {
+        this.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY);
     },
-    zoomOfLocal(t, origin, scaleX, scaleY = scaleX, moveLayer) {
+    zoomOfLocal(t, origin, scaleX, scaleY = scaleX) {
         copy$5(matrix, t.__local);
-        if (moveLayer)
-            translate$2(matrix, moveLayer.x, moveLayer.y);
         scaleOfOuter$3(matrix, origin, scaleX, scaleY);
-        if (!moveLayer)
-            moveLayer = t;
-        moveLayer.x += matrix.e - t.__local.e;
-        moveLayer.y += matrix.f - t.__local.f;
+        moveByMatrix(t, matrix);
         t.scaleX *= scaleX;
         t.scaleY *= scaleY;
     },
-    rotateOfWorld(t, origin, angle, moveLayer) {
-        t.__layout.checkUpdate();
-        const local = t.parent ? PointHelper.tempToInnerOf(origin, t.parent.__world) : origin;
-        this.rotateOfLocal(t, local, angle, moveLayer);
+    rotateOfWorld(t, origin, angle) {
+        this.rotateOfLocal(t, getTempLocal(t, origin), angle);
     },
-    rotateOfLocal(t, origin, angle, moveLayer) {
+    rotateOfLocal(t, origin, angle) {
         copy$5(matrix, t.__local);
-        if (moveLayer)
-            translate$2(matrix, moveLayer.x, moveLayer.y);
         rotateOfOuter$3(matrix, origin, angle);
-        if (!moveLayer)
-            moveLayer = t;
-        moveLayer.x += matrix.e - t.__local.e;
-        moveLayer.y += matrix.f - t.__local.f;
+        moveByMatrix(t, matrix);
         t.rotation = MathHelper.formatRotation(t.rotation + angle);
     },
-    skewOfWorld(t, origin, skewX, skewY, moveLayer) {
-        t.__layout.checkUpdate();
-        const local = t.parent ? PointHelper.tempToInnerOf(origin, t.parent.__world) : origin;
-        this.skewOfLocal(t, local, skewX, skewY, moveLayer);
+    skewOfWorld(t, origin, skewX, skewY) {
+        this.skewOfLocal(t, getTempLocal(t, origin), skewX, skewY);
     },
-    skewOfLocal(t, origin, skewX, skewY, moveLayer) {
+    skewOfLocal(t, origin, skewX, skewY) {
         copy$5(matrix, t.__local);
-        if (moveLayer)
-            translate$2(matrix, moveLayer.x, moveLayer.y);
         skewOfOuter(matrix, origin, skewX, skewY);
-        if (!moveLayer)
-            moveLayer = t;
-        moveLayer.x = matrix.e - t.__local.e;
-        moveLayer.y = matrix.f - t.__local.f;
+        moveByMatrix(t, matrix);
         t.skewX = MathHelper.formatSkew(t.skewX + skewX);
         t.skewY = MathHelper.formatSkew(t.skewY + skewY);
     },
@@ -4156,6 +4141,14 @@ const LeafHelper = {
 };
 const L = LeafHelper;
 const { updateAllWorldMatrix: updateAllWorldMatrix$2, updateAllWorldOpacity: updateAllWorldOpacity$1, updateAllChange: updateAllChange$1 } = L;
+function moveByMatrix(t, matrix) {
+    t.x += matrix.e - t.__local.e;
+    t.y += matrix.f - t.__local.f;
+}
+function getTempLocal(t, world) {
+    t.__layout.checkUpdate();
+    return t.parent ? PointHelper.tempToInnerOf(world, t.parent.__world) : world;
+}
 
 const LeafBoundsHelper = {
     worldBounds(target) {
@@ -4317,7 +4310,8 @@ const InteractionHelper = {
 };
 const I = InteractionHelper;
 
-const { getDragEventData, getDropEventData, getSwipeEventData, filterPathByEventType } = InteractionHelper;
+const emptyList = new LeafList();
+const { getDragEventData, getDropEventData, getSwipeEventData } = InteractionHelper;
 class Dragger {
     constructor(interaction) {
         this.interaction = interaction;
@@ -4325,8 +4319,8 @@ class Dragger {
     setDragData(data) {
         this.dragData = getDragEventData(data, data, data);
     }
-    getDragList() {
-        return this.dragging ? DropEvent.dragList || this.dragList : null;
+    getList() {
+        return this.dragging ? (DragEvent.list || this.interaction.selector.list || this.dragableList || emptyList) : emptyList;
     }
     checkDrag(data, canDrag) {
         const { interaction } = this;
@@ -4355,7 +4349,7 @@ class Dragger {
             interaction.emit(MoveEvent.MOVE, this.dragData);
         }
         else if (this.dragging) {
-            this.dragDragableList();
+            this.realDrag();
             interaction.emit(DragEvent.BEFORE_DRAG, this.dragData);
             interaction.emit(DragEvent.DRAG, this.dragData);
         }
@@ -4366,9 +4360,6 @@ class Dragger {
             if (this.dragging) {
                 this.interaction.emit(DragEvent.START, this.dragData);
                 this.getDragableList(this.dragData.path);
-                this.dragList = filterPathByEventType(this.dragData.path, DragEvent.DRAG);
-                if (!this.dragList.length && this.dragableList)
-                    this.dragList.pushList(this.dragableList);
             }
         }
     }
@@ -4377,16 +4368,17 @@ class Dragger {
         for (let i = 0, len = path.length; i < len; i++) {
             leaf = path.list[i];
             if (leaf.__.draggable && leaf.__.hitSelf) {
-                this.dragableList = [leaf];
+                this.dragableList = new LeafList(leaf);
                 break;
             }
         }
     }
-    dragDragableList() {
+    realDrag() {
         const { running } = this.interaction;
-        if (this.dragableList && running) {
+        const list = this.getList();
+        if (list.length && running) {
             const { moveX, moveY } = this.dragData;
-            this.dragableList.forEach(leaf => {
+            list.forEach(leaf => {
                 LeafHelper.moveWorld(leaf, moveX, moveY);
             });
         }
@@ -4443,20 +4435,14 @@ class Dragger {
         }
     }
     drop(data) {
-        const dropData = getDropEventData(data, this.getDragList(), DropEvent.dragData);
+        const dropData = getDropEventData(data, this.getList(), DragEvent.data);
         dropData.path = this.dragEnterPath;
         this.interaction.emit(DropEvent.DROP, dropData);
         this.interaction.emit(DragEvent.LEAVE, data, this.dragEnterPath);
     }
     dragReset() {
-        DropEvent.dragList = null;
-        this.dragList = null;
-        this.dragableList = null;
-        this.dragData = null;
-        this.dragOverPath = null;
-        this.dragEnterPath = null;
-        this.dragging = null;
-        this.moving = null;
+        DragEvent.list = DragEvent.data = this.dragableList = this.dragData = this.dragOverPath = this.dragEnterPath = null;
+        this.dragging = this.moving = false;
     }
     checkDragOut(data) {
         const { interaction } = this;
@@ -4692,6 +4678,10 @@ class InteractionBase {
         this.zoom(getZoomEventData$1(center, scale, data));
         this.move(getMoveEventData$1(center, move, data));
     }
+    menu(data) {
+        this.findPath(data);
+        this.emit(PointerEvent.MENU, data);
+    }
     move(data) {
         this.transformer.move(data);
     }
@@ -4801,6 +4791,9 @@ class InteractionBase {
         data.path = find.path;
         return find.path;
     }
+    isDrag(leaf) {
+        return this.dragger.getList().has(leaf);
+    }
     updateDownData(data) {
         if (!data)
             data = this.downData;
@@ -4814,7 +4807,7 @@ class InteractionBase {
             data = this.hoverData;
         if (!data)
             return;
-        this.findPath(data, { exclude: this.dragger.getDragList(), name: PointerEvent.MOVE });
+        this.findPath(data, { exclude: this.dragger.getList(), name: PointerEvent.MOVE });
         this.hoverData = data;
     }
     updateCursor(data) {
@@ -4934,7 +4927,7 @@ class LeafLayout {
         this.renderBounds = this.strokeBounds = this.boxBounds = { x: 0, y: 0, width: 0, height: 0 };
         this.localRenderBounds = this.localStrokeBounds = leaf.__local;
         this.boxChange();
-        this.positionChange();
+        this.matrixChange();
     }
     checkUpdate(force) {
         const { leafer } = this.leaf;
@@ -5061,11 +5054,6 @@ class LeafLayout {
         this.renderSpread || (this.renderSpread = 1);
         this.boundsChanged = true;
     }
-    positionChange() {
-        this.positionChanged = true;
-        this.matrixChanged = true;
-        this.localBoxChanged || this.localBoxChange();
-    }
     scaleChange() {
         this.scaleChanged = true;
         this._scaleOrRotationChange();
@@ -5077,6 +5065,9 @@ class LeafLayout {
     }
     _scaleOrRotationChange() {
         this.affectScaleOrRotation = true;
+        this.matrixChange();
+    }
+    matrixChange() {
         this.matrixChanged = true;
         this.localBoxChanged || this.localBoxChange();
     }
@@ -5219,10 +5210,11 @@ function __getListenerMap(eventer, capture, create) {
 const LeafDataProxy = {
     __setAttr(name, newValue) {
         if (this.leafer && this.leafer.created) {
-            if (typeof newValue === 'object' || this.__.__getInput(name) !== newValue) {
+            const oldValue = this.__.__getInput(name);
+            if (typeof newValue === 'object' || oldValue !== newValue) {
                 this.__[name] = newValue;
                 const { CHANGE } = PropertyEvent;
-                const event = new PropertyEvent(CHANGE, this, name, this.__.__get(name), newValue);
+                const event = new PropertyEvent(CHANGE, this, name, oldValue, newValue);
                 if (this.hasEvent(CHANGE) && !this.isLeafer)
                     this.emitEvent(event);
                 this.leafer.emitEvent(event);
@@ -5313,17 +5305,17 @@ const LeafMatrix = {
                 }
             }
         }
-        if (layout.positionChanged) {
-            r.e = this.__.x;
-            r.f = this.__.y;
-            const { width, height, around } = this.__;
-            if (around && width && height) {
+        const { x, y, around } = this.__;
+        r.e = x;
+        r.f = y;
+        if (around) {
+            const { width, height } = this.__;
+            if (width && height) {
                 const origin = (around === 'center') ? defaultCenter : around;
                 const offsetX = width * origin.x, offsetY = height * origin.y;
                 r.e -= offsetX * r.a + offsetY * r.c;
                 r.f -= offsetX * r.b + offsetY * r.d;
             }
-            layout.positionChanged = false;
         }
         this.__layout.matrixChanged = false;
     }
@@ -5418,7 +5410,7 @@ const LeafBounds = {
         data.__naturalWidth = layout.boxBounds.width;
         data.__naturalHeight = layout.boxBounds.height;
         if (this.around) {
-            layout.positionChanged = layout.matrixChanged = true;
+            layout.matrixChanged = true;
             this.__updateWorldMatrix();
         }
     },
@@ -5606,11 +5598,16 @@ let Leaf = class Leaf {
     get __ignoreHitWorld() { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren; }
     constructor(data) {
         this.innerId = create(LEAF);
+        this.reset(data);
+    }
+    reset(data) {
         this.__world = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0, scaleX: 1, scaleY: 1, rotation: 0, skewX: 0, skewY: 0 };
         this.__local = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 };
         this.__worldOpacity = 1;
         this.__ = new this.__DataProcessor(this);
         this.__layout = new this.__LayoutProcessor(this);
+        if (this.__level)
+            this.resetCustom();
         if (data) {
             if (data.children) {
                 this.set(data);
@@ -5620,6 +5617,10 @@ let Leaf = class Leaf {
             }
         }
     }
+    resetCustom() {
+        this.__hasMask = this.__hasEraser = null;
+        this.forceUpdate();
+    }
     waitParent(item) {
         this.parent ? item() : (this.__parentWait ? this.__parentWait.push(item) : this.__parentWait = [item]);
     }
@@ -5634,8 +5635,11 @@ let Leaf = class Leaf {
             if (leafer !== null)
                 leafer = this;
         }
+        if (this.leafer && !leafer)
+            this.leafer.leafs--;
         this.leafer = leafer;
         if (leafer) {
+            leafer.leafs++;
             this.__level = this.parent ? this.parent.__level + 1 : 1;
             if (this.__leaferWait)
                 WaitHelper.run(this.__leaferWait);
@@ -5658,7 +5662,7 @@ let Leaf = class Leaf {
     __getAttr(_attrName) { return undefined; }
     forceUpdate(attrName) {
         if (attrName === undefined)
-            attrName = 'scaleX';
+            attrName = 'width';
         else if (attrName === 'surface')
             attrName = 'blendMode';
         const value = this.__.__getInput(attrName);
@@ -5865,7 +5869,7 @@ let Branch = class Branch extends Leaf {
         index === undefined ? this.children.push(child) : this.children.splice(index, 0, child);
         if (child.isBranch)
             this.__.__childBranchNumber = (this.__.__childBranchNumber || 0) + 1;
-        child.__layout.boundsChanged || child.__layout.positionChange();
+        child.__layout.boundsChanged || child.__layout.matrixChange();
         if (child.__parentWait)
             WaitHelper.run(child.__parentWait);
         if (this.leafer) {
@@ -6084,7 +6088,7 @@ function updateMatrix(updateList, levelList) {
     let layout;
     updateList.list.forEach(leaf => {
         layout = leaf.__layout;
-        if (levelList.without(leaf) && !layout.useZoomProxy) {
+        if (levelList.without(leaf) && !layout.proxyZoom) {
             if (layout.matrixChanged) {
                 updateAllWorldMatrix$1(leaf);
                 levelList.push(leaf);
@@ -6403,8 +6407,7 @@ class Renderer {
         const { canvas, updateBlocks: list } = this;
         if (!list)
             return debug$4.warn('PartRender: need update attr');
-        if (list.some(block => block.includes(this.target.__world)))
-            this.mergeBlocks();
+        this.mergeBlocks();
         list.forEach(block => { if (canvas.bounds.hit(block) && !block.isEmpty())
             this.clipRender(block); });
     }
@@ -6423,7 +6426,7 @@ class Renderer {
             canvas.clearWorld(bounds, true);
             canvas.clipWorld(bounds, true);
         }
-        this.__render(bounds, realBounds);
+        this.__render(bounds, includes, realBounds);
         canvas.restore();
         Run.end(t);
     }
@@ -6432,12 +6435,12 @@ class Renderer {
         const { canvas } = this;
         canvas.save();
         canvas.clear();
-        this.__render(canvas.bounds);
+        this.__render(canvas.bounds, true);
         canvas.restore();
         Run.end(t);
     }
-    __render(bounds, realBounds) {
-        const options = (bounds === null || bounds === void 0 ? void 0 : bounds.includes(this.target.__world)) ? {} : { bounds };
+    __render(bounds, includes, realBounds) {
+        const options = bounds.includes(this.target.__world) ? { includes } : { bounds, includes };
         if (this.needFill)
             this.canvas.fillWorld(bounds, this.config.fill);
         if (Debug.showRepaint)
@@ -7041,6 +7044,7 @@ class Interaction extends InteractionBase {
             'pointerdown': this.onPointerDown,
             'mousedown': this.onMouseDown,
             'touchstart': this.onTouchStart,
+            'contextmenu': this.onContextMenu,
             'wheel': this.onWheel,
             'gesturestart': this.onGesturestart,
             'gesturechange': this.onGesturechange,
@@ -7113,6 +7117,9 @@ class Interaction extends InteractionBase {
     onKeyUp(e) {
         this.keyUp(KeyEventHelper.convert(e));
     }
+    onContextMenu(e) {
+        this.menu(PointerEventHelper.convert(e, this.getLocal(e)));
+    }
     onScroll() {
         this.canvas.updateClientBounds();
     }
@@ -7317,6 +7324,11 @@ function useCanvas(_canvasType, _power) {
             });
         }
     };
+    Platform.event = {
+        stopDefault(origin) { origin.preventDefault(); },
+        stopNow(origin) { origin.stopImmediatePropagation(); },
+        stop(origin) { origin.stopPropagation(); }
+    };
     Platform.canvas = Creator.canvas();
     Platform.conicGradientSupport = !!Platform.canvas.context.createConicGradient;
 }
@@ -7353,7 +7365,7 @@ function draw(leafer) {
 function design(leafer) {
     if (leafer.isApp)
         return;
-    leafer.__eventIds.push(leafer.on_(MoveEvent.BEFORE_MOVE, (e) => { LeafHelper.moveWorld(leafer.moveLayer, e.moveX, e.moveY); }), leafer.on_(ZoomEvent.BEFORE_ZOOM, (e) => {
+    leafer.__eventIds.push(leafer.on_(MoveEvent.BEFORE_MOVE, (e) => { LeafHelper.moveWorld(leafer.zoomLayer, e.moveX, e.moveY); }), leafer.on_(ZoomEvent.BEFORE_ZOOM, (e) => {
         const { scaleX } = leafer.zoomLayer.__, { min, max } = leafer.config.zoom;
         let { scale } = e;
         if (scale * Math.abs(scaleX) < min)
@@ -7434,6 +7446,8 @@ class UIData extends LeafData {
                 this.__removeInput('fill');
                 Paint.recycleImage('fill', this);
                 this.__isFills = false;
+                if (this.__pixelFill)
+                    this.__pixelFill = false;
             }
             this._fill = value;
         }
@@ -7450,6 +7464,8 @@ class UIData extends LeafData {
                 this.__removeInput('stroke');
                 Paint.recycleImage('stroke', this);
                 this.__isStrokes = false;
+                if (this.__pixelStroke)
+                    this.__pixelStroke = false;
             }
             this._stroke = value;
         }
@@ -7747,9 +7763,9 @@ const UIRender = {
         const { fill, stroke } = this.__;
         this.__drawRenderPath(canvas);
         if (fill)
-            Paint.fill('#000000', this, canvas);
+            this.__.__pixelFill ? Paint.fills(fill, this, canvas) : Paint.fill('#000000', this, canvas);
         if (stroke)
-            Paint.stroke('#000000', this, canvas, renderOptions);
+            this.__.__pixelStroke ? Paint.strokes(stroke, this, canvas, renderOptions) : Paint.stroke('#000000', this, canvas, renderOptions);
     }
 };
 
@@ -7796,9 +7812,7 @@ let UI = UI_1 = class UI extends Leaf {
         const { scaleX, scaleY } = this;
         return scaleX !== scaleY ? { x: scaleX, y: scaleY } : scaleX;
     }
-    constructor(data) {
-        super(data);
-    }
+    reset(_data) { }
     set(data) {
         Object.assign(this, data);
     }
@@ -7987,6 +8001,9 @@ __decorate([
 __decorate([
     effectType()
 ], UI.prototype, "grayscale", void 0);
+__decorate([
+    rewrite(Leaf.prototype.reset)
+], UI.prototype, "reset", null);
 __decorate([
     rewrite(PathDrawer.drawPathByData)
 ], UI.prototype, "__drawPathByData", null);
@@ -8024,8 +8041,12 @@ let Group = class Group extends UI {
         if (data.children) {
             const { children } = data;
             delete data.children;
-            if (!this.children)
+            if (!this.children) {
                 this.__setBranch();
+            }
+            else {
+                this.removeAll(true);
+            }
             super.set(data);
             let child;
             children.forEach(childData => {
@@ -8226,8 +8247,10 @@ let Ellipse = class Ellipse extends UI {
                     ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius);
                     moveTo$3(path, width, ry);
                 }
-                ellipse(path, rx, ry, rx, ry, 0, 0, 360, true);
+                ellipse(path, rx, ry, rx, ry, 0, 360, 0, true);
             }
+            if (Platform.name === 'node')
+                this.__.path = PathConvert.toCanvasData(path, true);
         }
         else {
             if (startAngle || endAngle) {
@@ -8748,10 +8771,10 @@ let Leafer = class Leafer extends Group {
     get __tag() { return 'Leafer'; }
     get isApp() { return false; }
     get app() { return this.parent || this; }
+    get cursorPoint() { return (this.interaction && this.interaction.hoverData) || { x: this.width / 2, y: this.height / 2 }; }
     constructor(userConfig, data) {
         super(data);
         this.zoomLayer = this;
-        this.moveLayer = this;
         this.config = {
             type: 'design',
             start: true,
@@ -8767,6 +8790,7 @@ let Leafer = class Leafer extends Group {
                 autoDistance: 2
             }
         };
+        this.leafs = 0;
         this.__eventIds = [];
         this.__controllers = [];
         this.__readyWait = [];
@@ -8880,9 +8904,8 @@ let Leafer = class Leafer extends Group {
         this.isLeafer = !!leafer;
         this.__level = 1;
     }
-    setZoomLayer(zoomLayer, moveLayer) {
+    setZoomLayer(zoomLayer) {
         this.zoomLayer = zoomLayer;
-        this.moveLayer = moveLayer || zoomLayer;
     }
     __checkAutoLayout(config) {
         if (!config.width || !config.height) {
@@ -9390,10 +9413,13 @@ function checkImage(ui, canvas, paint, allowPaint) {
                 createPattern(ui, paint, canvas.pixelRatio);
             }
             else {
-                ImageManager.patternTasker.add(() => __awaiter(this, void 0, void 0, function* () {
-                    if (canvas.bounds.hit(ui.__world) && createPattern(ui, paint, canvas.pixelRatio))
-                        ui.forceUpdate('surface');
-                }), 300);
+                if (!paint.patternTask) {
+                    paint.patternTask = ImageManager.patternTasker.add(() => __awaiter(this, void 0, void 0, function* () {
+                        paint.patternTask = null;
+                        if (canvas.bounds.hit(ui.__world) && createPattern(ui, paint, canvas.pixelRatio))
+                            ui.forceUpdate('surface');
+                    }), 300);
+                }
             }
             return false;
         }
@@ -9757,17 +9783,30 @@ function conicGradient(paint, box) {
 let recycleMap;
 function compute(attrName, ui) {
     const value = [];
+    const data = ui.__;
     let item;
-    let paints = ui.__.__input[attrName];
+    let paints = data.__input[attrName];
     if (!(paints instanceof Array))
         paints = [paints];
-    recycleMap = recycleImage(attrName, ui.__);
+    recycleMap = recycleImage(attrName, data);
     for (let i = 0, len = paints.length; i < len; i++) {
         item = getLeafPaint(attrName, paints[i], ui);
         if (item)
             value.push(item);
     }
-    ui.__['_' + attrName] = value.length ? value : undefined;
+    data['_' + attrName] = value.length ? value : undefined;
+    let isPixel;
+    if (paints.length === 1) {
+        const paint = paints[0];
+        if (paint.type === 'image')
+            isPixel = ImageManager.isPixel(paint);
+    }
+    if (attrName === 'fill') {
+        data.__pixelFill = isPixel;
+    }
+    else {
+        data.__pixelStroke = isPixel;
+    }
 }
 function getLeafPaint(attrName, paint, ui) {
     if (typeof paint !== 'object' || paint.visible === false || paint.opacity === 0)
@@ -10423,4 +10462,4 @@ Object.assign(Export$1, Export);
 
 useCanvas();
 
-export { Animate, AnimateEvent, App, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, Branch, BranchHelper, BranchRender, Canvas, CanvasManager, ChildEvent, ColorConvert$1 as ColorConvert, Creator, Cursor, DataHelper, Debug, DragEvent, DropEvent, Effect, Ellipse, EllipseHelper, Event, EventCreator, Export$1 as Export, FileHelper, Frame, Group, HitCanvasManager, Image$1 as Image, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafHit, LeafLayout, LeafLevelList, LeafList, LeafMask, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferEvent, LeaferImage, LeaferTypeCreator, Line, MathHelper, Matrix, MatrixHelper, MoveEvent, MultiTouchHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, Path, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, Platform, PluginManager, Point, PointHelper, PointerButton, PointerEvent, Polygon, PropertyEvent, Rect, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, RotateEvent, Run, Selector, Star, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert$1 as TextConvert, TransformEvent, TwoPointBounds, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIEvent, UIHit, UIRender, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, aliasType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, defineDataProcessor, defineKey, defineLeafAttr, effectType, eraserType, getDescriptor, hitType, layoutProcessor, maskType, opacityType, pathType, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, setDefaultValue, sortType, strokeType, surfaceType, useCanvas, useModule, usePlugin };
+export { Animate, AnimateEvent, App, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, Branch, BranchHelper, BranchRender, Canvas, CanvasManager, ChildEvent, ColorConvert$1 as ColorConvert, Creator, Cursor, DataHelper, Debug, DragEvent, DropEvent, Effect, Ellipse, EllipseHelper, Event, EventCreator, Export$1 as Export, FileHelper, Frame, Group, HitCanvasManager, Image$1 as Image, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafHit, LeafLayout, LeafLevelList, LeafList, LeafMask, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferEvent, LeaferImage, LeaferTypeCreator, Line, MathHelper, Matrix, MatrixHelper, MoveEvent, MultiTouchHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, Path, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, Platform, PluginManager, Point, PointHelper, PointerButton, PointerEvent, Polygon, PropertyEvent, Rect, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, RotateEvent, Run, Selector, Star, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert$1 as TextConvert, TwoPointBounds, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIEvent, UIHit, UIRender, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, aliasType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, defineDataProcessor, defineKey, defineLeafAttr, effectType, eraserType, getDescriptor, hitType, layoutProcessor, maskType, opacityType, pathType, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, setDefaultValue, sortType, strokeType, surfaceType, useCanvas, useModule, usePlugin };