@leafer/display 1.9.3 → 1.9.5

package/package.json

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

package/src/Leaf.ts

@@ -22,7 +22,7 @@ const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWor
 @useModule(LeafBounds)
 @useModule(LeafEventer)
 @useModule(LeafRender)
-export class Leaf implements ILeaf {
+export class Leaf<TInputData = ILeafInputData> implements ILeaf {
 
     public get tag(): string { return this.__tag }
     public set tag(_value: string) { }
@@ -111,7 +111,7 @@ export class Leaf implements ILeaf {
     public destroyed: boolean
 
 
-    constructor(data?: ILeafInputData) {
+    constructor(data?: TInputData) {
         this.innerId = create(LEAF)
         this.reset(data)
         if (this.__bubbleMap) this.__emitLifeEvent(ChildEvent.CREATED)
@@ -415,11 +415,11 @@ export class Leaf implements ILeaf {
             relative.innerToWorld(world, to, distance)
             world = to ? to : world
         }
-        toInnerPoint(this.worldTransform, world, to, distance)
+        toInnerPoint(this.scrollWorldTransform, world, to, distance)
     }
 
     public innerToWorld(inner: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void {
-        toOuterPoint(this.worldTransform, inner, to, distance)
+        toOuterPoint(this.scrollWorldTransform, inner, to, distance)
         if (relative) relative.worldToInner(to ? to : inner, null, distance)
     }
 

package/types/index.d.ts

@@ -1,8 +1,8 @@
-import { ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, IMatrixWithScaleData, IHitCanvas, IEventParamsMap, IEventListenerMap, ILeafInputData, IFunction, IObject, IValue, IJSONOptions, IFindMethod, ILeaferCanvas, IRenderOptions, IScaleFixed, IScaleData, ILocationType, IBoundsType, ILayoutBoundsData, IPointData, ITransition, IAlign, IAxis, IRadiusPointData, IMotionPathData, IUnitData, IRotationPointData, IEventParams, IEventListener, IEventOption, IEventListenerId, IEvent, IValueFunction, IAttrDecorator } from '@leafer/interface';
+import { ILeafInputData, ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, IMatrixWithScaleData, IHitCanvas, IEventParamsMap, IEventListenerMap, IFunction, IObject, IValue, IJSONOptions, IFindMethod, ILeaferCanvas, IRenderOptions, IScaleFixed, IScaleData, 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';
 
-declare class Leaf implements ILeaf {
+declare class Leaf<TInputData = ILeafInputData> implements ILeaf {
     get tag(): string;
     set tag(_value: string);
     get __tag(): string;
@@ -57,7 +57,7 @@ declare class Leaf implements ILeaf {
     children?: ILeaf[];
     topChildren?: ILeaf[];
     destroyed: boolean;
-    constructor(data?: ILeafInputData);
+    constructor(data?: TInputData);
     reset(data?: ILeafInputData): void;
     resetCustom(): void;
     waitParent(item: IFunction, bind?: IObject): void;