@leafer/helper 2.0.2 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/helper",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "@leafer/helper",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/data": "2.0.2",
-    "@leafer/math": "2.0.2",
-    "@leafer/platform": "2.0.2"
+    "@leafer/data": "2.0.3",
+    "@leafer/math": "2.0.3",
+    "@leafer/platform": "2.0.3"
   },
   "devDependencies": {
-    "@leafer/interface": "2.0.2"
+    "@leafer/interface": "2.0.3"
   }
 }

package/src/LeafBoundsHelper.ts

@@ -16,7 +16,8 @@ export const LeafBoundsHelper = {
     },
 
     localRenderBounds(target: ILeaf): IBoundsData {
-        return target.__.eraser || target.__.visible === 0 ? null : target.__layout.localRenderBounds
+        const { __, __layout } = target
+        return __.eraser || __.visible === 0 ? null : (__layout.localOuterBounds || __layout.localRenderBounds)
     },
 
     maskLocalBoxBounds(target: ILeaf, index: number): IBoundsData {
@@ -28,7 +29,8 @@ export const LeafBoundsHelper = {
     },
 
     maskLocalRenderBounds(target: ILeaf, index: number): IBoundsData {
-        return checkMask(target, index) && target.__layout.localRenderBounds
+        const { __layout } = target
+        return checkMask(target, index) && (__layout.localOuterBounds || __layout.localRenderBounds)
     },
 
     excludeRenderBounds(child: ILeaf, options: IRenderOptions): boolean {

package/src/LeafHelper.ts

@@ -1,4 +1,4 @@
-import { IAlign, ILeaf, IMatrixData, IPointData, IAxis, ITransition, ILeaferCanvas, IBoundsData, IMatrixWithBoundsData } from '@leafer/interface'
+import { IAlign, ILeaf, IMatrixData, IPointData, IAxis, ITransition, ILeaferCanvas, IRenderOptions, IBoundsData, IMatrixWithBoundsData } from '@leafer/interface'
 import { MathHelper, MatrixHelper, PointHelper, AroundHelper, getMatrixData, BoundsHelper } from '@leafer/math'
 import { Platform } from '@leafer/platform'
 import { isObject, isNumber } from '@leafer/data'
@@ -60,6 +60,10 @@ export const LeafHelper = {
         if (layout.stateStyleChanged) leaf.updateState()
         if (layout.opacityChanged) updateAllWorldOpacity(leaf)
         leaf.__updateChange()
+        if (layout.surfaceChanged) {
+            if (leaf.__hasComplex) L.updateComplex(leaf)
+            layout.surfaceChanged = false
+        }
     },
 
     updateAllChange(leaf: ILeaf): void {
@@ -90,6 +94,11 @@ export const LeafHelper = {
         else currentCanvas.copyWorldToInner(fromCanvas, fromWorld as IMatrixWithBoundsData, leaf.__layout.renderBounds, blendMode)
     },
 
+    // complex will rewrite
+    renderComplex(_leaf: ILeaf, _canvas: ILeaferCanvas, _options: IRenderOptions): void { },
+    updateComplex(_leaf: ILeaf): void { },
+    checkComplex(_leaf: ILeaf): void { },
+
     // transform
 
     moveWorld(t: ILeaf, x: number | IPointData, y = 0, isInnerPoint?: boolean, transition?: ITransition): void {
@@ -210,6 +219,13 @@ export const LeafHelper = {
         return temp ? matrix : { ...matrix }
     },
 
+    // @leafer-in/scale-fixed will rewrite
+    updateScaleFixedWorld(_t: ILeaf): void { },
+    updateOuterBounds(_t: ILeaf): void { },
+
+    // @leafer-in/find will rewrite
+    cacheId(_t: ILeaf): void { },
+
     drop(t: ILeaf, parent: ILeaf, index?: number, resize?: boolean): void {
         t.setTransform(L.getRelativeWorld(t, parent, true), resize)
         parent.add(t, index)

package/src/index.ts

@@ -1,4 +1,4 @@
 export { LeafHelper } from './LeafHelper'
 export { LeafBoundsHelper } from './LeafBoundsHelper'
 export { BranchHelper } from './BranchHelper'
-export { WaitHelper } from './WaitHelper'
+export { WaitHelper } from './WaitHelper'

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, ILeaferCanvas, IBoundsData, IPointData, ITransition, IMatrixData, IAxis, IAlign, IRenderOptions, ILeafList, ILeafLevelList, IFunction } from '@leafer/interface';
+import { ILeaf, ILeaferCanvas, IBoundsData, IRenderOptions, IPointData, ITransition, IMatrixData, IAxis, IAlign, ILeafList, ILeafLevelList, IFunction } from '@leafer/interface';
 
 declare const LeafHelper: {
     updateAllMatrix(leaf: ILeaf, checkAutoLayout?: boolean, waitAutoLayout?: boolean): void;
@@ -10,6 +10,9 @@ declare const LeafHelper: {
     worldHittable(t: ILeaf): boolean;
     draggable(t: ILeaf): boolean;
     copyCanvasByWorld(leaf: ILeaf, currentCanvas: ILeaferCanvas, fromCanvas: ILeaferCanvas, fromWorld?: IBoundsData, blendMode?: string, onlyResetTransform?: boolean): void;
+    renderComplex(_leaf: ILeaf, _canvas: ILeaferCanvas, _options: IRenderOptions): void;
+    updateComplex(_leaf: ILeaf): void;
+    checkComplex(_leaf: ILeaf): void;
     moveWorld(t: ILeaf, x: number | IPointData, y?: number, isInnerPoint?: boolean, transition?: ITransition): void;
     moveLocal(t: ILeaf, x: number | IPointData, y?: number, transition?: ITransition): void;
     zoomOfWorld(t: ILeaf, origin: IPointData, scaleX: number, scaleY?: number | ITransition, resize?: boolean, transition?: ITransition): void;
@@ -25,6 +28,9 @@ declare const LeafHelper: {
     getLocalOrigin(t: ILeaf, origin: IPointData | IAlign): IPointData;
     getInnerOrigin(t: ILeaf, origin: IPointData | IAlign): IPointData;
     getRelativeWorld(t: ILeaf, relative: ILeaf, temp?: boolean): IMatrixData;
+    updateScaleFixedWorld(_t: ILeaf): void;
+    updateOuterBounds(_t: ILeaf): void;
+    cacheId(_t: ILeaf): void;
     drop(t: ILeaf, parent: ILeaf, index?: number, resize?: boolean): void;
     hasHighPosition(t: ILeaf): boolean;
     hasOffset(t: ILeaf): boolean;