@leafer/selector 1.0.0-alpha.1 → 1.0.0-alpha.21

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "@leafer/selector",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.21",
   "description": "@leafer/selector",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
-  "files": ["src"],
+  "files": [
+    "src"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/leaferjs/leafer.git"
@@ -17,11 +19,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/event": "1.0.0-alpha.1",
-    "@leafer/math": "1.0.0-alpha.1",
-    "@leafer/list": "1.0.0-alpha.1"
+    "@leafer/event": "1.0.0-alpha.21",
+    "@leafer/math": "1.0.0-alpha.21",
+    "@leafer/list": "1.0.0-alpha.21"
   },
   "devDependencies": {
-     "@leafer/interface": "1.0.0-alpha.1"
+    "@leafer/interface": "1.0.0-alpha.21"
   }
 }

package/src/PathFinder.ts

@@ -24,7 +24,7 @@ export class PathFinder {
 
     public getHitPointPath(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult {
         const through = options ? options.through : false
-        this.exclude = options ? options.exclude : undefined
+        this.exclude = options ? options.exclude : null
 
         this.isStop = false
         this.point = { x: hitPoint.x, y: hitPoint.y, radiusX: hitRadius, radiusY: hitRadius }
@@ -69,17 +69,14 @@ export class PathFinder {
         const { point } = this, len = children.length
         for (let i = len - 1; i > -1; i--) {
             child = children[i]
-            if (child.__interactionOff) continue
+            if (child.__.hittable) {
+                if (hitRadiusPoint(child.__world, point)) {
+                    if (child.__isBranch && child.__.hitChildren) this.eachThroughFind(child.children)
 
-            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)
             }
-
         }
     }
 
@@ -88,23 +85,23 @@ export class PathFinder {
         const { point } = this, len = children.length
         for (let i = len - 1; i > -1; i--) {
             child = children[i]
-            if (child.__interactionOff) continue
+            if (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.__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
+            }
         }
     }
 
@@ -117,15 +114,15 @@ export class PathFinder {
     }
 
     protected clear(): void {
-        this.point = undefined
-        this.leaf = undefined
-        this.throughPath = undefined
-        this.exclude = undefined
+        this.point = null
+        this.leaf = null
+        this.throughPath = null
+        this.exclude = null
     }
 
     public destroy(): void {
-        this.target = undefined
-        this.selector = undefined
+        this.target = null
+        this.selector = null
     }
 
 }

package/src/Selector.ts

@@ -13,38 +13,22 @@ interface IFind {
 export class Selector implements ISelector {
 
     public target: ILeaf
-    protected pathFinder: PathFinder
-
     public defaultPath: ILeafList
 
-    protected eventIds: IEventListenerId[]
+    protected pathFinder: PathFinder
 
     protected innerIdList: ILeafMap = {}
     protected idList: ILeafMap = {}
     protected classNameList: ILeafArrayMap = {}
     protected tagNameList: ILeafArrayMap = {}
 
+    protected __eventIds: IEventListenerId[]
+
     constructor(target: ILeaf) {
         this.target = target
         this.defaultPath = new LeafList(target)
         this.pathFinder = new PathFinder(target, this)
-        this.listenEvents()
-    }
-
-    protected listenEvents(): void {
-        this.eventIds = [
-            this.target.on__(ChildEvent.REMOVE, this.onRemoveChild, this)
-        ]
-    }
-
-    protected removeListenEvents(): void {
-        this.target.off__(this.eventIds)
-    }
-
-    protected onRemoveChild(event: ChildEvent): void {
-        const target = event.target as ILeaf
-        if (this.idList[target.id]) this.idList[target.id] = undefined
-        if (this.innerIdList[target.id]) this.innerIdList[target.innerId] = undefined
+        this.__listenEvents()
     }
 
     public getHitPointPath(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult {
@@ -128,17 +112,34 @@ export class Selector implements ISelector {
         }
     }
 
+    protected __onRemoveChild(event: ChildEvent): void {
+        const target = event.target as ILeaf
+        if (this.idList[target.id]) this.idList[target.id] = null
+        if (this.innerIdList[target.id]) this.innerIdList[target.innerId] = null
+    }
+
+
+    protected __listenEvents(): void {
+        this.__eventIds = [
+            this.target.on__(ChildEvent.REMOVE, this.__onRemoveChild, this)
+        ]
+    }
+
+    protected __removeListenEvents(): void {
+        this.target.off__(this.__eventIds)
+    }
+
     public destroy(): void {
         if (this.target) {
-            this.removeListenEvents()
+            this.__removeListenEvents()
             this.pathFinder.destroy()
 
-            this.target = undefined
-            this.pathFinder = undefined
-            this.innerIdList = undefined
-            this.idList = undefined
-            this.classNameList = undefined
-            this.tagNameList = undefined
+            this.target = null
+            this.pathFinder = null
+            this.innerIdList = null
+            this.idList = null
+            this.classNameList = null
+            this.tagNameList = null
         }
     }