@leafer/selector 1.8.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/selector",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "@leafer/selector",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,9 +22,9 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.8.0"
+    "@leafer/core": "1.9.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.8.0"
+    "@leafer/interface": "1.9.0"
   }
 }

package/src/Picker.ts

@@ -1,10 +1,10 @@
-import { ILeaf, ILeafList, IPointData, IRadiusPointData, IPickResult, IPickOptions, ISelector, IPickBottom } from '@leafer/interface'
+import { ILeaf, ILeafList, IPointData, IRadiusPointData, IPickResult, IPickOptions, ISelector, IPickBottom, IPicker } from '@leafer/interface'
 import { BoundsHelper, LeafList, LeafHelper } from '@leafer/core'
 
 
 const { hitRadiusPoint } = BoundsHelper
 
-export class Picker {
+export class Picker implements IPicker {
 
     protected target?: ILeaf
     protected selector: ISelector
@@ -32,7 +32,7 @@ export class Picker {
         this.findList = new LeafList(options.findList)
 
         // path
-        if (!options.findList) this.hitBranch(target)  // 包含through元素
+        if (!options.findList) this.hitBranch(target.isBranchLeaf ? { children: [target] } as ILeaf : target)  // 包含through元素
 
         const { list } = this.findList
         const leaf = this.getBestMatchLeaf(list, options.bottomList, ignoreHittable)
@@ -43,29 +43,40 @@ export class Picker {
         return through ? { path, target: leaf, throughPath: list.length ? this.getThroughPath(list) : path } : { path, target: leaf }
     }
 
+    public hitPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): boolean {
+        return !!this.getByPoint(hitPoint, hitRadius, options).target // 后期需进行优化 ！！！
+    }
+
     public getBestMatchLeaf(list: ILeaf[], bottomList: IPickBottom[], ignoreHittable: boolean): ILeaf {
+        const findList = this.findList = new LeafList()
+
         if (list.length) {
             let find: ILeaf
-            this.findList = new LeafList()
             const { x, y } = this.point
             const point = { x, y, radiusX: 0, radiusY: 0 }
             for (let i = 0, len = list.length; i < len; i++) {
                 find = list[i]
                 if (ignoreHittable || LeafHelper.worldHittable(find)) {
                     this.hitChild(find, point)
-                    if (this.findList.length) return this.findList.list[0]
+                    if (findList.length) {
+                        if (find.isBranchLeaf && list.some(item => item !== find && LeafHelper.hasParent(item, find))) {
+                            findList.reset()
+                            break // Frame / Box 同时碰撞到子元素时，忽略自身，优先选中子元素
+                        }
+                        return findList.list[0]
+                    }
                 }
             }
         }
 
-        if (bottomList) { // 底部虚拟元素
+        if (bottomList) { // 底部虚拟元素，一般为编辑器的虚拟框
             for (let i = 0, len = bottomList.length; i < len; i++) {
                 this.hitChild(bottomList[i].target, this.point, bottomList[i].proxy)
-                if (this.findList.length) return this.findList.list[0]
+                if (findList.length) return findList.list[0]
             }
         }
 
-        return list[0]
+        return ignoreHittable ? list[0] : list.find(item => LeafHelper.worldHittable(item))
     }
 
     public getPath(leaf: ILeaf): LeafList {
@@ -138,7 +149,21 @@ export class Picker {
         if (this.exclude && this.exclude.has(child)) return
         if (child.__hitWorld(point)) {
             const { parent } = child
-            if (parent && parent.__hasMask && !child.__.mask && !parent.children.some(item => item.__.mask && item.__hitWorld(point))) return
+            if (parent && parent.__hasMask && !child.__.mask) {
+
+                let findMasks: ILeaf[] = [], item: ILeaf
+                const { children } = parent
+
+                for (let i = 0, len = children.length; i < len; i++) {
+                    item = children[i]
+                    if (item.__.mask) findMasks.push(item)
+                    if (item === child) {
+                        if (findMasks && !findMasks.every(value => value.__hitWorld(point))) return // 遮罩上层的元素，与遮罩相交的区域才能响应事件
+                        break
+                    }
+                }
+
+            }
             this.findList.add(proxy || child)
         }
     }

package/src/Selector.ts

@@ -26,6 +26,10 @@ export class Selector implements ISelector {
         return picker.getByPoint(hitPoint, hitRadius, options)
     }
 
+    public hitPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): boolean {
+        return this.picker.hitPoint(hitPoint, hitRadius, options)
+    }
+
     // @leafer-in/find will rewrite
     public getBy(condition: number | string | IFindCondition | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[] {
         return this.finder ? this.finder.getBy(condition, branch, one, options) : Plugin.need('find')

package/types/index.d.ts

@@ -9,11 +9,12 @@ declare class Selector implements ISelector {
     finder?: IFinder;
     constructor(target: ILeaf, userConfig?: ISelectorConfig);
     getByPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): IPickResult;
+    hitPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): boolean;
     getBy(condition: number | string | IFindCondition | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[];
     destroy(): void;
 }
 
-declare class Picker {
+declare class Picker implements IPicker {
     protected target?: ILeaf;
     protected selector: ISelector;
     protected findList: ILeafList;
@@ -21,6 +22,7 @@ declare class Picker {
     protected point: IRadiusPointData;
     constructor(target: ILeaf, selector: ISelector);
     getByPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): IPickResult;
+    hitPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): boolean;
     getBestMatchLeaf(list: ILeaf[], bottomList: IPickBottom[], ignoreHittable: boolean): ILeaf;
     getPath(leaf: ILeaf): LeafList;
     getHitablePath(leaf: ILeaf): LeafList;