@leafer-in/editor 2.2.7 → 2.2.9

package/package.json

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

package/src/Editor.ts

@@ -154,8 +154,7 @@ export class Editor extends Group implements IEditor {
     public update(): void {
         if (this.editing) {
             if (!this.element.parent) return this.cancel()
-            if (this.innerEditing) this.innerEditor.update()
-            this.editTool.update()
+            this.innerEditing ? this.innerEditor.update() : this.editTool.update() // 同一时间只能有一个工具更新
             this.selector.update()
         }
     }
@@ -290,6 +289,7 @@ export class Editor extends Group implements IEditor {
         if (opened.length) {
             let { list } = opened
             if (this.editing) list = [], opened.forEach(item => this.list.every(leaf => !LeafHelper.hasParent(leaf, item)) && list.push(item))
+            else list = [...list] // 防止 list 循环时被修改
             list.forEach(item => this.closeGroup(item as IGroup))
         }
         if (this.editing && !this.selector.dragging) this.checkDeepSelect()

package/src/display/EditBox.ts

@@ -153,10 +153,7 @@ export class EditBox extends Group implements IEditBox {
         const rectThrough = isNull(mergeConfig.rectThrough) ? single : mergeConfig.rectThrough
         rect.hittable = !rectThrough
 
-        if (rectThrough) {
-            target.syncEventer = rect // 同步给 rect 冒泡，在 target 属性装饰器中重置
-            this.app.interaction.bottomList = [{ target: rect, proxy: target }]
-        }
+        if (rectThrough) this.addBottomList()
 
         // 忽略元素像素对齐，在 target 属性装饰器中重置
         if (single) DataHelper.stintSet(target.__world, 'ignorePixelSnap', ignorePixelSnap)
@@ -179,6 +176,17 @@ export class EditBox extends Group implements IEditBox {
     public unload(): void {
         this.unloadWidgets()
         this.visible = false
+        this.removeBottomList()
+    }
+
+
+    public addBottomList(): void {
+        const { target, rect } = this
+        target.syncEventer = rect // 同步给 rect 冒泡，在 target 属性装饰器中重置
+        this.app.interaction.bottomList = [{ target: rect, proxy: target }]
+    }
+
+    public removeBottomList(): void {
         if (this.app) this.rect.syncEventer = this.app.interaction.bottomList = null
     }
 

package/src/display/Stroker.ts

@@ -43,6 +43,7 @@ export class Stroker extends UI implements IStroker {
             if (style) this.set(style)
             this.set(bounds)
             this.visible = true
+            this.forceUpdate('surface') // 防止bounds相同不更新
         } else this.visible = 0
     }
 

package/src/tool/EditTool.ts

@@ -67,20 +67,18 @@ export class EditTool extends InnerEditor implements IEditTool {
     // 状态
 
     public load(): void {
-        this.editBox.view.visible = true
-        this.onLoad()
-    }
-
-    public update(): void {
-        this.updateEditBoxConfig()
-        this.editBox.update()
-        this.onUpdate()
+        if (this.editor) {
+            this.editBox.view.visible = true
+            this.onLoad()
+        }
     }
 
     public unload(): void {
-        this.editBox.view.visible = false
-        this.unloadEditBoxConfig()
-        this.onUnload()
+        if (this.editor) {
+            this.editBox.view.visible = false
+            this.unloadEditBoxConfig()
+            this.onUnload()
+        }
     }
 
 }

package/src/tool/InnerEditor.ts

@@ -92,6 +92,7 @@ export class InnerEditor implements IInnerEditor {
     public update(): void {
         if (this.editor) {
             this.updateEditBoxConfig()
+            this.editBox.update()
             this.onUpdate()
         }
     }

package/types/index.d.ts

@@ -185,6 +185,8 @@ declare class EditBox extends Group implements IEditBox {
     load(): void;
     update(): void;
     unload(): void;
+    addBottomList(): void;
+    removeBottomList(): void;
     updateBounds(bounds: IBoundsData): void;
     protected layoutCircle(): void;
     protected layoutButtons(): void;
@@ -379,7 +381,6 @@ declare class EditTool extends InnerEditor implements IEditTool {
     onRotate(e: IEditorRotateEvent): void;
     onSkew(e: IEditorSkewEvent): void;
     load(): void;
-    update(): void;
     unload(): void;
 }
 interface EditTool {