@leafer/selector 1.2.2 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/selector",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "@leafer/selector",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,9 +22,9 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.2.2"
+    "@leafer/core": "1.3.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.2.2"
+    "@leafer/interface": "1.3.0"
   }
 }

package/src/Selector.ts

@@ -1,164 +1,38 @@
-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 { ILeaf, ISelector, ISelectorProxy, IPickResult, IPickOptions, IPointData, ISelectorConfig, IFinder, IFindMethod, IFindCondition, IPicker } from '@leafer/interface'
+import { Creator, DataHelper, Plugin, Platform } 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 // target 不存在时，为临时选择器（不能缓存数据）
-
     public proxy?: ISelectorProxy // editor
 
     public config: ISelectorConfig = {}
 
-    protected picker: Picker
-
-    protected innerIdMap: ILeafMap = {}
-    protected idMap: ILeafMap = {}
-
-    protected findLeaf: ILeaf
-
-    protected methods = {
-        id: (leaf: ILeaf, name: string) => leaf.id === name ? (this.target && (this.idMap[name] = leaf), 1) : 0,
-        innerId: (leaf: ILeaf, innerId: number) => leaf.innerId === innerId ? (this.target && (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,
-        tags: (leaf: ILeaf, nameMap: IBooleanMap) => nameMap[leaf.__tag] ? 1 : 0
-    }
-
-    protected __eventIds: IEventListenerId[]
-
+    public picker: IPicker
+    public finder?: IFinder
 
     constructor(target: ILeaf, userConfig?: ISelectorConfig) {
-        this.target = target
         if (userConfig) this.config = DataHelper.default(userConfig, this.config)
-        this.picker = new Picker(target, this)
-        if (target) this.__listenEvents()
-    }
-
-    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)
-                return one ? leaf : (leaf ? [leaf] : [])
-            case 'string':
-                switch (condition[0]) {
-                    case '#':
-                        idCondition.id = condition.substring(1), condition = idCondition; break
-                    case '.':
-                        classNameCondition.className = condition.substring(1), condition = classNameCondition; break
-                    default:
-                        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)
-        }
+        this.picker = new Picker(this.target = target, this)
+        this.finder = Creator.finder && Creator.finder()
     }
 
     public getByPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): IPickResult {
-        if (Platform.name === 'node' && this.target) this.target.emit(LayoutEvent.CHECK_UPDATE)
+        if (Platform.backgrounder && this.target) this.target.updateLayout()
         return this.picker.getByPoint(hitPoint, hitRadius, options)
     }
 
-    public getByInnerId(innerId: number, branch?: ILeaf): ILeaf {
-        const cache = this.innerIdMap[innerId]
-        if (cache) return cache
-        this.eachFind(this.toChildren(branch), this.methods.innerId, null, innerId)
-        return this.findLeaf
-    }
-
-    public getById(id: string, branch?: ILeaf): ILeaf {
-        const cache = this.idMap[id]
-        if (cache && LeafHelper.hasParent(cache, branch || this.target)) return cache
-        this.eachFind(this.toChildren(branch), this.methods.id, null, id)
-        return this.findLeaf
-    }
-
-    public getByClassName(className: string, branch?: ILeaf): ILeaf[] {
-        return this.getByMethod(this.methods.className, branch, false, className) as ILeaf[]
-    }
-
-    public getByTag(tag: string, branch?: ILeaf): ILeaf[] {
-        return this.getByMethod(this.methods.tag, branch, false, tag) as ILeaf[]
-    }
-
-    public getByMethod(method: IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf[] | ILeaf {
-        const list: ILeaf[] = one ? null : []
-        this.eachFind(this.toChildren(branch), method, list, options)
-        return list || this.findLeaf
-    }
-
-
-    protected eachFind(children: ILeaf[], method: IFindMethod, list?: ILeaf[], options?: any): void {
-        let child: ILeaf, result: IAnswer
-        for (let i = 0, len = children.length; i < len; i++) {
-            child = children[i]
-            result = method(child, options)
-            if (result === Yes || result === YesAndSkip) {
-                if (list) {
-                    list.push(child)
-                } else {
-                    this.findLeaf = child
-                    return
-                }
-            }
-            if (child.isBranch && result < NoAndSkip) this.eachFind(child.children, method, list, options)
-        }
-    }
-
-    protected toChildren(branch: ILeaf): ILeaf[] {
-        this.findLeaf = null
-        return [branch || this.target]
-    }
-
-
-    protected __onRemoveChild(event: ChildEvent): void {
-        const { id, innerId } = event.child
-        if (this.idMap[id]) delete this.idMap[id]
-        if (this.innerIdMap[innerId]) delete this.innerIdMap[innerId]
-    }
-
-    protected __checkIdChange(event: PropertyEvent): void {
-        if (event.attrName === 'id') {
-            const id = event.oldValue as string
-            if (this.idMap[id]) delete this.idMap[id]
-        }
-    }
-
-
-    protected __listenEvents(): void {
-        this.__eventIds = [
-            this.target.on_(ChildEvent.REMOVE, this.__onRemoveChild, this),
-            this.target.on_(PropertyEvent.CHANGE, this.__checkIdChange, this)
-        ]
-    }
-
-    protected __removeListenEvents(): void {
-        this.target.off_(this.__eventIds)
-        this.__eventIds.length = 0
+    // @leafer-in/find will rewrite
+    public getBy(condition: number | string | IFindCondition | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[] {
+        return this.finder ? this.finder.getBy(condition, branch, one, options) : Plugin.need('find')
     }
 
     public destroy(): void {
-        if (this.__eventIds.length) {
-            this.__removeListenEvents()
-            this.picker.destroy()
-            this.findLeaf = null
-            this.innerIdMap = {}
-            this.idMap = {}
-        }
+        this.picker.destroy()
+        if (this.finder) this.finder.destroy()
     }
 
 }

package/src/index.ts

@@ -1 +1,2 @@
-export { Selector } from './Selector'
+export { Selector } from './Selector'
+export { Picker } from './Picker'

package/types/index.d.ts

@@ -1,5 +1,17 @@
-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';
+import { ISelector, ILeaf, ISelectorProxy, ISelectorConfig, IPicker, IFinder, IPointData, IPickOptions, IPickResult, IFindCondition, IFindMethod, ILeafList, IRadiusPointData, IPickBottom } from '@leafer/interface';
+import { LeafList } from '@leafer/core';
+
+declare class Selector implements ISelector {
+    target?: ILeaf;
+    proxy?: ISelectorProxy;
+    config: ISelectorConfig;
+    picker: IPicker;
+    finder?: IFinder;
+    constructor(target: ILeaf, userConfig?: ISelectorConfig);
+    getByPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): IPickResult;
+    getBy(condition: number | string | IFindCondition | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[];
+    destroy(): void;
+}
 
 declare class Picker {
     protected target?: ILeaf;
@@ -20,37 +32,4 @@ declare class Picker {
     destroy(): void;
 }
 
-declare class Selector implements ISelector {
-    target?: ILeaf;
-    proxy?: ISelectorProxy;
-    config: ISelectorConfig;
-    protected picker: Picker;
-    protected innerIdMap: ILeafMap;
-    protected idMap: ILeafMap;
-    protected findLeaf: ILeaf;
-    protected methods: {
-        id: (leaf: ILeaf, name: string) => 1 | 0;
-        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 | 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;
-    getByClassName(className: string, branch?: ILeaf): ILeaf[];
-    getByTag(tag: string, branch?: ILeaf): ILeaf[];
-    getByMethod(method: IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf[] | ILeaf;
-    protected eachFind(children: ILeaf[], method: IFindMethod, list?: ILeaf[], options?: any): void;
-    protected toChildren(branch: ILeaf): ILeaf[];
-    protected __onRemoveChild(event: ChildEvent): void;
-    protected __checkIdChange(event: PropertyEvent): void;
-    protected __listenEvents(): void;
-    protected __removeListenEvents(): void;
-    destroy(): void;
-}
-
-export { Selector };
+export { Picker, Selector };