@leafer/selector 1.0.0-alpha.10 → 1.0.0-alpha.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/selector",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.23",
   "description": "@leafer/selector",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,11 +19,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/event": "1.0.0-alpha.10",
-    "@leafer/math": "1.0.0-alpha.10",
-    "@leafer/list": "1.0.0-alpha.10"
+    "@leafer/event": "1.0.0-alpha.23",
+    "@leafer/math": "1.0.0-alpha.23",
+    "@leafer/list": "1.0.0-alpha.23"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-alpha.10"
+    "@leafer/interface": "1.0.0-alpha.23"
   }
 }

package/src/PathFinder.ts

@@ -30,7 +30,7 @@ export class PathFinder {
         this.point = { x: hitPoint.x, y: hitPoint.y, radiusX: hitRadius, radiusY: hitRadius }
 
         // path
-        this.eachFind(this.target.children)
+        this.eachFind(this.target.children, this.target.__hasMask)
 
         const { leaf } = this
         const { defaultPath } = this.selector
@@ -42,7 +42,7 @@ export class PathFinder {
         // throughPath
         if (through) {
             const throughPath = this.throughPath = new LeafList()
-            this.eachThroughFind(this.target.children)
+            this.eachThroughFind(this.target.children, this.target.__hasMask)
             throughPath.pushList(defaultPath.list)
             result = { path, leaf, throughPath }
         } else {
@@ -64,47 +64,44 @@ export class PathFinder {
         return list
     }
 
-    protected eachThroughFind(children: Array<ILeaf>): void {
+    protected eachThroughFind(children: Array<ILeaf>, hasMask: boolean): void {
         let child: ILeaf
         const { point } = this, len = children.length
         for (let i = len - 1; i > -1; i--) {
             child = children[i]
-            if (child.__interactionOff) continue
+            if (hasMask ? child.isMask && child.__.hittable : child.__.hittable) {
+                if (hitRadiusPoint(child.__world, point)) {
+                    if (child.__isBranch && child.__.hitChildren) this.eachThroughFind(child.children, child.__hasMask)
 
-            if (hitRadiusPoint(child.__world, point)) {
-                if (child.__isBranch) {
-                    child.__childrenInteractionOff || this.eachThroughFind(child.children)
+                    if (this.exclude && this.exclude.has(child)) continue
+                    if (child.__hitWorld(point)) this.throughPath.push(child)
                 }
-
-                if (this.exclude && this.exclude.has(child)) continue
-                if (child.__hitWorld(point)) this.throughPath.push(child)
             }
-
         }
     }
 
-    protected eachFind(children: Array<ILeaf>): void {
+    protected eachFind(children: Array<ILeaf>, hasMask: boolean): void {
         let child: ILeaf
         const { point } = this, len = children.length
         for (let i = len - 1; i > -1; i--) {
             child = children[i]
-            if (child.__interactionOff) continue
+            if (hasMask ? child.isMask && child.__.hittable : child.__.hittable) {
+                if (hitRadiusPoint(child.__world, point)) {
+                    if (child.__isBranch) {
 
-            if (hitRadiusPoint(child.__world, point)) {
-                if (child.__isBranch) {
+                        if (child.__.hitChildren) this.eachFind(child.children, child.__hasMask)
 
-                    child.__childrenInteractionOff || this.eachFind(child.children)
+                        if (child.__isBranchLeaf) { // 填充了背景色的Group, 如画板/Frame元素
+                            if (!this.isStop) this.hitChild(child, point)
+                        }
 
-                    if (child.__isBranchLeaf) { // 填充了背景色的Group, 如画板/Frame元素
-                        if (!this.isStop) this.hitChild(child, point)
+                    } else {
+                        this.hitChild(child, point)
                     }
-
-                } else {
-                    this.hitChild(child, point)
                 }
-            }
 
-            if (this.isStop) break
+                if (this.isStop) break
+            }
         }
     }
 

package/src/Selector.ts

@@ -96,7 +96,7 @@ export class Selector implements ISelector {
         if (!branch) branch = this.target
         let find: Array<ILeaf | ILeaf> = []
         this.loopFind(branch, (leaf) => {
-            if (leaf.tag === name) find.push(leaf)
+            if (leaf.__tag === name) find.push(leaf)
             return false
         })
         return find