leafer-ui 1.0.0-rc.18 → 1.0.0-rc.19

package/dist/web.module.js

@@ -6476,7 +6476,7 @@ class Picker {
         return path;
     }
     getHitablePath(leaf) {
-        const path = this.getPath(leaf);
+        const path = this.getPath(leaf && leaf.hittable ? leaf : null);
         let item, hittablePath = new LeafList();
         for (let i = path.list.length - 1; i > -1; i--) {
             item = path.list[i];
@@ -7519,7 +7519,7 @@ let Leafer = class Leafer extends Group {
             hittable: true,
             smooth: true,
             zoom: {
-                min: 0.02,
+                min: 0.01,
                 max: 256
             },
             move: {
@@ -9077,7 +9077,7 @@ class Dragger {
             return;
         }
         if (!this.moving && canDrag) {
-            if (this.moving = interaction.moveMode || interaction.isHoldRightKey)
+            if (this.moving = interaction.canMove(this.downData) || interaction.isHoldRightKey)
                 interaction.emit(MoveEvent.START, this.dragData);
         }
         if (!this.moving) {
@@ -9351,7 +9351,7 @@ const config = {
 const { pathHasEventType, getMoveEventData: getMoveEventData$1, getZoomEventData: getZoomEventData$1, getRotateEventData: getRotateEventData$1 } = InteractionHelper;
 class InteractionBase {
     get dragging() { return this.dragger.dragging; }
-    get isDragEmpty() { return this.config.move.dragEmpty && (this.hoverData && this.hoverData.path.list[0].isLeafer) && (!this.downData || this.downData.path.list[0].isLeafer); }
+    get isDragEmpty() { return this.config.move.dragEmpty && this.isRootPath(this.hoverData) && (!this.downData || this.isRootPath(this.downData)); }
     get isHoldRightKey() { return this.config.move.holdRightKey && this.downData && PointerButton.right(this.downData); }
     get moveMode() { return this.config.move.drag || (this.config.move.holdSpaceKey && Keyboard.isHoldSpaceKey()) || (this.downData && ((this.config.move.holdMiddleKey && PointerButton.middle(this.downData)) || (this.isHoldRightKey && this.dragger.moving))) || this.isDragEmpty; }
     get hitRadius() { return this.config.pointer.hitRadius; }
@@ -9383,19 +9383,16 @@ class InteractionBase {
             return;
         PointerButton.defaultLeft(data);
         this.updateDownData(data);
-        if (useDefaultPath)
-            data.path = this.defaultPath;
+        this.checkPath(data, useDefaultPath);
         this.downTime = Date.now();
-        if (this.downed = !this.moveMode) {
-            this.emit(PointerEvent.BEFORE_DOWN, data);
-            this.emit(PointerEvent.DOWN, data);
-            if (PointerButton.left(data)) {
-                this.tapWait();
-                this.longPressWait(data);
-            }
-            else if (PointerButton.right(data)) {
-                this.waitMenuTap = true;
-            }
+        this.emit(PointerEvent.BEFORE_DOWN, data);
+        this.emit(PointerEvent.DOWN, data);
+        if (PointerButton.left(data)) {
+            this.tapWait();
+            this.longPressWait(data);
+        }
+        else if (PointerButton.right(data)) {
+            this.waitMenuTap = true;
         }
         this.dragger.setDragData(data);
         this.updateCursor(data);
@@ -9410,10 +9407,6 @@ class InteractionBase {
             PointerButton.defaultLeft(data);
         const hit = this.canvas.bounds.hitPoint(data);
         if (hit || downData) {
-            if (hit && !downData && PointerButton.left(data)) {
-                this.pointerDown(data, true);
-                this.dragger.canDragOut = false;
-            }
             this.pointerMoveReal(data);
             if (downData)
                 this.dragger.checkDragOut(data);
@@ -9432,8 +9425,7 @@ class InteractionBase {
         }
         if (!this.dragger.moving) {
             this.updateHoverData(data);
-            if (this.moveMode)
-                data.path = this.defaultPath;
+            this.checkPath(data);
             this.emit(PointerEvent.MOVE, data);
             if (!(this.dragging && !this.config.pointer.dragHover))
                 this.pointerHover(data);
@@ -9445,26 +9437,22 @@ class InteractionBase {
         this.updateCursor(this.downData || data);
     }
     pointerUp(data) {
-        const { downData, oldDownData } = this;
+        const { downData } = this;
         if (!data)
             data = downData;
         if (!downData)
             return;
         PointerButton.defaultLeft(data);
+        this.downData = null;
         this.findPath(data);
-        if (this.downed) {
-            this.downed = false;
-            this.emit(PointerEvent.BEFORE_UP, data);
-            this.emit(PointerEvent.UP, data);
-            if (oldDownData)
-                this.emit(PointerEvent.UP, oldDownData, undefined, data.path);
-            this.emit(PointerEvent.UP, downData, undefined, data.path);
-            this.touchLeave(data);
-            this.tap(data);
-            this.menuTap(data);
-        }
+        data.path.addList(downData.path.list);
+        this.checkPath(data);
+        this.emit(PointerEvent.BEFORE_UP, data);
+        this.emit(PointerEvent.UP, data);
+        this.touchLeave(data);
+        this.tap(data);
+        this.menuTap(data);
         this.dragger.dragEnd(data);
-        this.downData = this.oldDownData = null;
         this.updateCursor(data);
     }
     pointerCancel() {
@@ -9597,12 +9585,21 @@ class InteractionBase {
         data.path = find.path;
         return find.path;
     }
+    isRootPath(data) {
+        return data && data.path.list[0].isLeafer;
+    }
+    checkPath(data, useDefaultPath) {
+        if (useDefaultPath || this.canMove(data))
+            data.path = this.defaultPath;
+    }
+    canMove(data) {
+        return this.moveMode && data && data.path.list.every(item => !item.isOutside);
+    }
     isDrag(leaf) {
         return this.dragger.getList().has(leaf);
     }
     isPress(leaf) {
-        const { downData, oldDownData } = this;
-        return this.downed && ((downData && downData.path.has(leaf)) || (oldDownData && oldDownData.path.has(leaf)));
+        return this.downData && this.downData.path.has(leaf);
     }
     isHover(leaf) {
         return this.enterPath && this.enterPath.has(leaf);
@@ -9617,14 +9614,15 @@ class InteractionBase {
             this.pointerHover(hoverData);
         }
     }
-    updateDownData(data, options) {
+    updateDownData(data, options, merge) {
         const { downData } = this;
         if (!data && downData)
-            data = Object.assign({}, downData);
+            data = downData;
         if (!data)
             return;
-        this.oldDownData = downData;
         this.findPath(data, options);
+        if (merge && downData)
+            data.path.addList(downData.path.list);
         this.downData = data;
     }
     updateHoverData(data) {
@@ -9645,7 +9643,7 @@ class InteractionBase {
         if (this.dragger.moving) {
             return this.setCursor('grabbing');
         }
-        else if (this.moveMode) {
+        else if (this.canMove(data)) {
             return this.setCursor(this.downData ? 'grabbing' : 'grab');
         }
         else if (!data)
@@ -9785,7 +9783,8 @@ const inner = {};
 Leaf.prototype.__hitWorld = function (point) {
     if (this.__layout.hitCanvasChanged || !this.__hitCanvas) {
         this.__updateHitCanvas();
-        this.__layout.hitCanvasChanged = false;
+        if (!this.__layout.boundsChanged)
+            this.__layout.hitCanvasChanged = false;
     }
     if (this.__.hitRadius) {
         copy$2(inner, point), point = inner;