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

package/package.json

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

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,4 +1,4 @@
-import { ILeaf, ISelector, ILeafList, IRadiusPointData, IPointData, IPickOptions, IPickResult, IPickBottom, 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 {
@@ -33,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;