@leafer-in/editor 1.9.7 → 1.9.8

package/package.json

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

package/src/decorator/data.ts

@@ -21,18 +21,18 @@ export function targetAttr(fn: IFunction) {
 
                         const isSelect = key === 'target'
                         if (isSelect) {
-                            t.setDimOthers(false)
-                            t.setBright(false)
-
-                            if (isArray(value) && value.length > 1 && value[0].locked) value.splice(0, 1) // fix: 单个锁定 + shift多选
-                            if (t.single) t.element.syncEventer = null // 重置 EditBox.load() 设置
-
                             const { beforeSelect } = t.config
                             if (beforeSelect) {
                                 const check = beforeSelect({ target: value })
                                 if (isObject(check)) value = check
                                 else if (check === false) return
                             }
+
+                            t.setDimOthers(false)
+                            t.setBright(false)
+
+                            if (isArray(value) && value.length > 1 && value[0].locked) value.splice(0, 1) // fix: 单个锁定 + shift多选
+                            if (t.single) t.element.syncEventer = null // 重置 EditBox.load() 设置
                         }
 
                         const type = isSelect ? EditorEvent.BEFORE_SELECT : EditorEvent.BEFORE_HOVER

package/src/display/EditBox.ts

@@ -1,5 +1,5 @@
 import { IRect, IEventListenerId, IBoundsData, IPointData, IKeyEvent, IGroup, IBox, IBoxInputData, IAlign, IUI, IEditorConfig, IEditorDragStartData, ITransformTool, IUIEvent, IEditPointInputData } from '@leafer-ui/interface'
-import { Group, Text, AroundHelper, Direction9, ResizeEvent, BoundsHelper, isArray, isString, isNumber } from '@leafer-ui/draw'
+import { Group, Text, AroundHelper, Direction9, ResizeEvent, BoundsHelper, isArray, isString, isNumber, getPointData } from '@leafer-ui/draw'
 import { DragEvent, PointerEvent, KeyEvent, RotateEvent, ZoomEvent, MoveEvent } from '@leafer-ui/core'
 
 import { IEditBox, IEditor, IEditPoint, IEditPointType } from '@leafer-in/interface'
@@ -68,6 +68,7 @@ export class EditBox extends Group implements IEditBox {
         const { moveable, resizeable, rotateable } = this.mergeConfig
         return isString(moveable) || isString(resizeable) || isString(rotateable)
     }
+    public get canDragLimitAnimate(): boolean { return (this.moving && this.mergeConfig.dragLimitAnimate && this.target.dragBounds) as any as boolean }
 
     protected __eventIds: IEventListenerId[] = []
 
@@ -285,15 +286,14 @@ export class EditBox extends Group implements IEditBox {
 
     // drag
 
-    protected onDragStart(e: DragEvent): void {
+    public onDragStart(e: DragEvent): void {
         this.dragging = true
         const point = this.dragPoint = e.current as IEditPoint, { pointType } = point
-        const { editor, dragStartData } = this, { target } = this, { moveable, resizeable, rotateable, skewable, hideOnMove } = this.mergeConfig
+        const { moveable, resizeable, rotateable, skewable } = this.mergeConfig
 
         // 确定模式
         if (pointType === 'move') {
             moveable && (this.moving = true)
-            editor.opacity = hideOnMove ? 0 : 1 // move
         } else {
             if (pointType.includes('rotate') || this.isHoldRotateKey(e) || !resizeable) {
                 rotateable && (this.rotating = true)
@@ -303,25 +303,10 @@ export class EditBox extends Group implements IEditBox {
             if (pointType === 'skew') skewable && (this.skewing = true)
         }
 
-        dragStartData.x = e.x
-        dragStartData.y = e.y
-        dragStartData.point = { x: target.x, y: target.y } // 用于移动
-        dragStartData.bounds = { ...target.getLayoutBounds('box', 'local') } // 用于resize
-        dragStartData.rotation = target.rotation // 用于旋转
-        if (pointType && pointType.includes('resize')) ResizeEvent.resizingKeys = editor.leafList.keys // 记录正在resize中的元素列表
+        this.onTransformStart(e)
     }
 
-    protected onDragEnd(e: DragEvent): void {
-        if (this.moving && this.mergeConfig.dragLimitAnimate && this.target.dragBounds) this.transformTool.onMove(e)
-
-        this.dragPoint = null
-        this.resetDoing()
-        const { pointType } = e.current as IEditPoint
-        if (pointType === 'move') this.editor.opacity = 1 // move
-        if (pointType && pointType.includes('resize')) ResizeEvent.resizingKeys = null
-    }
-
-    protected onDrag(e: DragEvent): void {
+    public onDrag(e: DragEvent): void {
         const { transformTool, moving, resizing, rotating, skewing } = this
         if (moving) {
             transformTool.onMove(e)
@@ -335,8 +320,37 @@ export class EditBox extends Group implements IEditBox {
         updatePointCursor(this, e)
     }
 
-    protected resetDoing(): void {
-        if (this.canUse) this.dragging = this.gesturing = this.moving = this.resizing = this.rotating = this.skewing = false
+    public onDragEnd(e: DragEvent): void {
+        this.onTransformEnd(e)
+        this.dragPoint = null
+    }
+
+    // 操作事件共用
+
+    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 // 用于旋转
+        }
+    }
+
+    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
+
+            this.dragging = this.gesturing = this.moving = this.resizing = this.rotating = this.skewing = false
+            this.editor.opacity = 1
+            this.update() // 移动端手势操作hideOnMove移动需强制更新一次           
+        }
     }
 
     // 手势控制元素
@@ -344,24 +358,19 @@ export class EditBox extends Group implements IEditBox {
     public onMove(e: MoveEvent): void {
         if (this.canGesture && e.moveType !== 'drag') {
             e.stop()
-            if (isString(this.mergeConfig.moveable)) {
+            if (isString(this.mergedConfig.moveable)) {
                 this.gesturing = this.moving = true
-                this.transformTool.onMove(e)
+                e.type === MoveEvent.START ? this.onTransformStart(e) : this.transformTool.onMove(e)
             }
         }
     }
 
-    public onMoveEnd(e: MoveEvent): void {
-        if (this.moving) this.transformTool.onMove(e)
-        this.resetDoing()
-    }
-
     public onScale(e: ZoomEvent): void {
         if (this.canGesture) {
             e.stop()
-            if (isString(this.mergeConfig.resizeable)) {
+            if (isString(this.mergedConfig.resizeable)) {
                 this.gesturing = this.resizing = true
-                this.transformTool.onScale(e)
+                e.type === ZoomEvent.START ? this.onTransformStart(e) : this.transformTool.onScale(e)
             }
         }
     }
@@ -369,14 +378,15 @@ export class EditBox extends Group implements IEditBox {
     public onRotate(e: RotateEvent): void {
         if (this.canGesture) {
             e.stop()
-            if (isString(this.mergeConfig.rotateable)) {
+            if (isString(this.mergedConfig.rotateable)) {
                 this.gesturing = this.rotating = true
-                this.transformTool.onRotate(e)
+                e.type === RotateEvent.START ? this.onTransformStart(e) : this.transformTool.onRotate(e)
             }
         }
     }
 
     // 键盘
+
     public isHoldRotateKey(e: IUIEvent): boolean { // 按住ctrl在控制点上变旋转功能
         const { rotateKey } = this.mergedConfig
         if (rotateKey) return e.isHoldKeys(rotateKey)
@@ -388,8 +398,7 @@ export class EditBox extends Group implements IEditBox {
     }
 
     public onArrow(e: IKeyEvent): void {
-        const { editor, transformTool } = this
-        if (this.canUse && editor.editing && this.mergeConfig.keyEvent) {
+        if (this.canUse && this.mergeConfig.keyEvent) {
             let x = 0, y = 0
             const distance = e.shiftKey ? 10 : 1
             switch (e.code) {
@@ -405,7 +414,7 @@ export class EditBox extends Group implements IEditBox {
                 case 'ArrowRight':
                     x = distance
             }
-            if (x || y) transformTool.move(x, y)
+            if (x || y) this.transformTool.move(x, y)
         }
     }
 
@@ -471,12 +480,12 @@ export class EditBox extends Group implements IEditBox {
                 editor.app.on_([
                     [[KeyEvent.HOLD, KeyEvent.UP], this.onKey, this],
                     [KeyEvent.DOWN, this.onArrow, this],
-                    [MoveEvent.BEFORE_MOVE, this.onMove, this, true],
-                    [ZoomEvent.BEFORE_ZOOM, this.onScale, this, true],
-                    [RotateEvent.BEFORE_ROTATE, this.onRotate, this, true],
-                    [MoveEvent.END, this.onMoveEnd, this],
-                    [ZoomEvent.END, this.resetDoing, this],
-                    [RotateEvent.END, this.resetDoing, 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.END, ZoomEvent.END, RotateEvent.END], this.onTransformEnd, this],
                 ])
             )
         })

package/src/display/EditSelect.ts

@@ -17,8 +17,8 @@ export class EditSelect extends Group implements IEditSelect {
     public editor: IEditor
 
     public get dragging(): boolean { return !!this.originList }
-    public get running(): boolean { const { editor } = this; return this.hittable && editor.visible && editor.hittable && editor.mergeConfig.selector && this.app.mode === 'normal' }
-    public get isMoveMode(): boolean { return this.app && this.app.interaction.moveMode }
+    public get running(): boolean { const { editor, app } = this; return this.hittable && editor.visible && editor.hittable && editor.mergeConfig.selector && (app && app.mode === 'normal') }
+    public get isMoveMode(): boolean { const { app } = this; return app && app.interaction.moveMode }
 
     public hoverStroker: IStroker = new Stroker()
     public targetStroker: IStroker = new Stroker()
@@ -95,7 +95,7 @@ export class EditSelect extends Group implements IEditSelect {
         if (e.multiTouch) return
 
         const { editor } = this
-        const { select } = editor.mergeConfig
+        const { select, selectKeep } = editor.mergeConfig
 
         if (select === 'tap') this.checkAndSelect(e)
         else if (this.waitSelect) this.waitSelect()
@@ -103,7 +103,7 @@ export class EditSelect extends Group implements IEditSelect {
         if (this.needRemoveItem) {
             editor.removeItem(this.needRemoveItem)
         } else if (this.isMoveMode) {
-            editor.target = null  // move.dragEmpty
+            if (!selectKeep) editor.target = null  // move.dragEmpty
         }
 
     }
@@ -125,7 +125,7 @@ export class EditSelect extends Group implements IEditSelect {
 
             } else if (this.allow(e.target)) {
 
-                if (!this.isHoldMultipleSelectKey(e)) editor.target = null
+                if (!this.isHoldMultipleSelectKey(e) && !this.editor.mergedConfig.selectKeep) editor.target = null
 
             }
         }

package/src/helper/EditDataHelper.ts

@@ -1,5 +1,5 @@
 import { IBoundsData, IPointData, IAround, IAlign, IUI, ILayoutBoundsData } from '@leafer-ui/interface'
-import { AroundHelper, MathHelper, PointHelper, Direction9, DragBoundsHelper } from '@leafer-ui/draw'
+import { AroundHelper, MathHelper, PointHelper, Direction9, DragBoundsHelper, isNumber } from '@leafer-ui/draw'
 
 import { IEditorScaleEvent, IEditorSkewEvent, IEditorRotateEvent } from '@leafer-in/interface'
 
@@ -10,18 +10,12 @@ const { within, sign } = MathHelper
 
 export const EditDataHelper = {
 
-    getScaleData(target: IUI, startBounds: ILayoutBoundsData, direction: Direction9, totalMove: IPointData, lockRatio: boolean | 'corner', around: IAround, flipable: boolean, scaleMode: boolean): IEditorScaleEvent {
+    getScaleData(target: IUI, startBounds: ILayoutBoundsData, direction: Direction9, totalMoveOrScale: IPointData | number, lockRatio: boolean | 'corner', around: IAround, flipable: boolean, scaleMode: boolean): IEditorScaleEvent {
         let align: IAlign, origin = {} as IPointData, scaleX: number = 1, scaleY: number = 1
 
         const { boxBounds, widthRange, heightRange, dragBounds, worldBoxBounds } = target
         const { width, height } = startBounds
 
-        if (around) {
-            totalMove.x *= 2
-            totalMove.y *= 2
-        }
-
-
         // 获取已经改变的比例
         const originChangedScaleX = target.scaleX / startBounds.scaleX
         const originChangedScaleY = target.scaleY / startBounds.scaleY
@@ -31,72 +25,85 @@ export const EditDataHelper = {
         const changedScaleX = scaleMode ? originChangedScaleX : signX * boxBounds.width / width
         const changedScaleY = scaleMode ? originChangedScaleY : signY * boxBounds.height / height
 
-        totalMove.x *= scaleMode ? originChangedScaleX : signX
-        totalMove.y *= scaleMode ? originChangedScaleY : signY
+        if (isNumber(totalMoveOrScale)) {
 
-        const topScale = (-totalMove.y + height) / height
-        const rightScale = (totalMove.x + width) / width
-        const bottomScale = (totalMove.y + height) / height
-        const leftScale = (-totalMove.x + width) / width
+            scaleX = scaleY = Math.sqrt(totalMoveOrScale)
 
-        switch (direction) {
-            case top:
-                scaleY = topScale
-                align = 'bottom'
-                break
-            case right:
-                scaleX = rightScale
-                align = 'left'
-                break
-            case bottom:
-                scaleY = bottomScale
-                align = 'top'
-                break
-            case left:
-                scaleX = leftScale
-                align = 'right'
-                break
-            case topLeft:
-                scaleY = topScale
-                scaleX = leftScale
-                align = 'bottom-right'
-                break
-            case topRight:
-                scaleY = topScale
-                scaleX = rightScale
-                align = 'bottom-left'
-                break
-            case bottomRight:
-                scaleY = bottomScale
-                scaleX = rightScale
-                align = 'top-left'
-                break
-            case bottomLeft:
-                scaleY = bottomScale
-                scaleX = leftScale
-                align = 'top-right'
-        }
+        } else {
+
+            if (around) {
+                totalMoveOrScale.x *= 2
+                totalMoveOrScale.y *= 2
+            }
+
+            totalMoveOrScale.x *= scaleMode ? originChangedScaleX : signX
+            totalMoveOrScale.y *= scaleMode ? originChangedScaleY : signY
+
+            const topScale = (-totalMoveOrScale.y + height) / height
+            const rightScale = (totalMoveOrScale.x + width) / width
+            const bottomScale = (totalMoveOrScale.y + height) / height
+            const leftScale = (-totalMoveOrScale.x + width) / width
 
-        if (lockRatio) {
-            if (lockRatio === 'corner' && direction % 2) {
-                lockRatio = false
-            } else {
-                let scale: number
-                switch (direction) {
-                    case top:
-                    case bottom:
-                        scale = scaleY
-                        break
-                    case left:
-                    case right:
-                        scale = scaleX
-                        break
-                    default:
-                        scale = Math.sqrt(Math.abs(scaleX * scaleY))
+            switch (direction) {
+                case top:
+                    scaleY = topScale
+                    align = 'bottom'
+                    break
+                case right:
+                    scaleX = rightScale
+                    align = 'left'
+                    break
+                case bottom:
+                    scaleY = bottomScale
+                    align = 'top'
+                    break
+                case left:
+                    scaleX = leftScale
+                    align = 'right'
+                    break
+                case topLeft:
+                    scaleY = topScale
+                    scaleX = leftScale
+                    align = 'bottom-right'
+                    break
+                case topRight:
+                    scaleY = topScale
+                    scaleX = rightScale
+                    align = 'bottom-left'
+                    break
+                case bottomRight:
+                    scaleY = bottomScale
+                    scaleX = rightScale
+                    align = 'top-left'
+                    break
+                case bottomLeft:
+                    scaleY = bottomScale
+                    scaleX = leftScale
+                    align = 'top-right'
+            }
+
+            if (lockRatio) {
+                if (lockRatio === 'corner' && direction % 2) {
+                    lockRatio = false
+                } else {
+                    let scale: number
+                    switch (direction) {
+                        case top:
+                        case bottom:
+                            scale = scaleY
+                            break
+                        case left:
+                        case right:
+                            scale = scaleX
+                            break
+                        default:
+                            scale = Math.sqrt(Math.abs(scaleX * scaleY))
+                    }
+                    scaleX = scaleX < 0 ? -scale : scale
+                    scaleY = scaleY < 0 ? -scale : scale
                 }
-                scaleX = scaleX < 0 ? -scale : scale
-                scaleY = scaleY < 0 ? -scale : scale
             }
+
         }
 
         const useScaleX = scaleX !== 1, useScaleY = scaleY !== 1

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, isString, isNumber } from '@leafer-ui/draw'
+import { MathHelper, PointHelper, Matrix, LeafHelper, AroundHelper, isObject, isString, isNumber } 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'
@@ -12,6 +12,7 @@ import { EditorSkewEvent } from '../event/EditorSkewEvent'
 import { EditDataHelper } from '../helper/EditDataHelper'
 import { ITransformTool } from '@leafer-ui/interface'
 
+
 export class TransformTool implements ITransformTool { // Editor use
 
     public editBox: IEditBox
@@ -31,24 +32,19 @@ export class TransformTool implements ITransformTool { // Editor use
         const axisDrag = isString(target.draggable)
         const checkLimitMove = !dragLimitAnimate || isMoveEnd || axisDrag
 
-        if (e instanceof MoveEvent) {
-
-            move = e.getLocalMove(target)
-            if (checkLimitMove) DragEvent.limitMove(target, move)
-
-        } else {
-
-            const total = { x: e.totalX, y: e.totalY }
-
-            if (e.shiftKey) {
-                if (Math.abs(total.x) > Math.abs(total.y)) total.y = 0
-                else total.x = 0
-            }
+        const total = { x: e.totalX, y: e.totalY }
 
-            move = DragEvent.getValidMove(target, dragStartData.point, total, checkLimitMove)
+        if (e instanceof MoveEvent) {
+            PointHelper.move(total, target.getWorldPointByLocal(dragStartData.totalOffset, null, true))
+        }
 
+        if (e.shiftKey) {
+            if (Math.abs(total.x) > Math.abs(total.y)) total.y = 0
+            else total.x = 0
         }
 
+        move = DragEvent.getValidMove(target, dragStartData.point, total, checkLimitMove)
+
         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)
@@ -58,33 +54,36 @@ export class TransformTool implements ITransformTool { // Editor use
     public onScale(e: DragEvent | ZoomEvent): void {
 
         const { target, mergeConfig, single, dragStartData } = this.editBox
-        let { around, lockRatio, flipable, editSize } = mergeConfig
+        let { around, lockRatio, flipable, editSize } = mergeConfig, totalMove: IPointData | number
 
         if (e instanceof ZoomEvent) {
-
-            this.scaleOf(target.getBoxPoint(e), e.scale, e.scale)
-
+            around = target.getBoxPoint(e)
+            totalMove = e.totalScale
         } else {
+            totalMove = e.getInnerTotal(target)
+        }
 
-            const { direction } = e.current as IEditPoint
-            if (e.shiftKey || target.lockRatio) lockRatio = true
+        const { direction } = e.current as IEditPoint
+        if (e.shiftKey || target.lockRatio) lockRatio = true
 
-            const data = EditDataHelper.getScaleData(target, dragStartData.bounds, direction, e.getInnerTotal(target), lockRatio, EditDataHelper.getAround(around, e.altKey), flipable, !single || editSize === 'scale')
+        const data = EditDataHelper.getScaleData(target, dragStartData.bounds, direction, totalMove, lockRatio, EditDataHelper.getAround(around, e.altKey), flipable, !single || editSize === 'scale')
 
-            if (this.editTool && this.editTool.onScaleWithDrag) {
-                data.drag = e
-                this.scaleWithDrag(data)
-            } else {
-                this.scaleOf(data.origin, data.scaleX, data.scaleY)
-            }
+        const targetX = target.x, targetY = target.y
 
+        if (e instanceof DragEvent && this.editTool && this.editTool.onScaleWithDrag) {
+            data.drag = e
+            this.scaleWithDrag(data)
+        } else {
+            this.scaleOf(data.origin, data.scaleX, data.scaleY)
         }
+
+        PointHelper.move(dragStartData.totalOffset, target.x - targetX, target.y - targetY)
     }
 
     public onRotate(e: DragEvent | RotateEvent): void {
 
         const { target, mergeConfig, dragStartData } = this.editBox
-        const { around, rotateAround, rotateGap } = mergeConfig
+        const { around, rotateAround, rotateGap, diagonalRotateKey } = mergeConfig
         const { direction } = e.current as IEditPoint
 
         let origin: IPointData, rotation: number
@@ -96,7 +95,9 @@ export class TransformTool implements ITransformTool { // Editor use
 
         } else {
 
-            const data = EditDataHelper.getRotateData(target, direction, e, dragStartData, e.shiftKey ? null : (rotateAround || target.around || target.origin || around || 'center'))
+            const isDiagonalRotate = diagonalRotateKey ? e.isHoldKeys(diagonalRotateKey) : e.shiftKey // 对角旋转
+
+            const data = EditDataHelper.getRotateData(target, direction, e, dragStartData, isDiagonalRotate ? null : (rotateAround || target.around || target.origin || around || 'center'))
             rotation = dragStartData.rotation + data.rotation - target.rotation
             origin = data.origin
 
@@ -105,7 +106,11 @@ export class TransformTool implements ITransformTool { // Editor use
         rotation = MathHelper.float(MathHelper.getGapRotation(rotation, rotateGap, target.rotation), 2)
         if (!rotation) return
 
+        const targetX = target.x, targetY = target.y
+
         this.rotateOf(origin, rotation)
+
+        PointHelper.move(dragStartData.totalOffset, target.x - targetX, target.y - targetY)
     }
 
     public onSkew(e: DragEvent): void {

package/types/index.d.ts

@@ -168,6 +168,7 @@ declare class EditBox extends Group implements IEditBox {
     get flippedOne(): boolean;
     get canUse(): boolean;
     get canGesture(): boolean;
+    get canDragLimitAnimate(): boolean;
     protected __eventIds: IEventListenerId[];
     constructor(editor: IEditor);
     create(): void;
@@ -181,12 +182,12 @@ declare class EditBox extends Group implements IEditBox {
     getPointStyle(userStyle?: IBoxInputData): IBoxInputData;
     getPointsStyle(): IBoxInputData[];
     getMiddlePointsStyle(): IBoxInputData[];
-    protected onDragStart(e: DragEvent): void;
-    protected onDragEnd(e: DragEvent): void;
-    protected onDrag(e: DragEvent): void;
-    protected resetDoing(): void;
+    onDragStart(e: DragEvent): void;
+    onDrag(e: DragEvent): void;
+    onDragEnd(e: DragEvent): void;
+    onTransformStart(e: IUIEvent): void;
+    onTransformEnd(e: IUIEvent): void;
     onMove(e: MoveEvent): void;
-    onMoveEnd(e: MoveEvent): void;
     onScale(e: ZoomEvent): void;
     onRotate(e: RotateEvent): void;
     isHoldRotateKey(e: IUIEvent): boolean;
@@ -387,7 +388,7 @@ declare const EditorHelper: {
 };
 
 declare const EditDataHelper: {
-    getScaleData(target: IUI, startBounds: ILayoutBoundsData, direction: Direction9, totalMove: IPointData, lockRatio: boolean | "corner", around: IAround, flipable: boolean, scaleMode: boolean): IEditorScaleEvent;
+    getScaleData(target: IUI, startBounds: ILayoutBoundsData, direction: Direction9, totalMoveOrScale: IPointData | number, lockRatio: boolean | "corner", around: IAround, flipable: boolean, scaleMode: boolean): IEditorScaleEvent;
     getRotateData(target: IUI, direction: Direction9, current: IPointData, last: IPointData, around: IAround): IEditorRotateEvent;
     getSkewData(bounds: IBoundsData, direction: Direction9, move: IPointData, around: IAround): IEditorSkewEvent;
     getAround(around: IAround, altKey: boolean): IAround;