@leafer/selector 1.0.0-rc.21 → 1.0.0-rc.22

package/package.json

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

package/src/Picker.ts

@@ -1,4 +1,4 @@
-import { ILeaf, ILeafList, IPointData, IRadiusPointData, IPickResult, IPickOptions, ISelector } from '@leafer/interface'
+import { ILeaf, ILeafList, IPointData, IRadiusPointData, IPickResult, IPickOptions, ISelector, IPickBottom } from '@leafer/interface'
 import { BoundsHelper, LeafList, LeafHelper } from '@leafer/core'
 
 
@@ -9,7 +9,7 @@ export class Picker {
     protected target: ILeaf
     protected selector: ISelector
 
-    protected findList: ILeaf[]
+    protected findList: ILeafList
     protected exclude: ILeafList
 
     protected point: IRadiusPointData
@@ -29,13 +29,13 @@ export class Picker {
         this.exclude = options.exclude || null
 
         this.point = { x: hitPoint.x, y: hitPoint.y, radiusX: hitRadius, radiusY: hitRadius }
-        this.findList = options.findList || []
+        this.findList = new LeafList(options.findList)
 
         // path
-        if (!options.findList) this.eachFind(target.children, target.__onlyHitMask)
+        if (!options.findList) this.hitBranch(target)  // 包含through元素
 
-        const list = this.findList
-        const leaf = this.getBestMatchLeaf()
+        const { list } = this.findList
+        const leaf = this.getBestMatchLeaf(list, options.bottomList, ignoreHittable)
         const path = ignoreHittable ? this.getPath(leaf) : this.getHitablePath(leaf)
 
         this.clear()
@@ -43,22 +43,29 @@ export class Picker {
         return through ? { path, target: leaf, throughPath: list.length ? this.getThroughPath(list) : path } : { path, target: leaf }
     }
 
-    public getBestMatchLeaf(): ILeaf {
-        const { findList: targets } = this
-        if (targets.length > 1) {
+    public getBestMatchLeaf(list: ILeaf[], bottomList: IPickBottom[], ignoreHittable: boolean): ILeaf {
+        if (list.length) {
             let find: ILeaf
-            this.findList = []
+            this.findList = new LeafList()
             const { x, y } = this.point
             const point = { x, y, radiusX: 0, radiusY: 0 }
-            for (let i = 0, len = targets.length; i < len; i++) {
-                find = targets[i]
-                if (LeafHelper.worldHittable(find)) {
+            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[0]
+                    if (this.findList.length) return this.findList.list[0]
                 }
             }
         }
-        return targets[0]
+
+        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]
+            }
+        }
+
+        return list[0]
     }
 
     public getPath(leaf: ILeaf): LeafList {
@@ -104,6 +111,9 @@ export class Picker {
         return throughPath
     }
 
+    protected hitBranch(branch: ILeaf): void {
+        this.eachFind(branch.children, branch.__onlyHitMask)
+    }
 
     protected eachFind(children: ILeaf[], hitMask: boolean): void {
         let child: ILeaf, hit: boolean
@@ -124,9 +134,9 @@ export class Picker {
         }
     }
 
-    protected hitChild(child: ILeaf, point: IRadiusPointData): void {
+    protected hitChild(child: ILeaf, point: IRadiusPointData, proxy?: ILeaf): void {
         if (this.exclude && this.exclude.has(child)) return
-        if (child.__hitWorld(point)) this.findList.push(child)
+        if (child.__hitWorld(point)) this.findList.add(proxy || child)
     }
 
     protected clear(): void {

package/types/index.d.ts

@@ -1,20 +1,21 @@
-import { ILeaf, ISelector, ILeafList, IRadiusPointData, IPointData, IPickOptions, IPickResult, ISelectorProxy, ISelectorConfig, ILeafMap, IEventListenerId, IFindMethod } from '@leafer/interface';
+import { ILeaf, ISelector, ILeafList, IRadiusPointData, IPointData, IPickOptions, IPickResult, IPickBottom, ISelectorProxy, ISelectorConfig, ILeafMap, IEventListenerId, IFindMethod } from '@leafer/interface';
 import { LeafList, ChildEvent, PropertyEvent } from '@leafer/core';
 
 declare class Picker {
     protected target: ILeaf;
     protected selector: ISelector;
-    protected findList: ILeaf[];
+    protected findList: ILeafList;
     protected exclude: ILeafList;
     protected point: IRadiusPointData;
     constructor(target: ILeaf, selector: ISelector);
     getByPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): IPickResult;
-    getBestMatchLeaf(): ILeaf;
+    getBestMatchLeaf(list: ILeaf[], bottomList: IPickBottom[], ignoreHittable: boolean): ILeaf;
     getPath(leaf: ILeaf): LeafList;
     getHitablePath(leaf: ILeaf): LeafList;
     getThroughPath(list: ILeaf[]): LeafList;
+    protected hitBranch(branch: ILeaf): void;
     protected eachFind(children: ILeaf[], hitMask: boolean): void;
-    protected hitChild(child: ILeaf, point: IRadiusPointData): void;
+    protected hitChild(child: ILeaf, point: IRadiusPointData, proxy?: ILeaf): void;
     protected clear(): void;
     destroy(): void;
 }