kritzel-stencil 0.0.137 → 0.0.139

package/dist/cjs/{index-CZcU_Jdl.js → index-DgZMn9B_.js}

@@ -264,16 +264,17 @@ class KritzelTextTool extends KritzelBaseTool {
             const path = event.composedPath().slice(1);
             const objectElement = path.find(element => element.classList && element.classList.contains('object'));
             const object = this._core.findObjectById(objectElement?.id);
-            if (this._core.store.state.activeText === null && object && object instanceof KritzelText) {
+            if (object instanceof KritzelText) {
                 this._core.store.setState('activeText', object);
                 object.focus();
                 return;
             }
             if (this._core.store.state.activeText !== null && object instanceof KritzelText) {
+                this._core.store.setState('activeText', object);
                 object.focus();
                 return;
             }
-            if (this._core.store.state.activeText !== null) {
+            if (this._core.store.state.activeText !== null && object instanceof KritzelText === false) {
                 this._core.resetActiveText();
                 this._core.store.setState('activeTool', KritzelToolRegistry.getTool('selection'));
                 return;
@@ -296,16 +297,17 @@ class KritzelTextTool extends KritzelBaseTool {
             const path = event.composedPath().slice(1);
             const objectElement = path.find(element => element.classList && element.classList.contains('object'));
             const object = this._core.findObjectById(objectElement?.id);
-            if (this._core.store.state.activeText === null && object && object instanceof KritzelText) {
+            if (object instanceof KritzelText) {
                 this._core.store.setState('activeText', object);
                 object.focus();
                 return;
             }
             if (this._core.store.state.activeText !== null && object instanceof KritzelText) {
+                this._core.store.setState('activeText', object);
                 object.focus();
                 return;
             }
-            if (this._core.store.state.activeText !== null) {
+            if (this._core.store.state.activeText !== null && object instanceof KritzelText === false) {
                 this._core.resetActiveText();
                 this._core.store.setState('activeTool', KritzelToolRegistry.getTool('selection'));
                 return;
@@ -761,13 +763,12 @@ class KritzelText extends KritzelBaseObject {
         }
     }
     edit() {
+        KritzelKeyboardHelper.disableInteractiveWidget();
         this._core.store.setState('activeTool', KritzelToolRegistry.getTool('text'));
-        this._core.store.setState('selectionGroup', null);
-        this._core.store.setState('selectionBox', null);
         this._core.store.setState('activeText', this);
-        setTimeout(() => {
-            this.focus();
-        }, 300);
+        this._core.clearSelection();
+        this.focus();
+        KritzelKeyboardHelper.enableInteractiveWidget();
     }
 }
 
@@ -1534,7 +1535,6 @@ class KritzelMoveHandler extends KritzelBaseHandler {
                 this._core.store.setState('isDragging', true);
                 this.endX = x;
                 this.endY = y;
-                this.hasMoved = true;
                 const moveDeltaX = Math.abs(x - this.startX);
                 const moveDeltaY = Math.abs(y - this.startY);
                 const moveThreshold = 5;
@@ -1543,6 +1543,7 @@ class KritzelMoveHandler extends KritzelBaseHandler {
                     this._core.store.state.selectionGroup.move(x, y, this.dragStartX, this.dragStartY);
                     this.dragStartX = x;
                     this.dragStartY = y;
+                    this.hasMoved = true;
                 }
             }
         }
@@ -1553,6 +1554,7 @@ class KritzelMoveHandler extends KritzelBaseHandler {
                 this._core.store.setState('isDragging', false);
                 if (this.hasMoved) {
                     this._core.history.executeCommand(new MoveSelectionGroupCommand(this._core, this, this.endX, this.endY, this.startX, this.startY, true));
+                    this._core.store.setState('hasObjectsChanged', true);
                 }
                 this.reset();
             }
@@ -1562,6 +1564,7 @@ class KritzelMoveHandler extends KritzelBaseHandler {
                 this._core.store.setState('isDragging', false);
                 if (this.hasMoved) {
                     this._core.history.executeCommand(new MoveSelectionGroupCommand(this._core, this, this.endX, this.endY, this.startX, this.startY, true));
+                    this._core.store.setState('hasObjectsChanged', true);
                 }
                 this.reset();
             }
@@ -1740,6 +1743,7 @@ class KritzelResizeHandler extends KritzelBaseHandler {
             if (this._core.store.state.isResizing) {
                 this._core.history.executeCommand(new ResizeSelectionGroupCommand(this._core, this, structuredClone(this.initialSize), structuredClone(this.newSize)));
                 this._core.store.setState('isResizing', false);
+                this._core.store.setState('hasObjectsChanged', true);
                 this.reset();
             }
         }
@@ -1747,6 +1751,7 @@ class KritzelResizeHandler extends KritzelBaseHandler {
             if (this._core.store.state.isResizing) {
                 this._core.history.executeCommand(new ResizeSelectionGroupCommand(this._core, this, structuredClone(this.initialSize), structuredClone(this.newSize)));
                 this._core.store.setState('isResizing', false);
+                this._core.store.setState('hasObjectsChanged', true);
                 this.reset();
                 clearTimeout(this._core.store.state.longTouchTimeout);
             }
@@ -1874,6 +1879,7 @@ class KritzelRotationHandler extends KritzelBaseHandler {
             if (this._core.store.state.isRotating) {
                 this._core.history.executeCommand(new RotateSelectionGroupCommand(this._core, this, this.rotation, this.initialSelectionGroupRotation));
                 this._core.store.setState('isRotating', false);
+                this._core.store.setState('hasObjectsChanged', true);
                 this.reset();
             }
         }
@@ -1881,6 +1887,7 @@ class KritzelRotationHandler extends KritzelBaseHandler {
             if (this._core.store.state.isRotating) {
                 this._core.history.executeCommand(new RotateSelectionGroupCommand(this._core, this, this.rotation, this.initialSelectionGroupRotation));
                 this._core.store.setState('isRotating', false);
+                this._core.store.setState('hasObjectsChanged', true);
                 this.reset();
                 clearTimeout(this._core.store.state.longTouchTimeout);
             }
@@ -1979,23 +1986,35 @@ class KritzelSelectionHandler extends KritzelBaseHandler {
     }
     handlePointerUp(event) {
         if (event.pointerType === 'mouse') {
-            if (KritzelEventHelper.isLeftClick(event) && this._core.store.state.isSelecting) {
-                if (this.isSelectionClick) {
-                    const x = this._core.store.state.pointerX;
-                    const y = this._core.store.state.pointerY;
-                    const selectedObject = this._core.getObjectsFromPointerEvent(event, '.object').find(obj => obj.hitTest(x, y));
-                    this.addObjectToSelectionGroup(selectedObject);
-                    this.removeSelectionBox();
+            if (KritzelEventHelper.isLeftClick(event)) {
+                const hasObjectsMoved = this._core.store.state.hasObjectsChanged;
+                if (this._core.store.state.selectionGroup?.objects.length === 1 && hasObjectsMoved === false) {
+                    this._core.store.state.selectionGroup.objects[0].edit();
                 }
-                if (this.isSelectionDrag) {
-                    this.updateMouseSelection(event);
-                    this.addSelectedObjectsToSelectionGroup();
-                    this.removeSelectionBox();
+                this._core.store.setState('hasObjectsChanged', false);
+                if (this._core.store.state.isSelecting) {
+                    if (this.isSelectionClick) {
+                        const x = this._core.store.state.pointerX;
+                        const y = this._core.store.state.pointerY;
+                        const selectedObject = this._core.getObjectsFromPointerEvent(event, '.object').find(obj => obj.hitTest(x, y));
+                        this.addObjectToSelectionGroup(selectedObject);
+                        this.removeSelectionBox();
+                    }
+                    if (this.isSelectionDrag) {
+                        this.updateMouseSelection(event);
+                        this.addSelectedObjectsToSelectionGroup();
+                        this.removeSelectionBox();
+                    }
                 }
             }
         }
         if (event.pointerType === 'touch') {
             clearTimeout(this.touchStartTimeout);
+            const hasObjectsMoved = this._core.store.state.hasObjectsChanged;
+            if (this._core.store.state.selectionGroup?.objects.length === 1 && hasObjectsMoved === false) {
+                this._core.store.state.selectionGroup.objects[0].edit();
+            }
+            this._core.store.setState('hasObjectsChanged', false);
             if (this._core.store.state.isSelecting) {
                 if (this.isSelectionClick) {
                     const x = this._core.store.state.pointerX;
@@ -2099,12 +2118,12 @@ class KritzelSelectionHandler extends KritzelBaseHandler {
         if (!object) {
             return;
         }
+        object.isSelected = false;
         const selectionGroup = KritzelSelectionGroup.create(this._core);
         selectionGroup.addOrRemove(object);
         selectionGroup.isSelected = true;
         selectionGroup.rotation = object.rotation;
-        this._core.store.setState('selectionGroup', selectionGroup);
-        this._core.history.executeCommand(new AddSelectionGroupCommand(this._core, this, this._core.store.state.selectionGroup));
+        this._core.history.executeCommand(new AddSelectionGroupCommand(this._core, this, selectionGroup));
     }
     addSelectedObjectsToSelectionGroup() {
         const selectedObjects = this._core.store.selectedObjects;
@@ -2113,16 +2132,15 @@ class KritzelSelectionHandler extends KritzelBaseHandler {
         }
         this._core.store.setState('selectionGroup', KritzelSelectionGroup.create(this._core));
         selectedObjects.forEach(o => {
-            o.isSelected = false;
             this._core.store.state.selectionGroup.addOrRemove(o);
+            o.isSelected = false;
         });
         const selectionGroup = this._core.store.state.selectionGroup;
         selectionGroup.isSelected = true;
         if (selectionGroup.length === 1) {
             selectionGroup.rotation = selectionGroup.objects[0].rotation;
         }
-        this._core.store.setState('selectionGroup', selectionGroup);
-        this._core.history.executeCommand(new AddSelectionGroupCommand(this._core, this, this._core.store.state.selectionGroup));
+        this._core.history.executeCommand(new AddSelectionGroupCommand(this._core, this, selectionGroup));
     }
 }
 
@@ -2239,9 +2257,9 @@ class KritzelSelectionTool extends KritzelBaseTool {
         }
         if (event.pointerType === 'mouse') {
             this.moveHandler.handlePointerUp(event);
-            this.selectionHandler.handlePointerUp(event);
             this.resizeHandler.handlePointerUp(event);
             this.rotationHandler.handlePointerUp(event);
+            this.selectionHandler.handlePointerUp(event);
             this._core.rerender();
         }
         if (event.pointerType === 'touch') {
@@ -2768,6 +2786,6 @@ exports.ObjectHelper = ObjectHelper;
 exports.RemoveObjectCommand = RemoveObjectCommand;
 exports.RemoveSelectionGroupCommand = RemoveSelectionGroupCommand;
 exports.UpdateObjectCommand = UpdateObjectCommand;
-//# sourceMappingURL=index-CZcU_Jdl.js.map
+//# sourceMappingURL=index-DgZMn9B_.js.map
 
-//# sourceMappingURL=index-CZcU_Jdl.js.map
+//# sourceMappingURL=index-DgZMn9B_.js.map