@leafer-in/editor 1.9.1 → 1.9.3

package/package.json

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

package/src/Editor.ts

@@ -1,5 +1,5 @@
 import { IGroupInputData, IUI, IEventListenerId, IPointData, ILeafList, IEditSize, IGroup, IObject, IAlign, IAxis, IFunction, IMatrix, IApp } from '@leafer-ui/interface'
-import { Group, DataHelper, LeafList, RenderEvent, LeafHelper, Direction9, Plugin, isString } from '@leafer-ui/draw'
+import { Group, DataHelper, LeafList, RenderEvent, LeafHelper, Direction9, Plugin, isString, PropertyEvent } from '@leafer-ui/draw'
 import { DragEvent, RotateEvent, ZoomEvent, MoveEvent, useModule } from '@leafer-ui/core'
 
 import { IEditBox, IEditPoint, IEditor, IEditorConfig, IEditTool, IEditorScaleEvent, IInnerEditor, ISimulateElement } from '@leafer-in/interface'
@@ -78,6 +78,7 @@ export class Editor extends Group implements IEditor {
     public selector: EditSelect = new EditSelect(this)
     public editMask: EditMask = new EditMask(this)
 
+    public get targetLeafer() { const first = this.list[0]; return first && first.leafer }
     public targetChanged: boolean
     public targetEventIds: IEventListenerId[] = []
 
@@ -140,11 +141,22 @@ export class Editor extends Group implements IEditor {
         this.unloadEditTool()
 
         if (this.editing) {
-            const name = this.element.editOuter || 'EditTool'
-            const tool = this.editTool = this.editToolList[name] = this.editToolList[name] || EditToolCreator.get(name, this)
-            this.editBox.load()
-            tool.load()
-            this.update()
+            const target = this.element
+            let name = target.editOuter || 'EditTool'
+
+            const { beforeEditOuter } = this.mergeConfig
+            if (beforeEditOuter) {
+                const check = beforeEditOuter({ target, name })
+                if (isString(check)) name = check
+                else if (check === false) return
+            }
+
+            if (EditToolCreator.list[name]) {
+                const tool = this.editTool = this.editToolList[name] = this.editToolList[name] || EditToolCreator.get(name, this)
+                this.editBox.load()
+                tool.load()
+                this.update()
+            }
         }
     }
 
@@ -273,18 +285,25 @@ export class Editor extends Group implements IEditor {
         if (target && select) this.target = target
 
         if (this.single) {
-            const editTarget = target || this.element
-            name || (name = editTarget.editInner)
-            if (name && EditToolCreator.list[name]) {
+            if (!target) target = this.element
+            if (!name) name = target.editInner
+
+            const { beforeEditInner } = this.mergeConfig
+            if (beforeEditInner) {
+                const check = beforeEditInner({ target, name })
+                if (isString(check)) name = check
+                else if (check === false) return
+            }
+
+            if (EditToolCreator.list[name]) {
                 this.editTool.unload()
                 this.innerEditing = true
                 this.innerEditor = this.editToolList[name] = this.editToolList[name] || EditToolCreator.get(name, this)
-                this.innerEditor.editTarget = editTarget
+                this.innerEditor.editTarget = target
 
                 this.emitInnerEvent(InnerEditorEvent.BEFORE_OPEN)
                 this.innerEditor.load()
                 this.emitInnerEvent(InnerEditorEvent.OPEN)
-                console.log('hello')
             }
         }
     }
@@ -345,14 +364,18 @@ export class Editor extends Group implements IEditor {
         if (this.targetChanged) this.update()
     }
 
+    protected onChildScroll(): void {
+        if (this.multiple) this.updateEditBox()
+    }
 
     // event 
 
     public listenTargetEvents(): void {
         if (!this.targetEventIds.length) {
-            const { app, leafer, editMask } = this
+            const { app, leafer, targetLeafer, editMask } = this
             this.targetEventIds = [
                 leafer.on_(RenderEvent.START, this.onRenderStart, this),
+                targetLeafer && targetLeafer.on_(PropertyEvent.SCROLL, this.onChildScroll, this),
                 app.on_(RenderEvent.CHILD_START, this.onAppRenderStart, this)
             ]
             if (editMask.visible) editMask.forceRender()

package/src/display/EditBox.ts

@@ -307,7 +307,7 @@ export class EditBox extends Group implements IEditBox {
     }
 
     protected onDragEnd(e: DragEvent): void {
-        if (this.mergeConfig.dragLimitAnimate && this.moving) this.transformTool.onMove(e)
+        if (this.moving) this.transformTool.onMove(e)
 
         this.dragPoint = null
         this.resetDoing()
@@ -347,6 +347,11 @@ export class EditBox extends Group implements IEditBox {
         }
     }
 
+    public onMoveEnd(e: MoveEvent): void {
+        if (this.moving) this.transformTool.onMove(e)
+        this.resetDoing()
+    }
+
     public onScale(e: ZoomEvent): void {
         if (this.canGesture) {
             e.stop()
@@ -468,7 +473,7 @@ export class EditBox extends Group implements IEditBox {
                     [MoveEvent.BEFORE_MOVE, this.onMove, this, true],
                     [ZoomEvent.BEFORE_ZOOM, this.onScale, this, true],
                     [RotateEvent.BEFORE_ROTATE, this.onRotate, this, true],
-                    [MoveEvent.END, this.resetDoing, this],
+                    [MoveEvent.END, this.onMoveEnd, this],
                     [ZoomEvent.END, this.resetDoing, this],
                     [RotateEvent.END, this.resetDoing, this],
                 ])

package/src/helper/EditorHelper.ts

@@ -22,7 +22,7 @@ export const EditorHelper = {
         list.sort(order)
 
         const matrx = new Matrix(element.worldTransform)
-        matrx.divideParent(parent.worldTransform)
+        matrx.divideParent(parent.scrollWorldTransform)
         group.setTransform(matrx)
         group.editable = true
         group.hitChildren = false

package/src/tool/TransformTool.ts

@@ -1,5 +1,5 @@
 import { IEvent, IPointData, IAlign, IAxis, IFunction, IMatrix, IUI } from '@leafer-ui/interface'
-import { MathHelper, Matrix, LeafHelper, AroundHelper, isObject, isNumber, isUndefined } from '@leafer-ui/draw'
+import { MathHelper, Matrix, LeafHelper, AroundHelper, isObject, isString, isNumber, isUndefined } from '@leafer-ui/draw'
 import { DragEvent, RotateEvent, ZoomEvent, MoveEvent } from '@leafer-ui/core'
 
 import { IEditBox, IEditPoint, IEditTool, IEditorScaleEvent, ISimulateElement, IEditorMoveEvent, IEditorRotateEvent, IEditorSkewEvent } from '@leafer-in/interface'
@@ -26,10 +26,12 @@ export class TransformTool implements ITransformTool { // Editor use
         const { target, mergeConfig, dragStartData, app } = this.editBox
 
         let move: IPointData, { dragLimitAnimate } = mergeConfig
+
         if (isUndefined(dragLimitAnimate)) dragLimitAnimate = app && app.config.pointer.dragLimitAnimate
 
-        const isMoveEnd = e.type === DragEvent.END || e.type === DragEvent.END
-        const checkLimitMove = !dragLimitAnimate || isMoveEnd
+        const isMoveEnd = e.type === MoveEvent.END || e.type === DragEvent.END
+        const axisDrag = isString(target.draggable)
+        const checkLimitMove = !dragLimitAnimate || isMoveEnd || axisDrag
 
         if (e instanceof MoveEvent) {
 
@@ -49,9 +51,10 @@ export class TransformTool implements ITransformTool { // Editor use
 
         }
 
-        if (dragLimitAnimate && isMoveEnd) LeafHelper.animateMove(this as unknown as IUI, move, isNumber(dragLimitAnimate) ? dragLimitAnimate : 0.3)  // 是否进行动画
-        else this.move(move)
-
+        if (move.x || move.y) {
+            if (dragLimitAnimate && !axisDrag && isMoveEnd) LeafHelper.animateMove(this as unknown as IUI, move, isNumber(dragLimitAnimate) ? dragLimitAnimate : 0.3)  // 是否进行动画
+            else this.move(move)
+        }
     }
 
     public onScale(e: DragEvent | ZoomEvent): void {

package/types/index.d.ts

@@ -1,3 +1,4 @@
+import * as _leafer_ui_interface from '@leafer-ui/interface';
 import { IBounds, ILeafList, IUI, IFunction, IEventListenerId, ILeaf, IPointerEvent, ILeaferCanvas, IRenderOptions, IGroup, IObject, IGroupInputData, IEditSize, IPointData, IAlign, IAxis, IMatrix, IApp, IBox, IEditorDragStartData, IEditorConfig as IEditorConfig$1, ITransformTool, IBoundsData, IBoxInputData, IUIEvent, IKeyEvent, IRect, IRectInputData, IMatrixData, IDragEvent, IAround, IEvent, ILayoutBoundsData } from '@leafer-ui/interface';
 import { Group, UI, Direction9, Box, Event } from '@leafer-ui/draw';
 import { PointerEvent, DragEvent, MoveEvent, ZoomEvent, RotateEvent, KeyEvent } from '@leafer-ui/core';
@@ -80,6 +81,7 @@ declare class Editor extends Group implements IEditor {
     editToolList: IObject;
     selector: EditSelect;
     editMask: EditMask;
+    get targetLeafer(): _leafer_ui_interface.ILeafer;
     targetChanged: boolean;
     targetEventIds: IEventListenerId[];
     constructor(userConfig?: IEditorConfig, data?: IGroupInputData);
@@ -123,6 +125,7 @@ declare class Editor extends Group implements IEditor {
     toBottom(): void;
     protected onAppRenderStart(app: IApp): void;
     protected onRenderStart(): void;
+    protected onChildScroll(): void;
     listenTargetEvents(): void;
     removeTargetEvents(): void;
     destroy(): void;
@@ -180,6 +183,7 @@ declare class EditBox extends Group implements IEditBox {
     protected onDrag(e: DragEvent): void;
     protected resetDoing(): void;
     onMove(e: MoveEvent): void;
+    onMoveEnd(e: MoveEvent): void;
     onScale(e: ZoomEvent): void;
     onRotate(e: RotateEvent): void;
     isHoldRotateKey(e: IUIEvent): boolean;