@leafer/selector 1.0.0-rc.6 → 1.0.0-rc.7

package/package.json

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

package/src/Pather.ts

@@ -63,10 +63,10 @@ export class Pather {
     public getPath(leaf: ILeaf): LeafList {
         const path = new LeafList()
         while (leaf) {
-            path.push(leaf)
+            path.add(leaf)
             leaf = leaf.parent
         }
-        path.push(this.target)
+        path.add(this.target)
         return path
     }
 
@@ -76,7 +76,7 @@ export class Pather {
         for (let i = path.list.length - 1; i > -1; i--) {
             item = path.list[i]
             if (!item.__.hittable) break
-            hittablePath.unshift(item)
+            hittablePath.addAt(item, 0)
             if (!item.__.hitChildren) break
         }
         return hittablePath
@@ -96,7 +96,7 @@ export class Pather {
             for (let j = 0, jLen = path.length; j < jLen; j++) {
                 leaf = path.list[j]
                 if (nextPath && nextPath.has(leaf)) break
-                throughPath.push(leaf)
+                throughPath.add(leaf)
             }
         }
 

package/src/Selector.ts

@@ -1,28 +1,29 @@
-import { ILeaf, ILeafMap, ILeafList, ISelector, ISelectPathResult, ISelectPathOptions, IPointData, IEventListenerId, ISelectorConfig, IFindMethod } from '@leafer/interface'
+import { ILeaf, ILeafMap, ISelector, ISelectorProxy, ISelectPathResult, ISelectPathOptions, IPointData, IEventListenerId, ISelectorConfig, IFindMethod, AnswerType } from '@leafer/interface'
 import { ChildEvent, LayoutEvent, DataHelper, Platform, PropertyEvent, LeafHelper } from '@leafer/core'
 
 import { Pather } from './Pather'
 
 
+const { Yes, NoAndSkip, YesAndSkip } = AnswerType
+
 export class Selector implements ISelector {
 
     public target: ILeaf
 
-    public list: ILeafList
+    public proxy?: ISelectorProxy // editor
 
     public config: ISelectorConfig = {}
 
     protected pather: Pather
 
-
     protected innerIdMap: ILeafMap = {}
     protected idMap: ILeafMap = {}
 
     protected findLeaf: ILeaf
 
     protected methods = {
-        id: (leaf: ILeaf, name: string) => leaf.id === name ? this.idMap[name] = leaf : 0,
-        innerId: (leaf: ILeaf, innerId: number) => leaf.innerId === innerId ? this.innerIdMap[innerId] = leaf : 0,
+        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
     }
@@ -37,11 +38,6 @@ export class Selector implements ISelector {
         this.__listenEvents()
     }
 
-    public getByPoint(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult {
-        if (Platform.name === 'node') this.target.emit(LayoutEvent.CHECK_UPDATE)
-        return this.pather.getByPoint(hitPoint, hitRadius, options)
-    }
-
     public getBy(condition: number | string | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[] {
         switch (typeof condition) {
             case 'number':
@@ -62,6 +58,11 @@ export class Selector implements ISelector {
         }
     }
 
+    public getByPoint(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult {
+        if (Platform.name === 'node') this.target.emit(LayoutEvent.CHECK_UPDATE)
+        return this.pather.getByPoint(hitPoint, hitRadius, options)
+    }
+
     public getByInnerId(innerId: number, branch?: ILeaf): ILeaf {
         const cache = this.innerIdMap[innerId]
         if (cache) return cache
@@ -91,11 +92,12 @@ export class Selector implements ISelector {
     }
 
 
-    protected eachFind(children: ILeaf[], method: IFindMethod, list?: ILeaf[], options?: any,): void {
-        let child: ILeaf
+    protected eachFind(children: ILeaf[], method: IFindMethod, list?: ILeaf[], options?: any): void {
+        let child: ILeaf, result: AnswerType
         for (let i = 0, len = children.length; i < len; i++) {
             child = children[i]
-            if (method(child, options)) {
+            result = method(child, options)
+            if (result === Yes || result === YesAndSkip) {
                 if (list) {
                     list.push(child)
                 } else {
@@ -103,7 +105,7 @@ export class Selector implements ISelector {
                     return
                 }
             }
-            if (child.isBranch) this.eachFind(child.children, method, list, options)
+            if (child.isBranch && result < NoAndSkip) this.eachFind(child.children, method, list, options)
         }
     }
 

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, ISelector, ILeafList, IRadiusPointData, IPointData, ISelectPathOptions, ISelectPathResult, ISelectorConfig, ILeafMap, IEventListenerId, IFindMethod } from '@leafer/interface';
+import { ILeaf, ISelector, ILeafList, IRadiusPointData, IPointData, ISelectPathOptions, ISelectPathResult, ISelectorProxy, ISelectorConfig, ILeafMap, IEventListenerId, IFindMethod } from '@leafer/interface';
 import { LeafList, ChildEvent, PropertyEvent } from '@leafer/core';
 
 declare class Pather {
@@ -21,22 +21,22 @@ declare class Pather {
 
 declare class Selector implements ISelector {
     target: ILeaf;
-    list: ILeafList;
+    proxy?: ISelectorProxy;
     config: ISelectorConfig;
     protected pather: Pather;
     protected innerIdMap: ILeafMap;
     protected idMap: ILeafMap;
     protected findLeaf: ILeaf;
     protected methods: {
-        id: (leaf: ILeaf, name: string) => ILeaf | 0;
-        innerId: (leaf: ILeaf, innerId: number) => ILeaf | 0;
+        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;
     };
     protected __eventIds: IEventListenerId[];
     constructor(target: ILeaf, userConfig?: ISelectorConfig);
-    getByPoint(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult;
     getBy(condition: number | string | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[];
+    getByPoint(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult;
     getByInnerId(innerId: number, branch?: ILeaf): ILeaf;
     getById(id: string, branch?: ILeaf): ILeaf;
     getByClassName(className: string, branch?: ILeaf): ILeaf[];