@leafer-in/editor 1.0.3 → 1.0.5

package/src/helper/EditDataHelper.ts

@@ -130,8 +130,6 @@ export const EditDataHelper = {
 
         toPoint(around || align, boxBounds, origin, true)
 
-        console.log({ origin, scaleX, scaleY, direction, lockRatio, around })
-
         return { origin, scaleX, scaleY, direction, lockRatio, around }
     },
 

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/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/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;