@leafer-in/editor 1.0.0-rc.26 → 1.0.0-rc.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-in/editor",
-  "version": "1.0.0-rc.26",
+  "version": "1.0.0-rc.28",
   "description": "@leafer-in/editor",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -34,10 +34,9 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer-ui/core": "1.0.0-rc.26",
-    "@leafer-ui/scale": "1.0.0-rc.26",
-    "@leafer-ui/interface": "1.0.0-rc.26",
-    "@leafer-in/resize": "1.0.0-rc.26",
-    "@leafer-in/interface": "1.0.0-rc.26"
+    "@leafer-ui/core": "1.0.0-rc.28",
+    "@leafer-ui/interface": "1.0.0-rc.28",
+    "@leafer-in/resize": "1.0.0-rc.28",
+    "@leafer-in/interface": "1.0.0-rc.28"
   }
 }

package/src/Editor.ts

@@ -18,6 +18,7 @@ import { onTarget, onHover } from './editor/target'
 import { targetAttr } from './decorator/data'
 import { EditorHelper } from './helper/EditorHelper'
 import { EditDataHelper } from './helper/EditDataHelper'
+import { simulate } from './editor/simulate'
 import { updateCursor } from './editor/cursor'
 import { EditToolCreator } from './tool/EditToolCreator'
 import { InnerEditorEvent } from './event/InnerEditorEvent'
@@ -27,7 +28,11 @@ import { EditorGroupEvent } from './event/EditorGroupEvent'
 export class Editor extends Group implements IEditor {
 
     public config = config
-    public mergeConfig = config // 实际使用
+
+    public get mergeConfig(): IEditorConfig {
+        const { element, config } = this
+        return this.single && element.editConfig ? { ...config, ...element.editConfig } : config // 实时合并，后期可优化
+    }
 
     @targetAttr(onHover)
     public hoverTarget: IUI
@@ -116,6 +121,11 @@ export class Editor extends Group implements IEditor {
         }
     }
 
+    public updateEditBox(): void {
+        if (this.multiple) simulate(this)
+        this.update()
+    }
+
     public updateEditTool(): void {
         const tool = this.editTool
         if (tool) {
@@ -127,8 +137,6 @@ export class Editor extends Group implements IEditor {
         if (this.editing) {
             const tag = this.single ? this.list[0].editOuter as string : 'EditTool'
             this.editTool = this.editToolList[tag] = this.editToolList[tag] || EditToolCreator.get(tag, this)
-            const { editConfig } = this.element
-            this.mergeConfig = this.single && editConfig ? { ...this.mergeConfig, ...editConfig } : this.config
             this.editBox.load()
             this.editTool.load()
         }

package/src/index.ts

@@ -8,12 +8,14 @@ export { EditSelect } from './display/EditSelect'
 export { SelectArea } from './display/SelectArea'
 export { Stroker } from './display/Stroker'
 
-export { InnerEditorEvent } from './event/InnerEditorEvent'
+
 export { EditorEvent } from './event/EditorEvent'
 export { EditorMoveEvent } from './event/EditorMoveEvent'
 export { EditorScaleEvent } from './event/EditorScaleEvent'
 export { EditorRotateEvent } from './event/EditorRotateEvent'
 export { EditorSkewEvent } from './event/EditorSkewEvent'
+export { EditorGroupEvent } from './event/EditorGroupEvent'
+export { InnerEditorEvent } from './event/InnerEditorEvent'
 
 export { EditToolCreator, registerEditTool, registerInnerEditor } from './tool/EditToolCreator'
 export { InnerEditor } from './tool/InnerEditor'

package/types/index.d.ts

@@ -2,7 +2,7 @@ export * from '@leafer-in/resize';
 import { IBounds, ILeafList, IUI, IEventListenerId, ILeaf, IPointerEvent, IGroup, IObject, IPointData, IGroupInputData, IEditSize, IAlign, IBox, IBoundsData, IBoxInputData, IKeyEvent, IRect, IRectInputData, ILeaferCanvas, IRenderOptions, IMatrixData, IDragEvent, IAround } from '@leafer-ui/interface';
 import { Group, Event, Direction9, Box, UI, Answer } from '@leafer-ui/draw';
 import { PointerEvent, DragEvent, MoveEvent, ZoomEvent, RotateEvent } from '@leafer-ui/core';
-import { IEditSelect, IEditor, IStroker, ISelectArea, IEditorConfig, IEditBox, IEditTool, IInnerEditor, IEditorScaleEvent, IEditorEvent, IEditPoint, IEditPointType, IInnerEditorEvent, IEditorMoveEvent, IEditorRotateEvent, IEditorSkewEvent, 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, IEditBox, IEditTool, IInnerEditor, IEditorScaleEvent, IEditorEvent, IEditPoint, IEditPointType, IEditorMoveEvent, IEditorRotateEvent, IEditorSkewEvent, IEditorGroupEvent, IInnerEditorEvent, 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;
@@ -41,7 +41,7 @@ declare class EditSelect extends Group implements IEditSelect {
 
 declare class Editor extends Group implements IEditor {
     config: IEditorConfig;
-    mergeConfig: IEditorConfig;
+    get mergeConfig(): IEditorConfig;
     hoverTarget: IUI;
     target: IUI | IUI[];
     get list(): IUI[];
@@ -71,6 +71,7 @@ declare class Editor extends Group implements IEditor {
     removeItem(item: IUI): void;
     shiftItem(item: IUI): void;
     update(): void;
+    updateEditBox(): void;
     updateEditTool(): void;
     getEditSize(_ui: IUI): IEditSize;
     onMove(e: DragEvent): void;
@@ -177,16 +178,6 @@ declare class Stroker extends UI implements IStroker {
     destroy(): void;
 }
 
-declare class InnerEditorEvent extends EditorEvent implements IInnerEditorEvent {
-    static BEFORE_OPEN: string;
-    static OPEN: string;
-    static BEFORE_CLOSE: string;
-    static CLOSE: string;
-    readonly editTarget: IUI;
-    readonly innerEditor: IInnerEditor;
-    constructor(type: string, data?: IInnerEditorEvent);
-}
-
 declare class EditorMoveEvent extends EditorEvent implements IEditorMoveEvent {
     static MOVE: string;
     readonly moveX: number;
@@ -219,6 +210,26 @@ declare class EditorSkewEvent extends EditorEvent implements IEditorSkewEvent {
     constructor(type: string, data?: IEditorSkewEvent);
 }
 
+declare class EditorGroupEvent extends EditorEvent implements IEditorGroupEvent {
+    static GROUP: string;
+    static BEFORE_UNGROUP: string;
+    static UNGROUP: string;
+    static OPEN: string;
+    static CLOSE: string;
+    readonly editTarget: IGroup;
+    constructor(type: string, data?: IEditorGroupEvent);
+}
+
+declare class InnerEditorEvent extends EditorEvent implements IInnerEditorEvent {
+    static BEFORE_OPEN: string;
+    static OPEN: string;
+    static BEFORE_CLOSE: string;
+    static CLOSE: string;
+    readonly editTarget: IUI;
+    readonly innerEditor: IInnerEditor;
+    constructor(type: string, data?: IInnerEditorEvent);
+}
+
 declare function registerEditTool(): (target: IObject) => void;
 declare const registerInnerEditor: typeof registerEditTool;
 declare const EditToolCreator: {
@@ -281,7 +292,7 @@ declare const EditorHelper: {
 };
 
 declare const EditDataHelper: {
-    getScaleData(bounds: IBoundsData, direction: Direction9, pointMove: IPointData, lockRatio: boolean | 'corner', around: IAround): IEditorScaleEvent;
+    getScaleData(bounds: IBoundsData, direction: Direction9, pointMove: IPointData, lockRatio: boolean | "corner", around: IAround): IEditorScaleEvent;
     getRotateData(bounds: IBoundsData, direction: Direction9, current: IPointData, last: IPointData, around: IAround): IEditorRotateEvent;
     getSkewData(bounds: IBoundsData, direction: Direction9, move: IPointData, around: IAround): IEditorSkewEvent;
     getAround(around: IAround, altKey: boolean): IAround;
@@ -294,4 +305,4 @@ declare const EditSelectHelper: {
     findBounds(leaf: IUI, bounds: IBounds): Answer;
 };
 
-export { EditBox, EditDataHelper, EditPoint, EditSelect, EditSelectHelper, EditTool, EditToolCreator, Editor, EditorEvent, EditorHelper, EditorMoveEvent, EditorRotateEvent, EditorScaleEvent, EditorSkewEvent, InnerEditor, InnerEditorEvent, LineEditTool, SelectArea, Stroker, registerEditTool, registerInnerEditor };
+export { EditBox, EditDataHelper, EditPoint, EditSelect, EditSelectHelper, EditTool, EditToolCreator, Editor, EditorEvent, EditorGroupEvent, EditorHelper, EditorMoveEvent, EditorRotateEvent, EditorScaleEvent, EditorSkewEvent, InnerEditor, InnerEditorEvent, LineEditTool, SelectArea, Stroker, registerEditTool, registerInnerEditor };