@leafer/display 1.6.1 → 1.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "@leafer/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,17 +22,17 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.6.1",
-    "@leafer/data": "1.6.1",
-    "@leafer/layout": "1.6.1",
-    "@leafer/display-module": "1.6.1",
-    "@leafer/event": "1.6.1",
-    "@leafer/decorator": "1.6.1",
-    "@leafer/helper": "1.6.1",
-    "@leafer/debug": "1.6.1",
-    "@leafer/platform": "1.6.1"
+    "@leafer/math": "1.6.3",
+    "@leafer/data": "1.6.3",
+    "@leafer/layout": "1.6.3",
+    "@leafer/display-module": "1.6.3",
+    "@leafer/event": "1.6.3",
+    "@leafer/decorator": "1.6.3",
+    "@leafer/helper": "1.6.3",
+    "@leafer/debug": "1.6.3",
+    "@leafer/platform": "1.6.3"
   },
   "devDependencies": {
-    "@leafer/interface": "1.6.1"
+    "@leafer/interface": "1.6.3"
   }
 }

package/src/Leaf.ts

@@ -1,4 +1,4 @@
-import { ILeaferBase, ILeaf, ILeafInputData, ILeafData, ILeaferCanvas, IRenderOptions, IBoundsType, ILocationType, IMatrixWithBoundsData, ILayoutBoundsData, IValue, ILeafLayout, InnerId, IHitCanvas, IRadiusPointData, IEventListenerMap, IEventListener, IEventListenerId, IEvent, IObject, IFunction, IPointData, IBoundsData, IBranch, IFindMethod, IMatrixData, IAttrDecorator, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAlign, IJSONOptions, IEventMap, IEventOption, IAxis, IMotionPathData, IUnitData, IRotationPointData, ITransition, IValueFunction } from '@leafer/interface'
+import { ILeaferBase, ILeaf, ILeafInputData, ILeafData, ILeaferCanvas, IRenderOptions, IBoundsType, ILocationType, IMatrixWithBoundsData, ILayoutBoundsData, IValue, ILeafLayout, InnerId, IHitCanvas, IRadiusPointData, IEventListenerMap, IEventListener, IEventListenerId, IEvent, IObject, IFunction, IPointData, IBoundsData, IBranch, IFindMethod, IMatrixData, IAttrDecorator, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAlign, IJSONOptions, IEventParamsMap, IEventOption, IAxis, IMotionPathData, IUnitData, IRotationPointData, ITransition, IValueFunction, IEventParams } from '@leafer/interface'
 import { BoundsHelper, IncrementId, MatrixHelper, PointHelper } from '@leafer/math'
 import { LeafData } from '@leafer/data'
 import { LeafLayout } from '@leafer/layout'
@@ -91,11 +91,14 @@ export class Leaf implements ILeaf {
     public get pathInputed(): boolean { return this.__.__pathInputed as unknown as boolean }
 
     // event
-    public set event(map: IEventMap) { this.on(map) }
+    public set event(map: IEventParamsMap) { this.on(map) }
 
     public __captureMap?: IEventListenerMap
     public __bubbleMap?: IEventListenerMap
 
+    public __hasLocalEvent?: boolean
+    public __hasWorldEvent?: boolean
+
     // branch 
     public children?: ILeaf[]
 
@@ -631,15 +634,15 @@ export class Leaf implements ILeaf {
 
     // LeafEventer rewrite
 
-    public on(_type: string | string[] | IEventMap, _listener?: IEventListener, _options?: IEventOption): void { }
+    public on(_type: string | string[] | IEventParams[] | IEventParamsMap, _listener?: IEventListener, _options?: IEventOption): void { }
 
     public off(_type?: string | string[], _listener?: IEventListener, _options?: IEventOption): void { }
 
-    public on_(_type: string | string[], _listener: IEventListener, _bind?: IObject, _options?: IEventOption): IEventListenerId { return undefined }
+    public on_(_type: string | string[] | IEventParams[], _listener?: IEventListener, _bind?: IObject, _options?: IEventOption): IEventListenerId { return undefined }
 
     public off_(_id: IEventListenerId | IEventListenerId[]): void { }
 
-    public once(_type: string | string[], _listener: IEventListener, _capture?: boolean): void { }
+    public once(_type: string | string[] | IEventParams[], _listener?: IEventListener, _captureOrBind?: boolean | IObject, _capture?: boolean): void { }
 
     public emit(_type: string, _event?: IEvent | IObject, _capture?: boolean): void { }
 

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, IMatrixWithScaleData, IHitCanvas, IEventMap, IEventListenerMap, ILeafInputData, IFunction, IObject, IValue, IJSONOptions, IFindMethod, ILeaferCanvas, IRenderOptions, ILocationType, IBoundsType, ILayoutBoundsData, IPointData, ITransition, IAlign, IAxis, IRadiusPointData, IMotionPathData, IUnitData, IRotationPointData, IEventListener, IEventOption, IEventListenerId, IEvent, IValueFunction, IAttrDecorator } from '@leafer/interface';
+import { ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, IMatrixWithScaleData, IHitCanvas, IEventParamsMap, IEventListenerMap, ILeafInputData, IFunction, IObject, IValue, IJSONOptions, IFindMethod, ILeaferCanvas, IRenderOptions, ILocationType, IBoundsType, ILayoutBoundsData, IPointData, ITransition, IAlign, IAxis, IRadiusPointData, IMotionPathData, IUnitData, IRotationPointData, IEventParams, IEventListener, IEventOption, IEventListenerId, IEvent, IValueFunction, IAttrDecorator } from '@leafer/interface';
 import { LeafData } from '@leafer/data';
 import { LeafLayout } from '@leafer/layout';
 
@@ -47,9 +47,11 @@ declare class Leaf implements ILeaf {
     get __ignoreHitWorld(): boolean;
     get __inLazyBounds(): boolean;
     get pathInputed(): boolean;
-    set event(map: IEventMap);
+    set event(map: IEventParamsMap);
     __captureMap?: IEventListenerMap;
     __bubbleMap?: IEventListenerMap;
+    __hasLocalEvent?: boolean;
+    __hasWorldEvent?: boolean;
     children?: ILeaf[];
     destroyed: boolean;
     constructor(data?: ILeafInputData);
@@ -171,11 +173,11 @@ declare class Leaf implements ILeaf {
     add(_child: ILeaf | ILeaf[] | ILeafInputData | ILeafInputData[], _index?: number): void;
     remove(_child?: ILeaf | number | string | IFindMethod, destroy?: boolean): void;
     dropTo(parent: ILeaf, index?: number, resize?: boolean): void;
-    on(_type: string | string[] | IEventMap, _listener?: IEventListener, _options?: IEventOption): void;
+    on(_type: string | string[] | IEventParams[] | IEventParamsMap, _listener?: IEventListener, _options?: IEventOption): void;
     off(_type?: string | string[], _listener?: IEventListener, _options?: IEventOption): void;
-    on_(_type: string | string[], _listener: IEventListener, _bind?: IObject, _options?: IEventOption): IEventListenerId;
+    on_(_type: string | string[] | IEventParams[], _listener?: IEventListener, _bind?: IObject, _options?: IEventOption): IEventListenerId;
     off_(_id: IEventListenerId | IEventListenerId[]): void;
-    once(_type: string | string[], _listener: IEventListener, _capture?: boolean): void;
+    once(_type: string | string[] | IEventParams[], _listener?: IEventListener, _captureOrBind?: boolean | IObject, _capture?: boolean): void;
     emit(_type: string, _event?: IEvent | IObject, _capture?: boolean): void;
     emitEvent(_event?: IEvent, _capture?: boolean): void;
     hasEvent(_type: string, _capture?: boolean): boolean;