@leafer/display 1.8.0 → 1.9.0

package/package.json

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

package/src/Branch.ts

@@ -5,6 +5,7 @@ import { BranchHelper, LeafBoundsHelper } from '@leafer/helper'
 import { useModule } from '@leafer/decorator'
 import { BranchRender } from '@leafer/display-module'
 import { UICreator } from '@leafer/platform'
+import { isArray, isUndefined } from '@leafer/data'
 import { Debug } from '@leafer/debug'
 
 import { Leaf } from './Leaf'
@@ -67,9 +68,9 @@ export class Branch extends Leaf { // tip: rewrited Group
     public add(child: ILeaf, index?: number): void {
         if (child === this || child.destroyed) return debug.warn('add self or destroyed')
 
-        const noIndex = index === undefined
+        const noIndex = isUndefined(index)
         if (!child.__) {
-            if (child instanceof Array) return child.forEach(item => { this.add(item, index); noIndex || index++ }) // add []
+            if (isArray(child)) return child.forEach(item => { this.add(item, index); noIndex || index++ }) // add []
             else child = UICreator.get(child.tag, child) // add JSON
         }
 
@@ -105,7 +106,7 @@ export class Branch extends Leaf { // tip: rewrited Group
 
             } else this.find(child as any).forEach(item => this.remove(item, destroy)) // 
 
-        } else if (child === undefined) {
+        } else if (isUndefined(child)) {
             super.remove(null, destroy)
         }
     }

package/src/Leaf.ts

@@ -1,6 +1,6 @@
-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 } 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, IEventParamsMap, IEventOption, IAxis, IMotionPathData, IUnitData, IRotationPointData, ITransition, IValueFunction, IEventParams, IScaleData, IScaleFixed } from '@leafer/interface'
 import { BoundsHelper, IncrementId, MatrixHelper, PointHelper } from '@leafer/math'
-import { LeafData } from '@leafer/data'
+import { LeafData, isUndefined } from '@leafer/data'
 import { LeafLayout } from '@leafer/layout'
 import { LeafDataProxy, LeafMatrix, LeafBounds, LeafEventer, LeafRender } from '@leafer/display-module'
 import { boundsType, useModule, defineDataProcessor } from '@leafer/decorator'
@@ -247,10 +247,10 @@ export class Leaf implements ILeaf {
     }
 
     public forceUpdate(attrName?: string): void {
-        if (attrName === undefined) attrName = 'width'
+        if (isUndefined(attrName)) attrName = 'width'
         else if (attrName === 'surface') attrName = 'blendMode'
         const value = this.__.__getInput(attrName);
-        (this.__ as any)[attrName] = value === undefined ? null : undefined;
+        (this.__ as any)[attrName] = isUndefined(value) ? null : undefined;
         (this as any)[attrName] = value
     }
 
@@ -355,11 +355,12 @@ export class Leaf implements ILeaf {
         return scaleX > 1 ? scaleX : 1
     }
 
-    public getRenderScaleData(abs?: boolean, scaleFixed?: boolean): IScaleData {
-        const { scaleX, scaleY } = ImageManager.patternLocked ? this.__world : this.__nowWorld
-        if (scaleFixed) tempScaleData.scaleX = tempScaleData.scaleY = 1
-        else if (abs) tempScaleData.scaleX = scaleX < 0 ? -scaleX : scaleX, tempScaleData.scaleY = scaleY < 0 ? -scaleY : scaleY
-        else tempScaleData.scaleX = scaleX, tempScaleData.scaleY = scaleY
+    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
     }
 
@@ -557,6 +558,8 @@ export class Leaf implements ILeaf {
 
     // @leafer-ui/hit LeafHit rewrite
 
+    public hit(_world: IPointData, _hitRadius?: number): boolean { return true }
+
     public __hitWorld(_point: IRadiusPointData): boolean { return true }
 
     public __hit(_local: IRadiusPointData): boolean { return true }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, IMatrixWithScaleData, IHitCanvas, IEventParamsMap, IEventListenerMap, ILeafInputData, IFunction, IObject, IValue, IJSONOptions, IFindMethod, ILeaferCanvas, IRenderOptions, IScaleData, ILocationType, IBoundsType, ILayoutBoundsData, IPointData, ITransition, IAlign, IAxis, IRadiusPointData, IMotionPathData, IUnitData, IRotationPointData, IEventParams, IEventListener, IEventOption, IEventListenerId, IEvent, IValueFunction, IAttrDecorator } from '@leafer/interface';
+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 { LeafData } from '@leafer/data';
 import { LeafLayout } from '@leafer/layout';
 
@@ -109,7 +109,7 @@ declare class Leaf implements ILeaf {
     __renderMask(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData;
     getClampRenderScale(): number;
-    getRenderScaleData(abs?: boolean, scaleFixed?: boolean): IScaleData;
+    getRenderScaleData(abs?: boolean, scaleFixed?: IScaleFixed): IScaleData;
     getTransform(relative?: ILocationType | ILeaf): IMatrixData;
     getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData;
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData;
@@ -148,6 +148,7 @@ declare class Leaf implements ILeaf {
     __scaleResize(_scaleX: number, _scaleY: number): void;
     resizeWidth(_width: number): void;
     resizeHeight(_height: number): void;
+    hit(_world: IPointData, _hitRadius?: number): boolean;
     __hitWorld(_point: IRadiusPointData): boolean;
     __hit(_local: IRadiusPointData): boolean;
     __hitFill(_inner: IRadiusPointData): boolean;