@leafer-in/editor 1.9.10 → 1.9.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-in/editor",
-  "version": "1.9.10",
+  "version": "1.9.12",
   "description": "@leafer-in/editor",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -34,10 +34,10 @@
     "leaferjs"
   ],
   "peerDependencies": {
-    "@leafer-ui/draw": "^1.9.10",
-    "@leafer-ui/core": "^1.9.10",
-    "@leafer-in/resize": "^1.9.10",
-    "@leafer-ui/interface": "^1.9.10",
-    "@leafer-in/interface": "^1.9.10"
+    "@leafer-ui/draw": "^1.9.12",
+    "@leafer-ui/core": "^1.9.12",
+    "@leafer-in/resize": "^1.9.12",
+    "@leafer-ui/interface": "^1.9.12",
+    "@leafer-in/interface": "^1.9.12"
   }
 }

package/src/Editor.ts

@@ -287,7 +287,7 @@ export class Editor extends Group implements IEditor {
 
     public emitGroupEvent(type: string, group?: IGroup): void {
         const event = new EditorGroupEvent(type, { editTarget: group })
-        if (!group || !group.syncEventer) this.emitEvent(event) // 单选时，元素会自动将事件传递给 editor，避免重复触发
+        this.emitEvent(event)
         if (group) group.emitEvent(event)
     }
 
@@ -340,7 +340,7 @@ export class Editor extends Group implements IEditor {
     public emitInnerEvent(type: string): void {
         const { innerEditor } = this, { editTarget } = innerEditor
         const event = new InnerEditorEvent(type, { editTarget, innerEditor })
-        if (!editTarget.syncEventer) this.emitEvent(event) // 单选时，元素会自动将事件传递给 editor，避免重复触发
+        this.emitEvent(event)
         editTarget.emitEvent(event)
     }
 

package/src/display/EditBox.ts

@@ -62,7 +62,7 @@ export class EditBox extends Group implements IEditBox {
     public get flippedY(): boolean { return this.scaleY < 0 }
     public get flippedOne(): boolean { return this.scaleX * this.scaleY < 0 }
 
-    public get canUse(): boolean { return (this.app && this.visible && this.view.visible) as boolean } // 编辑框是否处于激活状态
+    public get canUse(): boolean { return this.app && this.editor.editing } // 编辑框是否处于激活状态
     public get canGesture(): boolean { // 是否支持手势
         if (!this.canUse) return false
         const { moveable, resizeable, rotateable } = this.mergeConfig
@@ -148,6 +148,7 @@ export class EditBox extends Group implements IEditBox {
         updateMoveCursor(this)
     }
 
+    // 必须来自 editor.update()，需同步更新编辑工具 
     public update(): void {
         const { editor } = this
         const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = this.target.getLayoutBounds('box', editor, true)
@@ -329,29 +330,25 @@ export class EditBox extends Group implements IEditBox {
     // 操作事件共用
 
     public onTransformStart(e: IUIEvent): void {
-        if (this.canUse) {
-            if (this.moving) this.editor.opacity = this.mergedConfig.hideOnMove ? 0 : 1 // move
-            if (this.resizing) ResizeEvent.resizingKeys = this.editor.leafList.keys // 记录正在resize中的元素列表
-
-            const { dragStartData, target } = this
-            dragStartData.x = e.x
-            dragStartData.y = e.y
-            dragStartData.totalOffset = getPointData() // 缩放、旋转造成的总偏移量，一般用于手势操作的move纠正
-            dragStartData.point = { x: target.x, y: target.y } // 用于移动
-            dragStartData.bounds = { ...target.getLayoutBounds('box', 'local') } // 用于resize
-            dragStartData.rotation = target.rotation // 用于旋转
-        }
+        if (this.moving) this.editor.opacity = this.mergedConfig.hideOnMove ? 0 : 1 // move
+        if (this.resizing) ResizeEvent.resizingKeys = this.editor.leafList.keys // 记录正在resize中的元素列表
+
+        const { dragStartData, target } = this
+        dragStartData.x = e.x
+        dragStartData.y = e.y
+        dragStartData.totalOffset = getPointData() // 缩放、旋转造成的总偏移量，一般用于手势操作的move纠正
+        dragStartData.point = { x: target.x, y: target.y } // 用于移动
+        dragStartData.bounds = { ...target.getLayoutBounds('box', 'local') } // 用于resize
+        dragStartData.rotation = target.rotation // 用于旋转
     }
 
     public onTransformEnd(e: IUIEvent): void {
-        if (this.canUse) {
-            if (this.canDragLimitAnimate && (e instanceof DragEvent || e instanceof MoveEvent)) this.transformTool.onMove(e)
-            if (this.resizing) ResizeEvent.resizingKeys = null
+        if (this.canDragLimitAnimate && (e instanceof DragEvent || e instanceof MoveEvent)) this.transformTool.onMove(e)
+        if (this.resizing) ResizeEvent.resizingKeys = null
 
-            this.dragging = this.gesturing = this.moving = this.resizing = this.rotating = this.skewing = false
-            this.editor.opacity = 1
-            this.update() // 移动端手势操作hideOnMove移动需强制更新一次           
-        }
+        this.dragging = this.gesturing = this.moving = this.resizing = this.rotating = this.skewing = false
+        this.editor.opacity = 1
+        this.editor.update() // 移动端手势操作hideOnMove移动需强制更新一次           
     }
 
     // 手势控制元素
@@ -386,6 +383,14 @@ export class EditBox extends Group implements IEditBox {
         }
     }
 
+    public onGestureStart(e: IUIEvent): void {
+        if (this.canGesture && (e as MoveEvent).moveType !== 'drag') this.onTransformStart(e)
+    }
+
+    public onGestureEnd(e: IUIEvent): void {
+        if (this.canGesture && (e as MoveEvent).moveType !== 'drag') this.onTransformEnd(e)
+    }
+
     // 键盘
 
     public isHoldRotateKey(e: IUIEvent): boolean { // 按住ctrl在控制点上变旋转功能
@@ -482,11 +487,12 @@ export class EditBox extends Group implements IEditBox {
                     [[KeyEvent.HOLD, KeyEvent.UP], this.onKey, this],
                     [KeyEvent.DOWN, this.onArrow, this],
 
-                    [[MoveEvent.START, MoveEvent.BEFORE_MOVE], this.onMove, this, true],
-                    [[ZoomEvent.START, ZoomEvent.BEFORE_ZOOM], this.onScale, this, true],
-                    [[RotateEvent.START, RotateEvent.BEFORE_ROTATE], this.onRotate, this, true],
+                    [MoveEvent.BEFORE_MOVE, this.onMove, this, true],
+                    [ZoomEvent.BEFORE_ZOOM, this.onScale, this, true],
+                    [RotateEvent.BEFORE_ROTATE, this.onRotate, this, true],
 
-                    [[MoveEvent.END, ZoomEvent.END, RotateEvent.END], this.onTransformEnd, this],
+                    [[MoveEvent.START, ZoomEvent.START, RotateEvent.START], this.onGestureStart, this],
+                    [[MoveEvent.END, ZoomEvent.END, RotateEvent.END], this.onGestureEnd, this],
                 ])
             )
         })

package/types/index.d.ts

@@ -190,6 +190,8 @@ declare class EditBox extends Group implements IEditBox {
     onMove(e: MoveEvent): void;
     onScale(e: ZoomEvent): void;
     onRotate(e: RotateEvent): void;
+    onGestureStart(e: IUIEvent): void;
+    onGestureEnd(e: IUIEvent): void;
     isHoldRotateKey(e: IUIEvent): boolean;
     protected onKey(e: KeyEvent): void;
     onArrow(e: IKeyEvent): void;