@leafer/interface 1.0.0-rc.3 → 1.0.0-rc.30

package/src/display/ILeaf.ts

@@ -1,21 +1,24 @@
-import { ILeafer } from '../app/ILeafer'
+import { ILeaferBase } from '../app/ILeafer'
 import { IEventer } from '../event/IEventer'
 
 import { ILeaferCanvas, IHitCanvas } from '../canvas/ILeaferCanvas'
 import { IRenderOptions } from '../renderer/IRenderer'
 
-import { IObject, __Number, __Boolean, __Value, __String } from '../data/IData'
-import { IMatrixWithBoundsData, IMatrix, IPointData, IBoundsData, IRadiusPointData, IMatrixDecompositionAttr, IMatrixWithLayoutData } from '../math/IMath'
+import { IObject, INumber, IBoolean, IValue, IString, IPathString, IFourNumber } from '../data/IData'
+import { IMatrixWithBoundsData, IMatrix, IPointData, IBoundsData, IRadiusPointData, ILayoutBoundsData, IMatrixData, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAutoBoxData, IUnitPointData } from '../math/IMath'
 import { IFunction } from '../function/IFunction'
 
 import { ILeafDataProxy } from './module/ILeafDataProxy'
 import { ILeafMatrix } from './module/ILeafMatrix'
 import { ILeafBounds } from './module/ILeafBounds'
-import { ILeafLayout, ILayoutBoundsType, ILayoutLocationType } from '../layout/ILeafLayout'
+import { ILeafLayout, IBoundsType, ILocationType } from '../layout/ILeafLayout'
 import { ILeafHit } from './module/ILeafHit'
 import { ILeafRender } from './module/ILeafRender'
-import { ILeafMask } from './module/ILeafMask'
 import { ILeafData } from '../data/ILeafData'
+import { IFindMethod } from '../selector/ISelector'
+import { IPathCommandData } from '../path/IPathCommand'
+import { IWindingRule, IPath2D } from '../canvas/ICanvas'
+import { IJSONOptions } from '../file/IExport'
 
 
 export interface ICachedLeaf {
@@ -27,49 +30,150 @@ export interface ICachedLeaf {
 
 export interface ILeafAttrData {
     // layer data
-    id: __String
-    name: __String
-    className: __String
+    id?: IString
+    name?: IString
+    className?: IString
 
-    blendMode: IBlendMode
-    opacity: __Number
-    visible: __Boolean
-    isMask: __Boolean
-    isEraser: __Boolean
-    zIndex: __Number
+    blendMode?: IBlendMode
+    opacity?: INumber
+    visible?: IBoolean | 0 // 0 = display: none
+    selected?: IBoolean
+    disabled?: IBoolean
+    locked?: IBoolean
+    zIndex?: INumber
+
+    mask?: IBoolean | IMaskType
+    eraser?: IBoolean | IEraserType
 
     // layout data
-    x: __Number
-    y: __Number
-    width: __Number
-    height: __Number
-    scaleX: __Number
-    scaleY: __Number
-    rotation: __Number
-    skewX: __Number
-    skewY: __Number
-
-    scale: __Number | IPointData // helper
-    around: 'center' | IPointData
-
-    draggable: __Boolean
-
-    hittable: __Boolean
-    hitFill: IHitType
-    hitStroke: IHitType
-    hitChildren: __Boolean
-    hitSelf: __Boolean
-    hitRadius: __Number
-
-    cursor: ICursorType | ICursorType[]
+    x?: INumber
+    y?: INumber
+    width?: INumber
+    height?: INumber
+    scaleX?: INumber
+    scaleY?: INumber
+    rotation?: INumber
+    skewX?: INumber
+    skewY?: INumber
+
+    scale?: INumber | IPointData // helper
+
+    offsetX?: INumber
+    offsetY?: INumber
+    scrollX?: INumber
+    scrollY?: INumber
+
+    origin?: IAlign | IUnitPointData
+    around?: IAlign | IUnitPointData
+
+    lazy?: IBoolean
+    pixelRatio?: INumber
+
+    path?: IPathCommandData | IPathString
+    windingRule?: IWindingRule
+    closed?: IBoolean
+
+    // auto layout
+    flow?: IFlowType
+    padding?: IFourNumber
+    gap?: IGap | IPointGap
+    flowAlign?: IFlowAlign | IFlowAxisAlign
+    flowWrap?: IFlowWrap
+    itemBox?: IFlowBoxType
+
+    inFlow?: IBoolean
+    autoWidth?: IAutoSize
+    autoHeight?: IAutoSize
+    lockRatio?: IBoolean
+    autoBox?: IAutoBoxData | IConstraint
+
+    widthRange?: IRangeSize
+    heightRange?: IRangeSize
+
+    // interactive
+    draggable?: IBoolean | IAxis
+    dragBounds?: IBoundsData | 'parent'
+
+    editable?: IBoolean
+
+    hittable?: IBoolean
+    hitFill?: IHitType
+    hitStroke?: IHitType
+    hitBox?: IBoolean
+    hitChildren?: IBoolean
+    hitSelf?: IBoolean
+    hitRadius?: INumber
+
+    cursor?: ICursorType | ICursorType[]
+
+    normalStyle?: ILeafInputData // restore hover / press / focus / selected / disabled style
+    hoverStyle?: ILeafInputData
+    pressStyle?: ILeafInputData
+    focusStyle?: ILeafInputData
+    selectedStyle?: ILeafInputData
+    disabledStyle?: ILeafInputData
+
+    // 预留给用户使用的数据对象
+    data: IObject
+}
+
+
+export type IAxis = 'x' | 'y'
+
+export type IAxisReverse = 'x-reverse' | 'y-reverse'
+
+export type IFlowType = boolean | IAxis | IAxisReverse
+
+export type IFlowBoxType = 'box' | 'stroke'
+
+export type IGap = INumber | 'auto' | 'fit'
+
+export interface IPointGap { x?: IGap, y?: IGap }
+
+export type IAxisAlign = 'from' | 'center' | 'to'
+
+export interface IFlowAxisAlign { content?: IFlowAlign, x?: IAxisAlign, y?: IAxisAlign }
+
+export type IFlowWrap = boolean | 'reverse'
+
+export type IAutoSize = IBoolean | INumber | IPercentData
+
+export interface IRangeSize {
+    min?: number
+    max?: number
+}
+
+export interface IUnitData {
+    type: 'percent' | 'px'
+    value: number
 }
 
+export interface IPercentData extends IUnitData {
+    type: 'percent'
+}
+
+export interface IConstraint {
+    x: IConstraintType
+    y: IConstraintType
+}
+
+export type IConstraintType = 'from' | 'center' | 'to' | 'from-to' | 'scale'
+
 export type IHitType =
     | 'path'
     | 'pixel'
     | 'all'
     | 'none'
 
+export type IMaskType =
+    | 'path'
+    | 'pixel'
+    | 'clipping'
+
+export type IEraserType =
+    | 'path'
+    | 'pixel'
+
 export type IBlendMode =
     | 'pass-through'
     | 'normal'
@@ -96,18 +200,46 @@ export type IBlendMode =
     | 'destination-in'
     | 'destination-out'
     | 'destination-atop'
+    | 'xor'
 
-export type IResizeType = 'size' | 'scale'
+export type IEditSize = 'size' | 'font-size' | 'scale'
 export interface IImageCursor {
     url: string
     x?: number
     y?: number
+    rotation?: number
 }
 
-export type IAround = 'center' | IPointData
+export type IDirection =
+    | 'top-left'
+    | 'top'
+    | 'top-right'
+    | 'right'
+    | 'bottom-right'
+    | 'bottom'
+    | 'bottom-left'
+    | 'left'
+    | 'center'
+
+export type IAlign = IDirection
+
+export type IBaseLineAlign =
+    | 'baseline-left'
+    | 'baseline-center'
+    | 'baseline-right'
+
+export type IFlowAlign =
+    | IAlign
+    | IBaseLineAlign
+
+
+export type IAround =
+    | IAlign
+    | IUnitPointData
 
 export type ICursorType =
     | IImageCursor
+    | ''
     | 'auto'
     | 'default'
     | 'none'
@@ -142,53 +274,110 @@ export type ICursorType =
     | 'col-resize'
     | 'row-resize'
     | 'all-scroll'
-    | 'zoom -in'
+    | 'zoom-in'
     | 'zoom-out'
 
-export interface ICursorTypeMap {
-    [name: string]: ICursorType | ICursorType[]
-}
-export interface ILeafInputData extends IObject {
+export type IStateStyleType =
+    | 'hoverStyle'
+    | 'pressStyle'
+    | 'focusStyle'
+    | 'selectedStyle'
+    | 'disabledStyle'
+
+export interface ILeafInputData {
     tag?: string
 
     // layer data
-    id?: __String
-    name?: __String
-    className?: __String
+    id?: IString
+    name?: IString
+    className?: IString
 
     blendMode?: IBlendMode
-    opacity?: __Number
-    visible?: __Boolean
-    isMask?: __Boolean
-    isEraser?: __Boolean
-    zIndex?: __Number
+    opacity?: INumber
+    visible?: IBoolean | 0
+    selected?: IBoolean
+    disabled?: IBoolean
+    locked?: IBoolean
+    zIndex?: INumber
+
+    mask?: IBoolean | IMaskType
+    eraser?: IBoolean | IEraserType
 
     // layout data
-    x?: __Number
-    y?: __Number
-    width?: __Number
-    height?: __Number
-    scaleX?: __Number
-    scaleY?: __Number
-    rotation?: __Number
-    skewX?: __Number
-    skewY?: __Number
-
-    scale?: __Number | IPointData // helper
-    around?: IAround
-
-    draggable?: __Boolean
-
-    hittable?: __Boolean
+    x?: INumber
+    y?: INumber
+    width?: INumber
+    height?: INumber
+    scaleX?: INumber
+    scaleY?: INumber
+    rotation?: INumber
+    skewX?: INumber
+    skewY?: INumber
+
+    scale?: INumber | IPointData // helper
+
+    offsetX?: INumber
+    offsetY?: INumber
+    scrollX?: INumber
+    scrollY?: INumber
+
+    origin?: IAlign | IUnitPointData
+    around?: IAlign | IUnitPointData
+
+    lazy?: IBoolean
+    pixelRatio?: INumber
+
+    path?: IPathCommandData | IPathString
+    windingRule?: IWindingRule
+    closed?: IBoolean
+
+    // auto layout
+    flow?: IFlowType
+    padding?: IFourNumber
+    gap?: IGap | IPointGap
+    flowAlign?: IFlowAlign | IFlowAxisAlign
+    flowWrap?: IFlowWrap
+    itemBox?: IFlowBoxType
+
+    inFlow?: IBoolean
+    autoWidth?: IAutoSize
+    autoHeight?: IAutoSize
+    lockRatio?: IBoolean
+    autoBox?: IAutoBoxData | IConstraint
+
+    widthRange?: IRangeSize
+    heightRange?: IRangeSize
+
+    // interactive
+    draggable?: IBoolean | IAxis
+    dragBounds?: IBoundsData | 'parent'
+
+    editable?: IBoolean
+
+    hittable?: IBoolean
     hitFill?: IHitType
     hitStroke?: IHitType
-    hitChildren?: __Boolean
-    hitSelf?: __Boolean
-    hitRadius?: __Number
+    hitBox?: IBoolean
+    hitChildren?: IBoolean
+    hitSelf?: IBoolean
+    hitRadius?: INumber
 
     cursor?: ICursorType | ICursorType[]
 
+    normalStyle?: ILeafInputData
+    hoverStyle?: ILeafInputData
+    pressStyle?: ILeafInputData
+    focusStyle?: ILeafInputData
+    selectedStyle?: ILeafInputData
+    disabledStyle?: ILeafInputData
+
+    // 预留给用户使用的数据对象
+    data?: IObject
+
     children?: ILeafInputData[]
+
+    // other
+    noBounds?: boolean
 }
 export interface ILeafComputedData {
     // layer data
@@ -198,11 +387,15 @@ export interface ILeafComputedData {
 
     blendMode?: IBlendMode
     opacity?: number
-    visible?: boolean
-    isMask?: boolean
-    isEraser?: boolean
+    visible?: boolean | 0
+    selected?: boolean
+    disabled?: boolean
+    locked?: boolean
     zIndex?: number
 
+    mask?: boolean | IMaskType
+    eraser?: boolean | IEraserType
+
     // layout data
     x?: number
     y?: number
@@ -214,27 +407,90 @@ export interface ILeafComputedData {
     skewX?: number
     skewY?: number
 
-    around?: IAround
+    offsetX?: number
+    offsetY?: number
+    scrollX?: number
+    scrollY?: number
+
+    origin?: IAlign | IUnitPointData
+    around?: IAlign | IUnitPointData
+
+    lazy?: boolean
+    pixelRatio?: number
+
+    path?: IPathCommandData
+    windingRule?: IWindingRule
+    closed?: boolean
 
-    draggable?: boolean
+    // auto layout
+    flow?: IFlowType
+    padding?: IFourNumber
+    gap?: IGap | IPointGap
+    flowAlign?: IFlowAlign | IFlowAxisAlign
+    flowWrap?: IFlowWrap
+    itemBox?: IFlowBoxType
+
+    inFlow?: boolean
+    autoWidth?: IAutoSize
+    autoHeight?: IAutoSize
+    lockRatio?: boolean
+    autoBox?: IAutoBoxData | IConstraint
+
+    widthRange?: IRangeSize
+    heightRange?: IRangeSize
+
+    // interactive
+    draggable?: boolean | IAxis
+    dragBounds?: IBoundsData | 'parent'
+
+    editable?: boolean
 
     hittable?: boolean
     hitFill?: IHitType
     hitStroke?: IHitType
+    hitBox?: boolean
     hitChildren?: boolean
     hitSelf?: boolean
     hitRadius?: number
 
     cursor?: ICursorType | ICursorType[]
 
+    normalStyle?: ILeafInputData
+    hoverStyle?: ILeafInputData
+    pressStyle?: ILeafInputData
+    focusStyle?: ILeafInputData
+    selectedStyle?: ILeafInputData
+    disabledStyle?: ILeafInputData
+
+
+    // 预留给用户使用的数据对象
+    data?: IObject
+
     // other
     __childBranchNumber?: number // 存在子分支的个数
     __complex?: boolean // 外观是否复杂
+
     __naturalWidth?: number
     __naturalHeight?: number
+
+    readonly __autoWidth?: boolean
+    readonly __autoHeight?: boolean
+    readonly __autoSide?: boolean
+    readonly __autoSize?: boolean
+
+    readonly __useNaturalRatio: boolean // 宽高存在一个值时，另一个自动值是否采用natural尺寸比例
+    readonly __isLinePath: boolean
+    readonly __blendMode: string
+
+    __useArrow?: boolean
+    __useEffect?: boolean
+
+    __pathInputed?: number // 是否为输入path, 0：否，1：是，2：永远是（不自动检测）
+    __pathForRender?: IPathCommandData
+    __path2DForRender?: IPath2D
 }
 
-export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDataProxy, ILeafInputData, IEventer {
+export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDataProxy, ILeafInputData, IEventer {
     tag: string
     readonly __tag: string
     readonly innerName: string
@@ -242,68 +498,113 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     readonly __DataProcessor: IObject // IDataProcessor
     readonly __LayoutProcessor: IObject // ILeafLayout
 
-    leafer?: ILeafer
+    readonly app?: ILeaferBase
+    leafer?: ILeaferBase
     parent?: ILeaf
+    zoomLayer?: ILeaf
 
     readonly isApp?: boolean
-    isLeafer?: boolean
-    isBranch?: boolean
-    isBranchLeaf?: boolean
+    readonly isLeafer?: boolean
+    readonly isBranch?: boolean
+    readonly isBranchLeaf?: boolean
+    readonly isOutside?: boolean // scrollBar ...
 
     __: ILeafData
+
+    proxyData?: ILeafInputData
+    __proxyData?: ILeafInputData
+
+    syncEventer?: ILeaf // 同步触发一样事件的元素
+
     __layout: ILeafLayout
 
-    __world: IMatrixWithLayoutData
-    __local: IMatrixWithBoundsData
+    __world: IMatrixWithBoundsScaleData
+    __local?: IMatrixWithBoundsData
+
+    __nowWorld?: IMatrixWithBoundsScaleData // use __world or __cameraWorld render
+    __cameraWorld?: IMatrixWithBoundsScaleData // use camera matrix render
+
+    readonly __localMatrix: IMatrixData
+    readonly __localBoxBounds: IBoundsData
 
     __worldOpacity: number
 
-    readonly worldTransform: IMatrixWithLayoutData
-    readonly localTransform: IMatrixWithBoundsData
+    readonly worldTransform: IMatrixWithScaleData
+    readonly localTransform: IMatrixData
 
     readonly boxBounds: IBoundsData
+    readonly renderBounds: IBoundsData
     readonly worldBoxBounds: IBoundsData
     readonly worldStrokeBounds: IBoundsData
     readonly worldRenderBounds: IBoundsData
 
     readonly worldOpacity: number
 
-    __renderTime?: number // μs 1000微秒 = 1毫秒
-
     __level: number // 图层级别 root(1) -> hight
     __tempNumber?: number // 用于临时运算储存状态
 
-    readonly resizeable: boolean
-
-    readonly __hasMirror: boolean
+    readonly __worldFlipped: boolean
 
+    __hasAutoLayout?: boolean
     __hasMask?: boolean
     __hasEraser?: boolean
     __hitCanvas?: IHitCanvas
 
+    __flowBounds?: IBoundsData // localBoxBounds or localStrokeBounds
+    __widthGrow?: number
+    __heightGrow?: number
+    __hasGrow?: boolean
+
     readonly __onlyHitMask: boolean
     readonly __ignoreHitWorld: boolean
+    readonly __inLazyBounds: boolean
+
+    readonly pathInputed: boolean
 
     __parentWait?: IFunction[]
     __leaferWait?: IFunction[]
 
     destroyed: boolean
 
-    waitParent(item: IFunction): void
-    waitLeafer(item: IFunction): void
-    nextRender(item: IFunction): void
+    reset(data?: ILeafInputData): void
+    resetCustom(): void
+
+    waitParent(item: IFunction, bind?: IObject): void
+    waitLeafer(item: IFunction, bind?: IObject): void
+    nextRender(item: IFunction, bind?: IObject, off?: 'off'): void
+    removeNextRender(item: IFunction): void
 
-    __bindLeafer(leafer: ILeafer | null): void
+    __bindLeafer(leafer: ILeaferBase | null): void
 
     set(data: IObject): void
-    toJSON(): IObject
-    toString(): string
+    get(name?: string | string[] | IObject): ILeafInputData | IValue
+    setAttr(name: string, value: any): void
+    getAttr(name: string): any
+    getComputedAttr(name: string): any
+
+    toJSON(options?: IJSONOptions): IObject
+    toString(options?: IJSONOptions): string
+    toSVG(): string
+    __SVG(data: IObject): void
+    toHTML(): string
 
     // ILeafData ->
-    __setAttr(attrName: string, newValue: __Value): void
-    __getAttr(attrName: string): __Value
+    __setAttr(attrName: string, newValue: IValue, checkFiniteNumber?: boolean): boolean
+    __getAttr(attrName: string): IValue
+    setProxyAttr(name: string, newValue: IValue): void
+    getProxyAttr(name: string): IValue
+
+    // find
+    find(condition: number | string | IFindMethod, options?: any): ILeaf[]
+    findTag(tag: string | string[]): ILeaf[]
+    findOne(condition: number | string | IFindMethod, options?: any): ILeaf | undefined
+    findId(id: number | string): ILeaf | undefined
+
+    focus(value?: boolean): void
 
+    updateLayout(): void
     forceUpdate(attrName?: string): void
+    forceRender(_bounds?: IBoundsData): void
 
     // ILeafMatrix ->
     __updateWorldMatrix(): void
@@ -311,15 +612,19 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
 
     // ILeafBounds ->
     __updateWorldBounds(): void
+    __updateLocalBounds(): void
 
     __updateLocalBoxBounds(): void
     __updateLocalStrokeBounds(): void
     __updateLocalRenderBounds(): void
 
+    __updateContentBounds(): void
     __updateBoxBounds(): void
     __updateStrokeBounds(): void
     __updateRenderBounds(): void
 
+    __updateAutoLayout(): void
+    __updateFlowLayout(): void
     __updateNaturalSize(): void
 
     __updateStrokeSpread(): number
@@ -330,12 +635,19 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     // IBranchMask ->
     __updateEraser(value?: boolean): void
     __updateMask(value?: boolean): void
-    __renderMask(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas): void
-    __removeMask(child?: ILeaf): void
+    __renderMask(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __renderEraser(canvas: ILeaferCanvas, options: IRenderOptions): void
 
     // convert
-    getWorld(attrName: IMatrixDecompositionAttr): number
-    getBounds(type: ILayoutBoundsType, locationType?: ILayoutLocationType): IBoundsData
+    __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData // when render use other matrix
+
+    getTransform(relative?: ILocationType | ILeaf): IMatrixData
+
+    getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData
+    getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData
+    getLayoutPoints(type?: IBoundsType, relative?: ILocationType | ILeaf): IPointData[]
+
+    getWorldBounds(inner: IBoundsData, relative?: ILeaf, change?: boolean): IBoundsData
 
     worldToLocal(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
     localToWorld(local: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
@@ -348,15 +660,37 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     getLocalPointByInner(inner: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
     getWorldPoint(inner: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
     getWorldPointByLocal(local: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
+    getPagePoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
+    getWorldPointByPage(page: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
+
+
+    // transform
+    setTransform(transform?: IMatrixData, resize?: boolean): void
+    transform(transform?: IMatrixData, resize?: boolean): void
+
+    move(x: number | IPointData, y?: number): void
+    scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void
+    rotateOf(origin: IPointData | IAlign, rotation: number): void
+    skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean): void
+
+    transformWorld(worldTransform?: IMatrixData, resize?: boolean): void
+    moveWorld(x: number | IPointData, y?: number): void
+    scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void
+    rotateOfWorld(worldOrigin: IPointData, rotation: number): void
+    skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void
+
+    scaleResize(scaleX: number, scaleY: number, noResize?: boolean): void
+    __scaleResize(scaleX: number, scaleY: number): void
 
-    move(x: number, y?: number): void
-    scaleOf(origin: IPointData, x: number, y?: number): void
-    rotateOf(origin: IPointData, rotation: number): void
-    skewOf(origin: IPointData, x: number, y: number): void
+    resizeWidth(width: number): void
+    resizeHeight(height: number): void
 
     // ILeafHit ->
     __hitWorld(point: IRadiusPointData): boolean
     __hit(local: IRadiusPointData): boolean
+    __hitFill(inner: IRadiusPointData): boolean
+    __hitStroke(inner: IRadiusPointData, strokeWidth: number): boolean
+    __hitPixel(inner: IRadiusPointData): boolean
     __drawHitPath(canvas: ILeaferCanvas): void
     __updateHitCanvas(): void
 
@@ -365,7 +699,8 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     __drawFast(canvas: ILeaferCanvas, options: IRenderOptions): void
     __draw(canvas: ILeaferCanvas, options: IRenderOptions): void
 
-    __renderShape(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __clip(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __renderShape(canvas: ILeaferCanvas, options: IRenderOptions, ignoreFill?: boolean, ignoreStroke?: boolean): void
 
     __updateWorldOpacity(): void
     __updateChange(): void
@@ -376,10 +711,19 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     __updatePath(): void
     __updateRenderPath(): void
 
+    // 
+
     // branch
     children?: ILeaf[]
 
     __updateSortChildren(): void
     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
+}