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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/selector",
-  "version": "1.0.0-rc.21",
+  "version": "1.0.0-rc.23",
   "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.23"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.21"
+    "@leafer/interface": "1.0.0-rc.23"
   }
 }

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/src/Selector.ts

@@ -1,13 +1,11 @@
-import { ILeaf, ILeafMap, ISelector, ISelectorProxy, IPickResult, IPickOptions, IPointData, IEventListenerId, ISelectorConfig, IFindMethod, IAnswer } from '@leafer/interface'
+import { ILeaf, ILeafMap, ISelector, ISelectorProxy, IPickResult, IPickOptions, IPointData, IEventListenerId, ISelectorConfig, IFindMethod, IAnswer, IFindCondition, IBooleanMap } from '@leafer/interface'
 import { ChildEvent, LayoutEvent, DataHelper, Answer, Platform, PropertyEvent, LeafHelper } from '@leafer/core'
 
 import { Picker } from './Picker'
 
 
-
-
 const { Yes, NoAndSkip, YesAndSkip } = Answer
-
+const idCondition = {} as IFindCondition, classNameCondition = {} as IFindCondition, tagCondition = {} as IFindCondition
 export class Selector implements ISelector {
 
     public target: ILeaf
@@ -27,7 +25,8 @@ export class Selector implements ISelector {
         id: (leaf: ILeaf, name: string) => leaf.id === name ? (this.idMap[name] = leaf, 1) : 0,
         innerId: (leaf: ILeaf, innerId: number) => leaf.innerId === innerId ? (this.innerIdMap[innerId] = leaf, 1) : 0,
         className: (leaf: ILeaf, name: string) => leaf.className === name ? 1 : 0,
-        tag: (leaf: ILeaf, name: string) => leaf.__tag === name ? 1 : 0
+        tag: (leaf: ILeaf, name: string) => leaf.__tag === name ? 1 : 0,
+        tags: (leaf: ILeaf, nameMap: IBooleanMap) => nameMap[leaf.__tag] ? 1 : 0
     }
 
     protected __eventIds: IEventListenerId[]
@@ -40,7 +39,7 @@ export class Selector implements ISelector {
         this.__listenEvents()
     }
 
-    public getBy(condition: number | string | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[] {
+    public getBy(condition: number | string | IFindCondition | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[] {
         switch (typeof condition) {
             case 'number':
                 const leaf = this.getByInnerId(condition, branch)
@@ -48,12 +47,21 @@ export class Selector implements ISelector {
             case 'string':
                 switch (condition[0]) {
                     case '#':
-                        const leaf = this.getById(condition.substring(1), branch)
-                        return one ? leaf : (leaf ? [leaf] : [])
+                        idCondition.id = condition.substring(1), condition = idCondition; break
                     case '.':
-                        return this.getByMethod(this.methods.className, branch, one, condition.substring(1)) // className
+                        classNameCondition.className = condition.substring(1), condition = classNameCondition; break
                     default:
-                        return this.getByMethod(this.methods.tag, branch, one, condition) // tagName
+                        tagCondition.tag = condition, condition = tagCondition
+                }
+            case 'object':
+                if (condition.id !== undefined) {
+                    const leaf = this.getById(condition.id as string, branch)
+                    return one ? leaf : (leaf ? [leaf] : [])
+                } else if (condition.tag) {
+                    const { tag } = condition, isArray = tag instanceof Array
+                    return this.getByMethod(isArray ? this.methods.tags : this.methods.tag, branch, one, isArray ? DataHelper.toMap(tag) : tag)
+                } else {
+                    return this.getByMethod(this.methods.className, branch, one, condition.className)
                 }
             case 'function':
                 return this.getByMethod(condition as IFindMethod, branch, one, options)

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, IBooleanMap, IEventListenerId, IFindCondition, 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;
 }
@@ -32,10 +33,11 @@ declare class Selector implements ISelector {
         innerId: (leaf: ILeaf, innerId: number) => 1 | 0;
         className: (leaf: ILeaf, name: string) => 1 | 0;
         tag: (leaf: ILeaf, name: string) => 1 | 0;
+        tags: (leaf: ILeaf, nameMap: IBooleanMap) => 1 | 0;
     };
     protected __eventIds: IEventListenerId[];
     constructor(target: ILeaf, userConfig?: ISelectorConfig);
-    getBy(condition: number | string | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[];
+    getBy(condition: number | string | IFindCondition | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[];
     getByPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): IPickResult;
     getByInnerId(innerId: number, branch?: ILeaf): ILeaf;
     getById(id: string, branch?: ILeaf): ILeaf;