@leafer/interface 1.0.0-rc.19 → 1.0.0-rc.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/interface",
-  "version": "1.0.0-rc.19",
+  "version": "1.0.0-rc.20",
   "description": "@leafer/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",

package/src/app/ILeafer.ts

@@ -5,7 +5,7 @@ import { ILayouter, ILayouterConfig } from '../layouter/ILayouter'
 import { ISelector, ISelectorConfig } from '../selector/ISelector'
 import { IInteraction, IInteractionCanvas, IInteractionConfig } from '../interaction/IInteraction'
 import { IWatcher, IWatcherConfig } from '../watcher/IWatcher'
-import { IAutoBounds, IBoundsData, IPointData, IScreenSizeData } from '../math/IMath'
+import { IAutoBounds, IBoundsData, IPointData, IScreenSizeData, IBounds } from '../math/IMath'
 import { ICanvasManager } from '../canvas/ICanvasManager'
 import { IHitCanvasManager } from '../canvas/IHitCanvasManager'
 import { IEventListenerId } from '../event/IEventer'
@@ -22,6 +22,7 @@ export interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IIn
     start?: boolean
     type?: ILeaferType
     realCanvas?: boolean
+    lazySpeard?: IFourNumber
 }
 
 export interface ILeaferAttrData {
@@ -50,6 +51,7 @@ export interface ILeaferAttrData {
     hitCanvasManager?: IHitCanvasManager
 
     autoLayout?: IAutoBounds
+    lazyBounds: IBounds
 
     config: ILeaferConfig
 
@@ -77,7 +79,8 @@ export interface ILeaferAttrData {
     waitViewCompleted(item: IFunction, bind?: IObject): void
 
     zoom(zoomType: IZoomType, padding?: IFourNumber, fixedScale?: boolean): IBoundsData
-    validScale(changeScale: number): number
+    getValidMove(moveX: number, moveY: number): IPointData
+    getValidScale(changeScale: number): number
 }
 
 export type IZoomType = 'in' | 'out' | 'fit' | 'fit-width' | 'fit-height' | number | ILeaf | ILeaf[] | IBoundsData

package/src/canvas/ICanvas.ts

@@ -125,15 +125,18 @@ interface CanvasRect {
 }
 
 type PredefinedColorSpace = 'display-p3' | 'srgb'
-interface CanvasRenderingContext2DSettings {
+interface ICanvasRenderingContext2DSettings {
     alpha?: boolean
     colorSpace?: PredefinedColorSpace
     desynchronized?: boolean
     willReadFrequently?: boolean
 }
+
+export type ICanvasContext2DSettings = ICanvasRenderingContext2DSettings
+
 export interface ICanvasContext2D extends CanvasCompositing, CanvasDrawImage, CanvasDrawPath, CanvasFillStrokeStyles, CanvasFilters, CanvasImageData, CanvasImageSmoothing, CanvasPath, CanvasPathDrawingStyles, CanvasRect, CanvasShadowStyles, CanvasState, CanvasText, CanvasTextDrawingStyles, CanvasTransform, CanvasUserInterface {
     readonly canvas: HTMLCanvasElement
-    getContextAttributes(): CanvasRenderingContext2DSettings
+    getContextAttributes(): ICanvasRenderingContext2DSettings
 }
 
 declare var ICanvasContext2D: {

package/src/canvas/IHitCanvasManager.ts

@@ -1,9 +1,9 @@
 import { ILeaf } from '../display/ILeaf'
-import { IScreenSizeData } from '../math/IMath'
 import { ICanvasManager } from './ICanvasManager'
-import { IHitCanvas } from './ILeaferCanvas'
+import { IHitCanvas, ILeaferCanvasConfig } from './ILeaferCanvas'
 
 export interface IHitCanvasManager extends ICanvasManager {
+    maxTotal: number // 最多缓存多少张画布
     getPathType(leaf: ILeaf): IHitCanvas
-    getImageType(leaf: ILeaf, size: IScreenSizeData): IHitCanvas
+    getPixelType(leaf: ILeaf, config: ILeaferCanvasConfig): IHitCanvas
 }

package/src/canvas/ILeaferCanvas.ts

@@ -1,6 +1,6 @@
 import { IObject } from '../data/IData'
-import { IBounds, IMatrixData, IBoundsData, IAutoBoundsData, IAutoBounds, IScreenSizeData, IMatrixWithBoundsData, IPointData } from '../math/IMath'
-import { ICanvasContext2D, IWindingRule, IPath2D, ITextMetrics, CanvasGradient, CanvasPattern } from './ICanvas'
+import { IBounds, IMatrixData, IBoundsData, IAutoBoundsData, IAutoBounds, IScreenSizeData, IMatrixWithBoundsData, IPointData, IRadiusPointData } from '../math/IMath'
+import { ICanvasContext2D, IWindingRule, IPath2D, ITextMetrics, CanvasGradient, CanvasPattern, ICanvasContext2DSettings } from './ICanvas'
 import { IResizeEventListener } from '../event/IEvent'
 import { IPathDrawer } from '../path/IPathDrawer'
 import { InnerId } from '../event/IEventer'
@@ -15,6 +15,7 @@ export interface ILeaferCanvasConfig extends IAutoBoundsData {
     smooth?: boolean
     hittable?: boolean
     webgl?: boolean
+    contextSettings?: ICanvasContext2DSettings
 }
 
 export type IHitCanvasConfig = ILeaferCanvasConfig
@@ -111,6 +112,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
@@ -199,7 +202,7 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 
 
 export interface IHitCanvas extends ILeaferCanvas {
-
+    hitScale?: number
 }
 
 

package/src/display/ILeaf.ts

@@ -66,9 +66,11 @@ export interface ILeafAttrData {
 
     path: IPathCommandData | IPathString
     windingRule: IWindingRule
+    closed: boolean
 
     editable: IBoolean
     editSize: IEditSize
+    editorStyle: IObject
 
     hittable: IBoolean
     hitFill: IHitType
@@ -235,9 +237,11 @@ export interface ILeafInputData {
 
     path?: IPathCommandData | IPathString
     windingRule?: IWindingRule
+    closed?: boolean
 
     editable?: IBoolean
     editSize?: IEditSize
+    editorStyle?: IObject
 
     hittable?: IBoolean
     hitFill?: IHitType
@@ -297,11 +301,13 @@ export interface ILeafComputedData {
 
     path?: IPathCommandData
     windingRule?: IWindingRule
+    closed?: boolean
 
     draggable?: boolean
 
     editable?: boolean
     editSize?: IEditSize
+    editorStyle?: IObject
 
     hittable?: boolean
     hitFill?: IHitType
@@ -397,7 +403,6 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     readonly __ignoreHitWorld: boolean
 
     readonly pathInputed: boolean
-    pathClosed: boolean
 
     __parentWait?: IFunction[]
     __leaferWait?: IFunction[]
@@ -422,7 +427,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     toHTML?(): string
 
     // ILeafData ->
-    __setAttr(attrName: string, newValue: IValue): void
+    __setAttr(attrName: string, newValue: IValue, checkFiniteNumber?: boolean): boolean
     __getAttr(attrName: string): IValue
     setProxyAttr(name: string, newValue: IValue): void
     getProxyAttr(name: string): IValue
@@ -512,8 +517,9 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     // ILeafHit ->
     __hitWorld(point: IRadiusPointData): boolean
     __hit(local: IRadiusPointData): boolean
-    __hitFill(inner: IRadiusPointData, windingRule?: string): boolean
+    __hitFill(inner: IRadiusPointData): boolean
     __hitStroke(inner: IRadiusPointData, strokeWidth: number): boolean
+    __hitPixel(inner: IRadiusPointData): boolean
     __drawHitPath(canvas: ILeaferCanvas): void
     __updateHitCanvas(): void
 
@@ -523,7 +529,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     __draw(canvas: ILeaferCanvas, options: IRenderOptions): void
 
     __clip(canvas: ILeaferCanvas, options: IRenderOptions): void
-    __renderShape(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __renderShape(canvas: ILeaferCanvas, options: IRenderOptions, ignoreFill?: boolean, ignoreStroke?: boolean): void
 
     __updateWorldOpacity(): void
     __updateChange(): void
@@ -543,4 +549,10 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     add(child: ILeaf, index?: number): void
     remove(child?: ILeaf, destroy?: boolean): void
     dropTo(parent: ILeaf, index?: number, resize?: boolean): void
-}
+}
+
+export type ILeafAttrDescriptor = IObject & ThisType<ILeaf>
+
+export interface ILeafAttrDescriptorFn {
+    (key: string): ILeafAttrDescriptor
+}

package/src/display/module/ILeafDataProxy.ts

@@ -4,7 +4,7 @@ import { IValue } from '../../data/IData'
 export type ILeafDataProxyModule = ILeafDataProxy & ThisType<ILeaf>
 
 export interface ILeafDataProxy {
-    __setAttr?(name: string, newValue: IValue): void
+    __setAttr?(name: string, newValue: IValue): boolean
     __getAttr?(name: string): IValue
     setProxyAttr?(name: string, newValue: IValue): void
     getProxyAttr?(name: string): IValue

package/src/display/module/ILeafHit.ts

@@ -7,8 +7,9 @@ export type ILeafHitModule = ILeafHit & ThisType<ILeaf>
 export interface ILeafHit {
     __hitWorld?(point: IRadiusPointData): boolean
     __hit?(inner: IRadiusPointData): boolean
-    __hitFill?(inner: IRadiusPointData, windingRule?: string): boolean
+    __hitFill?(inner: IRadiusPointData): boolean
     __hitStroke?(inner: IRadiusPointData, strokeWidth: number): boolean
+    __hitPixel(inner: IRadiusPointData): boolean
     __drawHitPath?(canvas: ILeaferCanvas): void
     __updateHitCanvas?(): void
 }

package/src/display/module/ILeafRender.ts

@@ -10,7 +10,7 @@ export interface ILeafRender {
     __drawFast?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
     __clip?(_canvas: ILeaferCanvas, _options: IRenderOptions): void
-    __renderShape?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __renderShape?(canvas: ILeaferCanvas, options: IRenderOptions, ignoreFill?: boolean, ignoreStroke?: boolean): void
 
     __updateWorldOpacity?(): void
     __updateChange?(): void

package/src/event/IUIEvent.ts

@@ -38,6 +38,7 @@ export interface IPointerEvent extends IUIEvent {
     tiltX?: number
     tiltY?: number
     twist?: number
+    isCancel?: boolean
 }
 export type PointerType = 'mouse' | 'pen' | 'touch'
 

package/src/image/IImageManager.ts

@@ -11,6 +11,7 @@ export interface IImageManager {
     recycledList: ILeaferImage[]
     tasker: ITaskProcessor
     patternTasker: ITaskProcessor
+    patternLocked?: boolean // 锁定pattern不更新, 一般用于创建碰撞位图 UIHit.ts
     readonly isComplete: boolean
     get(config: ILeaferImageConfig): ILeaferImage
     recycle(image: ILeaferImage): void

package/src/index.ts

@@ -1,6 +1,6 @@
 export { IAppBase } from './app/IApp'
 export { ILeaferBase, ILeaferAttrData, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator, IZoomType } from './app/ILeafer'
-export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IMaskType, IBlendMode, IEditSize, IImageCursor, ICursorType, IStateStyleType, IAround } from './display/ILeaf'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IMaskType, IBlendMode, IEditSize, IImageCursor, ICursorType, IStateStyleType, IAround, ILeafAttrDescriptor, ILeafAttrDescriptorFn } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
 
@@ -36,7 +36,7 @@ export { IPlugin } from './plugin/IPlugin'
 export { ILeaferCanvas, ILeaferCanvasView, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ICanvasCacheOptions, ILeaferCanvasConfig, IHitCanvasConfig, IBlobFunction, IBlob } from './canvas/ILeaferCanvas'
 export { ISkiaCanvas, ISkiaCanvasExportConfig, ICanvasType, ISkiaNAPICanvas } from './canvas/ISkiaCanvas'
 export { IPathDrawer, IPathCreator } from './path/IPathDrawer'
-export { IWindingRule, ICanvasContext2D, ITextMetrics, IPath2D, ICanvasPattern } from './canvas/ICanvas'
+export { IWindingRule, ICanvasContext2D, ICanvasContext2DSettings, ITextMetrics, IPath2D, ICanvasPattern } from './canvas/ICanvas'
 export { CanvasPathCommand, IPathCommandData, MCommandData, HCommandData, VCommandData, LCommandData, CCommandData, SCommandData, QCommandData, TCommandData, ZCommandData, ACommandData, RectCommandData, RoundRectCommandData, EllipseCommandData, ArcCommandData, ArcToCommandData } from './path/IPathCommand'
 
 export { ILeaferImage, ILeaferImageConfig, ILeaferImageOnLoaded, ILeaferImageOnError, ILeaferImageCacheCanvas, ILeaferImagePatternPaint } from './image/ILeaferImage'

package/src/interaction/IInteraction.ts

@@ -52,6 +52,7 @@ export interface IInteraction extends IControl {
 
     findPath(data: IPointerEvent, options?: IPickOptions): ILeafList
     isRootPath(data: IPointerEvent): boolean
+    isTreePath(data: IPointerEvent): boolean
     canMove(data: IPointerEvent): boolean
 
     isDrag(leaf: ILeaf): boolean
@@ -84,15 +85,17 @@ export interface IInteractionConfig {
 }
 
 export interface IZoomConfig {
+    disabled?: boolean
     min?: number
     max?: number
 }
 
 export interface IMoveConfig {
+    disabled?: boolean
     holdSpaceKey?: boolean
     holdMiddleKey?: boolean
     holdRightKey?: boolean
-    scroll?: boolean
+    scroll?: boolean | 'limit'
     drag?: boolean
     dragAnimate?: boolean
     dragEmpty?: boolean
@@ -118,6 +121,7 @@ export interface IPointerConfig {
     tapTime?: number
     longPressTime?: number
     transformTime?: number
+    hover?: boolean
     dragHover?: boolean
     dragDistance?: number
     swipeDistance?: number

package/src/layout/ILeafLayout.ts

@@ -58,7 +58,7 @@ export interface ILeafLayout {
     affectChildrenSort?: boolean
 
     strokeSpread: number
-    renderSpread: number
+    renderSpread: number // -1 表示监视变化，不影响实际renderBounds，目前用在Box上
     strokeBoxSpread: number
     renderShapeSpread: number
 

package/src/math/IMath.ts

@@ -68,7 +68,7 @@ export interface IBounds extends IBoundsData, ITwoPointBoundsData {
     scaleOf(origin: IPointData, scaleX: number, scaleY?: number): IBounds
     toOuterOf(matrix: IMatrixData, to?: IBoundsData): IBounds
     toInnerOf(matrix: IMatrixData, to?: IBoundsData): IBounds
-    getFitMatrix(put: IBoundsData): IMatrix
+    getFitMatrix(put: IBoundsData, baseScale?: number): IMatrix
 
     spread(fourNumber: IFourNumber, spreadY?: number): IBounds
     shrink(fourNumber: IFourNumber): IBounds
@@ -83,6 +83,7 @@ export interface IBounds extends IBoundsData, ITwoPointBoundsData {
     setListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds
 
     setPoints(points: IPointData[]): IBounds
+    addPoint(point: IPointData): IBounds
     getPoints(): IPointData[] // topLeft, topRight, bottomRight, bottomLeft
 
     hitPoint(point: IPointData, pointMatrix?: IMatrixData): boolean
@@ -162,9 +163,10 @@ export type ILayoutAttr =
 
 export interface ILayoutBoundsData extends ILayoutData, IBoundsData {
 }
-export interface IMatrix extends IMatrixData {
+export interface IMatrix extends IMatrixWithScaleData {
 
     set(a: number | IMatrixData, b: number, c: number, d: number, e: number, f: number): IMatrix
+    setWith(dataWithScale: IMatrixWithScaleData): IMatrix  // set scaleX scaleY
     get(): IMatrixData
     clone(): IMatrix
 
@@ -172,6 +174,7 @@ export interface IMatrix extends IMatrixData {
     translateInner(x: number, y: number): IMatrix
 
     scale(x: number, y?: number): IMatrix
+    scaleWith(x: number, y?: number): IMatrix // change scaleX scaleY
     scaleOfOuter(origin: IPointData, x: number, y?: number): IMatrix
     scaleOfInner(origin: IPointData, x: number, y?: number): IMatrix
 
@@ -189,6 +192,7 @@ export interface IMatrix extends IMatrixData {
     divide(child: IMatrixData): IMatrix
     divideParent(parent: IMatrixData): IMatrix
     invert(): IMatrix
+    invertWith(): IMatrix  // change scaleX scaleY
 
     toOuterPoint(inner: IPointData, to?: IPointData, distance?: boolean): void
     toInnerPoint(outer: IPointData, to?: IPointData, distance?: boolean): void

package/src/path/IPathDrawer.ts

@@ -16,7 +16,7 @@ export interface IPathDrawer {
     roundRect(x: number, y: number, width: number, height: number, radius?: number | number[]): void
 }
 
-export interface IPathCreator {
+export interface IPathCreator extends IPathDrawer {
     path: IPathCommandData
     __path: IPathCommandData
 
@@ -39,4 +39,6 @@ export interface IPathCreator {
     drawEllipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator
     drawArc(x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator
     drawPoints(points: number[], curve?: boolean | number, close?: boolean): IPathCreator
+
+    clearPath(): IPathCreator
 }

package/src/platform/IPlatform.ts

@@ -26,6 +26,7 @@ export interface IPlatform {
         canvasToDataURL(canvas: any, type?: IExportImageType, quality?: number): string | Promise<string>
         canvasToBolb(canvas: any, type?: IExportFileType, quality?: number): Promise<any>
         canvasSaveAs(canvas: any, filename: string, quality?: number): Promise<void>
+        download(url: string, filename: string): Promise<void>
         loadImage(url: string): Promise<any>
         noRepeat?: string  // fix: 微信小程序 createPattern 直接使用 no-repeat 有bug，导致无法显示
     },
@@ -38,6 +39,7 @@ export interface IPlatform {
     },
     miniapp?: IMiniapp
     image: {
+        hitCanvasSize: number // 图片生成碰撞画布的最大尺寸(单边)
         maxCacheSize: number // 最大等级缓存，一般取当前屏幕大小，默认2k: 2560 * 1600
         maxPatternSize: number // 最大repeat pattern缓存, 默认4k: 4096 * 2160
         suffix: string  // 需要带上后缀区分dom中image标签的缓存，否则会导致浏览器缓存跨域问题

package/types/index.d.ts

@@ -144,7 +144,7 @@ interface IBounds extends IBoundsData, ITwoPointBoundsData {
     scaleOf(origin: IPointData, scaleX: number, scaleY?: number): IBounds;
     toOuterOf(matrix: IMatrixData, to?: IBoundsData): IBounds;
     toInnerOf(matrix: IMatrixData, to?: IBoundsData): IBounds;
-    getFitMatrix(put: IBoundsData): IMatrix;
+    getFitMatrix(put: IBoundsData, baseScale?: number): IMatrix;
     spread(fourNumber: IFourNumber, spreadY?: number): IBounds;
     shrink(fourNumber: IFourNumber): IBounds;
     ceil(): IBounds;
@@ -156,6 +156,7 @@ interface IBounds extends IBoundsData, ITwoPointBoundsData {
     addListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds;
     setListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds;
     setPoints(points: IPointData[]): IBounds;
+    addPoint(point: IPointData): IBounds;
     getPoints(): IPointData[];
     hitPoint(point: IPointData, pointMatrix?: IMatrixData): boolean;
     hitRadiusPoint(point: IRadiusPointData, pointMatrix?: IMatrixWithLayoutData): boolean;
@@ -210,13 +211,15 @@ interface ILayoutData extends IScaleRotationData, ISkewData, IPointData {
 type ILayoutAttr = 'x' | 'y' | 'scaleX' | 'scaleY' | 'rotation' | 'skewX' | 'skewY';
 interface ILayoutBoundsData extends ILayoutData, IBoundsData {
 }
-interface IMatrix extends IMatrixData {
+interface IMatrix extends IMatrixWithScaleData {
     set(a: number | IMatrixData, b: number, c: number, d: number, e: number, f: number): IMatrix;
+    setWith(dataWithScale: IMatrixWithScaleData): IMatrix;
     get(): IMatrixData;
     clone(): IMatrix;
     translate(x: number, y: number): IMatrix;
     translateInner(x: number, y: number): IMatrix;
     scale(x: number, y?: number): IMatrix;
+    scaleWith(x: number, y?: number): IMatrix;
     scaleOfOuter(origin: IPointData, x: number, y?: number): IMatrix;
     scaleOfInner(origin: IPointData, x: number, y?: number): IMatrix;
     rotate(angle: number): IMatrix;
@@ -230,6 +233,7 @@ interface IMatrix extends IMatrixData {
     divide(child: IMatrixData): IMatrix;
     divideParent(parent: IMatrixData): IMatrix;
     invert(): IMatrix;
+    invertWith(): IMatrix;
     toOuterPoint(inner: IPointData, to?: IPointData, distance?: boolean): void;
     toInnerPoint(outer: IPointData, to?: IPointData, distance?: boolean): void;
     setLayout(data: ILayoutData, origin?: IPointData): IMatrix;
@@ -511,15 +515,16 @@ interface CanvasRect {
     strokeRect(x: number, y: number, w: number, h: number): void;
 }
 type PredefinedColorSpace = 'display-p3' | 'srgb';
-interface CanvasRenderingContext2DSettings {
+interface ICanvasRenderingContext2DSettings {
     alpha?: boolean;
     colorSpace?: PredefinedColorSpace;
     desynchronized?: boolean;
     willReadFrequently?: boolean;
 }
+type ICanvasContext2DSettings = ICanvasRenderingContext2DSettings;
 interface ICanvasContext2D extends CanvasCompositing, CanvasDrawImage, CanvasDrawPath, CanvasFillStrokeStyles, CanvasFilters, CanvasImageData, CanvasImageSmoothing, CanvasPath, CanvasPathDrawingStyles, CanvasRect, CanvasShadowStyles, CanvasState, CanvasText, CanvasTextDrawingStyles, CanvasTransform, CanvasUserInterface {
     readonly canvas: HTMLCanvasElement;
-    getContextAttributes(): CanvasRenderingContext2DSettings;
+    getContextAttributes(): ICanvasRenderingContext2DSettings;
 }
 interface CanvasShadowStyles {
     shadowBlur: number;
@@ -739,7 +744,7 @@ interface IPathDrawer {
     rect(x: number, y: number, width: number, height: number): void;
     roundRect(x: number, y: number, width: number, height: number, radius?: number | number[]): void;
 }
-interface IPathCreator {
+interface IPathCreator extends IPathDrawer {
     path: IPathCommandData;
     __path: IPathCommandData;
     beginPath(): IPathCreator;
@@ -756,6 +761,7 @@ interface IPathCreator {
     drawEllipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator;
     drawArc(x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator;
     drawPoints(points: number[], curve?: boolean | number, close?: boolean): IPathCreator;
+    clearPath(): IPathCreator;
 }
 
 interface ICanvasManager {
@@ -869,6 +875,7 @@ interface ILeaferCanvasConfig extends IAutoBoundsData {
     smooth?: boolean;
     hittable?: boolean;
     webgl?: boolean;
+    contextSettings?: ICanvasContext2DSettings;
 }
 type IHitCanvasConfig = ILeaferCanvasConfig;
 interface ICanvasStrokeOptions {
@@ -938,6 +945,7 @@ interface ICanvasMethod {
     restoreBlendMode(): void;
     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;
     setWorld(matrix: IMatrixData, parentMatrix?: IMatrixData): void;
@@ -996,6 +1004,7 @@ interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     destroy(): void;
 }
 interface IHitCanvas extends ILeaferCanvas {
+    hitScale?: number;
 }
 interface IBlobFunction {
     (blob: IBlob | null): void;
@@ -1043,7 +1052,7 @@ interface IRenderer extends IControl {
 
 type ILeafDataProxyModule = ILeafDataProxy & ThisType<ILeaf>;
 interface ILeafDataProxy {
-    __setAttr?(name: string, newValue: IValue): void;
+    __setAttr?(name: string, newValue: IValue): boolean;
     __getAttr?(name: string): IValue;
     setProxyAttr?(name: string, newValue: IValue): void;
     getProxyAttr?(name: string): IValue;
@@ -1076,8 +1085,9 @@ type ILeafHitModule = ILeafHit & ThisType<ILeaf>;
 interface ILeafHit {
     __hitWorld?(point: IRadiusPointData): boolean;
     __hit?(inner: IRadiusPointData): boolean;
-    __hitFill?(inner: IRadiusPointData, windingRule?: string): boolean;
+    __hitFill?(inner: IRadiusPointData): boolean;
     __hitStroke?(inner: IRadiusPointData, strokeWidth: number): boolean;
+    __hitPixel(inner: IRadiusPointData): boolean;
     __drawHitPath?(canvas: ILeaferCanvas): void;
     __updateHitCanvas?(): void;
 }
@@ -1088,7 +1098,7 @@ interface ILeafRender {
     __draw?(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __drawFast?(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __clip?(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
-    __renderShape?(canvas: ILeaferCanvas, options: IRenderOptions): void;
+    __renderShape?(canvas: ILeaferCanvas, options: IRenderOptions, ignoreFill?: boolean, ignoreStroke?: boolean): void;
     __updateWorldOpacity?(): void;
     __updateChange?(): void;
 }
@@ -1197,8 +1207,10 @@ interface ILeafAttrData {
     draggable: IBoolean;
     path: IPathCommandData | IPathString;
     windingRule: IWindingRule;
+    closed: boolean;
     editable: IBoolean;
     editSize: IEditSize;
+    editorStyle: IObject;
     hittable: IBoolean;
     hitFill: IHitType;
     hitStroke: IHitType;
@@ -1258,8 +1270,10 @@ interface ILeafInputData {
     draggable?: IBoolean;
     path?: IPathCommandData | IPathString;
     windingRule?: IWindingRule;
+    closed?: boolean;
     editable?: IBoolean;
     editSize?: IEditSize;
+    editorStyle?: IObject;
     hittable?: IBoolean;
     hitFill?: IHitType;
     hitStroke?: IHitType;
@@ -1305,9 +1319,11 @@ interface ILeafComputedData {
     pixelRatio?: number;
     path?: IPathCommandData;
     windingRule?: IWindingRule;
+    closed?: boolean;
     draggable?: boolean;
     editable?: boolean;
     editSize?: IEditSize;
+    editorStyle?: IObject;
     hittable?: boolean;
     hitFill?: IHitType;
     hitStroke?: IHitType;
@@ -1377,7 +1393,6 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     readonly __onlyHitMask: boolean;
     readonly __ignoreHitWorld: boolean;
     readonly pathInputed: boolean;
-    pathClosed: boolean;
     __parentWait?: IFunction[];
     __leaferWait?: IFunction[];
     destroyed: boolean;
@@ -1394,7 +1409,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     toString(): string;
     toSVG?(): string;
     toHTML?(): string;
-    __setAttr(attrName: string, newValue: IValue): void;
+    __setAttr(attrName: string, newValue: IValue, checkFiniteNumber?: boolean): boolean;
     __getAttr(attrName: string): IValue;
     setProxyAttr(name: string, newValue: IValue): void;
     getProxyAttr(name: string): IValue;
@@ -1454,15 +1469,16 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     __scaleResize(scaleX: number, scaleY: number): void;
     __hitWorld(point: IRadiusPointData): boolean;
     __hit(local: IRadiusPointData): boolean;
-    __hitFill(inner: IRadiusPointData, windingRule?: string): boolean;
+    __hitFill(inner: IRadiusPointData): boolean;
     __hitStroke(inner: IRadiusPointData, strokeWidth: number): boolean;
+    __hitPixel(inner: IRadiusPointData): boolean;
     __drawHitPath(canvas: ILeaferCanvas): void;
     __updateHitCanvas(): void;
     __render(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __drawFast(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __draw(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __clip(canvas: ILeaferCanvas, options: IRenderOptions): void;
-    __renderShape(canvas: ILeaferCanvas, options: IRenderOptions): void;
+    __renderShape(canvas: ILeaferCanvas, options: IRenderOptions, ignoreFill?: boolean, ignoreStroke?: boolean): void;
     __updateWorldOpacity(): void;
     __updateChange(): void;
     __drawPath(canvas: ILeaferCanvas): void;
@@ -1475,6 +1491,10 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     remove(child?: ILeaf, destroy?: boolean): void;
     dropTo(parent: ILeaf, index?: number, resize?: boolean): void;
 }
+type ILeafAttrDescriptor = IObject & ThisType<ILeaf>;
+interface ILeafAttrDescriptorFn {
+    (key: string): ILeafAttrDescriptor;
+}
 
 interface ILeaferImageConfig {
     url: string;
@@ -1542,6 +1562,7 @@ interface IPointerEvent extends IUIEvent {
     tiltX?: number;
     tiltY?: number;
     twist?: number;
+    isCancel?: boolean;
 }
 type PointerType = 'mouse' | 'pen' | 'touch';
 interface IDragEvent extends IPointerEvent {
@@ -1612,6 +1633,7 @@ interface IInteraction extends IControl {
     keyUp(data: IKeyEvent): void;
     findPath(data: IPointerEvent, options?: IPickOptions): ILeafList;
     isRootPath(data: IPointerEvent): boolean;
+    isTreePath(data: IPointerEvent): boolean;
     canMove(data: IPointerEvent): boolean;
     isDrag(leaf: ILeaf): boolean;
     isPress(leaf: ILeaf): boolean;
@@ -1635,14 +1657,16 @@ interface IInteractionConfig {
     eventer?: IObject;
 }
 interface IZoomConfig {
+    disabled?: boolean;
     min?: number;
     max?: number;
 }
 interface IMoveConfig {
+    disabled?: boolean;
     holdSpaceKey?: boolean;
     holdMiddleKey?: boolean;
     holdRightKey?: boolean;
-    scroll?: boolean;
+    scroll?: boolean | 'limit';
     drag?: boolean;
     dragAnimate?: boolean;
     dragEmpty?: boolean;
@@ -1666,6 +1690,7 @@ interface IPointerConfig {
     tapTime?: number;
     longPressTime?: number;
     transformTime?: number;
+    hover?: boolean;
     dragHover?: boolean;
     dragDistance?: number;
     swipeDistance?: number;
@@ -1678,8 +1703,9 @@ interface ICursorConfig {
 }
 
 interface IHitCanvasManager extends ICanvasManager {
+    maxTotal: number;
     getPathType(leaf: ILeaf): IHitCanvas;
-    getImageType(leaf: ILeaf, size: IScreenSizeData): IHitCanvas;
+    getPixelType(leaf: ILeaf, config: ILeaferCanvasConfig): IHitCanvas;
 }
 
 interface IZoomView extends IBranch {
@@ -1690,6 +1716,7 @@ interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IInteracti
     start?: boolean;
     type?: ILeaferType;
     realCanvas?: boolean;
+    lazySpeard?: IFourNumber;
 }
 interface ILeaferAttrData {
     running: boolean;
@@ -1710,6 +1737,7 @@ interface ILeaferAttrData {
     canvasManager: ICanvasManager;
     hitCanvasManager?: IHitCanvasManager;
     autoLayout?: IAutoBounds;
+    lazyBounds: IBounds;
     config: ILeaferConfig;
     readonly cursorPoint: IPointData;
     leafs: number;
@@ -1728,7 +1756,8 @@ interface ILeaferAttrData {
     waitViewReady(item: IFunction, bind?: IObject): void;
     waitViewCompleted(item: IFunction, bind?: IObject): void;
     zoom(zoomType: IZoomType, padding?: IFourNumber, fixedScale?: boolean): IBoundsData;
-    validScale(changeScale: number): number;
+    getValidMove(moveX: number, moveY: number): IPointData;
+    getValidScale(changeScale: number): number;
 }
 type IZoomType = 'in' | 'out' | 'fit' | 'fit-width' | 'fit-height' | number | ILeaf | ILeaf[] | IBoundsData;
 interface ILeaferBase extends IZoomView, IControl, ILeaferAttrData {
@@ -1822,6 +1851,7 @@ interface IImageManager {
     recycledList: ILeaferImage[];
     tasker: ITaskProcessor;
     patternTasker: ITaskProcessor;
+    patternLocked?: boolean;
     readonly isComplete: boolean;
     get(config: ILeaferImageConfig): ILeaferImage;
     recycle(image: ILeaferImage): void;
@@ -1880,6 +1910,7 @@ interface IPlatform {
         canvasToDataURL(canvas: any, type?: IExportImageType, quality?: number): string | Promise<string>;
         canvasToBolb(canvas: any, type?: IExportFileType, quality?: number): Promise<any>;
         canvasSaveAs(canvas: any, filename: string, quality?: number): Promise<void>;
+        download(url: string, filename: string): Promise<void>;
         loadImage(url: string): Promise<any>;
         noRepeat?: string;
     };
@@ -1892,6 +1923,7 @@ interface IPlatform {
     };
     miniapp?: IMiniapp;
     image: {
+        hitCanvasSize: number;
         maxCacheSize: number;
         maxPatternSize: number;
         suffix: string;
@@ -1931,4 +1963,4 @@ interface ICursorRotateMap {
     [name: string]: ICursorRotate;
 }
 
-export type { ACommandData, ArcCommandData, ArcToCommandData, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAnimateEvent, IAnswer, IAppBase, IAround, IAttrDecorator, IAutoBounds, IAutoBoundsData, IBlendMode, IBlob, IBlobFunction, IBoolean, IBooleanMap, IBounds, IBoundsData, IBoundsDataFn, IBoundsType, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasCacheOptions, ICanvasContext2D, ICanvasManager, ICanvasPattern, ICanvasStrokeOptions, ICanvasType, IChildEvent, IControl, ICreator, ICursorRotate, ICursorRotateMap, ICursorType, ICursorTypeMap, IDataProcessor, IDataTypeHandle, IDragEvent, IDropEvent, IEditSize, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventTarget, IEventer, IExportFileType, IExportImageType, IExportOnCanvasFunction, IExportOptions, IExportResult, IExportResultFunction, IFindMethod, IFourNumber, IFunction, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageCursor, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IKeepTouchData, IKeyEvent, ILayoutAttr, ILayoutBlockData, ILayoutBoundsData, ILayoutChangedData, ILayoutData, ILayoutEvent, ILayouter, ILayouterConfig, ILeaf, ILeafArrayMap, ILeafAttrData, ILeafBounds, ILeafBoundsModule, ILeafComputedData, ILeafData, ILeafDataOptions, ILeafDataProxy, ILeafDataProxyModule, ILeafEventer, ILeafEventerModule, ILeafHit, ILeafHitModule, ILeafInputData, ILeafLayout, ILeafLevelList, ILeafList, ILeafListItemCallback, ILeafMap, ILeafMatrix, ILeafMatrixModule, ILeafRender, ILeafRenderModule, ILeaferAttrData, ILeaferBase, ILeaferCanvas, ILeaferCanvasConfig, ILeaferCanvasView, ILeaferConfig, ILeaferEvent, ILeaferImage, ILeaferImageCacheCanvas, ILeaferImageConfig, ILeaferImageOnError, ILeaferImageOnLoaded, ILeaferImagePatternPaint, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILocationType, IMaskType, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IMatrixWithOptionScaleData, IMatrixWithScaleData, IMiniapp, IMiniappSelect, IMiniappSizeView, IMoveEvent, IMultiTouchData, INumber, INumberMap, IObject, IOffsetBoundsData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCreator, IPathDrawer, IPathString, IPickOptions, IPickResult, IPlatform, IPlugin, IPoint, IPointData, IPointerConfig, IPointerEvent, IPropertyEvent, IRadiusPointData, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IRotateEvent, IScaleData, IScaleRotationData, IScreenSizeData, ISelector, ISelectorConfig, ISelectorProxy, ISize, ISizeData, ISkewData, ISkiaCanvas, ISkiaCanvasExportConfig, ISkiaNAPICanvas, IStateStyleType, IString, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITwoPointBoundsData, IUICreator, IUIEvent, IUpdateEvent, IValue, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWindingRule, IZoomEvent, IZoomType, IZoomView, InnerId, LCommandData, MCommandData, PointerType, QCommandData, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, VCommandData, ZCommandData };
+export type { ACommandData, ArcCommandData, ArcToCommandData, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAnimateEvent, IAnswer, IAppBase, IAround, IAttrDecorator, IAutoBounds, IAutoBoundsData, IBlendMode, IBlob, IBlobFunction, IBoolean, IBooleanMap, IBounds, IBoundsData, IBoundsDataFn, IBoundsType, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasCacheOptions, ICanvasContext2D, ICanvasContext2DSettings, ICanvasManager, ICanvasPattern, ICanvasStrokeOptions, ICanvasType, IChildEvent, IControl, ICreator, ICursorRotate, ICursorRotateMap, ICursorType, ICursorTypeMap, IDataProcessor, IDataTypeHandle, IDragEvent, IDropEvent, IEditSize, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventTarget, IEventer, IExportFileType, IExportImageType, IExportOnCanvasFunction, IExportOptions, IExportResult, IExportResultFunction, IFindMethod, IFourNumber, IFunction, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageCursor, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IKeepTouchData, IKeyEvent, ILayoutAttr, ILayoutBlockData, ILayoutBoundsData, ILayoutChangedData, ILayoutData, ILayoutEvent, ILayouter, ILayouterConfig, ILeaf, ILeafArrayMap, ILeafAttrData, ILeafAttrDescriptor, ILeafAttrDescriptorFn, ILeafBounds, ILeafBoundsModule, ILeafComputedData, ILeafData, ILeafDataOptions, ILeafDataProxy, ILeafDataProxyModule, ILeafEventer, ILeafEventerModule, ILeafHit, ILeafHitModule, ILeafInputData, ILeafLayout, ILeafLevelList, ILeafList, ILeafListItemCallback, ILeafMap, ILeafMatrix, ILeafMatrixModule, ILeafRender, ILeafRenderModule, ILeaferAttrData, ILeaferBase, ILeaferCanvas, ILeaferCanvasConfig, ILeaferCanvasView, ILeaferConfig, ILeaferEvent, ILeaferImage, ILeaferImageCacheCanvas, ILeaferImageConfig, ILeaferImageOnError, ILeaferImageOnLoaded, ILeaferImagePatternPaint, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILocationType, IMaskType, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IMatrixWithOptionScaleData, IMatrixWithScaleData, IMiniapp, IMiniappSelect, IMiniappSizeView, IMoveEvent, IMultiTouchData, INumber, INumberMap, IObject, IOffsetBoundsData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCreator, IPathDrawer, IPathString, IPickOptions, IPickResult, IPlatform, IPlugin, IPoint, IPointData, IPointerConfig, IPointerEvent, IPropertyEvent, IRadiusPointData, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IRotateEvent, IScaleData, IScaleRotationData, IScreenSizeData, ISelector, ISelectorConfig, ISelectorProxy, ISize, ISizeData, ISkewData, ISkiaCanvas, ISkiaCanvasExportConfig, ISkiaNAPICanvas, IStateStyleType, IString, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITwoPointBoundsData, IUICreator, IUIEvent, IUpdateEvent, IValue, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWindingRule, IZoomEvent, IZoomType, IZoomView, InnerId, LCommandData, MCommandData, PointerType, QCommandData, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, VCommandData, ZCommandData };