@leafer-in/editor 1.9.6 → 1.9.8

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

@@ -1,5 +1,5 @@
 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 { IBounds, ILeafList, IUI, IFunction, IEventListenerId, ILeaf, IPointerEvent, ILeaferCanvas, IRenderOptions, IGroup, IObject, IGroupInputData, IEditSize, IPointData, IAlign, IAxis, IMatrix, IApp, 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';
 import { IEditSelect, IEditor, IStroker, ISelectArea, IEditorConfig, IEditPoint, ISimulateElement, IEditBox, IEditTool, IInnerEditor, IEditorScaleEvent, IEditPointType, IEditPointInputData, IEditorEvent, IEditorMoveEvent, IEditorRotateEvent, IEditorSkewEvent, IEditorGroupEvent, IInnerEditorEvent, IInnerEditorMode, IUI as IUI$1, IDragEvent as IDragEvent$1, IPointData as IPointData$1, IPathCommandData, IFromToData, IAround as IAround$1 } from '@leafer-in/interface';
@@ -53,8 +53,9 @@ declare class Editor extends Group implements IEditor {
     config: IEditorConfig;
     readonly mergeConfig: IEditorConfig;
     readonly mergedConfig: IEditorConfig;
-    hoverTarget?: IUI;
     target?: IUI | IUI[];
+    hoverTarget?: IUI;
+    dimTarget?: IGroup | IGroup[];
     leafList: ILeafList;
     get list(): IUI[];
     get dragHoverExclude(): IUI[];
@@ -91,6 +92,8 @@ declare class Editor extends Group implements IEditor {
     addItem(item: IUI): void;
     removeItem(item: IUI): void;
     shiftItem(item: IUI): void;
+    setDimOthers(value: boolean | number, attrName?: 'bright' | 'dim', list?: IUI[]): void;
+    setBright(value: boolean): void;
     update(): void;
     updateEditBox(): void;
     updateEditTool(): void;
@@ -140,7 +143,7 @@ declare class EditBox extends Group implements IEditBox {
     rotating: boolean;
     skewing: boolean;
     view: IGroup;
-    rect: IBox;
+    rect: IEditPoint;
     circle: IEditPoint;
     buttons: IGroup;
     resizePoints: IEditPoint[];
@@ -165,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;
@@ -178,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;
@@ -384,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;