@leafer-in/editor 1.3.1 → 1.3.3

package/src/display/EditSelect.ts

@@ -1,5 +1,5 @@
 import { IBounds, ILeaf, ILeafList, IUI, IEventListenerId, IPointerEvent, IFunction } from '@leafer-ui/interface'
-import { Bounds, LeafList, Group, Plugin } from '@leafer-ui/draw'
+import { Bounds, LeafList, Group } from '@leafer-ui/draw'
 import { PointerEvent, DragEvent, MoveEvent, ZoomEvent } from '@leafer-ui/core'
 
 import { IEditSelect, IEditor, ISelectArea, IStroker } from '@leafer-in/interface'
@@ -10,7 +10,7 @@ import { EditSelectHelper } from '../helper/EditSelectHelper'
 import { EditorEvent } from '../event/EditorEvent'
 
 
-const { findOne } = EditSelectHelper
+const { findOne, findByBounds } = EditSelectHelper
 
 export class EditSelect extends Group implements IEditSelect {
 
@@ -160,7 +160,7 @@ export class EditSelect extends Group implements IEditSelect {
             const total = e.getInnerTotal(this)
 
             const dragBounds = this.bounds.clone().unsign()
-            const list = new LeafList(editor.app.find(EditSelectHelper.findBounds, dragBounds))
+            const list = new LeafList(findByBounds(editor.app, dragBounds))
 
             this.bounds.width = total.x
             this.bounds.height = total.y
@@ -207,7 +207,7 @@ export class EditSelect extends Group implements IEditSelect {
     }
 
     protected allowDrag(e: DragEvent) {
-        if (this.running && (this.editor.mergeConfig.boxSelect && Plugin.has('find')) && !e.target.draggable) {
+        if (this.running && (this.editor.mergeConfig.boxSelect) && !e.target.draggable) {
             return (!this.editor.editing && this.allow(e.target)) || (e.shiftKey && !findOne(e.path))
         } else {
             return false

package/src/editor/target.ts

@@ -11,6 +11,7 @@ export function onTarget(editor: IEditor, oldValue: IUI | IUI[]): void {
     const { target } = editor
     if (target) {
         editor.leafList = target instanceof LeafList ? target : new LeafList(target instanceof Array ? target : target as IUI)
+        if (editor.multiple) simulate(editor) // 更新模拟元素
     } else {
         editor.simulateTarget.remove()
         editor.leafList.reset()
@@ -22,7 +23,6 @@ export function onTarget(editor: IEditor, oldValue: IUI | IUI[]): void {
 
     if (editor.editing) {
         editor.waitLeafer(() => {
-            if (editor.multiple) simulate(editor)
             updateMoveCursor(editor)
             editor.updateEditTool()
             editor.update()

package/src/helper/EditSelectHelper.ts

@@ -1,7 +1,5 @@
-import { IBounds, ILeafList, IUI } from '@leafer-ui/interface'
-import { Answer } from '@leafer-ui/draw'
+import { IBounds, ILeafList, IUI, IUIData } from '@leafer-ui/interface'
 
-const { No, Yes, NoAndSkip, YesAndSkip } = Answer
 
 export const EditSelectHelper = {
 
@@ -9,26 +7,35 @@ export const EditSelectHelper = {
         return path.list.find((leaf) => leaf.editable) as IUI
     },
 
-    findBounds(leaf: IUI, bounds: IBounds): Answer {
-        if (leaf.__.hittable && leaf.__.visible && !leaf.__.locked && bounds.hit(leaf.__world)) {
-
-            if (leaf.__.editable) {
-                if (leaf.isBranch && !leaf.__.hitChildren) {
-                    return leaf.__.hitSelf ? YesAndSkip : NoAndSkip
-                } else if (leaf.isFrame) {
-                    return bounds.includes(leaf.__layout.boxBounds, leaf.__world) ? YesAndSkip : No
-                } else {
-                    if (bounds.hit(leaf.__layout.boxBounds, leaf.__world) && leaf.__.hitSelf) return Yes
-                }
-            }
-
-            return No
+    findByBounds(branch: IUI, bounds: IBounds): IUI[] {
+        const list: IUI[] = []
+        eachFind([branch], list, bounds)
+        return list
+    }
 
-        } else {
+}
+
+
+function eachFind(children: IUI[], list: IUI[], bounds: IBounds): void {
+    let child: IUI, data: IUIData
+    for (let i = 0, len = children.length; i < len; i++) {
+        child = children[i], data = child.__
+        if (data.hittable && data.visible && !data.locked && bounds.hit(child.__world)) {
+
+            if (data.editable) {
+                if (child.isBranch && !data.hitChildren) {
+                    if (data.hitSelf) list.push(child)
+                    continue
+                } else if (child.isFrame) {
+                    if (bounds.includes(child.__layout.boxBounds, child.__world)) {
+                        list.push(child)
+                        continue
+                    }
+                } else if (bounds.hit(child.__layout.boxBounds, child.__world) && data.hitSelf) list.push(child)
+            }
 
-            return leaf.isBranch ? NoAndSkip : No
+            if (child.isBranch) eachFind(child.children, list, bounds)
 
         }
     }
-
 }

package/src/index.ts

@@ -29,12 +29,11 @@ import { IEditor, IEditorConfig, IEditToolFunction, IEditorConfigFunction } from
 import { Creator, UI, Group, Text, Box, dataType, defineKey, Plugin } from '@leafer-ui/draw'
 
 import '@leafer-in/resize'
-import '@leafer-in/find'
 
 import { Editor } from './Editor'
 
 
-Plugin.add('editor', 'resize', 'find')
+Plugin.add('editor', 'resize')
 
 
 Creator.editor = function (options?: IEditorConfig): IEditor { return new Editor(options) }

package/types/index.d.ts

@@ -1,5 +1,5 @@
 import { IBounds, ILeafList, IUI, IFunction, IEventListenerId, ILeaf, IPointerEvent, ILeaferCanvas, IRenderOptions, IGroup, IObject, 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 { Group, UI, Direction9, Event, Box } from '@leafer-ui/draw';
 import { PointerEvent, DragEvent, MoveEvent, ZoomEvent, RotateEvent } from '@leafer-ui/core';
 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';
 
@@ -321,7 +321,7 @@ declare const EditDataHelper: {
 
 declare const EditSelectHelper: {
     findOne(path: ILeafList): IUI;
-    findBounds(leaf: IUI, bounds: IBounds): Answer;
+    findByBounds(branch: IUI, bounds: IBounds): IUI[];
 };
 
 export { EditBox, EditDataHelper, EditPoint, EditSelect, EditSelectHelper, EditTool, EditToolCreator, Editor, EditorEvent, EditorGroupEvent, EditorHelper, EditorMoveEvent, EditorRotateEvent, EditorScaleEvent, EditorSkewEvent, InnerEditor, InnerEditorEvent, LineEditTool, SelectArea, Stroker, registerEditTool, registerInnerEditor };