@leafer-in/editor 1.0.4 → 1.0.6

package/src/editor/simulate.ts

@@ -4,11 +4,11 @@ import { Bounds } from '@leafer-ui/draw'
 import { IEditor } from '@leafer-in/interface'
 
 
-export function simulate(editor: IEditor) {
-    const { simulateTarget, leafList: targetList } = editor
-    const { x, y, width, height } = new Bounds().setListWithFn(targetList.list, (leaf: ILeaf) => leaf.worldBoxBounds)
+const bounds = new Bounds()
 
-    const parent = simulateTarget.parent = targetList.list[0].leafer.zoomLayer as IGroup // follow zoomLayer zoom / move
-    const { scaleX, scaleY, e: worldX, f: worldY } = parent.__world
-    simulateTarget.reset({ x: (x - worldX) / scaleX, y: (y - worldY) / scaleY, width: width / scaleX, height: height / scaleY })
+export function simulate(editor: IEditor) {
+    const { simulateTarget, list } = editor
+    const { zoomLayer } = list[0].leafer.zoomLayer as IGroup // follow zoomLayer zoom / move
+    simulateTarget.safeChange(() => simulateTarget.reset(bounds.setListWithFn(list, (leaf: ILeaf) => leaf.getBounds('box', 'page')).get()))
+    zoomLayer.add(simulateTarget)
 }

package/src/editor/target.ts

@@ -12,6 +12,7 @@ export function onTarget(editor: IEditor, oldValue: IUI | IUI[]): void {
     if (target) {
         editor.leafList = target instanceof LeafList ? target : new LeafList(target instanceof Array ? target : target as IUI)
     } else {
+        editor.simulateTarget.remove()
         editor.leafList.reset()
         editor.closeInnerEditor()
     }

package/src/helper/EditorHelper.ts

@@ -40,7 +40,7 @@ export const EditorHelper = {
 
         app.lockLayout()
         list.forEach(leaf => {
-            if (leaf.isBranch) {
+            if (leaf.isBranch && !leaf.isBranchLeaf) {
                 const { parent, children } = leaf
                 while (children.length) {
                     ungroupList.push(children[0])

package/src/index.ts

@@ -27,12 +27,27 @@ export { EditDataHelper } from './helper/EditDataHelper'
 export { EditSelectHelper } from './helper/EditSelectHelper'
 
 import { IEditor, IEditorConfig, IEditToolFunction, IEditorConfigFunction } from '@leafer-in/interface'
-import { Creator, UI, defineKey } from '@leafer-ui/draw'
+import { Creator, UI, Text, defineKey } from '@leafer-ui/draw'
 
 import { Editor } from './Editor'
 
+
 Creator.editor = function (options?: IEditorConfig): IEditor { return new Editor(options) }
 
+
+defineKey(UI.prototype, 'editOuter', {
+    get(): string { return this.__.__isLinePath ? 'LineEditTool' : 'EditTool' }
+})
+
+defineKey(UI.prototype, 'editInner', {
+    get(): string { return 'PathEditor' }
+})
+
+defineKey(Text.prototype, 'editInner', {
+    get(): string { return 'TextEditor' }
+})
+
+
 UI.setEditConfig = function (config: IEditorConfig | IEditorConfigFunction): void {
     defineKey(this.prototype, 'editConfig', {
         get(): IEditorConfig { return typeof config === 'function' ? config(this) : config }

package/src/tool/EditTool.ts

@@ -81,11 +81,7 @@ export class EditTool extends InnerEditor implements IEditTool {
 
     public update(): void {
         const { editor, editBox } = this
-
-        const { simulateTarget, element } = editor
-        if (editor.multiple) simulateTarget.parent.updateLayout()
-
-        const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = element.getLayoutBounds('box', editor, true)
+        const { x, y, scaleX, scaleY, rotation, skewX, skewY, width, height } = editor.element.getLayoutBounds('box', editor, true)
         editBox.set({ x, y, scaleX, scaleY, rotation, skewX, skewY })
         editBox.update({ x: 0, y: 0, width, height })
         this.onUpdate()

package/src/tool/LineEditTool.ts

@@ -7,7 +7,7 @@ import { registerEditTool } from './EditToolCreator'
 
 
 const { left, right } = Direction9
-const { move, copy } = PointHelper
+const { move, copy, toNumberPoints } = PointHelper
 
 @registerEditTool()
 export class LineEditTool extends EditTool {
@@ -65,13 +65,7 @@ export class LineEditTool extends EditTool {
 
     getInnerMove(ui: IUI, event: IDragEvent, lockRatio: boolean | 'corner'): IPointData {
         const movePoint = event.getInnerMove(ui)
-        if (lockRatio) {
-            if (Math.abs(movePoint.x) > Math.abs(movePoint.y)) {
-                movePoint.y = 0
-            } else {
-                movePoint.x = 0
-            }
-        }
+        if (lockRatio) Math.abs(movePoint.x) > Math.abs(movePoint.y) ? movePoint.y = 0 : movePoint.x = 0
         return movePoint
     }
 
@@ -82,7 +76,8 @@ export class LineEditTool extends EditTool {
         }
     }
 
-    getFromToByPoints(points: number[]): IFromToData {
+    getFromToByPoints(originPoints: number[] | IPointData[]): IFromToData {
+        const points = toNumberPoints(originPoints)
         return {
             from: { x: points[0], y: points[1] },
             to: { x: points[2], y: points[3] }

package/types/index.d.ts

@@ -1,8 +1,8 @@
 export * from '@leafer-in/resize';
-import { IBounds, ILeafList, IUI, IFunction, IEventListenerId, ILeaf, IPointerEvent, ILeaferCanvas, IRenderOptions, IObject, IGroup, IPointData, ILayoutBoundsData, IGroupInputData, IEditSize, IAlign, IAxis, IBox, IBoundsData, IEditorConfig as IEditorConfig$1, IBoxInputData, IKeyEvent, IRect, IRectInputData, IMatrixData, IDragEvent, IAround } from '@leafer-ui/interface';
-import { Group, UI, Direction9, Matrix, Event, Box, Answer } from '@leafer-ui/draw';
+import { IBounds, ILeafList, IUI, IFunction, IEventListenerId, ILeaf, IPointerEvent, ILeaferCanvas, IRenderOptions, IObject, IGroup, IPointData, ILayoutBoundsData, IGroupInputData, IEditSize, IAlign, IAxis, IMatrix, IBox, IBoundsData, IEditorConfig as IEditorConfig$1, IBoxInputData, IKeyEvent, IRect, IRectInputData, IMatrixData, IDragEvent, IAround } from '@leafer-ui/interface';
+import { Group, UI, Direction9, Event, Box, 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, 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';
+import { IEditSelect, IEditor, IStroker, ISelectArea, IEditorConfig, ISimulateElement, 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;
@@ -52,8 +52,9 @@ declare class Editor extends Group implements IEditor {
     get mergeConfig(): IEditorConfig;
     hoverTarget?: IUI;
     target?: IUI | IUI[];
-    get list(): IUI[];
     leafList: ILeafList;
+    get list(): IUI[];
+    get dragHoverExclude(): IUI[];
     openedGroupList: ILeafList;
     get editing(): boolean;
     innerEditing: boolean;
@@ -62,8 +63,9 @@ declare class Editor extends Group implements IEditor {
     get multiple(): boolean;
     get single(): boolean;
     get dragging(): boolean;
-    get element(): IUI;
-    simulateTarget: IUI;
+    get moving(): boolean;
+    get element(): ISimulateElement;
+    simulateTarget: ISimulateElement;
     editBox: IEditBox;
     get buttons(): IGroup;
     editTool?: IEditTool;
@@ -95,8 +97,9 @@ declare class Editor extends Group implements IEditor {
     flip(axis: IAxis): void;
     rotateOf(origin: IPointData | IAlign, rotation: number): void;
     skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, _resize?: boolean): void;
+    checkTransform(type: 'moveable' | 'resizeable' | 'rotateable' | 'skewable'): boolean;
     protected getWorldOrigin(origin: IPointData | IAlign): IPointData;
-    protected getChangedTransform(func: IFunction): Matrix;
+    protected getChangedTransform(func: IFunction): IMatrix;
     group(userGroup?: IGroup | IGroupInputData): IGroup;
     ungroup(): IUI[];
     openGroup(group: IGroup): void;
@@ -104,7 +107,7 @@ declare class Editor extends Group implements IEditor {
     checkOpenedGroups(): void;
     checkDeepSelect(): void;
     emitGroupEvent(type: string, group: IGroup): void;
-    openInnerEditor(target?: IUI): void;
+    openInnerEditor(target?: IUI, select?: boolean): void;
     closeInnerEditor(): void;
     emitInnerEvent(type: string): void;
     lock(): void;
@@ -294,7 +297,7 @@ declare class LineEditTool extends EditTool {
     onScaleWithDrag(e: IEditorScaleEvent): void;
     getInnerMove(ui: IUI$1, event: IDragEvent$1, lockRatio: boolean | 'corner'): IPointData$1;
     getFromToByPath(path: IPathCommandData): IFromToData;
-    getFromToByPoints(points: number[]): IFromToData;
+    getFromToByPoints(originPoints: number[] | IPointData$1[]): IFromToData;
     dragPoint(fromPoint: IPointData$1, toPoint: IPointData$1, isDragFrom: boolean, around: IAround$1, movePoint: IPointData$1): void;
     onSkew(_e: IEditorSkewEvent): void;
     onUpdate(): void;