@leafer-ui/interface 1.0.0-rc.1 → 1.0.0-rc.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/interface",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.11",
   "description": "@leafer-ui/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,6 +22,6 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/interface": "1.0.0-rc.1"
+    "@leafer/interface": "1.0.0-rc.11"
   }
 }

package/src/ICommonAttr.ts

@@ -1,15 +1,17 @@
-import { IPaint, IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, IUnitData } from './type/IType'
+import { INumber, IBoolean, IString } from '@leafer/interface'
+import { IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, IUnitData, ITextWrap, IStroke, IFill, IArrowType } from './type/IType'
 import { ILeafStrokePaint, ILeafShadowEffect, ILeafPaint } from './type/IComputedType'
-import { IPaintString, IDashPatternString, IShadowString, IColorString, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
+import { IDashPatternString, IShadowString, IColorString, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
+
 
 // corner---
 export interface ICornerRadiusAttrData {
-    cornerRadius: number | number[] | ICornerRadiusString
-    cornerSmoothing: number
+    cornerRadius: INumber | INumber[] | ICornerRadiusString
+    cornerSmoothing: INumber
 }
 export interface ICornerRadiusInputData {
-    cornerRadius?: number | number[] | ICornerRadiusString
-    cornerSmoothing?: number
+    cornerRadius?: INumber | INumber[] | ICornerRadiusString
+    cornerSmoothing?: INumber
 }
 export interface ICornerRadiusComputedData {
     cornerRadius?: number
@@ -18,10 +20,10 @@ export interface ICornerRadiusComputedData {
 
 // fill---
 export interface IFillAttrData {
-    fill: IPaint | IPaint[] | IPaintString
+    fill: IFill
 }
 export interface IFillInputData {
-    fill?: IPaint | IPaint[] | IPaintString
+    fill?: IFill
 }
 export interface IFillComputedData {
     fill?: IColorString | ILeafPaint[]
@@ -35,26 +37,34 @@ export interface IBorderComputedData {
 
 // stroke---
 export interface IStrokeAttrData {
-    stroke: IPaint | IPaint[] | IPaintString
+    stroke: IStroke
 
     strokeAlign: IStrokeAlign
-    strokeWidth: number | number[] | IStrokeWidthString
+    strokeWidth: INumber | INumber[] | IStrokeWidthString
+    strokeWidthFixed: IBoolean
     strokeCap: IStrokeCap
     strokeJoin: IStrokeJoin
-    dashPattern: number[] | IDashPatternString
-    dashOffset: number
-    miterLimit: number
+    dashPattern: INumber[] | IDashPatternString
+    dashOffset: INumber
+    miterLimit: INumber
+
+    startArrow: IArrowType
+    endArrow: IArrowType
 }
 export interface IStrokeInputData {
-    stroke?: IPaint | IPaint[] | IPaintString
+    stroke?: IStroke
 
     strokeAlign?: IStrokeAlign
-    strokeWidth?: number | number[] | IStrokeWidthString
+    strokeWidth?: INumber | INumber[] | IStrokeWidthString
+    strokeWidthFixed?: IBoolean
     strokeCap?: IStrokeCap
     strokeJoin?: IStrokeJoin
-    dashPattern?: number[] | IDashPatternString
-    dashOffset?: number
-    miterLimit?: number
+    dashPattern?: INumber[] | IDashPatternString
+    dashOffset?: INumber
+    miterLimit?: INumber
+
+    startArrow?: IArrowType
+    endArrow?: IArrowType
 }
 export interface IStrokeComputedData {
     stroke?: IColorString | ILeafStrokePaint[]
@@ -62,6 +72,7 @@ export interface IStrokeComputedData {
     strokeAlign?: IStrokeAlign
     strokeWidth?: number
     strokeWidths?: number[]
+    strokeWidthFixed?: boolean
     strokeCap?: IStrokeCap
     strokeJoin?: IStrokeJoin
     dashPattern?: number[]
@@ -71,39 +82,41 @@ export interface IStrokeComputedData {
 
 // text---
 export interface ITextStyleAttrData {
-    fontFamily: string
-    fontSize: number
+    fontFamily: IString
+    fontSize: INumber
     fontWeight: IFontWeight
-    italic: boolean
+    italic: IBoolean
     textCase: ITextCase
     textDecoration: ITextDecoration
-    letterSpacing: number | IUnitData
-    lineHeight: number | IUnitData
+    letterSpacing: INumber | IUnitData
+    lineHeight: INumber | IUnitData
 
-    paraIndent: number
-    paraSpacing: number
+    paraIndent: INumber
+    paraSpacing: INumber
 
     textAlign: ITextAlign
     verticalAlign: IVerticalAlign
 
+    textWrap: ITextWrap
     textOverflow: IOverflow | string
 }
 export interface ITextStyleInputData {
-    fontFamily?: string
-    fontSize?: number
+    fontFamily?: IString
+    fontSize?: INumber
     fontWeight?: IFontWeight
-    italic?: boolean
+    italic?: IBoolean
     textCase?: ITextCase
     textDecoration?: ITextDecoration
-    letterSpacing?: number | IUnitData
-    lineHeight?: number | IUnitData
+    letterSpacing?: INumber | IUnitData
+    lineHeight?: INumber | IUnitData
 
-    paraIndent?: number
-    paraSpacing?: number
+    paraIndent?: INumber
+    paraSpacing?: INumber
 
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
 
+    textWrap?: ITextWrap
     textOverflow?: IOverflow | string
 }
 export interface ITextStyleComputedData {
@@ -121,23 +134,25 @@ export interface ITextStyleComputedData {
 
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
-    textOverflow?: IOverflow
+
+    textWrap?: ITextWrap
+    textOverflow?: IOverflow | string
 }
 
 // effect---
 export interface IEffectAttrData {
     shadow: IShadowEffect | IShadowEffect[] | IShadowString
     innerShadow: IShadowEffect | IShadowEffect[] | IShadowString
-    blur: number | IBlurEffect
-    backgroundBlur: number | IBlurEffect
-    grayscale: number | IGrayscaleEffect
+    blur: INumber | IBlurEffect
+    backgroundBlur: INumber | IBlurEffect
+    grayscale: INumber | IGrayscaleEffect
 }
 export interface IEffectInputData {
     shadow?: IShadowEffect | IShadowEffect[] | IShadowString
     innerShadow?: IShadowEffect | IShadowEffect[] | IShadowString
-    blur?: number | IBlurEffect
-    backgroundBlur?: number | IBlurEffect
-    grayscale?: number | IGrayscaleEffect
+    blur?: INumber | IBlurEffect
+    backgroundBlur?: INumber | IBlurEffect
+    grayscale?: INumber | IGrayscaleEffect
 }
 export interface IEffectComputedData {
     shadow?: ILeafShadowEffect[]

package/src/IUI.ts

@@ -1,4 +1,4 @@
-import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IPathDrawer, IPointData, IPath2D, IPathCommandData, IWindingRule, ILeaferImageConfig, IBoundsData, IObject, __Number, IPathString, ILeaferImage, IBlob, IPathCreator } from '@leafer/interface'
+import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPathDrawer, IPointData, IPath2D, IPathCommandData, IWindingRule, ILeaferImageConfig, IBoundsData, IObject, IPathString, ILeaferImage, IPathCreator, IAnswer, IPickOptions, IPickResult } from '@leafer/interface'
 
 import {
     IFillAttrData, IFillInputData, IFillComputedData,
@@ -9,8 +9,7 @@ import {
     ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData
 } from './ICommonAttr'
 import { IOverflow } from './type/IType'
-import { IExportOptions } from './module/IExport'
-
+import { ILeafer } from './app/ILeafer'
 
 // Line
 export interface ILine extends IUI {
@@ -19,12 +18,26 @@ export interface ILine extends IUI {
     points: number[]
     curve: boolean | number
 }
-export interface ILineData extends IUIData { }
-export interface ILineInputData extends IUIBaseInputData {
+
+interface ILineAttrData {
     toPoint?: IPointData
     points?: number[]
     curve?: boolean | number
 }
+export interface ILineData extends ILineAttrData, IUIData { }
+export interface ILineInputData extends ILineAttrData, IUIBaseInputData { }
+
+
+// Arrow
+export interface IArrow extends ILine {
+    __: IArrowData
+}
+
+interface IArrowAttrData {
+
+}
+export interface IArrowData extends IArrowAttrData, ILineData { }
+export interface IArrowInputData extends IArrowAttrData, IUIBaseInputData { }
 
 
 // Rect
@@ -124,6 +137,9 @@ export interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIDat
     __baseLine?: number
     __lineHeight?: number
     __letterSpacing?: number
+    __padding?: number[]
+    __clipText?: boolean
+    __textBoxBounds?: IBoundsData
 }
 export interface ITextInputData extends ITextAttrData, ITextStyleInputData, IUIBaseInputData {
 
@@ -138,9 +154,13 @@ export interface ITextRowData {
     data?: ITextCharData[]
     words?: ITextWordData[]
 
+    startCharSize?: number
+    endCharSize?: number
+
     paraStart?: boolean // paragraph start
     paraEnd?: boolean // paragraph end
     isOverflow?: boolean
+    textMode?: boolean
 }
 
 export interface ITextWordData {
@@ -179,7 +199,9 @@ export interface IImage extends IRect, ILeaferImageConfig {
 interface IImageAttrData {
     url?: string
 }
-export interface IImageData extends IImageAttrData, IRectData { }
+export interface IImageData extends IImageAttrData, IRectData {
+    __setImageFill(value: string): void
+}
 export interface IImageInputData extends IImageAttrData, IUIBaseInputData { }
 
 export interface ICanvas extends IRect {
@@ -206,6 +228,12 @@ export interface ILeaferInputData extends IGroupInputData {
     pixelRatio?: number
 }
 
+export interface IAppData extends ILeaferData {
+
+}
+export interface IAppInputData extends ILeaferInputData {
+
+}
 
 // Frame
 export interface IFrame extends IBox {
@@ -238,13 +266,15 @@ export interface IBoxInputData extends IGroupInputData {
 export interface IGroup extends IUI {
     __: IGroupData
     children: IUI[]
-    mask?: IUI
+    pick(hitPoint: IPointData, options?: IPickOptions): IPickResult
     add(child: IUI, index?: number): void
     addAt(child: IUI, index: number): void
     addAfter(child: IUI, after: IUI): void
     addBefore(child: IUI, before: IUI): void
+    addMany(...children: ILeaf[]): void
     remove(child?: IUI): void
     removeAll(): void
+    clear(): void
 }
 export interface IGroupData extends IUIData { }
 export interface IGroupInputData extends IUIBaseInputData { }
@@ -252,20 +282,41 @@ export interface IGroupInputData extends IUIBaseInputData { }
 // UI
 export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEffectAttrData, ILeaf {
     __: IUIData
+
+    readonly app: ILeafer
+    leafer?: ILeafer
     parent?: IGroup
+    isFrame?: boolean
+
+    proxyData: IUIInputData
+    __proxyData?: IUIInputData
+
+    children?: IUI[]
+
+    reset(data?: IUIInputData): void
 
     set(data: IUIInputData): void
     toJSON(): IUIInputData
 
-    getPath(curve?: boolean): IPathCommandData
-    getPathString(curve?: boolean): IPathString
+    get(): IUIInputData
+    createProxyData(): IUIInputData
+
+    find(condition: number | string | IFindUIMethod, options?: any): IUI[]
+    findOne(condition: number | string | IFindUIMethod, options?: any): IUI
+
+    getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData
+    getPathString(curve?: boolean, pathForRender?: boolean): IPathString
 
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void
+    __drawPathByBox(drawer: IPathDrawer): void
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
-    export(filename: string, options?: IExportOptions | number): Promise<IBlob | string | boolean>
+    export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>
     clone(): IUI
+}
 
+export interface IFindUIMethod {
+    (leaf: IUI, options?: any): IAnswer
 }
 
 export interface IUIData extends IUIComputedData, ILeafData {
@@ -276,15 +327,25 @@ export interface IUIData extends IUIComputedData, ILeafData {
     // 非数据属性, 自动计算的缓存数据
     __isFills?: boolean
     __isStrokes?: boolean
+
+    readonly __strokeWidth: number
+
+    __pixelFill?: boolean // png / svg / webp
+    __pixelStroke?: boolean
+
+    __opacityFill?: boolean  // 半透明的
+    __opacityStroke?: boolean
+
     __drawAfterFill?: boolean
     __isOverflow?: boolean
     __blendLayer?: boolean
 
-    __isTranslucentFill?: boolean  // 半透明的
-    __isTranslucentStroke?: boolean
-
     __useEffect?: boolean
 
+    __autoWidth: boolean
+    __autoHeight: boolean
+    __autoBounds: boolean
+
     // path
     path?: IPathCommandData
     windingRule?: IWindingRule
@@ -298,6 +359,9 @@ export interface IUIData extends IUIComputedData, ILeafData {
     __font?: string
     __textDrawData?: ITextDrawData
 
+    __needComputePaint: boolean
+    __computePaint(): void
+
 }
 export interface IUIComputedData extends IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {
     padding?: number | number[]
@@ -308,7 +372,7 @@ export interface IUIComputedData extends IFillComputedData, IBorderComputedData,
 export interface IUIBaseInputData extends IFillInputData, IStrokeInputData, ITextStyleInputData, ICornerRadiusInputData, IEffectInputData, ILeafInputData {
     padding?: number | number[]
     locked?: boolean
-    children?: IUIBaseInputData[]
+    children?: IUIInputData[]
 }
 
 
@@ -331,5 +395,5 @@ export type IUITag =
 
 
 export interface IUIInputData extends IRectInputData, IEllipseInputData, IPolygonInputData, IStarInputData, ILineInputData, IPathInputData, ITextInputData, IImageInputData, IGroupInputData, IFrameInputData, IUIBaseInputData, IObject {
-
+    children?: IUIInputData[]
 }

package/src/app/IApp.ts

@@ -0,0 +1,16 @@
+import { ILeaferConfig } from '@leafer/interface'
+
+import { ILeafer } from './ILeafer'
+import { IEditorConfig } from '../editor/IEditor'
+
+export interface IApp extends ILeafer {
+    children: ILeafer[]
+    realCanvas: boolean
+}
+
+export interface IAppConfig extends ILeaferConfig {
+    ground?: ILeaferConfig
+    tree?: ILeaferConfig
+    sky?: ILeaferConfig
+    editor?: IEditorConfig
+}

package/src/app/ILeafer.ts

@@ -0,0 +1,21 @@
+import { IControl, ILeaferAttrData, ILeaferConfig, ILeaferType } from '@leafer/interface'
+import { IApp } from './IApp'
+import { IGroup } from '../IUI'
+import { IEditorBase } from '../editor/IEditor'
+
+export interface ILeafer extends IGroup, ILeaferAttrData, IControl {
+    readonly isApp: boolean
+    readonly app: ILeafer
+    parent?: IApp
+    zoomLayer: IGroup
+    editor: IEditorBase
+
+    ground?: ILeafer
+    tree?: ILeafer
+    sky?: ILeafer
+
+    userConfig?: ILeaferConfig
+
+    onInit(): void
+    initType(type: ILeaferType): void
+}

package/src/editor/IEditor.ts

@@ -0,0 +1,88 @@
+import { IGroup, IUI, IRectInputData, ISelectorProxy, IEditSize, ICursorType, IAround, IDragEvent, IRotateEvent, IStroke, IFill, ILeaf, IObject, IBoxInputData, IGroupInputData, IImageCursor } from '@leafer-ui/interface'
+
+export interface IEditorBase extends IGroup, ISelectorProxy {
+    config: IEditorConfig
+
+    hoverTarget: IUI
+    target: IUI | IUI[]
+
+    readonly list: IUI[]
+
+    readonly hasTarget: boolean
+    readonly multiple: boolean
+    readonly single: boolean
+
+    readonly dragging: boolean
+
+    element: IUI
+    buttons: IGroup
+
+    selector: IGroup
+    editBox: IGroup
+    editTool: IObject
+
+    hasItem(item: IUI): boolean
+    shiftItem(item: IUI): void
+    addItem(item: IUI): void
+    removeItem(item: IUI): void
+
+    update(): void
+    updateEditTool(): void
+
+    getEditSize(ui: ILeaf): IEditSize
+
+    onMove(e: IDragEvent): void
+    onScale(e: IDragEvent): void
+    onRotate(e: IDragEvent | IRotateEvent): void
+    onSkew(e: IDragEvent): void
+
+    group(group?: IGroup | IGroupInputData): IGroup
+    ungroup(): IUI[]
+
+    lock(): void
+    unlock(): void
+
+    toTop(): void
+    toBottom(): void
+}
+
+export interface IEditorConfig {
+    editSize?: 'auto' | IEditSize
+
+    stroke?: IStroke
+    strokeWidth?: number
+
+    pointFill?: IFill
+    pointSize?: number
+    pointRadius?: number
+
+    point?: IBoxInputData | IBoxInputData[]
+    middlePoint?: IBoxInputData | IBoxInputData[]
+    rotatePoint?: IBoxInputData
+
+    rect?: IBoxInputData
+    area?: IRectInputData
+
+    buttonsDirection?: 'top' | 'right' | 'bottom' | 'left'
+    buttonsFixed?: boolean
+    buttonsMargin?: number
+
+    hideOnMove?: boolean
+
+    moveCursor?: ICursorType
+    resizeCursor?: IImageCursor
+    rotateCursor?: IImageCursor
+    skewCursor?: IImageCursor
+
+    around?: IAround
+    lockRatio?: boolean
+    rotateGap?: number
+
+    selector?: boolean
+    hover?: boolean
+    boxSelect?: boolean
+
+    rotateable?: boolean
+    resizeable?: boolean
+    skewable?: boolean
+}

package/src/index.ts

@@ -1,7 +1,11 @@
 export * from '@leafer/interface'
 
+export { IApp, IAppConfig } from './app/IApp'
+export { ILeafer } from './app/ILeafer'
+
 export {
     ILine, ILineInputData, ILineData,
+    IArrow, IArrowInputData, IArrowData,
     IRect, IRectInputData, IRectData,
     IEllipse, IEllipseInputData, IEllipseData,
     IPolygon, IPolygonInputData, IPolygonData,
@@ -15,11 +19,13 @@ export {
     IBox, IBoxInputData, IBoxData,
     IGroup, IGroupInputData, IGroupData,
     ILeaferInputData, ILeaferData,
-    IUI, IUIBaseInputData, IUIData,
+    IAppInputData, IAppData,
+    IUI, IUIBaseInputData, IUIData, IFindUIMethod,
     IUITag, IUIInputData
 } from './IUI'
-export { IUnitData, IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, IOverflow } from './type/IType'
-export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IColorString as IStringColor } from './type/IStringType'
+
+export { IUnitData, IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IFill, IStroke, IPaintAttr, IStrokeAlign, IStrokeJoin, IStrokeCap, IArrowType, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IRepeat } from './type/IType'
+export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IColorString } from './type/IStringType'
 export { ILeafFill, ILeafPaint, ILeafPaintPatternData, ILeafPaintColor, ILeafStrokePaint, ILeafShadowEffect } from './type/IComputedType'
 
 export { IUIRenderModule, IRectRenderModule, IImageRenderModule, ITextRenderModule, IGroupRenderModule, IFrameRenderModule } from './module/IUIRender'
@@ -27,9 +33,10 @@ export { IUIBoundsModule } from './module/IUIBounds'
 export { IUIHitModule } from './module/IUIHit'
 export { ITextConvertModule } from './module/ITextConvert'
 export { IColorConvertModule } from './module/IColorConvert'
-export { IExportModule, IExportOptions, IExportResult, IExportResultFunction } from './module/IExport'
+export { IExportModule } from './module/IExport'
 
-
-export { IPaintModule } from './module/IPaint'
+export { IPaintModule, IPaintImageModule, IPaintGradientModule } from './module/IPaint'
 export { IEffectModule } from './module/IEffect'
-export { ICachedShape } from './ICachedShape'
+export { ICachedShape } from './ICachedShape'
+
+export { IEditorBase, IEditorConfig } from './editor/IEditor'

package/src/module/IColorConvert.ts

@@ -1,5 +1,5 @@
 import { IColor } from '../type/IType'
 
 export interface IColorConvertModule {
-    string?(color: IColor, opacity?: number): string
+    string(color: IColor, opacity?: number): string
 }

package/src/module/IEffect.ts

@@ -1,12 +1,12 @@
-import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
+import { ILeaferCanvas } from '@leafer/interface'
 
 import { IUI } from '../IUI'
 import { ICachedShape } from '../ICachedShape'
 
 
 export interface IEffectModule {
-    shadow?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, options: IRenderOptions): void
-    innerShadow?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, options: IRenderOptions): void
-    blur?(ui: IUI, current: ILeaferCanvas, origin: ILeaferCanvas, options: IRenderOptions): void
-    backgroundBlur?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, options: IRenderOptions): void
+    shadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void
+    innerShadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void
+    blur(ui: IUI, current: ILeaferCanvas, origin: ILeaferCanvas): void
+    backgroundBlur(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void
 }

package/src/module/IExport.ts

@@ -1,19 +1,7 @@
-import { ILeaf, IExportFileType, IBlob } from '@leafer/interface'
-
-export interface IExportOptions {
-    quality?: number
-    blob?: boolean
-}
-
-export interface IExportResult {
-    data: IBlob | string | boolean
-}
-
-export interface IExportResultFunction {
-    (data: IExportResult): void
-}
+import { ILeaf, IExportFileType, IExportOptions, IExportResult } from '@leafer/interface'
 
 
 export interface IExportModule {
-    export?(leaf: ILeaf, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>
+    running?: boolean
+    export(leaf: ILeaf, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>
 }

package/src/module/IPaint.ts

@@ -1,26 +1,42 @@
-import { ILeaferCanvas, IRenderOptions, IBooleanMap } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage } from '@leafer/interface'
 
-import { ILeafPaint } from '../type/IComputedType'
+import { ILeafPaint, ILeafPaintPatternData } from '../type/IComputedType'
 import { IUI, IUIData } from '../IUI'
 import { ICachedShape } from '../ICachedShape'
+import { IGradientPaint, IImagePaint, IImagePaintMode, IPaintAttr } from '../type/IType'
 
 export interface IPaintModule {
-    compute?(ui: IUI, attrName: 'fill' | 'stroke'): void
+    compute(attrName: IPaintAttr, ui: IUI): void
 
-    fill?(ui: IUI, canvas: ILeaferCanvas, fill: string): void
-    fills?(ui: IUI, canvas: ILeaferCanvas, fills: ILeafPaint[]): void
+    fill(fill: string, ui: IUI, canvas: ILeaferCanvas,): void
+    fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
 
-    fillText?(ui: IUI, canvas: ILeaferCanvas): void
+    fillText(ui: IUI, canvas: ILeaferCanvas): void
 
-    stroke?(ui: IUI, canvas: ILeaferCanvas, stroke: string): void
-    strokes?(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void
+    stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas): void
+    strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
 
-    strokeText?(ui: IUI, canvas: ILeaferCanvas, stroke: string): void
-    strokesText?(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void
+    strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
+    drawTextStroke(ui: IUI, canvas: ILeaferCanvas): void
+
+    shape(ui: IUI, current: ILeaferCanvas, renderOptions: IRenderOptions): ICachedShape
+}
 
-    drawTextStroke?(ui: IUI, canvas: ILeaferCanvas): void
 
-    shape?(ui: IUI, current: ILeaferCanvas, options: IRenderOptions): ICachedShape
+export interface IPaintImageModule {
+    image(ui: IUI, attrName: string, paint: IImagePaint, boxBounds: IBoundsData, firstUse: boolean): ILeafPaint
+    checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean
+    createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): boolean
+    recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap
 
-    recycleImage?(data: IUIData, attrName: string): IBooleanMap
+    createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void
+    fillOrFitMode(data: ILeafPaintPatternData, mode: IImagePaintMode, box: IBoundsData, width: number, height: number, rotation: number): void
+    clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void
+    repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void
 }
+
+export interface IPaintGradientModule {
+    linearGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint
+    radialGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint
+    conicGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint
+}

package/src/module/ITextConvert.ts

@@ -1,5 +1,5 @@
 import { ITextData, ITextDrawData } from '../IUI'
 
 export interface ITextConvertModule {
-    getDrawData?(content: string, style: ITextData): ITextDrawData
+    getDrawData(content: string, style: ITextData): ITextDrawData
 }

package/src/type/IComputedType.ts

@@ -1,4 +1,4 @@
-import { IBlendMode, ILeaferImage, IMatrixData } from '@leafer/interface'
+import { IBlendMode, ILeaferImage, IMatrixData, ITaskItem } from '@leafer/interface'
 
 import { IColorString } from './IStringType'
 import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode } from './IType'
@@ -15,6 +15,7 @@ export interface ILeafPaint {
     image?: ILeaferImage
     loadId?: number
     patternId?: string
+    patternTask?: ITaskItem
     data?: ILeafPaintPatternData
 }
 
@@ -26,6 +27,7 @@ export interface ILeafPaintPatternData {
     opacity?: number
     transform?: IMatrixData
     mode?: IImagePaintMode
+    repeat?: 'repeat' | 'repeat-x' | 'repeat-y'
 }
 
 export type ILeafFill = ILeafPaint

package/src/type/IType.ts

@@ -1,5 +1,5 @@
-import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType } from '@leafer/interface'
-import { IColorString } from './IStringType'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, ISizeData } from '@leafer/interface'
+import { IColorString, IPaintString } from './IStringType'
 
 export interface IUnitData {
     type: 'percent' | 'px'
@@ -8,6 +8,12 @@ export interface IUnitData {
 
 export type IPaint = ISolidPaint | IGradientPaint | IImagePaint
 
+export type IFill = IPaint | IPaint[] | IPaintString
+
+export type IStroke = IPaint | IPaint[] | IPaintString
+
+export type IPaintAttr = 'fill' | 'stroke'
+
 export interface IPaintBase {
     type: IPaintType
     blendMode?: IBlendMode
@@ -66,8 +72,11 @@ export interface IImagePaint extends IPaintBase {
     filters?: IImageFilters
 
     offset?: IPointData
+    size?: number | ISizeData
     scale?: number | IPointData
     rotation?: number
+
+    repeat?: IRepeat
 }
 export interface IImageFilters {
     exposure?: number // 曝光
@@ -79,12 +88,16 @@ export interface IImageFilters {
     shadows?: number // 阴影
 }
 export type IImagePaintMode = 'cover' | 'fit' | 'strench' | 'clip' | 'repeat'
+export type IRepeat = boolean | 'x' | 'y'
 
 // 描边
 export type IStrokeAlign = 'inside' | 'outside' | 'center'
 export type IStrokeCap = 'none' | 'round' | 'square' | 'arrow-lines' | 'arrow-equilateral'
 export type IStrokeJoin = 'bevel' | 'round' | 'miter'
 
+// 箭头
+export type IArrowType = 'none' | 'line' | 'triangle' | 'circle'
+
 // 文本
 export type ITextAlign = 'left' | 'center' | 'right' | 'justify'
 export type IVerticalAlign = 'top' | 'middle' | 'bottom'
@@ -102,6 +115,7 @@ export type IFontWeightString =
     | 'extra-bold'
     | 'black'
 export type ITextDecoration = 'none' | 'under' | 'delete'
+export type ITextWrap = 'normal' | 'none' | 'break'
 
 // 路径
 export interface IVectorPath {

package/types/index.d.ts

@@ -1,5 +1,6 @@
-import { IPointData, IExportFileType, IWindingRule, IPathCommandData, IBlendMode, IMatrixData, ILeaferImage, IBlob, ILeaf, IPathString, IPathCreator, IBoundsData, ILeaferImageConfig, ILeaferCanvas, IRenderOptions, IPathDrawer, ILeafData, IPath2D, ILeafComputedData, ILeafInputData, IObject, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap } from '@leafer/interface';
+import { IPointData, IExportFileType, ISizeData, IWindingRule, IPathCommandData, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, INumber, IBoolean, IString, IPathString, IPathCreator, IBoundsData, ILeaferImageConfig, ILeaferCanvas, IRenderOptions, IPickOptions, IPickResult, ILeaf, IPathDrawer, IExportOptions, IExportResult, IAnswer, ILeafData, IPath2D, ILeafComputedData, ILeafInputData, IObject, ILeaferAttrData, IControl, ILeaferConfig, ILeaferType, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap } from '@leafer/interface';
 export * from '@leafer/interface';
+import { IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, IObject as IObject$1, ILeaf as ILeaf$1, IEditSize, IDragEvent, IRotateEvent, IGroupInputData as IGroupInputData$1, IStroke as IStroke$1, IFill as IFill$1, IBoxInputData as IBoxInputData$1, IRectInputData as IRectInputData$1, ICursorType, IImageCursor, IAround } from '@leafer-ui/interface';
 
 type IPercent = string;
 type IColorString = string;
@@ -17,6 +18,9 @@ interface IUnitData {
     value: number;
 }
 type IPaint = ISolidPaint | IGradientPaint | IImagePaint;
+type IFill = IPaint | IPaint[] | IPaintString;
+type IStroke = IPaint | IPaint[] | IPaintString;
+type IPaintAttr = 'fill' | 'stroke';
 interface IPaintBase {
     type: IPaintType;
     blendMode?: IBlendMode;
@@ -57,8 +61,10 @@ interface IImagePaint extends IPaintBase {
     format?: IExportFileType;
     filters?: IImageFilters;
     offset?: IPointData;
+    size?: number | ISizeData;
     scale?: number | IPointData;
     rotation?: number;
+    repeat?: IRepeat;
 }
 interface IImageFilters {
     exposure?: number;
@@ -70,9 +76,11 @@ interface IImageFilters {
     shadows?: number;
 }
 type IImagePaintMode = 'cover' | 'fit' | 'strench' | 'clip' | 'repeat';
+type IRepeat = boolean | 'x' | 'y';
 type IStrokeAlign = 'inside' | 'outside' | 'center';
 type IStrokeCap = 'none' | 'round' | 'square' | 'arrow-lines' | 'arrow-equilateral';
 type IStrokeJoin = 'bevel' | 'round' | 'miter';
+type IArrowType = 'none' | 'line' | 'triangle' | 'circle';
 type ITextAlign = 'left' | 'center' | 'right' | 'justify';
 type IVerticalAlign = 'top' | 'middle' | 'bottom';
 type ITextCase = 'upper' | 'lower' | 'title' | 'none' | 'small-caps';
@@ -80,6 +88,7 @@ type IFontWeight = IFontWeightNumer | IFontWeightString;
 type IFontWeightNumer = 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;
 type IFontWeightString = 'thin' | 'extra-light' | 'light' | 'normal' | 'medium' | 'semi-bold' | 'bold' | 'extra-bold' | 'black';
 type ITextDecoration = 'none' | 'under' | 'delete';
+type ITextWrap = 'normal' | 'none' | 'break';
 interface IVectorPath {
     rule?: IWindingRule;
     data: string | IPathCommandData;
@@ -114,6 +123,7 @@ interface ILeafPaint {
     image?: ILeaferImage;
     loadId?: number;
     patternId?: string;
+    patternTask?: ITaskItem;
     data?: ILeafPaintPatternData;
 }
 interface ILeafPaintPatternData {
@@ -124,6 +134,7 @@ interface ILeafPaintPatternData {
     opacity?: number;
     transform?: IMatrixData;
     mode?: IImagePaintMode;
+    repeat?: 'repeat' | 'repeat-x' | 'repeat-y';
 }
 type ILeafFill = ILeafPaint;
 interface ILeafStrokePaint extends ILeafPaint {
@@ -145,22 +156,22 @@ interface ILeafShadowEffect {
 }
 
 interface ICornerRadiusAttrData {
-    cornerRadius: number | number[] | ICornerRadiusString;
-    cornerSmoothing: number;
+    cornerRadius: INumber | INumber[] | ICornerRadiusString;
+    cornerSmoothing: INumber;
 }
 interface ICornerRadiusInputData {
-    cornerRadius?: number | number[] | ICornerRadiusString;
-    cornerSmoothing?: number;
+    cornerRadius?: INumber | INumber[] | ICornerRadiusString;
+    cornerSmoothing?: INumber;
 }
 interface ICornerRadiusComputedData {
     cornerRadius?: number;
     cornerSmoothing?: number;
 }
 interface IFillAttrData {
-    fill: IPaint | IPaint[] | IPaintString;
+    fill: IFill;
 }
 interface IFillInputData {
-    fill?: IPaint | IPaint[] | IPaintString;
+    fill?: IFill;
 }
 interface IFillComputedData {
     fill?: IColorString | ILeafPaint[];
@@ -170,30 +181,37 @@ interface IBorderComputedData {
     borderRadius?: number | number[];
 }
 interface IStrokeAttrData {
-    stroke: IPaint | IPaint[] | IPaintString;
+    stroke: IStroke;
     strokeAlign: IStrokeAlign;
-    strokeWidth: number | number[] | IStrokeWidthString;
+    strokeWidth: INumber | INumber[] | IStrokeWidthString;
+    strokeWidthFixed: IBoolean;
     strokeCap: IStrokeCap;
     strokeJoin: IStrokeJoin;
-    dashPattern: number[] | IDashPatternString;
-    dashOffset: number;
-    miterLimit: number;
+    dashPattern: INumber[] | IDashPatternString;
+    dashOffset: INumber;
+    miterLimit: INumber;
+    startArrow: IArrowType;
+    endArrow: IArrowType;
 }
 interface IStrokeInputData {
-    stroke?: IPaint | IPaint[] | IPaintString;
+    stroke?: IStroke;
     strokeAlign?: IStrokeAlign;
-    strokeWidth?: number | number[] | IStrokeWidthString;
+    strokeWidth?: INumber | INumber[] | IStrokeWidthString;
+    strokeWidthFixed?: IBoolean;
     strokeCap?: IStrokeCap;
     strokeJoin?: IStrokeJoin;
-    dashPattern?: number[] | IDashPatternString;
-    dashOffset?: number;
-    miterLimit?: number;
+    dashPattern?: INumber[] | IDashPatternString;
+    dashOffset?: INumber;
+    miterLimit?: INumber;
+    startArrow?: IArrowType;
+    endArrow?: IArrowType;
 }
 interface IStrokeComputedData {
     stroke?: IColorString | ILeafStrokePaint[];
     strokeAlign?: IStrokeAlign;
     strokeWidth?: number;
     strokeWidths?: number[];
+    strokeWidthFixed?: boolean;
     strokeCap?: IStrokeCap;
     strokeJoin?: IStrokeJoin;
     dashPattern?: number[];
@@ -201,33 +219,35 @@ interface IStrokeComputedData {
     miterLimit?: number;
 }
 interface ITextStyleAttrData {
-    fontFamily: string;
-    fontSize: number;
+    fontFamily: IString;
+    fontSize: INumber;
     fontWeight: IFontWeight;
-    italic: boolean;
+    italic: IBoolean;
     textCase: ITextCase;
     textDecoration: ITextDecoration;
-    letterSpacing: number | IUnitData;
-    lineHeight: number | IUnitData;
-    paraIndent: number;
-    paraSpacing: number;
+    letterSpacing: INumber | IUnitData;
+    lineHeight: INumber | IUnitData;
+    paraIndent: INumber;
+    paraSpacing: INumber;
     textAlign: ITextAlign;
     verticalAlign: IVerticalAlign;
+    textWrap: ITextWrap;
     textOverflow: IOverflow | string;
 }
 interface ITextStyleInputData {
-    fontFamily?: string;
-    fontSize?: number;
+    fontFamily?: IString;
+    fontSize?: INumber;
     fontWeight?: IFontWeight;
-    italic?: boolean;
+    italic?: IBoolean;
     textCase?: ITextCase;
     textDecoration?: ITextDecoration;
-    letterSpacing?: number | IUnitData;
-    lineHeight?: number | IUnitData;
-    paraIndent?: number;
-    paraSpacing?: number;
+    letterSpacing?: INumber | IUnitData;
+    lineHeight?: INumber | IUnitData;
+    paraIndent?: INumber;
+    paraSpacing?: INumber;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
+    textWrap?: ITextWrap;
     textOverflow?: IOverflow | string;
 }
 interface ITextStyleComputedData {
@@ -243,21 +263,22 @@ interface ITextStyleComputedData {
     paraSpacing?: number;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
-    textOverflow?: IOverflow;
+    textWrap?: ITextWrap;
+    textOverflow?: IOverflow | string;
 }
 interface IEffectAttrData {
     shadow: IShadowEffect | IShadowEffect[] | IShadowString;
     innerShadow: IShadowEffect | IShadowEffect[] | IShadowString;
-    blur: number | IBlurEffect;
-    backgroundBlur: number | IBlurEffect;
-    grayscale: number | IGrayscaleEffect;
+    blur: INumber | IBlurEffect;
+    backgroundBlur: INumber | IBlurEffect;
+    grayscale: INumber | IGrayscaleEffect;
 }
 interface IEffectInputData {
     shadow?: IShadowEffect | IShadowEffect[] | IShadowString;
     innerShadow?: IShadowEffect | IShadowEffect[] | IShadowString;
-    blur?: number | IBlurEffect;
-    backgroundBlur?: number | IBlurEffect;
-    grayscale?: number | IGrayscaleEffect;
+    blur?: INumber | IBlurEffect;
+    backgroundBlur?: INumber | IBlurEffect;
+    grayscale?: INumber | IGrayscaleEffect;
 }
 interface IEffectComputedData {
     shadow?: ILeafShadowEffect[];
@@ -267,33 +288,30 @@ interface IEffectComputedData {
     grayscale?: number;
 }
 
-interface IExportOptions {
-    quality?: number;
-    blob?: boolean;
-}
-interface IExportResult {
-    data: IBlob | string | boolean;
-}
-interface IExportResultFunction {
-    (data: IExportResult): void;
-}
-interface IExportModule {
-    export?(leaf: ILeaf, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
-}
-
 interface ILine extends IUI {
     __: ILineData;
     toPoint: IPointData;
     points: number[];
     curve: boolean | number;
 }
-interface ILineData extends IUIData {
-}
-interface ILineInputData extends IUIBaseInputData {
+interface ILineAttrData {
     toPoint?: IPointData;
     points?: number[];
     curve?: boolean | number;
 }
+interface ILineData extends ILineAttrData, IUIData {
+}
+interface ILineInputData extends ILineAttrData, IUIBaseInputData {
+}
+interface IArrow extends ILine {
+    __: IArrowData;
+}
+interface IArrowAttrData {
+}
+interface IArrowData extends IArrowAttrData, ILineData {
+}
+interface IArrowInputData extends IArrowAttrData, IUIBaseInputData {
+}
 interface IRect extends IUI {
     __: IRectData;
 }
@@ -380,6 +398,9 @@ interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIData {
     __baseLine?: number;
     __lineHeight?: number;
     __letterSpacing?: number;
+    __padding?: number[];
+    __clipText?: boolean;
+    __textBoxBounds?: IBoundsData;
 }
 interface ITextInputData extends ITextAttrData, ITextStyleInputData, IUIBaseInputData {
 }
@@ -391,9 +412,12 @@ interface ITextRowData {
     text?: string;
     data?: ITextCharData[];
     words?: ITextWordData[];
+    startCharSize?: number;
+    endCharSize?: number;
     paraStart?: boolean;
     paraEnd?: boolean;
     isOverflow?: boolean;
+    textMode?: boolean;
 }
 interface ITextWordData {
     x?: number;
@@ -428,6 +452,7 @@ interface IImageAttrData {
     url?: string;
 }
 interface IImageData extends IImageAttrData, IRectData {
+    __setImageFill(value: string): void;
 }
 interface IImageInputData extends IImageAttrData, IUIBaseInputData {
 }
@@ -452,6 +477,10 @@ interface ILeaferData extends IGroupData {
 interface ILeaferInputData extends IGroupInputData {
     pixelRatio?: number;
 }
+interface IAppData extends ILeaferData {
+}
+interface IAppInputData extends ILeaferInputData {
+}
 interface IFrame extends IBox {
     __: IFrameData;
 }
@@ -474,13 +503,15 @@ interface IBoxInputData extends IGroupInputData {
 interface IGroup extends IUI {
     __: IGroupData;
     children: IUI[];
-    mask?: IUI;
+    pick(hitPoint: IPointData, options?: IPickOptions): IPickResult;
     add(child: IUI, index?: number): void;
     addAt(child: IUI, index: number): void;
     addAfter(child: IUI, after: IUI): void;
     addBefore(child: IUI, before: IUI): void;
+    addMany(...children: ILeaf[]): void;
     remove(child?: IUI): void;
     removeAll(): void;
+    clear(): void;
 }
 interface IGroupData extends IUIData {
 }
@@ -488,27 +519,48 @@ interface IGroupInputData extends IUIBaseInputData {
 }
 interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEffectAttrData, ILeaf {
     __: IUIData;
+    readonly app: ILeafer;
+    leafer?: ILeafer;
     parent?: IGroup;
+    isFrame?: boolean;
+    proxyData: IUIInputData;
+    __proxyData?: IUIInputData;
+    children?: IUI[];
+    reset(data?: IUIInputData): void;
     set(data: IUIInputData): void;
     toJSON(): IUIInputData;
-    getPath(curve?: boolean): IPathCommandData;
-    getPathString(curve?: boolean): IPathString;
+    get(): IUIInputData;
+    createProxyData(): IUIInputData;
+    find(condition: number | string | IFindUIMethod, options?: any): IUI[];
+    findOne(condition: number | string | IFindUIMethod, options?: any): IUI;
+    getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData;
+    getPathString(curve?: boolean, pathForRender?: boolean): IPathString;
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void;
+    __drawPathByBox(drawer: IPathDrawer): void;
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void;
-    export(filename: string, options?: IExportOptions | number): Promise<IBlob | string | boolean>;
+    export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
     clone(): IUI;
 }
+interface IFindUIMethod {
+    (leaf: IUI, options?: any): IAnswer;
+}
 interface IUIData extends IUIComputedData, ILeafData {
     padding?: number | number[];
     locked?: boolean;
     __isFills?: boolean;
     __isStrokes?: boolean;
+    readonly __strokeWidth: number;
+    __pixelFill?: boolean;
+    __pixelStroke?: boolean;
+    __opacityFill?: boolean;
+    __opacityStroke?: boolean;
     __drawAfterFill?: boolean;
     __isOverflow?: boolean;
     __blendLayer?: boolean;
-    __isTranslucentFill?: boolean;
-    __isTranslucentStroke?: boolean;
     __useEffect?: boolean;
+    __autoWidth: boolean;
+    __autoHeight: boolean;
+    __autoBounds: boolean;
     path?: IPathCommandData;
     windingRule?: IWindingRule;
     __pathForRender?: IPathCommandData;
@@ -516,6 +568,8 @@ interface IUIData extends IUIComputedData, ILeafData {
     __boxStroke?: boolean;
     __font?: string;
     __textDrawData?: ITextDrawData;
+    __needComputePaint: boolean;
+    __computePaint(): void;
 }
 interface IUIComputedData extends IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {
     padding?: number | number[];
@@ -524,10 +578,99 @@ interface IUIComputedData extends IFillComputedData, IBorderComputedData, IStrok
 interface IUIBaseInputData extends IFillInputData, IStrokeInputData, ITextStyleInputData, ICornerRadiusInputData, IEffectInputData, ILeafInputData {
     padding?: number | number[];
     locked?: boolean;
-    children?: IUIBaseInputData[];
+    children?: IUIInputData[];
 }
 type IUITag = 'App' | 'Leafer' | 'Rect' | 'Ellipse' | 'Polygon' | 'Star' | 'Line' | 'Path' | 'Pen' | 'Text' | 'Image' | 'Canvas' | 'Group' | 'Frame' | 'Box';
 interface IUIInputData extends IRectInputData, IEllipseInputData, IPolygonInputData, IStarInputData, ILineInputData, IPathInputData, ITextInputData, IImageInputData, IGroupInputData, IFrameInputData, IUIBaseInputData, IObject {
+    children?: IUIInputData[];
+}
+
+interface IEditorBase extends IGroup$1, ISelectorProxy {
+    config: IEditorConfig;
+    hoverTarget: IUI$1;
+    target: IUI$1 | IUI$1[];
+    readonly list: IUI$1[];
+    readonly hasTarget: boolean;
+    readonly multiple: boolean;
+    readonly single: boolean;
+    readonly dragging: boolean;
+    element: IUI$1;
+    buttons: IGroup$1;
+    selector: IGroup$1;
+    editBox: IGroup$1;
+    editTool: IObject$1;
+    hasItem(item: IUI$1): boolean;
+    shiftItem(item: IUI$1): void;
+    addItem(item: IUI$1): void;
+    removeItem(item: IUI$1): void;
+    update(): void;
+    updateEditTool(): void;
+    getEditSize(ui: ILeaf$1): IEditSize;
+    onMove(e: IDragEvent): void;
+    onScale(e: IDragEvent): void;
+    onRotate(e: IDragEvent | IRotateEvent): void;
+    onSkew(e: IDragEvent): void;
+    group(group?: IGroup$1 | IGroupInputData$1): IGroup$1;
+    ungroup(): IUI$1[];
+    lock(): void;
+    unlock(): void;
+    toTop(): void;
+    toBottom(): void;
+}
+interface IEditorConfig {
+    editSize?: 'auto' | IEditSize;
+    stroke?: IStroke$1;
+    strokeWidth?: number;
+    pointFill?: IFill$1;
+    pointSize?: number;
+    pointRadius?: number;
+    point?: IBoxInputData$1 | IBoxInputData$1[];
+    middlePoint?: IBoxInputData$1 | IBoxInputData$1[];
+    rotatePoint?: IBoxInputData$1;
+    rect?: IBoxInputData$1;
+    area?: IRectInputData$1;
+    buttonsDirection?: 'top' | 'right' | 'bottom' | 'left';
+    buttonsFixed?: boolean;
+    buttonsMargin?: number;
+    hideOnMove?: boolean;
+    moveCursor?: ICursorType;
+    resizeCursor?: IImageCursor;
+    rotateCursor?: IImageCursor;
+    skewCursor?: IImageCursor;
+    around?: IAround;
+    lockRatio?: boolean;
+    rotateGap?: number;
+    selector?: boolean;
+    hover?: boolean;
+    boxSelect?: boolean;
+    rotateable?: boolean;
+    resizeable?: boolean;
+    skewable?: boolean;
+}
+
+interface ILeafer extends IGroup, ILeaferAttrData, IControl {
+    readonly isApp: boolean;
+    readonly app: ILeafer;
+    parent?: IApp;
+    zoomLayer: IGroup;
+    editor: IEditorBase;
+    ground?: ILeafer;
+    tree?: ILeafer;
+    sky?: ILeafer;
+    userConfig?: ILeaferConfig;
+    onInit(): void;
+    initType(type: ILeaferType): void;
+}
+
+interface IApp extends ILeafer {
+    children: ILeafer[];
+    realCanvas: boolean;
+}
+interface IAppConfig extends ILeaferConfig {
+    ground?: ILeaferConfig;
+    tree?: ILeaferConfig;
+    sky?: ILeaferConfig;
+    editor?: IEditorConfig;
 }
 
 type IUIRenderModule = IUIRender & ThisType<IUI>;
@@ -557,11 +700,16 @@ interface IUIBounds extends ILeafBounds {
 type IUIHitModule = ILeafHit & ThisType<IUI>;
 
 interface ITextConvertModule {
-    getDrawData?(content: string, style: ITextData): ITextDrawData;
+    getDrawData(content: string, style: ITextData): ITextDrawData;
 }
 
 interface IColorConvertModule {
-    string?(color: IColor, opacity?: number): string;
+    string(color: IColor, opacity?: number): string;
+}
+
+interface IExportModule {
+    running?: boolean;
+    export(leaf: ILeaf, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
 }
 
 interface ICachedShape extends ICachedLeaf {
@@ -572,24 +720,37 @@ interface ICachedShape extends ICachedLeaf {
 }
 
 interface IPaintModule {
-    compute?(ui: IUI, attrName: 'fill' | 'stroke'): void;
-    fill?(ui: IUI, canvas: ILeaferCanvas, fill: string): void;
-    fills?(ui: IUI, canvas: ILeaferCanvas, fills: ILeafPaint[]): void;
-    fillText?(ui: IUI, canvas: ILeaferCanvas): void;
-    stroke?(ui: IUI, canvas: ILeaferCanvas, stroke: string): void;
-    strokes?(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void;
-    strokeText?(ui: IUI, canvas: ILeaferCanvas, stroke: string): void;
-    strokesText?(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void;
-    drawTextStroke?(ui: IUI, canvas: ILeaferCanvas): void;
-    shape?(ui: IUI, current: ILeaferCanvas, options: IRenderOptions): ICachedShape;
-    recycleImage?(data: IUIData, attrName: string): IBooleanMap;
+    compute(attrName: IPaintAttr, ui: IUI): void;
+    fill(fill: string, ui: IUI, canvas: ILeaferCanvas): void;
+    fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
+    fillText(ui: IUI, canvas: ILeaferCanvas): void;
+    stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas): void;
+    strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
+    strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
+    drawTextStroke(ui: IUI, canvas: ILeaferCanvas): void;
+    shape(ui: IUI, current: ILeaferCanvas, renderOptions: IRenderOptions): ICachedShape;
+}
+interface IPaintImageModule {
+    image(ui: IUI, attrName: string, paint: IImagePaint, boxBounds: IBoundsData, firstUse: boolean): ILeafPaint;
+    checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean;
+    createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): boolean;
+    recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap;
+    createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void;
+    fillOrFitMode(data: ILeafPaintPatternData, mode: IImagePaintMode, box: IBoundsData, width: number, height: number, rotation: number): void;
+    clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void;
+    repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void;
+}
+interface IPaintGradientModule {
+    linearGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint;
+    radialGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint;
+    conicGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint;
 }
 
 interface IEffectModule {
-    shadow?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, options: IRenderOptions): void;
-    innerShadow?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, options: IRenderOptions): void;
-    blur?(ui: IUI, current: ILeaferCanvas, origin: ILeaferCanvas, options: IRenderOptions): void;
-    backgroundBlur?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, options: IRenderOptions): void;
+    shadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void;
+    innerShadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void;
+    blur(ui: IUI, current: ILeaferCanvas, origin: ILeaferCanvas): void;
+    backgroundBlur(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void;
 }
 
-export type { IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, ICornerRadiusString, IDashPatternString, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IExportOptions, IExportResult, IExportResultFunction, IFontWeight, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGradientPaint, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintModule, IPaintString, IPath, IPathData, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IShadowEffect, IShadowString, IStar, IStarData, IStarInputData, IColorString as IStringColor, IStrokeAlign, IStrokeCap, IStrokeJoin, IStrokeWidthString, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextWordData, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIRenderModule, IUITag, IUnitData, IVectorPath, IVerticalAlign };
+export type { IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, ICornerRadiusString, IDashPatternString, IEditorBase, IEditorConfig, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFindUIMethod, IFontWeight, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGradientPaint, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPath, IPathData, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IShadowEffect, IShadowString, IStar, IStarData, IStarInputData, IStroke, IStrokeAlign, IStrokeCap, IStrokeJoin, IStrokeWidthString, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextWordData, ITextWrap, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIRenderModule, IUITag, IUnitData, IVectorPath, IVerticalAlign };