@leafer-in/editor 1.9.5 → 1.9.6

package/package.json

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

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, PropertyEvent } from '@leafer-ui/draw'
+import { IGroupInputData, IUI, IEventListenerId, IPointData, ILeafList, IEditSize, IGroup, IObject, IAlign, IAxis, IFunction, IMatrix, IApp, ILeaferMode } from '@leafer-ui/interface'
+import { Group, DataHelper, LeafList, RenderEvent, LeafHelper, Direction9, Plugin, isString, PropertyEvent, LeaferEvent } 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'
@@ -376,7 +376,8 @@ export class Editor extends Group implements IEditor {
             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)
+                app.on_(RenderEvent.CHILD_START, this.onAppRenderStart, this),
+                app.on_(LeaferEvent.UPDATE_MODE, (data: { mode: ILeaferMode }) => { if (data.mode && data.mode !== 'normal') this.cancel() })
             ]
             if (editMask.visible) editMask.forceRender()
         }

package/src/display/EditSelect.ts

@@ -17,7 +17,7 @@ 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 }
+    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 hoverStroker: IStroker = new Stroker()

package/src/helper/EditDataHelper.ts

@@ -1,5 +1,5 @@
 import { IBoundsData, IPointData, IAround, IAlign, IUI, ILayoutBoundsData } from '@leafer-ui/interface'
-import { AroundHelper, MathHelper, PointHelper, BoundsHelper, Bounds, Direction9 } from '@leafer-ui/draw'
+import { AroundHelper, MathHelper, PointHelper, Direction9, DragBoundsHelper } from '@leafer-ui/draw'
 
 import { IEditorScaleEvent, IEditorSkewEvent, IEditorRotateEvent } from '@leafer-in/interface'
 
@@ -115,20 +115,10 @@ export const EditDataHelper = {
         toPoint(around || align, boxBounds, origin, true)
 
         if (dragBounds) {
-            const allowBounds = dragBounds === 'parent' ? target.parent.boxBounds : dragBounds
-            const childBounds = new Bounds(target.__localBoxBounds)
-
-            if (BoundsHelper.includes(new Bounds(allowBounds).spread(0.1), childBounds)) {
-
-                childBounds.scaleOf(target.getLocalPointByInner(origin), scaleX, scaleY)
-
-                if (!BoundsHelper.includes(allowBounds, childBounds)) {
-                    const realBounds = childBounds.getIntersect(allowBounds)
-                    const fitScaleX = realBounds.width / childBounds.width, fitScaleY = realBounds.height / childBounds.height
-                    if (useScaleX) scaleX *= fitScaleX
-                    if (useScaleY) scaleY *= fitScaleY // 后续需优化带旋转的场景
-                }
-            }
+            const scaleData = { x: scaleX, y: scaleY }
+            DragBoundsHelper.limitScaleOf(target, origin, scaleData)
+            scaleX = scaleData.x
+            scaleY = scaleData.y
         }
 
         if (useScaleX && widthRange) {