@leafer/display 2.0.2 → 2.0.4

package/package.json

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

package/src/Branch.ts

@@ -1,4 +1,4 @@
-import { IBoundsData, IFourNumber, ILeaf } from '@leafer/interface'
+import { IBoundsData, IFourNumber, ILeaf, ILeafLayout } from '@leafer/interface'
 import { ChildEvent } from '@leafer/event'
 import { BoundsHelper } from '@leafer/math'
 import { BranchHelper, LeafBoundsHelper } from '@leafer/helper'
@@ -30,9 +30,11 @@ export class Branch extends Leaf { // tip: rewrited Group
     }
 
     public __updateRenderSpread(): IFourNumber {
+        let layout: ILeafLayout
         const { children } = this
         for (let i = 0, len = children.length; i < len; i++) {
-            if (children[i].__layout.renderSpread) return 1
+            layout = children[i].__layout
+            if (layout.renderSpread || layout.localOuterBounds) return 1
         }
         return 0
     }

package/src/Leaf.ts

@@ -1,5 +1,5 @@
 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, IEventParamsMap, IEventOption, IAxis, IMotionPathData, IUnitData, IRotationPointData, ITransition, IValueFunction, IEventParams, IScaleData, IScaleFixed, IFourNumber } from '@leafer/interface'
-import { BoundsHelper, IncrementId, MatrixHelper, PointHelper } from '@leafer/math'
+import { BoundsHelper, IncrementId, MathHelper, MatrixHelper, PointHelper } from '@leafer/math'
 import { LeafData, isUndefined, DataHelper } from '@leafer/data'
 import { LeafLayout } from '@leafer/layout'
 import { LeafDataProxy, LeafMatrix, LeafBounds, LeafEventer, LeafRender } from '@leafer/display-module'
@@ -10,12 +10,12 @@ import { ImageManager } from '@leafer/image'
 import { Plugin } from '@leafer/debug'
 
 
-const tempScaleData = {} as IScaleData
 const { LEAF, create } = IncrementId
 const { stintSet } = DataHelper
 const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper
 const { toOuterOf } = BoundsHelper
 const { copy, move } = PointHelper
+const { getScaleFixedData } = MathHelper
 const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getFlipTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper
 
 @useModule(LeafDataProxy)
@@ -176,6 +176,7 @@ export class Leaf<TInputData = ILeafInputData> implements ILeaf {
             this.__level = this.parent ? this.parent.__level + 1 : 1
             if ((this as ILeaf).animation) this.__runAnimation('in')
             if (this.__bubbleMap) this.__emitLifeEvent(ChildEvent.MOUNTED)
+            if (leafer.cacheId) LeafHelper.cacheId(this)
         } else {
             this.__emitLifeEvent(ChildEvent.UNMOUNTED)
         }
@@ -363,13 +364,8 @@ export class Leaf<TInputData = ILeafInputData> implements ILeaf {
         return scaleX > 1 ? scaleX : 1
     }
 
-    public getRenderScaleData(abs?: boolean, scaleFixed?: IScaleFixed): IScaleData {
-        let { scaleX, scaleY } = ImageManager.patternLocked ? this.__world : this.__nowWorld
-        if (abs) scaleX < 0 && (scaleX = -scaleX), scaleY < 0 && (scaleY = -scaleY)
-        if (scaleFixed === true || (scaleFixed === 'zoom-in' && scaleX > 1 && scaleY > 1)) scaleX = scaleY = 1
-        tempScaleData.scaleX = scaleX
-        tempScaleData.scaleY = scaleY
-        return tempScaleData
+    public getRenderScaleData(abs?: boolean, scaleFixed?: IScaleFixed, unscale = true): IScaleData {
+        return getScaleFixedData(ImageManager.patternLocked ? this.__world : this.__nowWorld || this.__world, scaleFixed, unscale, abs)
     }
 
     public getTransform(relative?: ILocationType | ILeaf): IMatrixData {
@@ -419,18 +415,20 @@ export class Leaf<TInputData = ILeafInputData> implements ILeaf {
             relative.innerToWorld(world, to, distance)
             world = to ? to : world
         }
-        toInnerPoint(this.scrollWorldTransform, world, to, distance)
+        toInnerPoint(this.worldTransform, world, to, distance)
     }
 
     public innerToWorld(inner: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void {
-        toOuterPoint(this.scrollWorldTransform, inner, to, distance)
+        toOuterPoint(this.worldTransform, inner, to, distance)
         if (relative) relative.worldToInner(to ? to : inner, null, distance)
     }
 
     // simple
 
     public getBoxPoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData {
-        return this.getBoxPointByInner(this.getInnerPoint(world, relative, distance, change), null, null, true)
+        const inner = this.getInnerPoint(world, relative, distance, change)
+        if (distance) return inner
+        return this.getBoxPointByInner(inner, null, null, true)
     }
 
     public getBoxPointByInner(inner: IPointData, _relative?: ILeaf, _distance?: boolean, change?: boolean): IPointData {
@@ -589,8 +587,6 @@ export class Leaf<TInputData = ILeafInputData> implements ILeaf {
 
     public __render(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }
 
-    public __renderComplex(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }
-
     public __drawFast(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }
 
     public __draw(_canvas: ILeaferCanvas, _options: IRenderOptions, _originCanvas?: ILeaferCanvas): void { }
@@ -618,7 +614,7 @@ export class Leaf<TInputData = ILeafInputData> implements ILeaf {
 
     public __updatePath(): void { }
 
-    public __updateRenderPath(): void { }
+    public __updateRenderPath(_updateCache?: boolean): void { }
 
     // ---
 

package/types/index.d.ts

@@ -113,7 +113,7 @@ declare class Leaf<TInputData = ILeafInputData> implements ILeaf {
     __renderMask(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData;
     getClampRenderScale(): number;
-    getRenderScaleData(abs?: boolean, scaleFixed?: IScaleFixed): IScaleData;
+    getRenderScaleData(abs?: boolean, scaleFixed?: IScaleFixed, unscale?: boolean): IScaleData;
     getTransform(relative?: ILocationType | ILeaf): IMatrixData;
     getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData;
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData;
@@ -161,7 +161,6 @@ declare class Leaf<TInputData = ILeafInputData> implements ILeaf {
     __drawHitPath(_canvas: ILeaferCanvas): void;
     __updateHitCanvas(): void;
     __render(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
-    __renderComplex(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __drawFast(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __draw(_canvas: ILeaferCanvas, _options: IRenderOptions, _originCanvas?: ILeaferCanvas): void;
     __clip(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
@@ -172,7 +171,7 @@ declare class Leaf<TInputData = ILeafInputData> implements ILeaf {
     __drawPath(_canvas: ILeaferCanvas): void;
     __drawRenderPath(_canvas: ILeaferCanvas): void;
     __updatePath(): void;
-    __updateRenderPath(): void;
+    __updateRenderPath(_updateCache?: boolean): void;
     getMotionPathData(): IMotionPathData;
     getMotionPoint(_motionDistance: number | IUnitData): IRotationPointData;
     getMotionTotal(): number;