@leafer/display 1.3.2 → 1.4.0

package/package.json

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

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 } 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, IMotionPathData, IUnitData, IRotationPointData, ITransition } from '@leafer/interface'
 import { BoundsHelper, IncrementId, MatrixHelper, PointHelper } from '@leafer/math'
 import { LeafData } from '@leafer/data'
 import { LeafLayout } from '@leafer/layout'
@@ -86,7 +86,7 @@ export class Leaf implements ILeaf {
 
     public get __onlyHitMask(): boolean { return this.__hasMask && !this.__.hitChildren }
     public get __ignoreHitWorld(): boolean { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren }
-    public get __inLazyBounds(): boolean { const { leafer } = this; return leafer && leafer.created && leafer.lazyBounds.hit(this.__world) }
+    public get __inLazyBounds(): boolean { return this.leaferIsCreated && this.leafer.lazyBounds.hit(this.__world) }
 
     public get pathInputed(): boolean { return this.__.__pathInputed as unknown as boolean }
 
@@ -254,6 +254,10 @@ export class Leaf implements ILeaf {
         this.forceUpdate('surface')
     }
 
+    public __extraUpdate(): void {
+        if (this.leaferIsReady) this.leafer.layouter.addExtra(this) // add part 额外更新元素
+    }
+
     // LeafMatrix rewrite
 
     public __updateWorldMatrix(): void { }
@@ -462,58 +466,58 @@ export class Leaf implements ILeaf {
 
     // transform 
 
-    public setTransform(matrix: IMatrixData, resize?: boolean): void {
-        setTransform(this, matrix, resize)
+    public setTransform(matrix: IMatrixData, resize?: boolean, transition?: ITransition): void {
+        setTransform(this, matrix, resize, transition)
     }
 
-    public transform(matrix: IMatrixData, resize?: boolean): void {
-        transform(this, matrix, resize)
+    public transform(matrix: IMatrixData, resize?: boolean, transition?: ITransition): void {
+        transform(this, matrix, resize, transition)
     }
 
-    public move(x: number | IPointData, y?: number, transition?: any): void {
+    public move(x: number | IPointData, y?: number, transition?: ITransition): void {
         moveLocal(this, x, y, transition)
     }
 
 
-    public moveInner(x: number | IPointData, y?: number, transition?: any): void {
+    public moveInner(x: number | IPointData, y?: number, transition?: ITransition): void {
         moveWorld(this, x, y, true, transition)
     }
 
-    public scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void {
-        zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize)
+    public scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number | ITransition, resize?: boolean, transition?: ITransition): void {
+        zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize, transition)
     }
 
-    public rotateOf(origin: IPointData | IAlign, rotation: number): void {
-        rotateOfLocal(this, getLocalOrigin(this, origin), rotation)
+    public rotateOf(origin: IPointData | IAlign, rotation: number, transition?: ITransition): void {
+        rotateOfLocal(this, getLocalOrigin(this, origin), rotation, transition)
     }
 
-    public skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean): void {
-        skewOfLocal(this, getLocalOrigin(this, origin), skewX, skewY, resize)
+    public skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean, transition?: ITransition): void {
+        skewOfLocal(this, getLocalOrigin(this, origin), skewX, skewY, resize, transition)
     }
 
 
-    public transformWorld(worldTransform?: IMatrixData, resize?: boolean): void {
-        transformWorld(this, worldTransform, resize)
+    public transformWorld(worldTransform?: IMatrixData, resize?: boolean, transition?: ITransition): void {
+        transformWorld(this, worldTransform, resize, transition)
     }
 
-    public moveWorld(x: number | IPointData, y?: number, transition?: any): void {
+    public moveWorld(x: number | IPointData, y?: number, transition?: ITransition): void {
         moveWorld(this, x, y, false, transition)
     }
 
-    public scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void {
-        zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize)
+    public scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number | ITransition, resize?: boolean, transition?: ITransition): void {
+        zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize, transition)
     }
 
     public rotateOfWorld(worldOrigin: IPointData, rotation: number): void {
         rotateOfWorld(this, worldOrigin, rotation)
     }
 
-    public skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void {
-        skewOfWorld(this, worldOrigin, skewX, skewY, resize)
+    public skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean, transition?: ITransition): void {
+        skewOfWorld(this, worldOrigin, skewX, skewY, resize, transition)
     }
 
-    public flip(axis: IAxis): void {
-        transform(this, getFlipTransform(this, axis))
+    public flip(axis: IAxis, transition?: ITransition): void {
+        transform(this, getFlipTransform(this, axis), false, transition)
     }
 
 

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, IAlign, IAxis, IRadiusPointData, IMotionPathData, IUnitData, IRotationPointData, IEventListener, IEventOption, IEventListenerId, IEvent, IAttrDecorator } from '@leafer/interface';
+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, IAttrDecorator } from '@leafer/interface';
 import { LeafData } from '@leafer/data';
 import { LeafLayout } from '@leafer/layout';
 
@@ -84,6 +84,7 @@ declare class Leaf implements ILeaf {
     updateLayout(): void;
     forceUpdate(attrName?: string): void;
     forceRender(_bounds?: IBoundsData, _sync?: boolean): void;
+    __extraUpdate(): void;
     __updateWorldMatrix(): void;
     __updateLocalMatrix(): void;
     __updateWorldBounds(): void;
@@ -127,19 +128,19 @@ declare class Leaf implements ILeaf {
     getWorldPointByBox(box: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
     getWorldPointByLocal(local: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
     getWorldPointByPage(page: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
-    setTransform(matrix: IMatrixData, resize?: boolean): void;
-    transform(matrix: IMatrixData, resize?: boolean): void;
-    move(x: number | IPointData, y?: number, transition?: any): void;
-    moveInner(x: number | IPointData, y?: number, transition?: any): 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;
-    transformWorld(worldTransform?: IMatrixData, resize?: boolean): void;
-    moveWorld(x: number | IPointData, y?: number, transition?: any): void;
-    scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
+    setTransform(matrix: IMatrixData, resize?: boolean, transition?: ITransition): void;
+    transform(matrix: IMatrixData, resize?: boolean, transition?: ITransition): void;
+    move(x: number | IPointData, y?: number, transition?: ITransition): void;
+    moveInner(x: number | IPointData, y?: number, transition?: ITransition): void;
+    scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number | ITransition, resize?: boolean, transition?: ITransition): void;
+    rotateOf(origin: IPointData | IAlign, rotation: number, transition?: ITransition): void;
+    skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean, transition?: ITransition): void;
+    transformWorld(worldTransform?: IMatrixData, resize?: boolean, transition?: ITransition): void;
+    moveWorld(x: number | IPointData, y?: number, transition?: ITransition): void;
+    scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number | ITransition, resize?: boolean, transition?: ITransition): void;
     rotateOfWorld(worldOrigin: IPointData, rotation: number): void;
-    skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void;
-    flip(axis: IAxis): void;
+    skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean, transition?: ITransition): void;
+    flip(axis: IAxis, transition?: ITransition): void;
     scaleResize(scaleX: number, scaleY?: number, _noResize?: boolean): void;
     __scaleResize(_scaleX: number, _scaleY: number): void;
     resizeWidth(_width: number): void;