@leafer/interface 1.0.0-rc.8 → 1.0.0

package/src/display/module/IBranchRender.ts

@@ -1,7 +1,7 @@
-import { ILeaferCanvas } from '../../canvas/ILeaferCanvas'
-import { IRenderOptions } from '../../renderer/IRenderer'
 import { IBranch } from '../IBranch'
 import { ILeafRender } from './ILeafRender'
+import { ILeaferCanvas } from '../../canvas/ILeaferCanvas'
+import { IRenderOptions } from '../../renderer/IRenderer'
 
 export type IBranchRenderModule = IBranchRender & ThisType<IBranch>
 

package/src/display/module/ILeafBounds.ts

@@ -15,6 +15,7 @@ export interface ILeafBounds {
     __updateRenderBounds?(): void
 
     __updateAutoLayout?(): void
+    __updateFlowLayout?(): void
     __updateNaturalSize?(): void
 
     __updateStrokeSpread?(): number

package/src/display/module/ILeafDataProxy.ts

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

package/src/display/module/ILeafEventer.ts

@@ -8,7 +8,7 @@ export type ILeafEventerModule = ILeafEventer & ThisType<ILeaf>
 
 export interface ILeafEventer {
     on?(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
-    off?(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
+    off?(type?: string | string[], listener?: IEventListener, options?: IEventListenerOptions | boolean): void
     on_?(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId
     off_?(id: IEventListenerId | IEventListenerId[]): void
     once?(type: string | string[], listener: IEventListener, capture?: boolean): void

package/src/display/module/ILeafHit.ts

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

package/src/display/module/ILeafRender.ts

@@ -9,7 +9,8 @@ export interface ILeafRender {
     __draw?(canvas: ILeaferCanvas, options: IRenderOptions): void
     __drawFast?(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

package/src/event/IEventer.ts

@@ -36,7 +36,7 @@ export interface IEventer extends ILeafEventer {
     __bubbleMap?: IEventListenerMap
 
     on(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
-    off(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void
+    off(type?: string | string[], listener?: IEventListener, options?: IEventListenerOptions | boolean): void
     on_(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId
     off_(id: IEventListenerId | IEventListenerId[]): void
     once(type: string | string[], listener: IEventListener): void

package/src/event/IUIEvent.ts

@@ -3,7 +3,7 @@ import { ILeafList } from '../data/IList'
 import { IEvent } from './IEvent'
 import { ILeaferImage } from '../image/ILeaferImage'
 import { ILeaf } from '../display/ILeaf'
-import { IPointData } from '../math/IMath'
+import { IPointData, IBoundsData } from '../math/IMath'
 
 export interface IUIEvent extends IEvent {
     x: number
@@ -23,6 +23,7 @@ export interface IUIEvent extends IEvent {
     path?: ILeafList
     throughPath?: ILeafList // 穿透path，不受层级影响，从上到下只要碰撞到区域就算，一般点击的时候
 
+    getPage?(): IPointData
     getInner?(relative?: ILeaf): IPointData
     getLocal?(relative?: ILeaf): IPointData
 }
@@ -37,6 +38,7 @@ export interface IPointerEvent extends IUIEvent {
     tiltX?: number
     tiltY?: number
     twist?: number
+    isCancel?: boolean
 }
 export type PointerType = 'mouse' | 'pen' | 'touch'
 
@@ -46,10 +48,15 @@ export interface IDragEvent extends IPointerEvent {
     totalX?: number
     totalY?: number
 
+    getPageMove?(total?: boolean): IPointData
     getInnerMove?(relative?: ILeaf): IPointData
     getLocalMove?(relative?: ILeaf): IPointData
+
+    getPageTotal?(): IPointData
     getInnerTotal?(relative?: ILeaf): IPointData
     getLocalTotal?(relative?: ILeaf): IPointData
+
+    getPageBounds?(): IBoundsData
 }
 
 export interface IDropEvent extends IPointerEvent {

package/src/file/IExport.ts

@@ -0,0 +1,41 @@
+import { IBlob, ILeaferCanvas } from '../canvas/ILeaferCanvas'
+import { ICanvasContext2DSettings } from '../canvas/ICanvas'
+import { ILeaf } from '../display/ILeaf'
+import { ILocationType } from '../layout/ILeafLayout'
+import { IBoundsData } from '../math/IMath'
+
+export interface IExportOptions {
+    quality?: number
+    blob?: boolean
+    scale?: number
+    smooth?: boolean
+    pixelRatio?: number
+    slice?: boolean
+    trim?: boolean
+    fill?: string
+    screenshot?: IBoundsData | boolean
+    relative?: ILocationType | ILeaf
+    json?: IJSONOptions
+    contextSettings?: ICanvasContext2DSettings
+    onCanvas?: IExportOnCanvasFunction
+}
+
+export interface IJSONOptions {
+    matrix?: boolean
+}
+
+export interface IExportResult {
+    data: ILeaferCanvas | IBlob | string | boolean
+    width?: number
+    height?: number
+    renderBounds?: IBoundsData
+    trimBounds?: IBoundsData
+}
+
+export interface IExportResultFunction {
+    (data: IExportResult): void
+}
+
+export interface IExportOnCanvasFunction {
+    (data: ILeaferCanvas): void
+}

package/src/file/IFileType.ts

@@ -1,2 +1,2 @@
 export type IExportImageType = 'jpg' | 'png' | 'webp'
-export type IExportFileType = IExportImageType | 'svg' | 'pdf' | 'json'
+export type IExportFileType = IExportImageType | 'svg' | 'pdf' | 'json'

package/src/function/IFunction.ts

@@ -1,3 +1,4 @@
+import { IObject } from '../data/IData'
 import { IPointData } from '../math/IMath'
 
 export interface IFunction {
@@ -8,6 +9,14 @@ export interface INumberFunction {
     (...arg: any): number
 }
 
+export interface IStringFunction {
+    (...arg: any): string
+}
+
+export interface IObjectFunction {
+    (...arg: any): IObject
+}
+
 export interface IPointDataFunction {
     (...arg: any): IPointData
 }

package/src/image/IImageManager.ts

@@ -11,11 +11,12 @@ export interface IImageManager {
     recycledList: ILeaferImage[]
     tasker: ITaskProcessor
     patternTasker: ITaskProcessor
+    patternLocked?: boolean // 锁定pattern不更新, 一般用于创建碰撞位图 UIHit.ts
     readonly isComplete: boolean
     get(config: ILeaferImageConfig): ILeaferImage
     recycle(image: ILeaferImage): void
     clearRecycled(): void
-    isPixel(config: ILeaferImageConfig): boolean // png / svg / webp
+    hasOpacityPixel(config: ILeaferImageConfig): boolean // png / svg / webp
     isFormat(format: IExportFileType, config: ILeaferImageConfig): boolean
     destroy(): void
 }

package/src/image/ILeaferImage.ts

@@ -1,6 +1,8 @@
+import { ICanvasPattern } from '../canvas/ICanvas'
 import { IObject } from '../data/IData'
 import { InnerId } from '../event/IEventer'
 import { IExportFileType } from '../file/IFileType'
+import { IMatrixData } from '../math/IMath'
 
 export interface ILeaferImageConfig {
     url: string
@@ -16,6 +18,15 @@ export interface ILeaferImageOnError {
     (error?: string | IObject, image?: ILeaferImage): any
 }
 
+export interface ILeaferImageCacheCanvas {
+    data: IObject
+    params: IArguments
+}
+
+export interface ILeaferImagePatternPaint {
+    transform: IMatrixData
+}
+
 export interface ILeaferImage {
     readonly innerId: InnerId
     readonly url: string
@@ -25,6 +36,7 @@ export interface ILeaferImage {
     height: number
 
     isSVG: boolean
+    hasOpacityPixel: boolean
 
     readonly completed: boolean
     ready: boolean
@@ -37,6 +49,7 @@ export interface ILeaferImage {
     load(onSuccess?: ILeaferImageOnLoaded, onError?: ILeaferImageOnError): number
     unload(index: number, stopEvent?: boolean): void
     getCanvas(width: number, height: number, opacity?: number, _filters?: IObject): unknown
+    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 } from './app/ILeafer'
-export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IBlendMode, IEditSize, ICursorType, ICursorTypeMap, IAround } from './display/ILeaf'
+export { ILeaferBase, ILeaferAttrData, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator, IZoomType } from './app/ILeafer'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IFlowType, IFlowBoxType, IAlign, IAxisAlign, IFlowAlign, IFlowAxisAlign, IAxis, IGap, IPointGap, IAxisReverse, IBaseLineAlign, IFlowWrap, IAutoSize, IRangeSize, IPercentData, IUnitData, IConstraint, IConstraintType, IHitType, IMaskType, IEraserType, IBlendMode, IEditSize, IImageCursor, ICursorType, IStateStyleType, IDirection, IAround, ILeafAttrDescriptor, ILeafAttrDescriptorFn } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
 
@@ -14,13 +14,12 @@ export { ILeafBounds, ILeafBoundsModule } from './display/module/ILeafBounds'
 export { ILeafHit, ILeafHitModule } from './display/module/ILeafHit'
 export { ILeafRender, ILeafRenderModule } from './display/module/ILeafRender'
 export { ILeafEventer, ILeafEventerModule } from './display/module/ILeafEventer'
-export { ILeafMask, ILeafMaskModule } from './display/module/ILeafMask'
 export { IBranchRender, IBranchRenderModule } from './display/module/IBranchRender'
 
 export { IRenderer, IRendererConfig, IRenderOptions } from './renderer/IRenderer'
 export { IWatcher, IWatchEventData, IWatcherConfig } from './watcher/IWatcher'
 export { ILayouter, ILayoutChangedData, ILayoutBlockData, ILayouterConfig, IPartLayoutConfig } from './layouter/ILayouter'
-export { ISelector, ISelectorConfig, ISelectorProxy, IFindMethod, ISelectPathResult, ISelectPathOptions, AnswerType } from './selector/ISelector'
+export { ISelector, ISelectorConfig, ISelectorProxy, IFindCondition, IFindMethod, IPickResult, IPickOptions, IPickBottom, IAnswer } from './selector/ISelector'
 
 export { ICanvasManager } from './canvas/ICanvasManager'
 export { IHitCanvasManager } from './canvas/IHitCanvasManager'
@@ -34,22 +33,24 @@ export { IPlatform, IMiniapp, IMiniappSelect, IMiniappSizeView } from './platfor
 export { IPlugin } from './plugin/IPlugin'
 
 
-export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasConfig, IHitCanvasConfig, IBlobFunction, IBlob } from './canvas/ILeaferCanvas'
+export { ILeaferCanvas, ILeaferCanvasView, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ICanvasCacheOptions, ILeaferCanvasConfig, IHitCanvasConfig, IBlobFunction, IBlob } from './canvas/ILeaferCanvas'
 export { ISkiaCanvas, ISkiaCanvasExportConfig, ICanvasType, ISkiaNAPICanvas } from './canvas/ISkiaCanvas'
 export { IPathDrawer, IPathCreator } from './path/IPathDrawer'
-export { IWindingRule, ICanvasContext2D, ITextMetrics, IPath2D } from './canvas/ICanvas'
+export { IWindingRule, ICanvasContext2D, ICanvasContext2DSettings, ITextMetrics, IPath2D, ICanvasPattern } from './canvas/ICanvas'
 export { CanvasPathCommand, IPathCommandData, MCommandData, HCommandData, VCommandData, LCommandData, CCommandData, SCommandData, QCommandData, TCommandData, ZCommandData, ACommandData, RectCommandData, RoundRectCommandData, EllipseCommandData, ArcCommandData, ArcToCommandData } from './path/IPathCommand'
 
-export { ILeaferImage, ILeaferImageConfig, ILeaferImageOnLoaded, ILeaferImageOnError } from './image/ILeaferImage'
+export { ILeaferImage, ILeaferImageConfig, ILeaferImageOnLoaded, ILeaferImageOnError, ILeaferImageCacheCanvas, ILeaferImagePatternPaint } from './image/ILeaferImage'
 export { IExportFileType, IExportImageType } from './file/IFileType'
+export { IExportOptions, IJSONOptions, IExportResult, IExportResultFunction, IExportOnCanvasFunction } from './file/IExport'
 
 export { InnerId, IEventer, IEventListener, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId } from './event/IEventer'
 export { IEventTarget, IEvent, ILeaferEvent, IPropertyEvent, ILayoutEvent, IRenderEvent, IAnimateEvent, IChildEvent, IResizeEvent, IResizeEventListener, IUpdateEvent, IWatchEvent, IMultiTouchData, IKeepTouchData } from './event/IEvent'
 export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEvent, IMoveEvent, IZoomEvent, IRotateEvent, IKeyEvent, IImageEvent } from './event/IUIEvent'
+export { ICursorTypeMap, ICursorRotate, ICursorRotateMap } from './interaction/ICursor'
 export { IInteraction, IInteractionCanvas, IInteractionConfig, IWheelConfig, IPointerConfig } from './interaction/IInteraction'
 
 
-export { INumber, IBoolean, IString, IValue, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
+export { INumber, IBoolean, IString, IValue, IFourNumber, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IPointDataMap, IDataTypeHandle } from './data/IData'
 export { ILeafList, ILeafArrayMap, ILeafMap, ILeafLevelList, ILeafListItemCallback } from './data/IList'
-export { IPoint, IPointData, IRadiusPointData, ISize, ISizeData, IScreenSizeData, IBounds, IBoundsData, IBoundsDataFn, IOffsetBoundsData, ITwoPointBoundsData, IAutoBounds, IAutoBoundsData, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithScaleData, IMatrixWithLayoutData, IScaleRotationData, IScaleData, ISkewData, ILayoutBoundsData, ILayoutData, ILayoutAttr } from './math/IMath'
-export { IFunction, IAttrDecorator } from './function/IFunction'
+export { IPoint, IPointData, IFromToData, IUnitPointData, IScrollPointData, IClientPointData, IRadiusPointData, ISize, ISizeData, IScreenSizeData, IBounds, IBoundsData, IBoundsDataFn, IOffsetBoundsData, ITwoPointBoundsData, IAutoBounds, IAutoBoxData, IAutoBoundsData, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithScaleData, IMatrixWithOptionScaleData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IScaleRotationData, IScaleData, ISkewData, ILayoutBoundsData, ILayoutData, ILayoutAttr } from './math/IMath'
+export { IFunction, IStringFunction, INumberFunction, IObjectFunction, IPointDataFunction, IAttrDecorator } from './function/IFunction'

package/src/interaction/ICursor.ts

@@ -0,0 +1,16 @@
+import { ICursorType } from '../display/ILeaf'
+
+
+export interface ICursorTypeMap {
+    [name: string]: ICursorType | ICursorType[]
+}
+
+
+export interface ICursorRotate {
+    rotation?: number
+    data?: string
+}
+
+export interface ICursorRotateMap {
+    [name: string]: ICursorRotate
+}

package/src/interaction/IInteraction.ts

@@ -2,8 +2,8 @@ import { INumberFunction, IPointDataFunction } from '../function/IFunction'
 import { IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent, IUIEvent, IKeyEvent } from '../event/IUIEvent'
 import { ILeaf, ICursorType } from '../display/ILeaf'
 import { ILeafList } from '../data/IList'
-import { IPointData } from '../math/IMath'
-import { ISelector, ISelectPathOptions } from '../selector/ISelector'
+import { IClientPointData, IPointData } from '../math/IMath'
+import { ISelector, IPickOptions, IPickBottom } from '../selector/ISelector'
 import { IBounds } from '../math/IMath'
 import { IControl } from '../control/IControl'
 import { IKeepTouchData } from '../event/IEvent'
@@ -18,6 +18,7 @@ export interface IInteraction extends IControl {
     running: boolean
     readonly dragging: boolean
     readonly isDragEmpty: boolean
+    readonly isHoldRightKey: boolean
     readonly moveMode: boolean
 
     config: IInteractionConfig
@@ -25,11 +26,14 @@ export interface IInteraction extends IControl {
     cursor: ICursorType | ICursorType[]
     readonly hitRadius: number
 
+    bottomList?: IPickBottom[] // 底部可拾取的虚拟元素
+
     shrinkCanvasBounds: IBounds
 
     downData: IPointerEvent
     hoverData: IPointerEvent
     downTime: number
+    focusData: ILeaf
 
     receive(event: any): void
 
@@ -48,12 +52,25 @@ export interface IInteraction extends IControl {
     keyDown(data: IKeyEvent): void
     keyUp(data: IKeyEvent): void
 
-    findPath(data: IPointerEvent, options?: ISelectPathOptions): ILeafList
+    findPath(data: IPointerEvent, options?: IPickOptions): ILeafList
+    isRootPath(data: IPointerEvent): boolean
+    isTreePath(data: IPointerEvent): boolean
+    canMove(data: IPointerEvent): boolean
+
     isDrag(leaf: ILeaf): boolean
+    isPress(leaf: ILeaf): boolean
+    isHover(leaf: ILeaf): boolean
+    isFocus(leaf: ILeaf): boolean
+
+    cancelHover(): void
 
-    updateDownData(data?: IPointerEvent): void
+    updateDownData(data?: IPointerEvent, options?: IPickOptions, merge?: boolean): void
     updateHoverData(data: IPointerEvent): void
+
     updateCursor(hoverData?: IPointerEvent): void
+    setCursor(cursor: ICursorType | ICursorType[]): void
+
+    getLocal(clientPoint: IClientPointData, updateClient?: boolean): IPointData
 
     emit(type: string, data: IUIEvent, path?: ILeafList, excludePath?: ILeafList): void
 }
@@ -65,26 +82,34 @@ export interface IInteractionCanvas extends ILeaferCanvas {
 export interface IInteractionConfig {
     wheel?: IWheelConfig
     pointer?: IPointerConfig
-    cursor?: ICursorConfig
     zoom?: IZoomConfig
     move?: IMoveConfig
     eventer?: IObject
+    cursor?: boolean
+    keyEvent?: boolean
 }
 
 export interface IZoomConfig {
+    disabled?: boolean
     min?: number
     max?: number
 }
 
 export interface IMoveConfig {
+    disabled?: boolean
     holdSpaceKey?: boolean
+    holdMiddleKey?: boolean
+    holdRightKey?: boolean
+    scroll?: boolean | 'limit'
     drag?: boolean
+    dragAnimate?: boolean
     dragEmpty?: boolean
     dragOut?: boolean
     autoDistance?: number
 }
 
 export interface IWheelConfig {
+    disabled?: boolean
     zoomMode?: boolean | 'mouse'
     zoomSpeed?: number // 取值范围 0 ～ 1, 默认0.5
     moveSpeed?: number
@@ -102,11 +127,13 @@ export interface IPointerConfig {
     tapTime?: number
     longPressTime?: number
     transformTime?: number
+    hover?: boolean
     dragHover?: boolean
     dragDistance?: number
     swipeDistance?: number
     ignoreMove?: boolean // 性能优化字段, 控制move事件触发次数
     preventDefault?: boolean
+    preventDefaultMenu?: boolean
 }
 
 export interface ICursorConfig {

package/src/layout/ILeafLayout.ts

@@ -1,8 +1,8 @@
 import { IBoundsData, IMatrixData, ILayoutBoundsData, IPointData } from '../math/IMath'
 import { ILeaf } from '../display/ILeaf'
 
-export type ILocationType = 'world' | 'local' | 'inner'
-export type IBoundsType = 'content' | 'box' | 'stroke' | 'margin' | 'render'
+export type ILocationType = 'world' | 'page' | 'local' | 'inner'
+export type IBoundsType = 'content' | 'box' | 'stroke' | 'render'
 
 export interface ILeafLayout {
 
@@ -12,19 +12,24 @@ export interface ILeafLayout {
 
     // inner
 
+    contentBounds: IBoundsData // | content | 
     boxBounds: IBoundsData    //  | content + padding |
     strokeBounds: IBoundsData  //  | boxBounds + border |  
     renderBounds: IBoundsData //  | strokeBounds + shadow |
 
-    // auto layout
-    marginBounds: IBoundsData //  | strokeBounds + margin |
-    contentBounds: IBoundsData // | content |  
-
     // local
 
-    //localBoxBounds: IBoundsData = leaf.__local
-    localStrokeBounds?: IBoundsData
-    localRenderBounds?: IBoundsData
+    localContentBounds: IBoundsData
+    // localBoxBounds: IBoundsData // use leaf.__localBoxBounds
+    localStrokeBounds: IBoundsData
+    localRenderBounds: IBoundsData
+
+    // world
+
+    worldContentBounds: IBoundsData
+    worldBoxBounds: IBoundsData
+    worldStrokeBounds: IBoundsData
+    // worldRenderBounds: IBoundsData // use leaf.__world
 
     // state
     resized: boolean
@@ -58,8 +63,8 @@ export interface ILeafLayout {
     affectChildrenSort?: boolean
 
     strokeSpread: number
-    renderSpread: number
-    strokeBoxSpread: number
+    strokeBoxSpread: number // 用于生成strokeBounds
+    renderSpread: number // -1 表示需监视变化，不影响实际renderBounds，目前用在Box上
     renderShapeSpread: number
 
     // temp local
@@ -69,6 +74,12 @@ export interface ILeafLayout {
     d: number
     e: number
     f: number
+    x: number
+    y: number
+    width: number
+    height: number
+
+    createLocal(): void
 
     update(): void
 
@@ -78,8 +89,10 @@ export interface ILeafLayout {
     getLayoutPoints(type?: IBoundsType, relative?: ILocationType | ILeaf): IPointData[]
 
     // 独立 / 引用 boxBounds
+    shrinkContent(): void
     spreadStroke(): void
     spreadRender(): void
+    shrinkContentCancel(): void
     spreadStrokeCancel(): void
     spreadRenderCancel(): void
 

package/src/math/IMath.ts

@@ -1,15 +1,39 @@
-import { IObject } from '../data/IData'
+import { IFourNumber, IObject } from '../data/IData'
 
 export interface IPointData {
     x: number
     y: number
 }
 
+export interface IUnitPointData {
+    type?: 'percent' | 'px'
+    x: number
+    y: number
+}
+
+export interface IFromToData {
+    from: IPointData
+    to: IPointData
+}
+
+export interface IScrollPointData {
+    scrollX: number
+    scrollY: number
+}
+
+export interface IClientPointData {
+    clientX: number
+    clientY: number
+}
+
 export interface IPoint extends IPointData {
     set(x?: number | IPointData, y?: number): IPoint
     get(): IPointData
     clone(): IPoint
 
+    move(x: number, y: number): IPoint
+    scale(scaleX: number, scaleY?: number): IPoint
+    scaleOf(origin: IPointData, scaleX: number, scaleY?: number): IPoint
     rotate(rotation: number, origin?: IPointData): IPoint
     rotateOf(origin: IPointData, rotation: number): IPoint
     getRotation(origin: IPointData, to: IPointData, toOrigin?: IPointData): number
@@ -19,7 +43,7 @@ export interface IPoint extends IPointData {
 
     getCenter(to: IPointData): IPoint
     getDistance(to: IPointData): number
-    getDistancePoint(to: IPointData, distance: number): IPoint
+    getDistancePoint(to: IPointData, distance: number, changeTo?: boolean): IPoint
 
     getAngle(to: IPointData): number
     getAtan2(to: IPointData): number
@@ -60,14 +84,18 @@ export interface IBounds extends IBoundsData, ITwoPointBoundsData {
     get(): IBoundsData
     clone(): IBounds
 
+    move(x: number, y: number): IBounds
     scale(scaleX: number, scaleY?: number): IBounds
     scaleOf(origin: IPointData, scaleX: number, scaleY?: number): IBounds
     toOuterOf(matrix: IMatrixData, to?: IBoundsData): IBounds
-    getFitMatrix(put: IBoundsData): IMatrix
+    toInnerOf(matrix: IMatrixData, to?: IBoundsData): IBounds
+    getFitMatrix(put: IBoundsData, baseScale?: number): IMatrix
 
-    spread(spreadX: number, spreadY?: number): IBounds
+    spread(fourNumber: IFourNumber): IBounds
+    shrink(fourNumber: IFourNumber): IBounds
     ceil(): IBounds
     unsign(): IBounds
+    float(maxLength?: number): IBounds
 
     add(bounds: IBoundsData): IBounds
     addList(boundsList: IBoundsData[]): IBounds
@@ -75,7 +103,9 @@ export interface IBounds extends IBoundsData, ITwoPointBoundsData {
     addListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds
     setListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds
 
+    setPoint(point: IPointData): IBounds
     setPoints(points: IPointData[]): IBounds
+    addPoint(point: IPointData): IBounds
     getPoints(): IPointData[] // topLeft, topRight, bottomRight, bottomLeft
 
     hitPoint(point: IPointData, pointMatrix?: IMatrixData): boolean
@@ -98,13 +128,15 @@ export interface ITwoPointBoundsData {
     maxY: number
 }
 
-
-export interface IAutoBoundsData {
+export interface IAutoBoxData {
     top?: number
     right?: number
     bottom?: number
     left?: number
+}
 
+
+export interface IAutoBoundsData extends IAutoBoxData {
     width?: number
     height?: number
 }
@@ -155,8 +187,10 @@ export type ILayoutAttr =
 
 export interface ILayoutBoundsData extends ILayoutData, IBoundsData {
 }
-export interface IMatrix extends IMatrixData {
+export interface IMatrix extends IMatrixWithScaleData {
+
     set(a: number | IMatrixData, b: number, c: number, d: number, e: number, f: number): IMatrix
+    setWith(dataWithScale: IMatrixWithScaleData): IMatrix  // set scaleX scaleY
     get(): IMatrixData
     clone(): IMatrix
 
@@ -164,6 +198,7 @@ export interface IMatrix extends IMatrixData {
     translateInner(x: number, y: number): IMatrix
 
     scale(x: number, y?: number): IMatrix
+    scaleWith(x: number, y?: number): IMatrix // change scaleX scaleY
     scaleOfOuter(origin: IPointData, x: number, y?: number): IMatrix
     scaleOfInner(origin: IPointData, x: number, y?: number): IMatrix
 
@@ -181,6 +216,7 @@ export interface IMatrix extends IMatrixData {
     divide(child: IMatrixData): IMatrix
     divideParent(parent: IMatrixData): IMatrix
     invert(): IMatrix
+    invertWith(): IMatrix  // change scaleX scaleY
 
     toOuterPoint(inner: IPointData, to?: IPointData, distance?: boolean): void
     toInnerPoint(outer: IPointData, to?: IPointData, distance?: boolean): void
@@ -188,6 +224,8 @@ export interface IMatrix extends IMatrixData {
     setLayout(data: ILayoutData, origin?: IPointData): IMatrix
     getLayout(origin?: IPointData, firstSkewY?: boolean): ILayoutData
 
+    withScale(scaleX?: number, scaleY?: number): IMatrixWithScaleData
+
     reset(): void
 }
 
@@ -195,4 +233,11 @@ export interface IMatrixWithBoundsData extends IMatrixData, IBoundsData { }
 
 export interface IMatrixWithScaleData extends IMatrixData, IScaleData { }
 
+export interface IMatrixWithOptionScaleData extends IMatrixData {
+    scaleX?: number
+    scaleY?: number
+}
+
+export interface IMatrixWithBoundsScaleData extends IMatrixData, IBoundsData, IScaleData { }
+
 export interface IMatrixWithLayoutData extends IMatrixData, ILayoutBoundsData { }