@leafer/display 1.0.0 → 1.0.2

package/package.json

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

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, IEventListenerOptions, IEventListenerId, IEvent, IObject, IFunction, IPointData, IBoundsData, IBranch, IFindMethod, IMatrixData, IAttrDecorator, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAlign, IJSONOptions } 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, IEventMap, IEventOption, IAxis } from '@leafer/interface'
 import { BoundsHelper, IncrementId, MatrixHelper, PointHelper } from '@leafer/math'
 import { LeafData } from '@leafer/data'
 import { LeafLayout } from '@leafer/layout'
@@ -12,7 +12,7 @@ const { LEAF, create } = IncrementId
 const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper
 const { toOuterOf } = BoundsHelper
 const { copy } = PointHelper
-const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper
+const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getFlipTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper
 
 @useModule(LeafDataProxy)
 @useModule(LeafMatrix)
@@ -84,6 +84,8 @@ export class Leaf implements ILeaf {
     public get pathInputed(): boolean { return this.__.__pathInputed as unknown as boolean }
 
     // event
+    public set event(map: IEventMap) { let event; for (let key in map) event = map[key], event instanceof Array ? this.on(key, event[0], event[1]) : this.on(key, event) }
+
     public __captureMap?: IEventListenerMap
     public __bubbleMap?: IEventListenerMap
 
@@ -442,6 +444,11 @@ export class Leaf implements ILeaf {
         moveLocal(this, x, y)
     }
 
+
+    public moveInner(x: number | IPointData, y?: number): void {
+        moveWorld(this, x, y, true)
+    }
+
     public scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void {
         zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize)
     }
@@ -454,6 +461,7 @@ export class Leaf implements ILeaf {
         skewOfLocal(this, getLocalOrigin(this, origin), skewX, skewY, resize)
     }
 
+
     public transformWorld(worldTransform?: IMatrixData, resize?: boolean): void {
         transformWorld(this, worldTransform, resize)
     }
@@ -474,6 +482,10 @@ export class Leaf implements ILeaf {
         skewOfWorld(this, worldOrigin, skewX, skewY, resize)
     }
 
+    public flip(axis: IAxis): void {
+        transform(this, getFlipTransform(this, axis))
+    }
+
 
     // @leafer-in/resize rewrite
 
@@ -560,11 +572,11 @@ export class Leaf implements ILeaf {
 
     // LeafEventer rewrite
 
-    public on(_type: string | string[], _listener: IEventListener, _options?: IEventListenerOptions | boolean): void { }
+    public on(_type: string | string[], _listener: IEventListener, _options?: IEventOption): void { }
 
-    public off(_type?: string | string[], _listener?: IEventListener, _options?: IEventListenerOptions | boolean): void { }
+    public off(_type?: string | string[], _listener?: IEventListener, _options?: IEventOption): void { }
 
-    public on_(_type: string | string[], _listener: IEventListener, _bind?: IObject, _options?: IEventListenerOptions | boolean): IEventListenerId { return undefined }
+    public on_(_type: string | string[], _listener: IEventListener, _bind?: IObject, _options?: IEventOption): IEventListenerId { return undefined }
 
     public off_(_id: IEventListenerId | IEventListenerId[]): void { }
 

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, IMatrixWithScaleData, IHitCanvas, IEventListenerMap, IFunction, ILeafInputData, IObject, IValue, IJSONOptions, IFindMethod, ILeaferCanvas, IRenderOptions, ILocationType, IBoundsType, ILayoutBoundsData, IPointData, IAlign, IRadiusPointData, IEventListener, IEventListenerOptions, IEventListenerId, IEvent, IAttrDecorator } from '@leafer/interface';
+import { ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, IMatrixWithScaleData, IHitCanvas, IEventMap, IEventListenerMap, IFunction, ILeafInputData, IObject, IValue, IJSONOptions, IFindMethod, ILeaferCanvas, IRenderOptions, ILocationType, IBoundsType, ILayoutBoundsData, IPointData, IAlign, IAxis, IRadiusPointData, IEventListener, IEventOption, IEventListenerId, IEvent, IAttrDecorator } from '@leafer/interface';
 import { LeafData } from '@leafer/data';
 import { LeafLayout } from '@leafer/layout';
 
@@ -43,6 +43,7 @@ declare class Leaf implements ILeaf {
     get __ignoreHitWorld(): boolean;
     get __inLazyBounds(): boolean;
     get pathInputed(): boolean;
+    set event(map: IEventMap);
     __captureMap?: IEventListenerMap;
     __bubbleMap?: IEventListenerMap;
     __parentWait?: IFunction[];
@@ -122,6 +123,7 @@ declare class Leaf implements ILeaf {
     setTransform(matrix: IMatrixData, resize?: boolean): void;
     transform(matrix: IMatrixData, resize?: boolean): void;
     move(x: number | IPointData, y?: number): void;
+    moveInner(x: number | IPointData, y?: number): void;
     scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void;
     rotateOf(origin: IPointData | IAlign, rotation: number): void;
     skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean): void;
@@ -130,6 +132,7 @@ declare class Leaf implements ILeaf {
     scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
     rotateOfWorld(worldOrigin: IPointData, rotation: number): void;
     skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void;
+    flip(axis: IAxis): void;
     scaleResize(scaleX: number, scaleY?: number, _noResize?: boolean): void;
     __scaleResize(_scaleX: number, _scaleY: number): void;
     resizeWidth(_width: number): void;
@@ -156,9 +159,9 @@ declare class Leaf implements ILeaf {
     add(_child: ILeaf, _index?: number): void;
     remove(_child?: ILeaf, destroy?: boolean): void;
     dropTo(parent: ILeaf, index?: number, resize?: boolean): void;
-    on(_type: string | string[], _listener: IEventListener, _options?: IEventListenerOptions | boolean): void;
-    off(_type?: string | string[], _listener?: IEventListener, _options?: IEventListenerOptions | boolean): void;
-    on_(_type: string | string[], _listener: IEventListener, _bind?: IObject, _options?: IEventListenerOptions | boolean): IEventListenerId;
+    on(_type: string | string[], _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;
     off_(_id: IEventListenerId | IEventListenerId[]): void;
     once(_type: string | string[], _listener: IEventListener, _capture?: boolean): void;
     emit(_type: string, _event?: IEvent | IObject, _capture?: boolean): void;