@leafer/interface 1.7.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/interface",
-  "version": "1.7.0",
+  "version": "1.9.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'
@@ -24,8 +24,9 @@ import { ITransition } from '../animate/ITransition'
 
 
 export interface ICachedLeaf {
-    canvas: ILeaferCanvas,
-    matrix?: IMatrix,
+    canvas: ILeaferCanvas, // 完整的元素缓存画布
+    matrix?: IMatrix, // 包含导出时附加的 options.matrix
+    fitMatrix?: IMatrix, // 不包含导出时附加的 options.matrix
     bounds: IBoundsData
 }
 
@@ -73,6 +74,8 @@ export interface IConstraint {
 
 export type IConstraintType = 'from' | 'center' | 'to' | 'from-to' | 'scale'
 
+export type IScaleFixed = boolean | 'zoom-in' // 缩放时是否固定原有比例，zoom-in表示仅在放大时固定比例（缩小时仍跟随缩小）
+
 export type IHitType =
     | 'path'
     | 'pixel'
@@ -258,6 +261,8 @@ export interface ILeafAttrData {
     lazy?: IBoolean
     pixelRatio?: INumber
 
+    renderSpread?: INumber // 扩大渲染边界
+
     path?: IPathCommandData | IPathCommandObject[] | IPathString
     windingRule?: IWindingRule
     closed?: IBoolean
@@ -359,6 +364,8 @@ export interface ILeafComputedData {
     lazy?: boolean
     pixelRatio?: number
 
+    renderSpread?: number
+
     path?: IPathCommandData
     windingRule?: IWindingRule
     closed?: boolean
@@ -515,6 +522,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 +607,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?: IScaleFixed): IScaleData // 当前渲染的比例数据，必须马上分解使用
 
     getTransform(relative?: ILocationType | ILeaf): IMatrixData
 
@@ -649,6 +661,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     resizeHeight(height: number): void
 
     // ILeafHit ->
+    hit(world: IPointData, hitRadius?: number): boolean
     __hitWorld(point: IRadiusPointData): boolean
     __hit(local: IRadiusPointData): boolean
     __hitFill(inner: IRadiusPointData): boolean

package/src/event/IUIEvent.ts

@@ -23,6 +23,8 @@ export interface IUIEvent extends IEvent {
     path?: ILeafList
     throughPath?: ILeafList // 穿透path，不受层级影响，从上到下只要碰撞到区域就算，一般点击的时候
 
+    isHoldKeys?(shortcutKeys?: IShortcutKeysCheck | IShortcutKeys): boolean
+
     getBoxPoint?(relative?: ILeaf): IPointData
     getInnerPoint?(relative?: ILeaf): IPointData
     getLocalPoint?(relative?: ILeaf): IPointData
@@ -93,10 +95,264 @@ export interface ISwipeEvent extends IDragEvent {
 }
 
 export interface IKeyEvent extends IUIEvent {
-    code?: string
+    code?: IKeyCodes
     key?: string
 }
 
+export type IShortcutKeys = IShortcutStringKeys | IShortcutArrayKeys
+
+export type IShortcutStringKeys = string
+
+export type IShortcutArrayKeys = IShortcutKeyCodes[] | IShortcutKeyCodes[][] // 二维数组表示或 [ [Shift, A] or [Ctrl, A] ]
+
+export type IShortcutKeyCodes =
+    | IKeyCodes
+    | 'A' // 增加更友好的键名
+    | 'B'
+    | 'C'
+    | 'D'
+    | 'E'
+    | 'F'
+    | 'G'
+    | 'H'
+    | 'I'
+    | 'J'
+    | 'K'
+    | 'L'
+    | 'M'
+    | 'N'
+    | 'O'
+    | 'P'
+    | 'Q'
+    | 'R'
+    | 'S'
+    | 'T'
+    | 'U'
+    | 'V'
+    | 'W'
+    | 'X'
+    | 'Y'
+    | 'Z'
+    | '0' // 包含小键盘上的 0
+    | '1'
+    | '2'
+    | '3'
+    | '4'
+    | '5'
+    | '6'
+    | '7'
+    | '8'
+    | '9'
+    | '!' // Shift + 1
+    | '@'
+    | '#'
+    | '$'
+    | '%'
+    | '^'
+    | '&'
+    | '*'
+    | '('
+    | ')'
+    | 'Esc'
+    | 'Caps'
+    | 'Shift' // 包含 ShiftLeft 和 ShiftRight
+    | 'Ctrl'
+    | 'Alt'
+    | 'Meta'
+    | '⌘' // = Meta
+    | 'Win' // = Meta
+    | '↑'
+    | '↓'
+    | '←'
+    | '→'
+    | 'Scroll'
+    | 'Num'
+    | '-'
+    | '_'
+    | '='
+    | '+'
+    | '['
+    | '{'
+    | ']'
+    | '}'
+    | '\\'
+    | '|'
+    | ';'
+    | ':'
+    | "'"
+    | '"'
+    | ','
+    | '<'
+    | '.'
+    | '>'
+    | '/'
+    | '?'
+    | '`'
+    | '~'
+
+export type IKeyCodes =
+    | 'KeyA' // A
+    | 'KeyB' // B
+    | 'KeyC' // C
+    | 'KeyD' // D
+    | 'KeyE' // E
+    | 'KeyF' // F
+    | 'KeyG' // G
+    | 'KeyH' // H
+    | 'KeyI' // I
+    | 'KeyJ' // J
+    | 'KeyK' // K
+    | 'KeyL' // L
+    | 'KeyM' // M
+    | 'KeyN' // N
+    | 'KeyO' // O
+    | 'KeyP' // P
+    | 'KeyQ' // Q
+    | 'KeyR' // R
+    | 'KeyS' // S
+    | 'KeyT' // T
+    | 'KeyU' // U
+    | 'KeyV' // V
+    | 'KeyW' // W
+    | 'KeyX' // X
+    | 'KeyY' // Y
+    | 'KeyZ' // Z
+    | 'Digit0' // 0
+    | 'Digit1' // 1
+    | 'Digit2' // 2
+    | 'Digit3' // 3
+    | 'Digit4' // 4
+    | 'Digit5' // 5
+    | 'Digit6' // 6
+    | 'Digit7' // 7
+    | 'Digit8' // 8
+    | 'Digit9' // 9
+    | 'F1' // F1
+    | 'F2' // F2
+    | 'F3' // F3
+    | 'F4' // F4
+    | 'F5' // F5
+    | 'F6' // F6
+    | 'F7' // F7
+    | 'F8' // F8
+    | 'F9' // F9
+    | 'F10' // F10
+    | 'F11' // F11
+    | 'F12' // F12
+    | 'F13' // F13
+    | 'F14' // F14
+    | 'F15' // F15
+    | 'F16' // F16
+    | 'F17' // F17
+    | 'F18' // F18
+    | 'F19' // F19
+    | 'F20' // F20
+    | 'F21' // F21
+    | 'F22' // F22
+    | 'F23' // F23
+    | 'F24' // F24
+    | 'Escape' // Esc
+    | 'Tab' // Tab
+    | 'CapsLock' // Caps Lock
+    | 'ShiftLeft' // Shift (左)
+    | 'ShiftRight' // Shift (右)
+    | 'ControlLeft' // Ctrl (左)
+    | 'ControlRight' // Ctrl (右)
+    | 'AltLeft' // Alt (左)
+    | 'AltRight' // Alt (右)
+    | 'MetaLeft' // Meta / ⌘ / Win (左)
+    | 'MetaRight' // Meta / ⌘ / Win (右)
+    | 'Enter' // Enter / 回车
+    | 'Space' // 空格键
+    | 'Backspace' // Backspace / 删除
+    | 'Insert' // Insert
+    | 'Delete' // Delete
+    | 'Home' // Home
+    | 'End' // End
+    | 'PageUp' // Page Up
+    | 'PageDown' // Page Down
+    | 'ArrowUp' // ↑
+    | 'ArrowDown' // ↓
+    | 'ArrowLeft' // ←
+    | 'ArrowRight' // →
+    | 'PrintScreen' // Print Screen
+    | 'Pause' // Pause / Break
+    | 'ScrollLock' // Scroll Lock
+    | 'NumLock' // Num Lock
+    | 'ContextMenu' // 菜单键
+    | 'Minus' // - / _
+    | 'Equal' // = / +
+    | 'BracketLeft' // [ / {
+    | 'BracketRight' // ] / }
+    | 'Backslash' // \ / |
+    | 'IntlBackslash' // 国际键盘上的 \
+    | 'Semicolon' // ; / :
+    | 'Quote' // ' / "
+    | 'Comma' // , / <
+    | 'Period' // . / >
+    | 'Slash' // / / ?
+    | 'Backquote' // ` / ~
+    | 'Numpad0' // 小键盘 0
+    | 'Numpad1' // 小键盘 1
+    | 'Numpad2' // 小键盘 2
+    | 'Numpad3' // 小键盘 3
+    | 'Numpad4' // 小键盘 4
+    | 'Numpad5' // 小键盘 5
+    | 'Numpad6' // 小键盘 6
+    | 'Numpad7' // 小键盘 7
+    | 'Numpad8' // 小键盘 8
+    | 'Numpad9' // 小键盘 9
+    | 'NumpadMultiply' // *
+    | 'NumpadAdd' // +
+    | 'NumpadSubtract' // -
+    | 'NumpadDecimal' // .
+    | 'NumpadDivide' // /
+    | 'NumpadEnter' // 小键盘回车
+    | 'NumpadComma' // 小键盘 ,
+    | 'NumpadParenLeft' // (
+    | 'NumpadParenRight' // )
+    | 'NumpadEqual' // =
+    | 'BrowserBack' // 浏览器后退
+    | 'BrowserForward' // 浏览器前进
+    | 'BrowserRefresh' // 浏览器刷新
+    | 'BrowserStop' // 停止加载
+    | 'BrowserSearch' // 浏览器搜索
+    | 'BrowserFavorites' // 浏览器收藏夹
+    | 'BrowserHome' // 浏览器主页
+    | 'LaunchMail' // 启动邮件客户端
+    | 'LaunchMediaPlayer' // 启动媒体播放器
+    | 'LaunchCalculator' // 启动计算器
+    | 'MediaPlayPause' // 播放/暂停
+    | 'MediaStop' // 停止播放
+    | 'MediaTrackNext' // 下一首
+    | 'MediaTrackPrevious' // 上一首
+    | 'MediaVolumeMute' // 静音
+    | 'MediaVolumeUp' // 音量+
+    | 'MediaVolumeDown' // 音量-
+    | 'AudioVolumeMute' // 系统静音
+    | 'AudioVolumeUp' // 系统音量+
+    | 'AudioVolumeDown' // 系统音量-
+    | 'Select' // 已废弃
+    | 'LaunchApp1' // 启动应用 1
+    | 'LaunchApp2' // 启动应用 2
+    | 'Help' // 帮助键
+    | 'Sleep' // 休眠
+    | 'WakeUp' // 唤醒
+    | 'Lang1' // 韩文/日文切换
+    | 'Lang2' // 韩文/日文切换
+    | 'Power' // 电源键
+    | 'Fn' // Fn 键（部分设备）
+    | 'Eject' // 光驱弹出键（Mac）
+    | 'Convert' // 日文输入：转换
+    | 'NonConvert' // 日文输入：不转换
+    | 'KanaMode' // 日文假名模式
+    | 'Unidentified' // 未识别键
+
+
+export interface IShortcutKeysCheck {
+    (e: IUIEvent): boolean
+}
+
 export interface IImageEvent extends IEvent {
     image?: ILeaferImage
     attrName?: string

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/image/ILeaferImage.ts

@@ -55,7 +55,7 @@ export interface ILeaferImage {
     load(onSuccess?: ILeaferImageOnLoaded, onError?: ILeaferImageOnError): number
     unload(index: number, stopEvent?: boolean): void
     getFull(filters?: IObject): any
-    getCanvas(width: number, height: number, opacity?: number, filters?: IObject): any
+    getCanvas(width: number, height: number, opacity?: number, filters?: IObject, xGap?: number, yGap?: number): any
     getPattern(canvas: any, repeat: string | null, transform?: IMatrixData, paint?: IObject): ICanvasPattern
     destroy(): 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, IZoomOptions } from './app/ILeafer'
-export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IFlowType, IFlowBoxType, IAlign, IAxisAlign, IFlowAlign, IFlowAxisAlign, ISide, IAxis, IGap, IPointGap, IAxisReverse, IBaseLineAlign, IFlowWrap, IAutoSize, IRangeSize, IPercentData, IUnitData, IConstraint, IConstraintType, IHitType, IMaskType, IEraserType, IBlendMode, IEditSize, IImageCursor, ICursorType, IStateStyleType, IDirection, IDirection4, IAround, IFilter, ILeafAttrDescriptor, ILeafAttrDescriptorFn } from './display/ILeaf'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IFlowType, IFlowBoxType, IAlign, IAxisAlign, IFlowAlign, IFlowAxisAlign, ISide, IAxis, IGap, IPointGap, IAxisReverse, IBaseLineAlign, IFlowWrap, IAutoSize, IRangeSize, IPercentData, IUnitData, IConstraint, IConstraintType, IScaleFixed, IHitType, IMaskType, IEraserType, IBlendMode, IEditSize, IImageCursor, ICursorType, IStateStyleType, IDirection, IDirection4, IAround, IFilter, ILeafAttrDescriptor, ILeafAttrDescriptorFn } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
 
@@ -47,7 +47,7 @@ export { IExportOptions, IJSONOptions, IExportResult, IExportResultFunction, IEx
 
 export { InnerId, IEventer, IEventParamsMap, IEventParams, IEventListener, IEventOption, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId } from './event/IEventer'
 export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IAnimateEvent, IChildEvent, IBoundsEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, IMultiTouchData, IKeepTouchData } from './event/IEvent'
-export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEvent, IMoveEvent, IZoomEvent, IRotateEvent, IWheelEvent, IKeyEvent, IImageEvent } from './event/IUIEvent'
+export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEvent, IMoveEvent, IZoomEvent, IRotateEvent, IWheelEvent, IKeyEvent, IShortcutKeys, IShortcutKeysCheck, IShortcutKeyCodes, IKeyCodes, IImageEvent } from './event/IUIEvent'
 export { IProgressData, IProgressFunction } from './event/IProgress'
 
 export { ICursorTypeMap, ICursorRotate, ICursorRotateMap } from './interaction/ICursor'

package/src/interaction/IInteraction.ts

@@ -10,6 +10,7 @@ import { IKeepTouchData } from '../event/IEvent'
 import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
 import { IObject } from '../data/IData'
 
+
 export interface IInteraction extends IControl {
     target: ILeaf
     canvas: IInteractionCanvas
@@ -117,7 +118,7 @@ export interface IMoveConfig {
     holdRightKey?: boolean
     scroll?: boolean | 'x' | 'y' | 'limit' | 'x-limit' | 'y-limit'
     drag?: boolean | 'auto'
-    dragAnimate?: boolean
+    dragAnimate?: boolean | number
     dragEmpty?: boolean
     dragOut?: boolean | number
     autoDistance?: number
@@ -152,6 +153,7 @@ export interface IPointerConfig {
     hover?: boolean
     touch?: boolean // 使用touch事件代替pointer事件
 
+    dragLimitAnimate?: boolean | number //拖拽限制可在拖拽结束时进行动画归位
     dragHover?: boolean
     dragDistance?: number
     swipeDistance?: number

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/src/math/IMath.ts

@@ -85,7 +85,7 @@ export interface IOffsetBoundsData extends IBoundsData {
 }
 
 export interface IBoundsDataFn {
-    (target: any): IBoundsData
+    (target: any, index?: number): IBoundsData
 }
 
 export interface IBounds extends IBoundsData, ITwoPointBoundsData {

package/src/platform/IPlatform.ts

@@ -31,6 +31,7 @@ export interface IPlatform {
     syncDomFont?: boolean // firefox need
 
     selector?: ISelector // 公共查找选择器
+    getSelector?(leaf: ILeaf): ISelector
     layout?(target: ILeaf): void
 
     origin?: {

package/src/selector/ISelector.ts

@@ -56,6 +56,7 @@ export interface ISelector {
     finder?: IFinder
 
     getByPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): IPickResult
+    hitPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): boolean
     getBy(condition: number | string | IFindCondition | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[]
     destroy(): void
 }
@@ -63,6 +64,7 @@ export interface ISelector {
 
 export interface IPicker {
     getByPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): IPickResult
+    hitPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): boolean
     destroy(): void
 }
 

package/types/index.d.ts

@@ -65,7 +65,7 @@ interface IOffsetBoundsData extends IBoundsData {
     offsetY: number;
 }
 interface IBoundsDataFn {
-    (target: any): IBoundsData;
+    (target: any, index?: number): IBoundsData;
 }
 interface IBounds extends IBoundsData, ITwoPointBoundsData {
     set(x?: number | IBoundsData, y?: number, width?: number, height?: number): IBounds;
@@ -597,12 +597,19 @@ interface CanvasUserInterface {
     drawFocusIfNeeded(path: IPath2D, element: any): void;
 }
 interface ITextMetrics {
+    /** Returns the measurement described below. */
     readonly actualBoundingBoxAscent: number;
+    /** Returns the measurement described below. */
     readonly actualBoundingBoxDescent: number;
+    /** Returns the measurement described below. */
     readonly actualBoundingBoxLeft: number;
+    /** Returns the measurement described below. */
     readonly actualBoundingBoxRight: number;
+    /** Returns the measurement described below. */
     readonly fontBoundingBoxAscent: number;
+    /** Returns the measurement described below. */
     readonly fontBoundingBoxDescent: number;
+    /** Returns the measurement described below. */
     readonly width: number;
 }
 interface CanvasText {
@@ -877,7 +884,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 +969,7 @@ interface IExportResult {
     height?: number;
     renderBounds?: IBoundsData;
     trimBounds?: IBoundsData;
+    error?: any;
 }
 interface IExportResultFunction {
     (data: IExportResult): void;
@@ -1051,8 +1059,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;
@@ -1298,11 +1306,13 @@ interface ISelector {
     picker: IPicker;
     finder?: IFinder;
     getByPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): IPickResult;
+    hitPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): boolean;
     getBy(condition: number | string | IFindCondition | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[];
     destroy(): void;
 }
 interface IPicker {
     getByPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): IPickResult;
+    hitPoint(hitPoint: IPointData, hitRadius: number, options?: IPickOptions): boolean;
     destroy(): void;
 }
 interface IFinder {
@@ -1370,6 +1380,7 @@ interface IAnimateEventFunction {
 interface ICachedLeaf {
     canvas: ILeaferCanvas;
     matrix?: IMatrix;
+    fitMatrix?: IMatrix;
     bounds: IBoundsData;
 }
 type ISide = 'width' | 'height';
@@ -1406,6 +1417,7 @@ interface IConstraint {
     y: IConstraintType;
 }
 type IConstraintType = 'from' | 'center' | 'to' | 'from-to' | 'scale';
+type IScaleFixed = boolean | 'zoom-in';
 type IHitType = 'path' | 'pixel' | 'all' | 'none';
 type IMaskType = 'path' | 'pixel' | 'grayscale' | 'clipping' | 'clipping-path';
 type IEraserType = 'path' | 'pixel';
@@ -1463,6 +1475,7 @@ interface ILeafAttrData {
     around?: IAlign | IUnitPointData;
     lazy?: IBoolean;
     pixelRatio?: INumber;
+    renderSpread?: INumber;
     path?: IPathCommandData | IPathCommandObject[] | IPathString;
     windingRule?: IWindingRule;
     closed?: IBoolean;
@@ -1536,6 +1549,7 @@ interface ILeafComputedData {
     around?: IAlign | IUnitPointData;
     lazy?: boolean;
     pixelRatio?: number;
+    renderSpread?: number;
     path?: IPathCommandData;
     windingRule?: IWindingRule;
     closed?: boolean;
@@ -1646,6 +1660,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 +1718,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?: IScaleFixed): IScaleData;
     getTransform(relative?: ILocationType | ILeaf): IMatrixData;
     getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData;
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData;
@@ -1740,6 +1758,7 @@ interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDa
     __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;
@@ -1824,7 +1843,7 @@ interface ILeaferImage {
     load(onSuccess?: ILeaferImageOnLoaded, onError?: ILeaferImageOnError): number;
     unload(index: number, stopEvent?: boolean): void;
     getFull(filters?: IObject): any;
-    getCanvas(width: number, height: number, opacity?: number, filters?: IObject): any;
+    getCanvas(width: number, height: number, opacity?: number, filters?: IObject, xGap?: number, yGap?: number): any;
     getPattern(canvas: any, repeat: string | null, transform?: IMatrixData, paint?: IObject): ICanvasPattern;
     destroy(): void;
 }
@@ -1843,6 +1862,7 @@ interface IUIEvent extends IEvent {
     buttons?: number;
     path?: ILeafList;
     throughPath?: ILeafList;
+    isHoldKeys?(shortcutKeys?: IShortcutKeysCheck | IShortcutKeys): boolean;
     getBoxPoint?(relative?: ILeaf): IPointData;
     getInnerPoint?(relative?: ILeaf): IPointData;
     getLocalPoint?(relative?: ILeaf): IPointData;
@@ -1897,9 +1917,17 @@ interface IWheelEvent extends IUIEvent {
 interface ISwipeEvent extends IDragEvent {
 }
 interface IKeyEvent extends IUIEvent {
-    code?: string;
+    code?: IKeyCodes;
     key?: string;
 }
+type IShortcutKeys = IShortcutStringKeys | IShortcutArrayKeys;
+type IShortcutStringKeys = string;
+type IShortcutArrayKeys = IShortcutKeyCodes[] | IShortcutKeyCodes[][];
+type IShortcutKeyCodes = IKeyCodes | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M' | 'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | '!' | '@' | '#' | '$' | '%' | '^' | '&' | '*' | '(' | ')' | 'Esc' | 'Caps' | 'Shift' | 'Ctrl' | 'Alt' | 'Meta' | '⌘' | 'Win' | '↑' | '↓' | '←' | '→' | 'Scroll' | 'Num' | '-' | '_' | '=' | '+' | '[' | '{' | ']' | '}' | '\\' | '|' | ';' | ':' | "'" | '"' | ',' | '<' | '.' | '>' | '/' | '?' | '`' | '~';
+type IKeyCodes = 'KeyA' | 'KeyB' | 'KeyC' | 'KeyD' | 'KeyE' | 'KeyF' | 'KeyG' | 'KeyH' | 'KeyI' | 'KeyJ' | 'KeyK' | 'KeyL' | 'KeyM' | 'KeyN' | 'KeyO' | 'KeyP' | 'KeyQ' | 'KeyR' | 'KeyS' | 'KeyT' | 'KeyU' | 'KeyV' | 'KeyW' | 'KeyX' | 'KeyY' | 'KeyZ' | 'Digit0' | 'Digit1' | 'Digit2' | 'Digit3' | 'Digit4' | 'Digit5' | 'Digit6' | 'Digit7' | 'Digit8' | 'Digit9' | 'F1' | 'F2' | 'F3' | 'F4' | 'F5' | 'F6' | 'F7' | 'F8' | 'F9' | 'F10' | 'F11' | 'F12' | 'F13' | 'F14' | 'F15' | 'F16' | 'F17' | 'F18' | 'F19' | 'F20' | 'F21' | 'F22' | 'F23' | 'F24' | 'Escape' | 'Tab' | 'CapsLock' | 'ShiftLeft' | 'ShiftRight' | 'ControlLeft' | 'ControlRight' | 'AltLeft' | 'AltRight' | 'MetaLeft' | 'MetaRight' | 'Enter' | 'Space' | 'Backspace' | 'Insert' | 'Delete' | 'Home' | 'End' | 'PageUp' | 'PageDown' | 'ArrowUp' | 'ArrowDown' | 'ArrowLeft' | 'ArrowRight' | 'PrintScreen' | 'Pause' | 'ScrollLock' | 'NumLock' | 'ContextMenu' | 'Minus' | 'Equal' | 'BracketLeft' | 'BracketRight' | 'Backslash' | 'IntlBackslash' | 'Semicolon' | 'Quote' | 'Comma' | 'Period' | 'Slash' | 'Backquote' | 'Numpad0' | 'Numpad1' | 'Numpad2' | 'Numpad3' | 'Numpad4' | 'Numpad5' | 'Numpad6' | 'Numpad7' | 'Numpad8' | 'Numpad9' | 'NumpadMultiply' | 'NumpadAdd' | 'NumpadSubtract' | 'NumpadDecimal' | 'NumpadDivide' | 'NumpadEnter' | 'NumpadComma' | 'NumpadParenLeft' | 'NumpadParenRight' | 'NumpadEqual' | 'BrowserBack' | 'BrowserForward' | 'BrowserRefresh' | 'BrowserStop' | 'BrowserSearch' | 'BrowserFavorites' | 'BrowserHome' | 'LaunchMail' | 'LaunchMediaPlayer' | 'LaunchCalculator' | 'MediaPlayPause' | 'MediaStop' | 'MediaTrackNext' | 'MediaTrackPrevious' | 'MediaVolumeMute' | 'MediaVolumeUp' | 'MediaVolumeDown' | 'AudioVolumeMute' | 'AudioVolumeUp' | 'AudioVolumeDown' | 'Select' | 'LaunchApp1' | 'LaunchApp2' | 'Help' | 'Sleep' | 'WakeUp' | 'Lang1' | 'Lang2' | 'Power' | 'Fn' | 'Eject' | 'Convert' | 'NonConvert' | 'KanaMode' | 'Unidentified';
+interface IShortcutKeysCheck {
+    (e: IUIEvent): boolean;
+}
 interface IImageEvent extends IEvent {
     image?: ILeaferImage;
     attrName?: string;
@@ -1987,7 +2015,7 @@ interface IMoveConfig {
     holdRightKey?: boolean;
     scroll?: boolean | 'x' | 'y' | 'limit' | 'x-limit' | 'y-limit';
     drag?: boolean | 'auto';
-    dragAnimate?: boolean;
+    dragAnimate?: boolean | number;
     dragEmpty?: boolean;
     dragOut?: boolean | number;
     autoDistance?: number;
@@ -2016,6 +2044,7 @@ interface IPointerConfig {
     transformTime?: number;
     hover?: boolean;
     touch?: boolean;
+    dragLimitAnimate?: boolean | number;
     dragHover?: boolean;
     dragDistance?: number;
     swipeDistance?: number;
@@ -2249,6 +2278,7 @@ interface IPlatform {
     fullImageShadow?: boolean;
     syncDomFont?: boolean;
     selector?: ISelector;
+    getSelector?(leaf: ILeaf): ISelector;
     layout?(target: ILeaf): void;
     origin?: {
         createCanvas(width: number, height: number, format?: 'svg' | 'pdf'): any;
@@ -2336,4 +2366,4 @@ interface ITransformer {
     destroy(): void;
 }
 
-export type { ACommandData, ArcCommandData, ArcToCommandData, BezierCurveToCommandObject, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAlign, IAnimateEasing, IAnimateEasingFunction, IAnimateEasingName, IAnimateEnding, IAnimateEvent, IAnimateEventFunction, IAnimateEvents, IAnimateOptions, IAnswer, IAppBase, IAround, IAttrDecorator, IAutoBounds, IAutoBoundsData, IAutoBoxData, IAutoSize, IAxis, IAxisAlign, IAxisReverse, IBaseLineAlign, IBlendMode, IBlob, IBlobFunction, IBoolean, IBooleanMap, IBounds, IBoundsData, IBoundsDataFn, IBoundsEvent, IBoundsType, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasCacheOptions, ICanvasContext2D, ICanvasContext2DSettings, ICanvasManager, ICanvasPattern, ICanvasStrokeOptions, ICanvasType, IChildEvent, IClientPointData, IConstraint, IConstraintType, IControl, ICreator, ICubicBezierEasing, ICursorConfig, ICursorRotate, ICursorRotateMap, ICursorType, ICursorTypeMap, ICustomEasingFunction, IDataProcessor, IDataTypeHandle, IDirection, IDirection4, IDragEvent, IDropEvent, IEditSize, IEraserType, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventOption, IEventParams, IEventParamsMap, IEventTarget, IEventer, IExportFileType, IExportImageType, IExportOnCanvasFunction, IExportOptions, IExportResult, IExportResultFunction, IFilter, IFindCondition, IFindMethod, IFinder, IFlowAlign, IFlowAxisAlign, IFlowBoxType, IFlowType, IFlowWrap, IFourNumber, IFromToData, IFunction, IFunctionMap, IGap, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageCursor, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IJSONOptions, 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, IMatrixWithOptionHalfData, IMatrixWithOptionScaleData, IMatrixWithScaleData, IMiniapp, IMiniappSelect, IMiniappSizeView, IMotionPathData, IMoveConfig, IMoveEvent, IMultiTouchConfig, IMultiTouchData, INumber, INumberFunction, INumberMap, IObject, IObjectFunction, IOffsetBoundsData, IOptionSizeData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCommandObject, IPathCreator, IPathDrawer, IPathString, IPercentData, IPickBottom, IPickOptions, IPickResult, IPicker, IPlatform, IPlugin, IPoint, IPointData, IPointDataFunction, IPointDataMap, IPointGap, IPointerConfig, IPointerEvent, IProgressData, IProgressFunction, IPropertyEvent, IRadiusPointData, IRangeSize, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IResource, IRotateEvent, IRotationPointData, IScaleData, IScaleRotationData, IScreenSizeData, IScrollPointData, ISelector, ISelectorConfig, ISelectorProxy, ISide, ISize, ISizeData, ISkewData, ISkiaCanvas, ISkiaCanvasExportConfig, ISkiaNAPICanvas, IStateStyleType, IStepsEasing, IString, IStringFunction, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITouchConfig, ITransformer, ITransition, ITwoPointBoundsData, IUICreator, IUIEvent, IUnitData, IUnitPointData, IUpdateEvent, IValue, IValueFunction, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWheelEvent, IWindingRule, IWindingRuleData, IZoomConfig, IZoomEvent, IZoomOptions, IZoomType, IZoomView, InnerId, LCommandData, LineToCommandObject, MCommandData, MoveToCommandObject, PointerType, QCommandData, QuadraticCurveToCommandObject, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, VCommandData, ZCommandData };
+export type { ACommandData, ArcCommandData, ArcToCommandData, BezierCurveToCommandObject, CCommandData, CanvasPathCommand, EllipseCommandData, HCommandData, IAlign, IAnimateEasing, IAnimateEasingFunction, IAnimateEasingName, IAnimateEnding, IAnimateEvent, IAnimateEventFunction, IAnimateEvents, IAnimateOptions, IAnswer, IAppBase, IAround, IAttrDecorator, IAutoBounds, IAutoBoundsData, IAutoBoxData, IAutoSize, IAxis, IAxisAlign, IAxisReverse, IBaseLineAlign, IBlendMode, IBlob, IBlobFunction, IBoolean, IBooleanMap, IBounds, IBoundsData, IBoundsDataFn, IBoundsEvent, IBoundsType, IBranch, IBranchRender, IBranchRenderModule, ICachedLeaf, ICanvasAttr, ICanvasCacheOptions, ICanvasContext2D, ICanvasContext2DSettings, ICanvasManager, ICanvasPattern, ICanvasStrokeOptions, ICanvasType, IChildEvent, IClientPointData, IConstraint, IConstraintType, IControl, ICreator, ICubicBezierEasing, ICursorConfig, ICursorRotate, ICursorRotateMap, ICursorType, ICursorTypeMap, ICustomEasingFunction, IDataProcessor, IDataTypeHandle, IDirection, IDirection4, IDragEvent, IDropEvent, IEditSize, IEraserType, IEvent, IEventListener, IEventListenerId, IEventListenerItem, IEventListenerMap, IEventListenerOptions, IEventOption, IEventParams, IEventParamsMap, IEventTarget, IEventer, IExportFileType, IExportImageType, IExportOnCanvasFunction, IExportOptions, IExportResult, IExportResultFunction, IFilter, IFindCondition, IFindMethod, IFinder, IFlowAlign, IFlowAxisAlign, IFlowBoxType, IFlowType, IFlowWrap, IFourNumber, IFromToData, IFunction, IFunctionMap, IGap, IHitCanvas, IHitCanvasConfig, IHitCanvasManager, IHitType, IImageCursor, IImageEvent, IImageManager, IInteraction, IInteractionCanvas, IInteractionConfig, IJSONOptions, IKeepTouchData, IKeyCodes, 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, IMatrixWithOptionHalfData, IMatrixWithOptionScaleData, IMatrixWithScaleData, IMiniapp, IMiniappSelect, IMiniappSizeView, IMotionPathData, IMoveConfig, IMoveEvent, IMultiTouchConfig, IMultiTouchData, INumber, INumberFunction, INumberMap, IObject, IObjectFunction, IOffsetBoundsData, IOptionSizeData, IPartLayoutConfig, IPath2D, IPathCommandData, IPathCommandObject, IPathCreator, IPathDrawer, IPathString, IPercentData, IPickBottom, IPickOptions, IPickResult, IPicker, IPlatform, IPlugin, IPoint, IPointData, IPointDataFunction, IPointDataMap, IPointGap, IPointerConfig, IPointerEvent, IProgressData, IProgressFunction, IPropertyEvent, IRadiusPointData, IRangeSize, IRenderEvent, IRenderOptions, IRenderer, IRendererConfig, IResizeEvent, IResizeEventListener, IResource, IRotateEvent, IRotationPointData, IScaleData, IScaleFixed, IScaleRotationData, IScreenSizeData, IScrollPointData, ISelector, ISelectorConfig, ISelectorProxy, IShortcutKeyCodes, IShortcutKeys, IShortcutKeysCheck, ISide, ISize, ISizeData, ISkewData, ISkiaCanvas, ISkiaCanvasExportConfig, ISkiaNAPICanvas, IStateStyleType, IStepsEasing, IString, IStringFunction, IStringMap, ISwipeEvent, ITaskItem, ITaskOptions, ITaskProcessor, ITaskProcessorConfig, ITextMetrics, ITimer, ITouchConfig, ITransformer, ITransition, ITwoPointBoundsData, IUICreator, IUIEvent, IUnitData, IUnitPointData, IUpdateEvent, IValue, IValueFunction, IWatchEvent, IWatchEventData, IWatcher, IWatcherConfig, IWheelConfig, IWheelEvent, IWindingRule, IWindingRuleData, IZoomConfig, IZoomEvent, IZoomOptions, IZoomType, IZoomView, InnerId, LCommandData, LineToCommandObject, MCommandData, MoveToCommandObject, PointerType, QCommandData, QuadraticCurveToCommandObject, RectCommandData, RoundRectCommandData, SCommandData, TCommandData, VCommandData, ZCommandData };