kritzel-stencil 0.0.137 → 0.0.139

package/dist/esm/{index-CeerFGiM.js → index-CxieEK_G.js}

@@ -262,16 +262,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;
@@ -294,16 +295,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;
@@ -759,13 +761,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();
     }
 }
 
@@ -1532,7 +1533,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;
@@ -1541,6 +1541,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;
                 }
             }
         }
@@ -1551,6 +1552,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();
             }
@@ -1560,6 +1562,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();
             }
@@ -1738,6 +1741,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();
             }
         }
@@ -1745,6 +1749,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);
             }
@@ -1872,6 +1877,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();
             }
         }
@@ -1879,6 +1885,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);
             }
@@ -1977,23 +1984,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;
@@ -2097,12 +2116,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;
@@ -2111,16 +2130,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));
     }
 }
 
@@ -2237,9 +2255,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') {
@@ -2740,6 +2758,6 @@ class KritzelImageTool extends KritzelBaseTool {
 }
 
 export { AddSelectionGroupCommand as A, BatchCommand as B, DEFAULT_BRUSH_CONFIG as D, KritzelBrushTool as K, ObjectHelper as O, RemoveSelectionGroupCommand as R, UpdateObjectCommand as U, KritzelTextTool as a, KritzelMouseButton as b, KritzelSelectionTool as c, KritzelEraserTool as d, DEFAULT_TEXT_CONFIG as e, KritzelImageTool as f, KritzelWorkspace as g, KritzelKeyboardHelper as h, KritzelEventHelper as i, KritzelBaseHandler as j, KritzelToolRegistry as k, KritzelSelectionGroup as l, KritzelBaseCommand as m, KrtizelSelectionBox as n, KritzelReviver as o, RemoveObjectCommand as p, AddObjectCommand as q, KritzelBaseTool as r, KritzelText as s, KritzelPath as t, KritzelImage as u };
-//# sourceMappingURL=index-CeerFGiM.js.map
+//# sourceMappingURL=index-CxieEK_G.js.map
 
-//# sourceMappingURL=index-CeerFGiM.js.map
+//# sourceMappingURL=index-CxieEK_G.js.map