@leafer/selector 1.0.0-beta.11 → 1.0.0-beta.15

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@leafer/selector",
-  "version": "1.0.0-beta.11",
+  "version": "1.0.0-beta.15",
   "description": "@leafer/selector",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
+  "types": "types/index.d.ts",
   "files": [
-    "src"
+    "src",
+    "types",
+    "dist"
   ],
   "repository": {
     "type": "git",
@@ -19,11 +22,9 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/event": "1.0.0-beta.11",
-    "@leafer/math": "1.0.0-beta.11",
-    "@leafer/list": "1.0.0-beta.11"
+    "@leafer/core": "1.0.0-beta.15"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.11"
+    "@leafer/interface": "1.0.0-beta.15"
   }
 }

package/src/FindPath.ts

@@ -1,7 +1,5 @@
 import { ILeaf, ILeafList, IPointData, IRadiusPointData, ISelectPathResult, ISelectPathOptions, ISelector } from '@leafer/interface'
-import { BoundsHelper } from '@leafer/math'
-import { LeafList } from '@leafer/list'
-import { LeafHelper } from '@leafer/helper'
+import { BoundsHelper, LeafList, LeafHelper } from '@leafer/core'
 
 
 const { hitRadiusPoint } = BoundsHelper
@@ -111,8 +109,8 @@ export class FindPath {
         const { point } = this, len = children.length
         for (let i = len - 1; i > -1; i--) {
             child = children[i]
-            if (hitMask && !child.isMask) continue
-            hit = hitRadiusPoint(child.__world, point)
+            if (!child.__.visible || (hitMask && !child.__.isMask)) continue
+            hit = child.__.hitRadius ? true : hitRadiusPoint(child.__world, point)
 
             if (child.isBranch) {
                 if (hit || child.__ignoreHitWorld) {
@@ -137,8 +135,7 @@ export class FindPath {
     }
 
     public destroy(): void {
-        this.target = null
-        this.selector = null
+        this.clear()
     }
 
 }

package/src/Selector.ts

@@ -1,7 +1,5 @@
 import { ILeaf, ILeafArrayMap, ILeafMap, ISelector, ISelectPathResult, ISelectPathOptions, IPointData, IEventListenerId, ISelectorConfig } from '@leafer/interface'
-import { ChildEvent, LayoutEvent } from '@leafer/event'
-import { DataHelper } from '@leafer/data'
-import { Platform } from '@leafer/platform'
+import { ChildEvent, LayoutEvent, DataHelper, Platform } from '@leafer/core'
 
 import { FindPath } from './FindPath'
 
@@ -129,19 +127,17 @@ export class Selector implements ISelector {
 
     protected __removeListenEvents(): void {
         this.target.off_(this.__eventIds)
+        this.__eventIds.length = 0
     }
 
     public destroy(): void {
-        if (this.target) {
+        if (this.__eventIds.length) {
             this.__removeListenEvents()
             this.findPath.destroy()
-
-            this.target = null
-            this.findPath = null
-            this.innerIdList = null
-            this.idList = null
-            this.classNameList = null
-            this.tagNameList = null
+            this.innerIdList = {}
+            this.idList = {}
+            this.classNameList = {}
+            this.tagNameList = {}
         }
     }
 

package/types/index.d.ts

@@ -0,0 +1,48 @@
+import { ILeaf, ISelector, ILeafList, IRadiusPointData, IPointData, ISelectPathOptions, ISelectPathResult, ISelectorConfig, ILeafMap, ILeafArrayMap, IEventListenerId } from '@leafer/interface';
+import { LeafList, ChildEvent } from '@leafer/core';
+
+declare class FindPath {
+    protected target: ILeaf;
+    protected selector: ISelector;
+    protected findList: ILeaf[];
+    protected exclude: ILeafList;
+    protected point: IRadiusPointData;
+    constructor(target: ILeaf, selector: ISelector);
+    getByPoint(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult;
+    getBestMatchLeaf(): ILeaf;
+    getPath(leaf: ILeaf): LeafList;
+    getHitablePath(leaf: ILeaf): LeafList;
+    getThroughPath(list: ILeaf[]): LeafList;
+    protected eachFind(children: Array<ILeaf>, hitMask: boolean): void;
+    protected hitChild(child: ILeaf, point: IRadiusPointData): void;
+    protected clear(): void;
+    destroy(): void;
+}
+
+interface IFind {
+    (leaf: ILeaf): boolean;
+}
+declare class Selector implements ISelector {
+    target: ILeaf;
+    config: ISelectorConfig;
+    protected findPath: FindPath;
+    protected innerIdList: ILeafMap;
+    protected idList: ILeafMap;
+    protected classNameList: ILeafArrayMap;
+    protected tagNameList: ILeafArrayMap;
+    protected __eventIds: IEventListenerId[];
+    constructor(target: ILeaf, userConfig?: ISelectorConfig);
+    getByPoint(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult;
+    find(name: number | string, branch?: ILeaf): ILeaf | ILeaf[];
+    getByInnerId(name: number, branch?: ILeaf): ILeaf;
+    getById(name: string, branch?: ILeaf): ILeaf;
+    getByClassName(name: string, branch?: ILeaf): ILeaf[];
+    getByTagName(name: string, branch?: ILeaf): ILeaf[];
+    protected loopFind(branch: ILeaf, find: IFind): void;
+    protected __onRemoveChild(event: ChildEvent): void;
+    protected __listenEvents(): void;
+    protected __removeListenEvents(): void;
+    destroy(): void;
+}
+
+export { Selector };