@leafer/display 1.9.1 → 1.9.2

package/package.json

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

package/src/Branch.ts

@@ -1,4 +1,4 @@
-import { ILeaf } from '@leafer/interface'
+import { IBoundsData, ILeaf } from '@leafer/interface'
 import { ChildEvent } from '@leafer/event'
 import { BoundsHelper } from '@leafer/math'
 import { BranchHelper, LeafBoundsHelper } from '@leafer/helper'
@@ -37,16 +37,16 @@ export class Branch extends Leaf { // tip: rewrited Group
         return 0
     }
 
-    public __updateBoxBounds(): void {
-        setListWithFn(this.__layout.boxBounds, this.children, this.__hasMask ? maskLocalBoxBounds : localBoxBounds)
+    public __updateBoxBounds(_secondLayout?: boolean, bounds?: IBoundsData): void {
+        setListWithFn(bounds || this.__layout.boxBounds, this.children, this.__hasMask ? maskLocalBoxBounds : localBoxBounds)
     }
 
-    public __updateStrokeBounds(): void {
-        setListWithFn(this.__layout.strokeBounds, this.children, this.__hasMask ? maskLocalStrokeBounds : localStrokeBounds)
+    public __updateStrokeBounds(bounds?: IBoundsData): void {
+        setListWithFn(bounds || this.__layout.strokeBounds, this.children, this.__hasMask ? maskLocalStrokeBounds : localStrokeBounds)
     }
 
-    public __updateRenderBounds(): void {
-        setListWithFn(this.__layout.renderBounds, this.children, this.__hasMask ? maskLocalRenderBounds : localRenderBounds)
+    public __updateRenderBounds(bounds?: IBoundsData): void {
+        setListWithFn(bounds || this.__layout.renderBounds, this.children, this.__hasMask ? maskLocalRenderBounds : localRenderBounds)
     }
 
 

package/src/Leaf.ts

@@ -66,6 +66,9 @@ export class Leaf implements ILeaf {
     public get worldTransform(): IMatrixWithScaleData { return this.__layout.getTransform('world') as IMatrixWithScaleData }
     public get localTransform(): IMatrixData { return this.__layout.getTransform('local') }
 
+    public __scrollWorld?: IMatrixWithBoundsScaleData
+    public get scrollWorldTransform(): IMatrixWithScaleData { this.updateLayout(); return this.__scrollWorld || this.__world }
+
     // now bounds
     public get boxBounds(): IBoundsData { return this.getBounds('box', 'inner') }
     public get renderBounds(): IBoundsData { return this.getBounds('render', 'inner') }
@@ -74,7 +77,7 @@ export class Leaf implements ILeaf {
     public get worldRenderBounds(): IBoundsData { return this.getBounds('render') }
 
     // now opacity
-    public get worldOpacity(): number { this.__layout.update(); return this.__worldOpacity }
+    public get worldOpacity(): number { this.updateLayout(); return this.__worldOpacity }
 
     public __level: number // layer level  0 -> branch -> branch -> deep
     public __tempNumber: number // temp sort
@@ -103,6 +106,7 @@ export class Leaf implements ILeaf {
 
     // branch 
     public children?: ILeaf[]
+    public topChildren?: ILeaf[]
 
     public destroyed: boolean
 
@@ -285,13 +289,13 @@ export class Leaf implements ILeaf {
 
     // box
 
-    public __updateBoxBounds(): void { }
+    public __updateBoxBounds(_secondLayout?: boolean, _bounds?: IBoundsData): void { }
 
     public __updateContentBounds(): void { }
 
-    public __updateStrokeBounds(): void { }
+    public __updateStrokeBounds(_bounds?: IBoundsData): void { }
 
-    public __updateRenderBounds(): void { }
+    public __updateRenderBounds(_bounds?: IBoundsData): void { }
 
 
     public __updateAutoLayout(): void { }

package/types/index.d.ts

@@ -30,6 +30,8 @@ declare class Leaf implements ILeaf {
     __worldOpacity: number;
     get worldTransform(): IMatrixWithScaleData;
     get localTransform(): IMatrixData;
+    __scrollWorld?: IMatrixWithBoundsScaleData;
+    get scrollWorldTransform(): IMatrixWithScaleData;
     get boxBounds(): IBoundsData;
     get renderBounds(): IBoundsData;
     get worldBoxBounds(): IBoundsData;
@@ -53,6 +55,7 @@ declare class Leaf implements ILeaf {
     __hasLocalEvent?: boolean;
     __hasWorldEvent?: boolean;
     children?: ILeaf[];
+    topChildren?: ILeaf[];
     destroyed: boolean;
     constructor(data?: ILeafInputData);
     reset(data?: ILeafInputData): void;
@@ -93,10 +96,10 @@ declare class Leaf implements ILeaf {
     __updateLocalBoxBounds(): void;
     __updateLocalStrokeBounds(): void;
     __updateLocalRenderBounds(): void;
-    __updateBoxBounds(): void;
+    __updateBoxBounds(_secondLayout?: boolean, _bounds?: IBoundsData): void;
     __updateContentBounds(): void;
-    __updateStrokeBounds(): void;
-    __updateRenderBounds(): void;
+    __updateStrokeBounds(_bounds?: IBoundsData): void;
+    __updateRenderBounds(_bounds?: IBoundsData): void;
     __updateAutoLayout(): void;
     __updateFlowLayout(): void;
     __updateNaturalSize(): void;
@@ -194,9 +197,9 @@ declare class Leaf implements ILeaf {
 declare class Branch extends Leaf {
     __updateStrokeSpread(): number;
     __updateRenderSpread(): number;
-    __updateBoxBounds(): void;
-    __updateStrokeBounds(): void;
-    __updateRenderBounds(): void;
+    __updateBoxBounds(_secondLayout?: boolean, bounds?: IBoundsData): void;
+    __updateStrokeBounds(bounds?: IBoundsData): void;
+    __updateRenderBounds(bounds?: IBoundsData): void;
     __updateSortChildren(): void;
     add(child: ILeaf, index?: number): void;
     addMany(...children: ILeaf[]): void;