@leafer/interface 1.7.0 → 1.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/interface",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "@leafer/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",

package/src/canvas/ILeaferCanvas.ts

@@ -118,8 +118,8 @@ interface ICanvasMethod {
     hitPixel(radiusPoint: IRadiusPointData, offset?: IPointData, scale?: number): boolean
 
 
-    setStroke(strokeStyle: string | object, strokeWidth: number, options?: ICanvasStrokeOptions): void
-    setStrokeOptions(options: ICanvasStrokeOptions): void
+    setStroke(strokeStyle: string | object, strokeWidth: number, options?: ICanvasStrokeOptions, childOptions?: ICanvasStrokeOptions): void
+    setStrokeOptions(options: ICanvasStrokeOptions, childOptions?: ICanvasStrokeOptions): void
 
     setWorld(matrix: IMatrixData, parentMatrix?: IMatrixData): void
     useWorldTransform(worldTransform?: IMatrixData): void

package/src/display/ILeaf.ts

@@ -5,7 +5,7 @@ import { ILeaferCanvas, IHitCanvas } from '../canvas/ILeaferCanvas'
 import { IRenderOptions } from '../renderer/IRenderer'
 
 import { IObject, INumber, IBoolean, IValue, IString, IPathString, IFourNumber } from '../data/IData'
-import { IMatrixWithBoundsData, IMatrix, IPointData, IBoundsData, IRadiusPointData, ILayoutBoundsData, IMatrixData, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAutoBoxData, IUnitPointData, IRotationPointData } from '../math/IMath'
+import { IMatrixWithBoundsData, IMatrix, IPointData, IBoundsData, IRadiusPointData, ILayoutBoundsData, IMatrixData, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAutoBoxData, IUnitPointData, IRotationPointData, IScaleData } from '../math/IMath'
 import { IFunction } from '../function/IFunction'
 
 import { ILeafDataProxy } from './module/ILeafDataProxy'
@@ -258,6 +258,8 @@ export interface ILeafAttrData {
     lazy?: IBoolean
     pixelRatio?: INumber
 
+    renderSpread?: INumber // 扩大渲染边界
+
     path?: IPathCommandData | IPathCommandObject[] | IPathString
     windingRule?: IWindingRule
     closed?: IBoolean
@@ -359,6 +361,8 @@ export interface ILeafComputedData {
     lazy?: boolean
     pixelRatio?: number
 
+    renderSpread?: number
+
     path?: IPathCommandData
     windingRule?: IWindingRule
     closed?: boolean
@@ -515,6 +519,9 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     readonly pathInputed: boolean
 
+    readonly isAutoWidth?: boolean
+    readonly isAutoHeight?: boolean
+
     destroyed: boolean
 
     reset(data?: ILeafInputData): void
@@ -597,6 +604,8 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     // convert
     __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData // when render use other matrix
+    getClampRenderScale(): number // 获取当前渲染元素的缩放比例，限制最小为1
+    getRenderScaleData(abs?: boolean, scaleFixed?: boolean): IScaleData // 当前渲染的比例数据，必须马上分解使用
 
     getTransform(relative?: ILocationType | ILeaf): IMatrixData
 

package/src/file/IExport.ts

@@ -35,6 +35,7 @@ export interface IExportResult {
     height?: number
     renderBounds?: IBoundsData
     trimBounds?: IBoundsData
+    error?: any
 }
 
 export interface IExportResultFunction {

package/src/layout/ILeafLayout.ts

@@ -32,7 +32,7 @@ export interface ILeafLayout {
     // worldRenderBounds: IBoundsData // use leaf.__world
 
     // state
-    resized: 'scale' | 'inner' | 'local' // (scale | inner） > local 
+    resized: 'inner' | 'scale' | 'local' // inner > scale > local,  设置了inner之后不能被覆盖
     waitAutoLayout: boolean
 
     // matrix changed

package/types/index.d.ts

@@ -877,7 +877,7 @@ interface ILeafLayout {
     worldContentBounds: IBoundsData;
     worldBoxBounds: IBoundsData;
     worldStrokeBounds: IBoundsData;
-    resized: 'scale' | 'inner' | 'local';
+    resized: 'inner' | 'scale' | 'local';
     waitAutoLayout: boolean;
     matrixChanged: boolean;
     scaleChanged: boolean;
@@ -962,6 +962,7 @@ interface IExportResult {
     height?: number;
     renderBounds?: IBoundsData;
     trimBounds?: IBoundsData;
+    error?: any;
 }
 interface IExportResultFunction {
     (data: IExportResult): void;
@@ -1051,8 +1052,8 @@ interface ICanvasMethod {
     hitFill(point: IPointData, fillRule?: string): boolean;
     hitStroke(point: IPointData, strokeWidth?: number): boolean;
     hitPixel(radiusPoint: IRadiusPointData, offset?: IPointData, scale?: number): boolean;
-    setStroke(strokeStyle: string | object, strokeWidth: number, options?: ICanvasStrokeOptions): void;
-    setStrokeOptions(options: ICanvasStrokeOptions): void;
+    setStroke(strokeStyle: string | object, strokeWidth: number, options?: ICanvasStrokeOptions, childOptions?: ICanvasStrokeOptions): void;
+    setStrokeOptions(options: ICanvasStrokeOptions, childOptions?: ICanvasStrokeOptions): void;
     setWorld(matrix: IMatrixData, parentMatrix?: IMatrixData): void;
     useWorldTransform(worldTransform?: IMatrixData): void;
     setWorldShadow(x: number, y: number, blur: number, color?: string): void;
@@ -1463,6 +1464,7 @@ interface ILeafAttrData {
     around?: IAlign | IUnitPointData;
     lazy?: IBoolean;
     pixelRatio?: INumber;
+    renderSpread?: INumber;
     path?: IPathCommandData | IPathCommandObject[] | IPathString;
     windingRule?: IWindingRule;
     closed?: IBoolean;
@@ -1536,6 +1538,7 @@ interface ILeafComputedData {
     around?: IAlign | IUnitPointData;
     lazy?: boolean;
     pixelRatio?: number;
+    renderSpread?: number;
     path?: IPathCommandData;
     windingRule?: IWindingRule;
     closed?: boolean;
@@ -1646,6 +1649,8 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     readonly __ignoreHitWorld: boolean;
     readonly __inLazyBounds: boolean;
     readonly pathInputed: boolean;
+    readonly isAutoWidth?: boolean;
+    readonly isAutoHeight?: boolean;
     destroyed: boolean;
     reset(data?: ILeafInputData): void;
     resetCustom(): void;
@@ -1702,6 +1707,8 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     __renderMask(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __renderEraser(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData;
+    getClampRenderScale(): number;
+    getRenderScaleData(abs?: boolean, scaleFixed?: boolean): IScaleData;
     getTransform(relative?: ILocationType | ILeaf): IMatrixData;
     getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData;
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData;