@leafer/selector 1.9.9 → 1.9.11

package/package.json

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

package/src/Picker.ts

@@ -35,7 +35,7 @@ export class Picker implements IPicker {
         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)
+        const leaf = this.getBestMatchLeaf(list, options.bottomList, ignoreHittable, !!options.findList)
         const path = ignoreHittable ? this.getPath(leaf) : this.getHitablePath(leaf)
 
         this.clear()
@@ -47,7 +47,7 @@ export class Picker implements IPicker {
         return !!this.getByPoint(hitPoint, hitRadius, options).target // 后期需进行优化 ！！！
     }
 
-    public getBestMatchLeaf(list: ILeaf[], bottomList: IPickBottom[], ignoreHittable: boolean): ILeaf {
+    public getBestMatchLeaf(list: ILeaf[], bottomList: IPickBottom[], ignoreHittable: boolean, allowNull?: boolean): ILeaf {
         const findList = this.findList = new LeafList()
 
         if (list.length) {
@@ -76,16 +76,32 @@ export class Picker implements IPicker {
             }
         }
 
+        if (allowNull) return null
         return ignoreHittable ? list[0] : list.find(item => LeafHelper.worldHittable(item))
     }
 
     public getPath(leaf: ILeaf): LeafList {
-        const path = new LeafList()
+        const path = new LeafList(), syncList = [], { target } = this
+
         while (leaf) {
+            if (leaf.syncEventer) syncList.push(leaf.syncEventer)
             path.add(leaf)
             leaf = leaf.parent
+            if (leaf === target) break
         }
-        if (this.target) path.add(this.target)
+
+        // 存在同步触发
+        if (syncList.length) {
+            syncList.forEach(item => {
+                while (item) {
+                    if (item.__.hittable) path.add(item)
+                    item = item.parent
+                    if (item === target) break
+                }
+            })
+        }
+
+        if (target) path.add(target)
         return path
     }
 

package/types/index.d.ts

@@ -23,7 +23,7 @@ declare class Picker implements IPicker {
     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;
+    getBestMatchLeaf(list: ILeaf[], bottomList: IPickBottom[], ignoreHittable: boolean, allowNull?: boolean): ILeaf;
     getPath(leaf: ILeaf): LeafList;
     getHitablePath(leaf: ILeaf): LeafList;
     getThroughPath(list: ILeaf[]): LeafList;