@leafer-in/editor 2.1.9 → 2.1.11

package/package.json

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

package/src/Editor.ts

@@ -199,11 +199,9 @@ export class Editor extends Group implements IEditor {
     public unloadEditTool(onlyTool?: boolean): void {
         let tool = this.editTool
         if (tool) {
-            if (!onlyTool) {
-                this.editBox.unload()
-                this.editTool = null
-            }
+            if (!onlyTool) this.editBox.unload()
             tool.unload()
+            if (!onlyTool) this.editTool = null
             tool.editTarget = null
         }
     }

package/src/display/EditBox.ts

@@ -165,10 +165,17 @@ export class EditBox extends Group implements IEditBox {
 
 
     public updateBounds(bounds: IBoundsData): void {
-        const { editor, mergeConfig, single, rect, circle, buttons, resizePoints, rotatePoints, resizeLines } = this
+        const { editor, target, mergeConfig, single, rect, circle, buttons, resizePoints, rotatePoints, resizeLines } = this
         const { editMask } = editor
         const { middlePoint, resizeable, rotateable, hideOnSmall, editBox, editBoxType, mask, dimOthers, bright, spread, hideRotatePoints, hideResizeLines } = mergeConfig
 
+        if (editBoxType === 'stroke') {
+            const { scaleX, scaleY } = target.worldTransform, { strokeBoxSpread } = target.__layout
+            strokeBoxSpread && BoundsHelper.spread(bounds, [strokeBoxSpread * Math.abs(scaleY), strokeBoxSpread * Math.abs(scaleX)])
+        }
+
+        if (spread) BoundsHelper.spread(bounds, spread)
+
         editMask.visible = mask ? true : 0
 
         if (!isUndefined(dimOthers) || !isUndefined(bright)) {  // 没有配置时不强制bright
@@ -179,9 +186,6 @@ export class EditBox extends Group implements IEditBox {
             editor.cancelDimOthers()
         }
 
-        if (editBoxType === 'stroke') BoundsHelper.spread(bounds, editor.element.__layout.strokeBoxSpread)
-        if (spread) BoundsHelper.spread(bounds, spread)
-
         if (this.view.worldOpacity) {
             const { width, height } = bounds
             const smallSize = isNumber(hideOnSmall) ? hideOnSmall : 10
@@ -345,7 +349,7 @@ export class EditBox extends Group implements IEditBox {
     // 操作事件共用
 
     public onTransformStart(e: IUIEvent): void {
-        const { hideOnMove, editBoxType } = this.mergedConfig
+        const { hideOnMove } = this.mergedConfig
         if (this.moving || this.gesturing) this.editor.opacity = hideOnMove ? 0 : 1 // move
         if (this.resizing) ResizeEvent.resizingKeys = this.editor.leafList.keys // 记录正在resize中的元素列表
 
@@ -354,7 +358,7 @@ export class EditBox extends Group implements IEditBox {
         dragStartData.y = e.y
         dragStartData.totalOffset = getPointData() // 缩放、旋转造成的总偏移量，一般用于手势操作的move纠正
         dragStartData.point = { x: target.x, y: target.y } // 用于移动
-        dragStartData.bounds = { ...target.getLayoutBounds(editBoxType, 'local') } // 用于resize
+        dragStartData.bounds = { ...target.getLayoutBounds('box', 'local') } // 用于resize
         dragStartData.rotation = target.rotation // 用于旋转
     }
 

package/src/helper/EditDataHelper.ts

@@ -1,4 +1,4 @@
-import { IPointData, IAround, IAlign, IUI, ILayoutBoundsData, IBoundsType } from '@leafer-ui/interface'
+import { IPointData, IAround, IAlign, IUI, ILayoutBoundsData } from '@leafer-ui/interface'
 import { AroundHelper, MathHelper, PointHelper, Direction9, isNumber } from '@leafer-ui/draw'
 import { DragBoundsHelper } from '@leafer-ui/core'
 
@@ -10,12 +10,11 @@ const { toPoint } = AroundHelper, { within, sign } = MathHelper, { abs } = Math
 
 export const EditDataHelper = {
 
-    getScaleData(target: IUI, startBounds: ILayoutBoundsData, direction: Direction9, totalMoveOrScale: IPointData | number, lockRatio: boolean | 'corner', around: IAround, flipable: boolean, scaleMode: boolean, boundsType: IBoundsType): 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, lockScale: number
 
         const { widthRange, heightRange, dragBounds, worldTransform, boxBounds } = target
         const { width, height } = startBounds, worldScaleX = abs(worldTransform.scaleX), worldScaleY = abs(worldTransform.scaleY)
-        const innerBounds = target.getBounds(boundsType, 'inner')
 
         // 获取已经改变的比例
         const originChangedScaleX = target.scaleX / startBounds.scaleX
@@ -23,8 +22,8 @@ export const EditDataHelper = {
         const signX = sign(originChangedScaleX)
         const signY = sign(originChangedScaleY)
 
-        const changedScaleX = scaleMode ? originChangedScaleX : signX * innerBounds.width / width
-        const changedScaleY = scaleMode ? originChangedScaleY : signY * innerBounds.height / height
+        const changedScaleX = scaleMode ? originChangedScaleX : signX * boxBounds.width / width
+        const changedScaleY = scaleMode ? originChangedScaleY : signY * boxBounds.height / height
 
         if (isNumber(totalMoveOrScale)) {
 
@@ -112,15 +111,13 @@ export const EditDataHelper = {
         if (useScaleY) scaleY /= changedScaleY
 
         if (!flipable) {
-            if (scaleX < 0) scaleX = 1 / innerBounds.width / worldScaleX
-            if (scaleY < 0) scaleY = 1 / innerBounds.height / worldScaleY
+            if (scaleX < 0) scaleX = 1 / boxBounds.width / worldScaleX
+            if (scaleY < 0) scaleY = 1 / boxBounds.height / worldScaleY
         }
 
         // 检查限制
 
-        toPoint(around || align, innerBounds, origin, true)
-
-        this.checkOrigin(target, origin, boundsType)
+        toPoint(around || align, boxBounds, origin, true)
 
         if (dragBounds) {
             const scaleData = { x: scaleX, y: scaleY }
@@ -130,24 +127,19 @@ export const EditDataHelper = {
         }
 
         if (useScaleX && widthRange) {
-            const nowWidth = innerBounds.width * target.scaleX
+            const nowWidth = boxBounds.width * target.scaleX
             scaleX = within(nowWidth * scaleX, widthRange) / nowWidth
         }
 
         if (useScaleY && heightRange) {
-            const nowHeight = innerBounds.height * target.scaleY
+            const nowHeight = boxBounds.height * target.scaleY
             scaleY = within(nowHeight * scaleY, heightRange) / nowHeight
         }
 
         // 防止小于1px, 需要考虑 editSize 的各种情况
-        let minWidth = 1, minHeight = 1
-
-        if (boundsType !== 'box') {
-            minWidth += (innerBounds.width - boxBounds.width) * worldScaleX
-            minHeight += (innerBounds.height - boxBounds.height) * worldScaleY
-        }
+        const minWidth = 1, minHeight = 1
 
-        const worldWidth = worldScaleX * innerBounds.width, worldHeight = worldScaleY * innerBounds.height
+        const worldWidth = worldScaleX * boxBounds.width, worldHeight = worldScaleY * boxBounds.height
         if (useScaleX && abs(scaleX * worldWidth) < minWidth) scaleX = sign(scaleX) * minWidth / worldWidth
         if (useScaleY && abs(scaleY * worldHeight) < minHeight) scaleY = sign(scaleY) * minHeight / worldHeight
 
@@ -163,7 +155,7 @@ export const EditDataHelper = {
         return { origin, scaleX, scaleY, direction, lockRatio, around }
     },
 
-    getRotateData(target: IUI, direction: Direction9, current: IPointData, last: IPointData, around: IAround, boundsType: IBoundsType): IEditorRotateEvent {
+    getRotateData(target: IUI, direction: Direction9, current: IPointData, last: IPointData, around: IAround): IEditorRotateEvent {
         let align: IAlign, origin = {} as IPointData
 
         switch (direction) {
@@ -183,14 +175,12 @@ export const EditDataHelper = {
                 align = 'center'
         }
 
-        toPoint(around || align, target.getBounds(boundsType, 'inner'), origin, true)
-
-        this.checkOrigin(target, origin, boundsType)
+        toPoint(around || align, target.boxBounds, origin, true)
 
         return { origin, rotation: PointHelper.getRotation(last, target.getWorldPointByBox(origin), current) }
     },
 
-    getSkewData(target: IUI, direction: Direction9, move: IPointData, around: IAround, boundsType: IBoundsType,): IEditorSkewEvent {
+    getSkewData(target: IUI, direction: Direction9, move: IPointData, around: IAround): IEditorSkewEvent {
         let align: IAlign, origin = {} as IPointData, skewX = 0, skewY = 0
         let last: IPointData
 
@@ -220,15 +210,12 @@ export const EditDataHelper = {
                 skewY = 1
         }
 
-        const innerBounds = target.getBounds(boundsType, 'inner')
-        const { width, height } = innerBounds
+        const { boxBounds } = target, { width, height } = boxBounds
 
         last.x = last.x * width
         last.y = last.y * height
 
-        toPoint(around || align, innerBounds, origin, true)
-
-        this.checkOrigin(target, origin, boundsType)
+        toPoint(around || align, boxBounds, origin, true)
 
         const rotation = PointHelper.getRotation(last, origin, { x: last.x + (skewX ? move.x : 0), y: last.y + (skewY ? move.y : 0) })
         skewX ? skewX = -rotation : skewY = rotation
@@ -237,15 +224,6 @@ export const EditDataHelper = {
     },
 
 
-    checkOrigin(target: IUI, origin: IPointData, boundsType: IBoundsType): void {
-        if (boundsType !== 'box') {
-            const { boxBounds } = target, innerBounds = target.getBounds(boundsType, 'inner')
-            origin.x += innerBounds.x - boxBounds.x
-            origin.y += innerBounds.y - boxBounds.y
-        }
-    },
-
-
     getAround(around: IAround, altKey: boolean): IAround {
         return (altKey && !around) ? 'center' : around
     },

package/src/index.ts

@@ -27,7 +27,7 @@ export { EditDataHelper } from './helper/EditDataHelper'
 export { EditSelectHelper } from './helper/EditSelectHelper'
 
 
-import { IEditor, IEditorConfig, IEditToolFunction, IEditorConfigFunction, IApp, ILine } from '@leafer-in/interface'
+import { IEditor, IEditorConfig, IEditToolFunction, IEditorConfigFunction, IApp, IUI } from '@leafer-in/interface'
 import { Creator, UI, Group, Text, Box, dataType, Plugin } from '@leafer-ui/draw'
 
 import '@leafer-in/resize'
@@ -48,10 +48,12 @@ Creator.editor = function (options?: IEditorConfig, app?: IApp): IEditor {
 Box.addAttr('textBox', false, dataType)
 
 UI.addAttr('editConfig', undefined, dataType)
-UI.addAttr('editOuter', (ui: UI) => {
+UI.addAttr('editOuter', (ui: IUI) => {
     ui.updateLayout()  // fix: Line 需要更新布局才能精准确定
-    const name = (ui.tag === 'Line' || ui.pathInputed ? '' : ((ui as ILine).points ? 'Points' : ui.tag)) + 'EditTool'
-    return ui.__.__isLinePath ? 'LineEditTool' : (EditToolCreator.list[name] ? name : 'EditTool')
+    const { EditTool, LineEditTool, PointsEditTool } = EditToolCreator
+    const name = (ui.pathInputed || ui.isPointsMode) ? PointsEditTool : ui.tag + 'EditTool'
+    const hasTool = EditToolCreator.list[name]
+    return ui.__.__isLinePath && !(name == PointsEditTool && hasTool) ? LineEditTool : (hasTool ? name : EditTool)
 }, dataType)
 
 UI.addAttr('editInner', 'PathEditor', dataType)

package/src/tool/EditTool.ts

@@ -28,36 +28,36 @@ export class EditTool extends InnerEditor implements IEditTool {
     }
 
     public onScale(e: IEditorScaleEvent): void {
-        const { scaleX, scaleY, transform, worldOrigin, editor, editBoxType } = e
+        const { scaleX, scaleY, transform, worldOrigin, editor } = e
         const { app, list } = editor
         app.lockLayout()
         list.forEach(target => {
             const resize = editor.getEditSize(target) !== 'scale'
-            if (transform) target.transformWorld(transform, resize, false, editBoxType)
-            else target.scaleOfWorld(worldOrigin, scaleX, scaleY, resize, false, editBoxType)
+            if (transform) target.transformWorld(transform, resize, false)
+            else target.scaleOfWorld(worldOrigin, scaleX, scaleY, resize, false)
         })
         app.unlockLayout()
     }
 
     public onRotate(e: IEditorRotateEvent): void {
-        const { rotation, transform, worldOrigin, editor, editBoxType } = e
+        const { rotation, transform, worldOrigin, editor } = e
         const { app, list } = editor
         app.lockLayout()
         list.forEach(target => {
             const resize = editor.getEditSize(target) !== 'scale'
-            if (transform) target.transformWorld(transform, resize, false, editBoxType)
+            if (transform) target.transformWorld(transform, resize, false)
             else target.rotateOfWorld(worldOrigin, rotation)
         })
         app.unlockLayout()
     }
 
     public onSkew(e: IEditorSkewEvent): void {
-        const { skewX, skewY, transform, worldOrigin, editor, editBoxType } = e
+        const { skewX, skewY, transform, worldOrigin, editor } = e
         const { app, list } = editor
         app.lockLayout()
         list.forEach(target => {
             const resize = editor.getEditSize(target) !== 'scale'
-            if (transform) target.transformWorld(transform, resize, false, editBoxType)
+            if (transform) target.transformWorld(transform, resize, false)
             else target.skewOfWorld(worldOrigin, skewX, skewY, resize)
         })
         app.unlockLayout()

package/src/tool/EditToolCreator.ts

@@ -16,6 +16,11 @@ export const registerInnerEditor = registerEditTool
 
 export const EditToolCreator = {
 
+    // 默认名称
+    EditTool: 'EditTool',
+    LineEditTool: 'LineEditTool',
+    PointsEditTool: 'PointsEditTool',
+
     list: {} as IObject,
 
     register(EditTool: IObject, name?: string): void {

package/src/tool/TransformTool.ts

@@ -54,7 +54,7 @@ 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, editBoxType } = mergeConfig, totalMove: IPointData | number
+        let { around, lockRatio, flipable, editSize } = mergeConfig, totalMove: IPointData | number
 
         if (e instanceof ZoomEvent) {
             if (!around) around = target.getBoxPoint(e)
@@ -66,7 +66,7 @@ export class TransformTool implements ITransformTool { // Editor use
         const { direction } = e.current as IEditPoint
         if (e.shiftKey || target.lockRatio) lockRatio = true
 
-        const data = EditDataHelper.getScaleData(target, dragStartData.bounds, direction, totalMove, lockRatio, EditDataHelper.getAround(around, e.altKey), flipable, !single || editSize === 'scale', editBoxType)
+        const data = EditDataHelper.getScaleData(target, dragStartData.bounds, direction, totalMove, lockRatio, EditDataHelper.getAround(around, e.altKey), flipable, !single || editSize === 'scale')
 
         const targetX = target.x, targetY = target.y
 
@@ -83,7 +83,7 @@ export class TransformTool implements ITransformTool { // Editor use
     public onRotate(e: DragEvent | RotateEvent): void {
 
         const { target, mergeConfig, dragStartData } = this.editBox
-        const { around, rotateAround, rotateGap, diagonalRotateKey, editBoxType } = mergeConfig
+        const { around, rotateAround, rotateGap, diagonalRotateKey } = mergeConfig
         const { direction } = e.current as IEditPoint
 
         let origin: IPointData, rotation: number
@@ -97,7 +97,7 @@ export class TransformTool implements ITransformTool { // Editor use
 
             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'), editBoxType)
+            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
 
@@ -116,9 +116,9 @@ export class TransformTool implements ITransformTool { // Editor use
     public onSkew(e: DragEvent): void {
 
         const { target, mergeConfig } = this.editBox
-        const { around, editBoxType } = mergeConfig
+        const { around } = mergeConfig
 
-        const { origin, skewX, skewY } = EditDataHelper.getSkewData(target, (e.current as IEditPoint).direction, e.getInnerMove(target), EditDataHelper.getAround(around, e.altKey), editBoxType)
+        const { origin, skewX, skewY } = EditDataHelper.getSkewData(target, (e.current as IEditPoint).direction, e.getInnerMove(target), EditDataHelper.getAround(around, e.altKey))
         if (!skewX && !skewY) return
 
         this.skewOf(origin, skewX, skewY)
@@ -173,7 +173,7 @@ export class TransformTool implements ITransformTool { // Editor use
 
         const { target, mergeConfig, single, editor } = this.editBox
 
-        const { beforeScale, editBoxType } = mergeConfig
+        const { beforeScale } = mergeConfig
         if (beforeScale) {
             const check = beforeScale({ target, origin, scaleX, scaleY })
             if (isObject(check)) scaleX = check.scaleX, scaleY = check.scaleY
@@ -182,7 +182,7 @@ export class TransformTool implements ITransformTool { // Editor use
 
         const worldOrigin = this.getWorldOrigin(origin)
         const transform = !single && this.getChangedTransform(() => (target as ISimulateElement).safeChange(() => target.scaleOf(origin, scaleX, scaleY)))
-        const data: IEditorScaleEvent = { target, editor, worldOrigin, scaleX, scaleY, transform, editBoxType }
+        const data: IEditorScaleEvent = { target, editor, worldOrigin, scaleX, scaleY, transform }
 
         this.emitEvent(new EditorScaleEvent(EditorScaleEvent.BEFORE_SCALE, data))
         const event = new EditorScaleEvent(EditorScaleEvent.SCALE, data)
@@ -210,7 +210,7 @@ export class TransformTool implements ITransformTool { // Editor use
 
         const { target, mergeConfig, single, editor } = this.editBox
 
-        const { beforeRotate, editBoxType } = mergeConfig
+        const { beforeRotate } = mergeConfig
         if (beforeRotate) {
             const check = beforeRotate({ target, origin, rotation })
             if (isNumber(check)) rotation = check
@@ -219,7 +219,7 @@ export class TransformTool implements ITransformTool { // Editor use
 
         const worldOrigin = this.getWorldOrigin(origin)
         const transform = !single && this.getChangedTransform(() => (target as ISimulateElement).safeChange(() => target.rotateOf(origin, rotation)))
-        const data: IEditorRotateEvent = { target, editor, worldOrigin, rotation, transform, editBoxType }
+        const data: IEditorRotateEvent = { target, editor, worldOrigin, rotation, transform }
 
         this.emitEvent(new EditorRotateEvent(EditorRotateEvent.BEFORE_ROTATE, data))
         const event = new EditorRotateEvent(EditorRotateEvent.ROTATE, data)
@@ -232,7 +232,7 @@ export class TransformTool implements ITransformTool { // Editor use
 
         const { target, mergeConfig, single, editor } = this.editBox
 
-        const { beforeSkew, editBoxType } = mergeConfig
+        const { beforeSkew } = mergeConfig
         if (beforeSkew) {
             const check = beforeSkew({ target, origin, skewX, skewY })
             if (isObject(check)) skewX = check.skewX, skewY = check.skewY
@@ -241,7 +241,7 @@ export class TransformTool implements ITransformTool { // Editor use
 
         const worldOrigin = this.getWorldOrigin(origin)
         const transform = !single && this.getChangedTransform(() => (target as ISimulateElement).safeChange(() => target.skewOf(origin, skewX, skewY)))
-        const data: IEditorSkewEvent = { target, editor, worldOrigin, skewX, skewY, transform, editBoxType }
+        const data: IEditorSkewEvent = { target, editor, worldOrigin, skewX, skewY, transform }
 
         this.emitEvent(new EditorSkewEvent(EditorSkewEvent.BEFORE_SKEW, data))
         const event = new EditorSkewEvent(EditorSkewEvent.SKEW, data)

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, IEditorDragStartData, IEditorConfig as IEditorConfig$1, ITransformTool, IBoundsData, IBoxInputData, IUIEvent, IKeyEvent, IRect, IRectInputData, IUIInputData, IMatrixData, IDragEvent, IAround, IEvent, ILayoutBoundsData, IBoundsType } 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, IUIInputData, 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';
@@ -312,6 +312,9 @@ declare class InnerEditorEvent extends EditorEvent implements IInnerEditorEvent
 declare function registerEditTool(): (target: IObject) => void;
 declare const registerInnerEditor: typeof registerEditTool;
 declare const EditToolCreator: {
+    EditTool: string;
+    LineEditTool: string;
+    PointsEditTool: string;
     list: IObject;
     register(EditTool: IObject, name?: string): void;
     get(tag: string, editor: IEditor): IEditTool;
@@ -398,10 +401,9 @@ declare const EditorHelper: {
 };
 
 declare const EditDataHelper: {
-    getScaleData(target: IUI, startBounds: ILayoutBoundsData, direction: Direction9, totalMoveOrScale: IPointData | number, lockRatio: boolean | "corner", around: IAround, flipable: boolean, scaleMode: boolean, boundsType: IBoundsType): IEditorScaleEvent;
-    getRotateData(target: IUI, direction: Direction9, current: IPointData, last: IPointData, around: IAround, boundsType: IBoundsType): IEditorRotateEvent;
-    getSkewData(target: IUI, direction: Direction9, move: IPointData, around: IAround, boundsType: IBoundsType): IEditorSkewEvent;
-    checkOrigin(target: IUI, origin: IPointData, boundsType: IBoundsType): void;
+    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(target: IUI, direction: Direction9, move: IPointData, around: IAround): IEditorSkewEvent;
     getAround(around: IAround, altKey: boolean): IAround;
     getRotateDirection(direction: number, rotation: number, totalDirection?: number): number;
     getFlipDirection(direction: Direction9, flipedX: boolean, flipedY: boolean): Direction9;