@leafer/interface 1.0.0-rc.2 → 1.0.0-rc.21

package/src/event/IEvent.ts

@@ -3,8 +3,11 @@ import { IWatchEventData } from '../watcher/IWatcher'
 import { ILayoutBlockData } from '../layouter/ILayouter'
 import { ILeaf } from '../display/ILeaf'
 import { IScreenSizeData, IPointData } from '../math/IMath'
+import { IObject } from '../data/IData'
 
 export interface IEvent {
+    origin?: IObject
+
     type?: string
     target?: IEventTarget
     current?: IEventTarget
@@ -75,29 +78,6 @@ export interface IWatchEvent extends IEvent {
     readonly data: IWatchEventData
 }
 
-export interface ITransformEventData {
-    x: number
-    y: number
-    scaleX: number
-    scaleY: number
-    rotation: number
-
-    readonly zooming: boolean
-    readonly moving: boolean
-    readonly rotating: boolean
-    readonly changing: boolean
-}
-
-export interface ITransformEvent extends IEvent, ITransformEventData {
-    readonly x: number
-    readonly y: number
-    readonly scaleX: number
-    readonly scaleY: number
-    readonly rotation: number
-}
-export type TransformMode = 'move' | 'zoom' | 'rotate'
-
-
 export interface IMultiTouchData {
     move: IPointData,
     scale: number,

package/src/event/IEventer.ts

@@ -1,5 +1,9 @@
-import { IEvent, IFunction, IObject } from '@leafer/interface'
 import { ILeafEventer } from '../display/module/ILeafEventer'
+import { ILeaf } from '../display/ILeaf'
+import { IFunction } from '../function/IFunction'
+import { IEvent } from './IEvent'
+import { IObject } from '../data/IData'
+
 
 export type IEventListener = IFunction
 
@@ -18,6 +22,7 @@ export interface IEventListenerMap {
 
 export interface IEventListenerId {
     type: string | string[]
+    current: ILeaf
     listener: IEventListener
     options?: IEventListenerOptions | boolean
 }

package/src/event/IUIEvent.ts

@@ -23,10 +23,9 @@ export interface IUIEvent extends IEvent {
     path?: ILeafList
     throughPath?: ILeafList // 穿透path，不受层级影响，从上到下只要碰撞到区域就算，一般点击的时候
 
-    origin?: IObject
-
-    getInner?(target?: ILeaf): IPointData
-    getLocal?(target?: ILeaf): IPointData
+    getPage?(): IPointData
+    getInner?(relative?: ILeaf): IPointData
+    getLocal?(relative?: ILeaf): IPointData
 }
 
 
@@ -39,6 +38,7 @@ export interface IPointerEvent extends IUIEvent {
     tiltX?: number
     tiltY?: number
     twist?: number
+    isCancel?: boolean
 }
 export type PointerType = 'mouse' | 'pen' | 'touch'
 
@@ -48,10 +48,13 @@ export interface IDragEvent extends IPointerEvent {
     totalX?: number
     totalY?: number
 
-    getInnerMove?(target?: ILeaf): IPointData
-    getLocalMove?(target?: ILeaf): IPointData
-    getInnerTotal?(target?: ILeaf): IPointData
-    getLocalTotal?(target?: ILeaf): IPointData
+    getPageMove?(total?: boolean): IPointData
+    getInnerMove?(relative?: ILeaf): IPointData
+    getLocalMove?(relative?: ILeaf): IPointData
+
+    getPageTotal?(): IPointData
+    getInnerTotal?(relative?: ILeaf): IPointData
+    getLocalTotal?(relative?: ILeaf): IPointData
 }
 
 export interface IDropEvent extends IPointerEvent {

package/src/file/IExport.ts

@@ -0,0 +1,34 @@
+import { IBlob, ILeaferCanvas } from '../canvas/ILeaferCanvas'
+import { ILeaf } from '../display/ILeaf'
+import { ILocationType } from '../layout/ILeafLayout'
+import { IBoundsData } from '../math/IMath'
+
+
+export interface IExportOptions {
+    quality?: number
+    blob?: boolean
+    scale?: number
+    pixelRatio?: number
+    slice?: boolean
+    trim?: boolean
+    fill?: string
+    screenshot?: IBoundsData | boolean
+    relative?: ILocationType | ILeaf
+    onCanvas?: IExportOnCanvasFunction
+}
+
+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

@@ -10,4 +10,13 @@ export interface INumberFunction {
 
 export interface IPointDataFunction {
     (...arg: any): IPointData
+}
+
+
+export interface IAttrDecorator {
+    (...arg: any): IAttrDecoratorInner
+}
+
+interface IAttrDecoratorInner {
+    (target: any, key: string): any
 }

package/src/image/IImageManager.ts

@@ -1,5 +1,6 @@
 import { ILeaferImage, ILeaferImageConfig } from './ILeaferImage'
 import { ITaskProcessor } from '../task/ITaskProcessor'
+import { IExportFileType } from '../file/IFileType'
 
 interface ILeaferImageMap {
     [name: string]: ILeaferImage
@@ -10,9 +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
+    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,12 +1,12 @@
-export { IApp } from './app/IApp'
-export { ILeafer, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
-export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IBlendMode, IResizeType, ICursorType, ICursorTypeMap, IAround } from './display/ILeaf'
+export { IAppBase } from './app/IApp'
+export { ILeaferBase, ILeaferAttrData, ILeaferType, ILeaferTypeCreator, ILeaferTypeFunction, ILeaferTypeList, ILeaferConfig, ICreator, IUICreator, IZoomType } from './app/ILeafer'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IMaskType, IBlendMode, IEditSize, IImageCursor, ICursorType, IStateStyleType, IAround, ILeafAttrDescriptor, ILeafAttrDescriptorFn } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
 
 
-export { ILeafData, IDataProcessor } from './data/ILeafData'
-export { ILeafLayout, ILayoutLocationType, ILayoutBoundsType } from './layout/ILeafLayout'
+export { ILeafData, IDataProcessor, ILeafDataOptions } from './data/ILeafData'
+export { ILeafLayout, ILocationType, IBoundsType } from './layout/ILeafLayout'
 
 export { ILeafDataProxy, ILeafDataProxyModule } from './display/module/ILeafDataProxy'
 export { ILeafMatrix, ILeafMatrixModule } from './display/module/ILeafMatrix'
@@ -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, ISelectPathResult, ISelectPathOptions } from './selector/ISelector'
+export { ISelector, ISelectorConfig, ISelectorProxy, IFindMethod, IPickResult, IPickOptions, 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 { ISkiaCanvas, ISkiaCanvasExportConfig, ICanvasType } from './canvas/ISkiaCanvas'
+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, 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, ITransformEvent, ITransformEventData, TransformMode, IMultiTouchData, IKeepTouchData } from './event/IEvent'
+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 { __Number, __Boolean, __String, __Object, __Value, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
+export { INumber, IBoolean, IString, IValue, IFourNumber, IPathString, ITimer, IObject, INumberMap, IStringMap, IBooleanMap, IDataTypeHandle } from './data/IData'
 export { ILeafList, ILeafArrayMap, ILeafMap, ILeafLevelList, ILeafListItemCallback } from './data/IList'
-export { IPoint, IPointData, IRadiusPointData, ISize, ISizeData, IScreenSizeData, IBounds, IBoundsData, IBoundsDataHandle, IOffsetBoundsData, ITwoPointBounds, ITwoPointBoundsData, IAutoBounds, IAutoBoundsData, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithLayoutData, IMatrixDecompositionData, IMatrixDecompositionAttr } from './math/IMath'
-export { IFunction } from './function/IFunction'
+export { IPoint, IPointData, IRadiusPointData, ISize, ISizeData, IScreenSizeData, IBounds, IBoundsData, IBoundsDataFn, IOffsetBoundsData, ITwoPointBoundsData, IAutoBounds, IAutoBoundsData, IMatrix, IMatrixData, IMatrixWithBoundsData, IMatrixWithScaleData, IMatrixWithOptionScaleData, IMatrixWithBoundsScaleData, IMatrixWithLayoutData, IScaleRotationData, IScaleData, ISkewData, ILayoutBoundsData, ILayoutData, ILayoutAttr } from './math/IMath'
+export { IFunction, 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

@@ -3,7 +3,7 @@ import { IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent, IUIEvent, IKeyEven
 import { ILeaf, ICursorType } from '../display/ILeaf'
 import { ILeafList } from '../data/IList'
 import { IPointData } from '../math/IMath'
-import { ISelector, ISelectPathOptions } from '../selector/ISelector'
+import { ISelector, IPickOptions } from '../selector/ISelector'
 import { IBounds } from '../math/IMath'
 import { IControl } from '../control/IControl'
 import { IKeepTouchData } from '../event/IEvent'
@@ -17,6 +17,8 @@ export interface IInteraction extends IControl {
 
     running: boolean
     readonly dragging: boolean
+    readonly isDragEmpty: boolean
+    readonly isHoldRightKey: boolean
     readonly moveMode: boolean
 
     config: IInteractionConfig
@@ -29,6 +31,7 @@ export interface IInteraction extends IControl {
     downData: IPointerEvent
     hoverData: IPointerEvent
     downTime: number
+    focusData: ILeaf
 
     receive(event: any): void
 
@@ -47,11 +50,23 @@ 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
 
-    updateDownData(data?: IPointerEvent): void
+    isDrag(leaf: ILeaf): boolean
+    isPress(leaf: ILeaf): boolean
+    isHover(leaf: ILeaf): boolean
+    isFocus(leaf: ILeaf): boolean
+
+    cancelHover(): void
+
+    updateDownData(data?: IPointerEvent, options?: IPickOptions, merge?: boolean): void
     updateHoverData(data: IPointerEvent): void
+
     updateCursor(hoverData?: IPointerEvent): void
+    setCursor(cursor: ICursorType | ICursorType[]): void
 
     emit(type: string, data: IUIEvent, path?: ILeafList, excludePath?: ILeafList): void
 }
@@ -63,25 +78,33 @@ export interface IInteractionCanvas extends ILeaferCanvas {
 export interface IInteractionConfig {
     wheel?: IWheelConfig
     pointer?: IPointerConfig
+    cursor?: ICursorConfig
     zoom?: IZoomConfig
     move?: IMoveConfig
     eventer?: IObject
 }
 
 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 {
-    zoomMode?: boolean
+    zoomMode?: boolean | 'mouse'
     zoomSpeed?: number // 取值范围 0 ～ 1, 默认0.5
     moveSpeed?: number
     rotateSpeed?: number // 取值范围 0 ～ 1, 默认0.5
@@ -98,9 +121,15 @@ 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 {
+    stop?: boolean
 }

package/src/layout/ILeafLayout.ts

@@ -1,14 +1,14 @@
-import { IBoundsData, IMatrixData } from '../math/IMath'
+import { IBoundsData, IMatrixData, ILayoutBoundsData, IPointData } from '../math/IMath'
 import { ILeaf } from '../display/ILeaf'
 
-export type ILayoutLocationType = 'world' | 'local' | 'inner'
-export type ILayoutBoundsType = 'content' | 'box' | 'stroke' | 'margin' | 'render'
+export type ILocationType = 'world' | 'page' | 'local' | 'inner'
+export type IBoundsType = 'content' | 'box' | 'stroke' | 'margin' | 'render'
 
 export interface ILeafLayout {
 
     leaf: ILeaf
 
-    useZoomProxy: boolean
+    proxyZoom: boolean
 
     // inner
 
@@ -23,17 +23,17 @@ export interface ILeafLayout {
     // local
 
     //localBoxBounds: IBoundsData = leaf.__local
-    localStrokeBounds: IBoundsData
-    localRenderBounds: IBoundsData
+    localStrokeBounds?: IBoundsData
+    localRenderBounds?: IBoundsData
 
     // state
+    resized: boolean
+    waitAutoLayout: boolean
 
     // matrix changed
     matrixChanged: boolean // include positionChanged scaleChanged skewChanged
-    positionChanged: boolean // x, y
-    originChanged?: boolean // originX originY
     scaleChanged: boolean // scaleX scaleY
-    rotationChanged: boolean // rotaiton, skewX scaleY 数据更新
+    rotationChanged: boolean // rotaiton, skewX skewY 数据更新
 
     // bounds changed
     boundsChanged: boolean
@@ -58,14 +58,30 @@ export interface ILeafLayout {
     affectChildrenSort?: boolean
 
     strokeSpread: number
-    renderSpread: number
+    renderSpread: number // -1 表示监视变化，不影响实际renderBounds，目前用在Box上
     strokeBoxSpread: number
     renderShapeSpread: number
 
-    checkUpdate(force?: boolean): void
+    // temp local
+    a: number
+    b: number
+    c: number
+    d: number
+    e: number
+    f: number
+    x: number
+    y: number
+    width: number
+    height: number
 
-    getTransform(locationType: ILayoutLocationType): IMatrixData
-    getBounds(type: ILayoutBoundsType, locationType: ILayoutLocationType): IBoundsData
+    createLocal(): void
+
+    update(): void
+
+    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[]
 
     // 独立 / 引用 boxBounds
     spreadStroke(): void
@@ -80,9 +96,9 @@ export interface ILeafLayout {
     renderChange(): void
 
     // matrix
-    positionChange(): void
     scaleChange(): void
     rotationChange(): void
+    matrixChange(): void
 
     // face
     surfaceChange(): void

package/src/layouter/ILayouter.ts

@@ -34,6 +34,7 @@ export interface ILayouterConfig {
 export interface ILayouter extends IControl {
     target: ILeaf
     layoutedBlocks: ILayoutBlockData[]
+    extraBlock: ILayoutBlockData
 
     totalTimes: number
     times: number
@@ -54,6 +55,8 @@ export interface ILayouter extends IControl {
     partLayout(): void
     fullLayout(): void
 
+    addExtra(leaf: ILeaf): void
+
     createBlock(data: ILeafList | ILeaf[]): ILayoutBlockData
     getBlocks(list: ILeafList): ILayoutBlockData[]
     addBlocks(current: ILayoutBlockData[]): void