@leafer-in/editor 2.1.8 → 2.1.10

package/package.json

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

package/src/Editor.ts

@@ -189,18 +189,20 @@ export class Editor extends Group implements IEditor {
             if (EditToolCreator.list[name]) {
                 const tool = this.editTool = this.getEditTool(name)
                 this.editBox.load()
+                tool.editTarget = target
                 tool.load()
                 this.update()
             }
         }
     }
 
-    public unloadEditTool(): void {
+    public unloadEditTool(onlyTool?: boolean): void {
         let tool = this.editTool
         if (tool) {
-            this.editBox.unload()
+            if (!onlyTool) this.editBox.unload()
             tool.unload()
-            this.editTool = null
+            if (!onlyTool) this.editTool = null
+            tool.editTarget = null
         }
     }
 
@@ -335,7 +337,7 @@ export class Editor extends Group implements IEditor {
             }
 
             if (EditToolCreator.list[name]) {
-                this.editTool.unload()
+                this.unloadEditTool(true)
                 this.innerEditing = true
                 this.innerEditor = this.getInnerEditor(name)
                 this.innerEditor.editTarget = target
@@ -356,7 +358,7 @@ export class Editor extends Group implements IEditor {
             this.emitInnerEvent(InnerEditorEvent.CLOSE)
 
             if (!onlyInnerEditor) this.updateEditTool()
-            this.innerEditor = null
+            this.innerEditor = this.innerEditor.editTarget = null
         }
     }
 

package/src/display/EditBox.ts

@@ -151,8 +151,8 @@ export class EditBox extends Group implements IEditBox {
 
     // 必须来自 editor.update()，需同步更新编辑工具 
     public update(): void {
-        const { editor, mergeConfig } = this
-        const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = this.target.getLayoutBounds(mergeConfig.editBoxType, editor, true)
+        const { editor } = this
+        const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = this.target.getLayoutBounds('box', editor, true)
         this.visible = !this.target.locked
         this.set({ x, y, scaleX, scaleY, rotation, skewX, skewY })
         this.updateBounds({ x: 0, y: 0, width, height })
@@ -165,9 +165,9 @@ export class EditBox extends Group implements IEditBox {
 
 
     public updateBounds(bounds: IBoundsData): void {
-        const { editor, mergedConfig, single, rect, circle, buttons, resizePoints, rotatePoints, resizeLines } = this
+        const { editor, mergeConfig, single, rect, circle, buttons, resizePoints, rotatePoints, resizeLines } = this
         const { editMask } = editor
-        const { middlePoint, resizeable, rotateable, hideOnSmall, editBox, mask, dimOthers, bright, spread, hideRotatePoints, hideResizeLines } = mergedConfig
+        const { middlePoint, resizeable, rotateable, hideOnSmall, editBox, editBoxType, mask, dimOthers, bright, spread, hideRotatePoints, hideResizeLines } = mergeConfig
 
         editMask.visible = mask ? true : 0
 
@@ -179,6 +179,7 @@ export class EditBox extends Group implements IEditBox {
             editor.cancelDimOthers()
         }
 
+        if (editBoxType === 'stroke') BoundsHelper.spread(bounds, this.target.__layout.strokeBoxSpread)
         if (spread) BoundsHelper.spread(bounds, spread)
 
         if (this.view.worldOpacity) {
@@ -221,7 +222,7 @@ export class EditBox extends Group implements IEditBox {
             }
 
             // rotate
-            circle.visible = showPoints && rotateable && !!(mergedConfig.circle || mergedConfig.rotatePoint)
+            circle.visible = showPoints && rotateable && !!(mergeConfig.circle || mergeConfig.rotatePoint)
             if (circle.visible) this.layoutCircle()
 
             // rect

package/src/helper/EditDataHelper.ts

@@ -14,7 +14,7 @@ export const EditDataHelper = {
         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
+        const { width, height } = startBounds, worldScaleX = abs(worldTransform.scaleX), worldScaleY = abs(worldTransform.scaleY)
         const innerBounds = target.getBounds(boundsType, 'inner')
 
         // 获取已经改变的比例
@@ -112,9 +112,8 @@ export const EditDataHelper = {
         if (useScaleY) scaleY /= changedScaleY
 
         if (!flipable) {
-            const { worldTransform } = target
-            if (scaleX < 0) scaleX = 1 / innerBounds.width / worldTransform.scaleX
-            if (scaleY < 0) scaleY = 1 / innerBounds.height / worldTransform.scaleY
+            if (scaleX < 0) scaleX = 1 / innerBounds.width / worldScaleX
+            if (scaleY < 0) scaleY = 1 / innerBounds.height / worldScaleY
         }
 
         // 检查限制
@@ -140,16 +139,17 @@ export const EditDataHelper = {
             scaleY = within(nowHeight * scaleY, heightRange) / nowHeight
         }
 
-        // 防止小于1px
-        let minWidth = 1 * abs(worldTransform.scaleX), minHeight = 1 * abs(worldTransform.scaleY)
+        // 防止小于1px, 需要考虑 editSize 的各种情况
+        let minWidth = 1, minHeight = 1
 
         if (boundsType !== 'box') {
-            minWidth += innerBounds.width - boxBounds.width
-            minHeight += innerBounds.height - boxBounds.height
+            minWidth += (innerBounds.width - boxBounds.width) * worldScaleX
+            minHeight += (innerBounds.height - boxBounds.height) * worldScaleY
         }
 
-        if (useScaleX && abs(scaleX * innerBounds.width) < minWidth) scaleX = sign(scaleX) * minWidth / innerBounds.width
-        if (useScaleY && abs(scaleY * innerBounds.height) < minHeight) scaleY = sign(scaleY) * minHeight / innerBounds.height
+        const worldWidth = worldScaleX * innerBounds.width, worldHeight = worldScaleY * innerBounds.height
+        if (useScaleX && abs(scaleX * worldWidth) < minWidth) scaleX = sign(scaleX) * minWidth / worldWidth
+        if (useScaleY && abs(scaleY * worldHeight) < minHeight) scaleY = sign(scaleY) * minHeight / worldHeight
 
         if (lockRatio && scaleX !== scaleY) {
             lockScale = Math.min(abs(scaleX), abs(scaleY))

package/src/tool/EditTool.ts

@@ -1,4 +1,5 @@
 import { IEditorScaleEvent, IEditorRotateEvent, IEditTool, IEditorSkewEvent, IEditorMoveEvent } from '@leafer-in/interface'
+import { defineKey } from '@leafer-ui/draw'
 
 import { registerEditTool, EditToolCreator } from './EditToolCreator'
 import { InnerEditor } from './InnerEditor'
@@ -7,8 +8,9 @@ import { InnerEditor } from './InnerEditor'
 @registerEditTool()
 export class EditTool extends InnerEditor implements IEditTool {
 
-    static registerEditTool(name?: string) {
+    static registerEditTool(name?: string, changeTag?: boolean) {
         EditToolCreator.register(this, name)
+        if (changeTag) defineKey(this.prototype, 'tag', { get() { return name } })
     }
 
 

package/types/index.d.ts

@@ -101,7 +101,7 @@ declare class Editor extends Group implements IEditor {
     updateEditBox(): void;
     getEditTool(name: string): IEditTool;
     updateEditTool(): void;
-    unloadEditTool(): void;
+    unloadEditTool(onlyTool?: boolean): void;
     getEditSize(_ui: IUI): IEditSize;
     onMove(_e: DragEvent | MoveEvent): void;
     onScale(_e: DragEvent | ZoomEvent): void;
@@ -344,7 +344,7 @@ declare class InnerEditor implements IInnerEditor {
 }
 
 declare class EditTool extends InnerEditor implements IEditTool {
-    static registerEditTool(name?: string): void;
+    static registerEditTool(name?: string, changeTag?: boolean): void;
     get tag(): string;
     onMove(e: IEditorMoveEvent): void;
     onScale(e: IEditorScaleEvent): void;