@leafer-in/editor 2.2.5 → 2.2.7

package/package.json

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

package/src/display/EditBox.ts

@@ -114,6 +114,15 @@ export class EditBox extends Group implements IEditBox {
         this.add(view)
     }
 
+    public showView(): void {
+        this.view.opacity = 1
+        this.update()
+    }
+
+    public hideView(): void {
+        this.view.opacity = 0
+    }
+
     public load(): void {
         const { target, mergeConfig, single, rect, circle, resizePoints, resizeLines } = this
         const { stroke, strokeWidth, ignorePixelSnap } = mergeConfig
@@ -152,14 +161,15 @@ export class EditBox extends Group implements IEditBox {
         // 忽略元素像素对齐，在 target 属性装饰器中重置
         if (single) DataHelper.stintSet(target.__world, 'ignorePixelSnap', ignorePixelSnap)
 
-        updateMoveCursor(this)
+        this.updateMoveCursor()
         this.loadWidgets()
     }
 
     // 必须来自 editor.update()，需同步更新编辑工具 
     public update(): void {
-        const { editor } = this
-        const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = this.target.getLayoutBounds('box', editor, true)
+        const { editor, target } = this
+        if (!target) return
+        const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = 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 })
@@ -313,6 +323,17 @@ export class EditBox extends Group implements IEditBox {
     }
 
 
+    // 光标
+
+    public updateMoveCursor(): void {
+        updateMoveCursor(this)
+    }
+
+    public updatePointCursor(e: IUIEvent): void {
+        updatePointCursor(this, e)
+    }
+
+
     // drag
 
     public onDragStart(e: DragEvent): void {
@@ -348,7 +369,7 @@ export class EditBox extends Group implements IEditBox {
             if (resizing) transformTool.onScale(e)
             if (skewing) transformTool.onSkew(e)
         }
-        updatePointCursor(this, e)
+        this.updatePointCursor(e)
     }
 
     public onDragEnd(e: DragEvent): void {
@@ -434,7 +455,7 @@ export class EditBox extends Group implements IEditBox {
     }
 
     protected onKey(e: KeyEvent): void {
-        updatePointCursor(this, e)
+        this.updatePointCursor(e)
     }
 
     public onArrow(e: IKeyEvent): void {
@@ -504,7 +525,7 @@ export class EditBox extends Group implements IEditBox {
                 [DragEvent.DRAG, this.onDrag, this],
                 [DragEvent.END, this.onDragEnd, this],
 
-                [PointerEvent.ENTER, (e: PointerEvent) => { this.enterPoint = point, updatePointCursor(this, e) }],
+                [PointerEvent.ENTER, (e: PointerEvent) => { this.enterPoint = point, this.updatePointCursor(e) }],
                 [PointerEvent.LEAVE, () => { this.enterPoint = null }]
             ])
         )

package/src/helper/EditSelectHelper.ts

@@ -33,7 +33,7 @@ function eachFind(children: IUI[], list: IUI[], bounds: IBounds, mode: 'hit' | '
                     isFind = bounds[mode](child.__layout.boxBounds, child.__world) && data.hitSelf
 
                     if (child.isBranch) {
-                        if (!data.hitChildren) {
+                        if (!data.hitChildren || (isFind && child.children.every(item => !item.editable))) {
                             if (isFind) list.push(child)
                             continue
                         }

package/src/tool/EditTool.ts

@@ -16,10 +16,11 @@ export class EditTool extends InnerEditor implements IEditTool {
 
     public get tag() { return 'EditTool' }
 
-
     // 操作
 
     public onMove(e: IEditorMoveEvent): void {
+        if (this.isMotionElement) return this.onMoveMotion(e)
+        else if (this.isFlowElement) return this.onMoveFlow(e)
         const { moveX, moveY, editor } = e
         const { app, list } = editor
         app.lockLayout()
@@ -71,13 +72,25 @@ export class EditTool extends InnerEditor implements IEditTool {
     }
 
     public update(): void {
+        this.updateEditBoxConfig()
         this.editBox.update()
         this.onUpdate()
     }
 
     public unload(): void {
         this.editBox.view.visible = false
+        this.unloadEditBoxConfig()
         this.onUnload()
     }
 
+}
+
+
+export interface EditTool {
+    // 扩展
+    readonly isMotionElement?: boolean
+    readonly isFlowElement?: boolean
+
+    onMoveMotion(e: IEditorMoveEvent): void
+    onMoveFlow(e: IEditorMoveEvent): void
 }

package/src/tool/InnerEditor.ts

@@ -1,8 +1,9 @@
-import { IGroup, IEventListenerId, IUI, IObject, IPointData, IEditorConfig } from '@leafer-ui/interface'
-import { IInnerEditor, IEditor, IEditBox, IInnerEditorMode } from '@leafer-in/interface'
+import { IGroup, IEventListenerId, IUI, IObject, IPointData, IEditorConfig, OptionalKeys } from '@leafer-ui/interface'
+import { IInnerEditor, IEditor, IEditBox, IInnerEditorMode, IInnerEditorConfig } from '@leafer-in/interface'
 
 import { Group, PointHelper } from '@leafer-ui/draw'
 import { EditToolCreator } from './EditToolCreator'
+import { editToolMergeConfigAttr } from '../decorator/data'
 
 
 const { abs } = Math, { scale } = PointHelper
@@ -21,9 +22,15 @@ export class InnerEditor implements IInnerEditor {
     public editTarget: IUI
     public editConfig?: IEditorConfig
 
-    public config: IObject
+    public config: IInnerEditorConfig
     public get userConfig(): IObject { return (this.editBox.mergeConfig[this.tag] || {}) }
 
+    @editToolMergeConfigAttr()
+    public readonly mergeConfig: IInnerEditorConfig
+    public readonly mergedConfig: IInnerEditorConfig
+
+    public configKeepKeys: OptionalKeys<IInnerEditorConfig>[] = ['editBox']
+
     public editor: IEditor
 
     protected _editBox: IEditBox
@@ -61,6 +68,15 @@ export class InnerEditor implements IInnerEditor {
     }
 
 
+    public showView(): void {
+        this.view.opacity = 1
+    }
+
+    public hideView(): void {
+        this.view.opacity = 0
+    }
+
+
     // 状态
 
     public onLoad(): void { }
@@ -73,17 +89,32 @@ export class InnerEditor implements IInnerEditor {
     }
 
     public onUpdate(): void { }
-    public update(): void { this.onUpdate() }
+    public update(): void {
+        if (this.editor) {
+            this.updateEditBoxConfig()
+            this.onUpdate()
+        }
+    }
 
     public onUnload(): void { }
     public unload(): void {
         const { editor } = this
         if (editor) {
+            this.unloadEditBoxConfig()
             if (editor.app && this.mode === 'focus') editor.selector.hittable = editor.app.tree.hitChildren = true
             this.onUnload()
         }
     }
 
+    public updateEditBoxConfig(): void {
+        const { mergeConfig } = this
+        if (mergeConfig) this.editBox.config = mergeConfig.editBox
+    }
+
+    public unloadEditBoxConfig(): void {
+        this.editBox.config = undefined
+    }
+
     public onDestroy(): void { }
     public destroy(): void {
         this.onDestroy()

package/types/index.d.ts

@@ -1,8 +1,8 @@
 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, IBoundsData, IEditorConfig as IEditorConfig$1, ITransformTool, IBoxInputData, IUIEvent, IKeyEvent, IRect, IRectInputData, IUIInputData, 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, IBoundsData, IEditorConfig as IEditorConfig$1, ITransformTool, IBoxInputData, IUIEvent, IKeyEvent, IRect, IRectInputData, IUIInputData, IMatrixData, IDragEvent, IAround, OptionalKeys, 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, IEditBoxWidget, 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';
+import { IEditSelect, IEditor, IStroker, ISelectArea, IEditorConfig, IEditPoint, ISimulateElement, IEditBox, IEditTool, IInnerEditor, IEditorScaleEvent, IEditPointType, IEditBoxWidget, IEditPointInputData, IEditorEvent, IEditorMoveEvent, IEditorRotateEvent, IEditorSkewEvent, IEditorGroupEvent, IInnerEditorEvent, IInnerEditorMode, IInnerEditorConfig, IUI as IUI$1, IDragEvent as IDragEvent$1, IPointData as IPointData$1, IPathCommandData, IFromToData, IAround as IAround$1 } from '@leafer-in/interface';
 
 declare class EditSelect extends Group implements IEditSelect {
     editor: IEditor;
@@ -180,6 +180,8 @@ declare class EditBox extends Group implements IEditBox {
     protected __eventIds: IEventListenerId[];
     constructor(editor: IEditor);
     create(): void;
+    showView(): void;
+    hideView(): void;
     load(): void;
     update(): void;
     unload(): void;
@@ -191,6 +193,8 @@ declare class EditBox extends Group implements IEditBox {
     getPointsStyle(): IBoxInputData[];
     getMiddlePointsStyle(): IBoxInputData[];
     getResizeLinesStyle(): IBoxInputData[];
+    updateMoveCursor(): void;
+    updatePointCursor(e: IUIEvent): void;
     onDragStart(e: DragEvent): void;
     onDrag(e: DragEvent): void;
     onDragEnd(e: DragEvent): void;
@@ -337,8 +341,11 @@ declare class InnerEditor implements IInnerEditor {
     get mode(): IInnerEditorMode;
     editTarget: IUI;
     editConfig?: IEditorConfig$1;
-    config: IObject;
+    config: IInnerEditorConfig;
     get userConfig(): IObject;
+    readonly mergeConfig: IInnerEditorConfig;
+    readonly mergedConfig: IInnerEditorConfig;
+    configKeepKeys: OptionalKeys<IInnerEditorConfig>[];
     editor: IEditor;
     protected _editBox: IEditBox;
     get editBox(): IEditBox;
@@ -350,12 +357,16 @@ declare class InnerEditor implements IInnerEditor {
     getEditTargetPoint(editBoxPoint: IPointData, change?: boolean): IPointData;
     onCreate(): void;
     create(): void;
+    showView(): void;
+    hideView(): void;
     onLoad(): void;
     load(): void;
     onUpdate(): void;
     update(): void;
     onUnload(): void;
     unload(): void;
+    updateEditBoxConfig(): void;
+    unloadEditBoxConfig(): void;
     onDestroy(): void;
     destroy(): void;
 }
@@ -371,6 +382,12 @@ declare class EditTool extends InnerEditor implements IEditTool {
     update(): void;
     unload(): void;
 }
+interface EditTool {
+    readonly isMotionElement?: boolean;
+    readonly isFlowElement?: boolean;
+    onMoveMotion(e: IEditorMoveEvent): void;
+    onMoveFlow(e: IEditorMoveEvent): void;
+}
 
 declare class LineEditTool extends EditTool {
     get tag(): string;