@leafer/interface 1.0.0-beta.12 → 1.0.0-beta.16

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@leafer/interface",
-  "version": "1.0.0-beta.12",
+  "version": "1.0.0-beta.16",
   "description": "@leafer/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
+  "types": "types/index.d.ts",
   "files": [
-    "src"
+    "src",
+    "types",
+    "dist"
   ],
   "repository": {
     "type": "git",

package/src/app/ILeafer.ts

@@ -27,12 +27,14 @@ export interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IIn
 export interface ILeafer extends IZoomView, IControl {
 
     readonly isApp: boolean
+    readonly app: ILeafer
     parent?: IApp
 
     running: boolean
+    created: boolean
     ready: boolean
     viewReady: boolean
-    readonly viewLoaded: boolean
+    viewCompleted: boolean
 
     pixelRatio: number
 
@@ -55,12 +57,17 @@ export interface ILeafer extends IZoomView, IControl {
     config: ILeaferConfig
 
     __eventIds: IEventListenerId[]
+    __nextRenderWait: IFunction[]
 
     init(userConfig?: ILeaferConfig, parentApp?: IApp): void
     setZoomLayer(zoomLayer: ILeaf, moveLayer?: ILeaf): void
     forceFullRender(): void
+    updateCursor(): void
     resize(size: IScreenSizeData): void
-    waitViewLoaded(fun: IFunction): void
+
+    waitReady(item: IFunction): void
+    waitViewReady(item: IFunction): void
+    waitViewCompleted(item: IFunction): void
 }
 
 export interface ILeaferTypeCreator {

package/src/canvas/ILeaferCanvas.ts

@@ -5,6 +5,7 @@ import { IResizeEventListener } from '../event/IEvent'
 import { IPathDrawer } from '../path/IPathDrawer'
 import { InnerId } from '../event/IEventer'
 import { ICanvasManager } from './ICanvasManager'
+import { ICursorType } from '../display/ILeaf'
 
 export interface ILeaferCanvasConfig extends IAutoBoundsData {
     view?: string | IObject
@@ -109,12 +110,15 @@ interface ICanvasMethod {
     setStrokeOptions(options: ICanvasStrokeOptions): void
 
     setWorld(matrix: IMatrixData, parentMatrix?: IMatrixData): void
+    useWorldTransform(worldTransform?: IMatrixData): void
 
     setWorldShadow(x: number, y: number, blur: number, color?: string): void
     setWorldBlur(blur: number): void
 
     copyWorld(canvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData, blendMode?: string): void
+    copyWorldByReset(canvas: ILeaferCanvas, from?: IBoundsData, to?: IBoundsData, blendMode?: string): void
     copyWorldToInner(canvas: ILeaferCanvas, fromWorld: IMatrixWithBoundsData, toInnerBounds: IBoundsData, blendMode?: string): void
+
     useMask(maskCanvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData): void
     useEraser(eraserCanvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData): void
 
@@ -175,12 +179,15 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     updateViewSize(): void
     updateClientBounds(): void
 
+    setCursor(cursor: ICursorType | ICursorType[]): void
+
     // other
     isSameSize(options: ILeaferCanvasConfig): boolean
     getSameCanvas(useSameWorldTransform?: boolean): ILeaferCanvas
     getBiggerCanvas(addWidth: number, addHeight: number): ILeaferCanvas
     recycle(): void
 
+    updateRender(): void
     unrealCanvas(): void
     destroy(): void
 }

package/src/data/IData.ts

@@ -25,5 +25,4 @@ export interface IStringMap {
 
 export interface IDataTypeHandle {
     (target: any): void
-}
-
+}

package/src/data/ILeafData.ts

@@ -9,15 +9,15 @@ export interface IDataProcessor extends IObject {
     __single: boolean
     __checkSingle(): void
 
-    __get(name: string): unknown
+    __get(name: string): any
 
-    __setInput(name: string, value: unknown): void
-    __getInput(name: string): unknown
+    __setInput(name: string, value: any): void
+    __getInput(name: string): any
     __removeInput(name: string): void
     __getInputData(): IObject
 
-    __setMiddle(name: string, value: unknown): void
-    __getMiddle(name: string): unknown
+    __setMiddle(name: string, value: any): void
+    __getMiddle(name: string): any
 
     destroy(): void
 }

package/src/display/IBranch.ts

@@ -5,5 +5,6 @@ import { ILeaf } from './ILeaf'
 export interface IBranch extends ILeaf {
     children: ILeaf[]
     __renderBranch?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    addMany(...children: ILeaf[]): void
     removeAll(destroy?: boolean): void
 }

package/src/display/ILeaf.ts

@@ -5,7 +5,7 @@ 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, IMatrixData, IRadiusPointData, IMatrixDecompositionAttr } from '../math/IMath'
+import { IMatrixWithBoundsData, IMatrix, IPointData, IBoundsData, IRadiusPointData, IMatrixDecompositionAttr, IMatrixWithLayoutData } from '../math/IMath'
 import { IFunction } from '../function/IFunction'
 
 import { ILeafDataProxy } from './module/ILeafDataProxy'
@@ -35,7 +35,7 @@ export interface ILeafAttrData {
     opacity: __Number
     visible: __Boolean
     isMask: __Boolean
-    isEraser?: __Boolean
+    isEraser: __Boolean
     zIndex: __Number
 
     // layout data
@@ -49,6 +49,9 @@ export interface ILeafAttrData {
     skewX: __Number
     skewY: __Number
 
+    scale: __Number | IPointData // helper
+    around: 'center' | IPointData
+
     draggable: __Boolean
 
     hittable: __Boolean
@@ -56,6 +59,9 @@ export interface ILeafAttrData {
     hitStroke: IHitType
     hitChildren: __Boolean
     hitSelf: __Boolean
+    hitRadius: __Number
+
+    cursor: ICursorType | ICursorType[]
 }
 
 export type IHitType =
@@ -91,7 +97,60 @@ export type IBlendMode =
     | 'destination-out'
     | 'destination-atop'
 
-export interface ILeafInputData {
+export type IResizeType = 'size' | 'scale'
+export interface IImageCursor {
+    url: string
+    x?: number
+    y?: number
+}
+
+export type IAround = 'center' | IPointData
+
+export type ICursorType =
+    | IImageCursor
+    | 'auto'
+    | 'default'
+    | 'none'
+    | 'context-menu'
+    | 'help'
+    | 'pointer'
+    | 'progress'
+    | 'wait'
+    | 'cell'
+    | 'crosshair'
+    | 'text'
+    | 'vertical-text'
+    | 'alias'
+    | 'copy'
+    | 'move'
+    | 'no-drop'
+    | 'not-allowed'
+    | 'grab'
+    | 'grabbing'
+    | 'e-resize'
+    | 'n-resize'
+    | 'ne-resize'
+    | 'nw-resize'
+    | 's-resize'
+    | 'se-resize'
+    | 'sw-resize'
+    | 'w-resize'
+    | 'ew-resize'
+    | 'ns-resize'
+    | 'nesw-resize'
+    | 'nwse-resize'
+    | 'col-resize'
+    | 'row-resize'
+    | 'all-scroll'
+    | 'zoom -in'
+    | 'zoom-out'
+
+export interface ICursorTypeMap {
+    [name: string]: ICursorType | ICursorType[]
+}
+export interface ILeafInputData extends IObject {
+    tag?: string
+
     // layer data
     id?: __String
     name?: __String
@@ -115,6 +174,9 @@ export interface ILeafInputData {
     skewX?: __Number
     skewY?: __Number
 
+    scale?: __Number | IPointData // helper
+    around?: IAround
+
     draggable?: __Boolean
 
     hittable?: __Boolean
@@ -122,6 +184,11 @@ export interface ILeafInputData {
     hitStroke?: IHitType
     hitChildren?: __Boolean
     hitSelf?: __Boolean
+    hitRadius?: __Number
+
+    cursor?: ICursorType | ICursorType[]
+
+    children?: ILeafInputData[]
 }
 export interface ILeafComputedData {
     // layer data
@@ -147,6 +214,8 @@ export interface ILeafComputedData {
     skewX?: number
     skewY?: number
 
+    around?: IAround
+
     draggable?: boolean
 
     hittable?: boolean
@@ -154,6 +223,9 @@ export interface ILeafComputedData {
     hitStroke?: IHitType
     hitChildren?: boolean
     hitSelf?: boolean
+    hitRadius?: number
+
+    cursor?: ICursorType | ICursorType[]
 
     // other
     __childBranchNumber?: number // 存在子分支的个数
@@ -181,13 +253,15 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     __: ILeafData
     __layout: ILeafLayout
 
+    __world: IMatrixWithLayoutData
     __local: IMatrixWithBoundsData
-    __world: IMatrixWithBoundsData
+
     __worldOpacity: number
 
-    readonly worldTransform: IMatrixData
-    readonly localTransform: IMatrixData
+    readonly worldTransform: IMatrixWithLayoutData
+    readonly localTransform: IMatrixWithBoundsData
 
+    readonly boxBounds: IBoundsData
     readonly worldBoxBounds: IBoundsData
     readonly worldStrokeBounds: IBoundsData
     readonly worldRenderBounds: IBoundsData
@@ -199,6 +273,10 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     __level: number // 图层级别 root(1) -> hight
     __tempNumber?: number // 用于临时运算储存状态
 
+    readonly resizeable: boolean
+
+    readonly __hasMirror: boolean
+
     __hasMask?: boolean
     __hasEraser?: boolean
     __hitCanvas?: IHitCanvas
@@ -213,11 +291,13 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
 
     waitParent(item: IFunction): void
     waitLeafer(item: IFunction): void
+    nextRender(item: IFunction): void
 
     __bindLeafer(leafer: ILeafer | null): void
 
     set(data: IObject): void
-    get(attrNames?: string[]): IObject
+    toJSON(): IObject
+    toString(): string
 
     // ILeafData ->
     __setAttr(attrName: string, newValue: __Value): void
@@ -240,6 +320,8 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     __updateStrokeBounds(): void
     __updateRenderBounds(): void
 
+    __updateNaturalSize(): void
+
     __updateStrokeSpread(): number
     __updateRenderSpread(): number
 
@@ -255,14 +337,22 @@ export interface ILeaf extends ILeafMask, ILeafRender, ILeafHit, ILeafBounds, IL
     getWorld(attrName: IMatrixDecompositionAttr): number
     getBounds(type: ILayoutBoundsType, locationType?: ILayoutLocationType): IBoundsData
 
-    worldToLocal(world: IPointData, to?: IPointData, isMovePoint?: boolean): void
-    localToWorld(local: IPointData, to?: IPointData, isMovePoint?: boolean): void
-    worldToInner(world: IPointData, to?: IPointData, isMovePoint?: boolean): void
-    innerToWorld(inner: IPointData, to?: IPointData, isMovePoint?: boolean): void
+    worldToLocal(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
+    localToWorld(local: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
+    worldToInner(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
+    innerToWorld(inner: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void
+
+    getInnerPoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
+    getInnerPointByLocal(local: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
+    getLocalPoint(world: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData
+    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
 
     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
 
     // ILeafHit ->
     __hitWorld(point: IRadiusPointData): boolean

package/src/display/module/ILeafBounds.ts

@@ -13,6 +13,8 @@ export interface ILeafBounds {
     __updateStrokeBounds?(): void
     __updateRenderBounds?(): void
 
+    __updateNaturalSize?(): void
+
     __updateStrokeSpread?(): number
     __updateRenderSpread?(): number
 

package/src/event/IUIEvent.ts

@@ -45,11 +45,13 @@ export type PointerType = 'mouse' | 'pen' | 'touch'
 export interface IDragEvent extends IPointerEvent {
     moveX: number
     moveY: number
-    totalX: number
-    totalY: number
+    totalX?: number
+    totalY?: number
 
     getInnerMove?(target?: ILeaf): IPointData
     getLocalMove?(target?: ILeaf): IPointData
+    getInnerTotal?(target?: ILeaf): IPointData
+    getLocalTotal?(target?: ILeaf): IPointData
 }
 
 export interface IDropEvent extends IPointerEvent {
@@ -74,7 +76,8 @@ export interface ISwipeEvent extends IDragEvent {
 }
 
 export interface IKeyEvent extends IUIEvent {
-
+    code?: string
+    key?: string
 }
 
 export interface IImageEvent extends IEvent {

package/src/image/ILeaferImage.ts

@@ -1,9 +1,11 @@
 import { IObject } from '../data/IData'
 import { InnerId } from '../event/IEventer'
+import { IExportFileType } from '../file/IFileType'
 
 export interface ILeaferImageConfig {
     url: string
     thumb?: string
+    format?: IExportFileType
 }
 
 export interface ILeaferImageOnLoaded {

package/src/index.ts

@@ -1,6 +1,6 @@
 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 } from './display/ILeaf'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IBlendMode, IResizeType, ICursorType, ICursorTypeMap, IAround } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
 
@@ -51,5 +51,5 @@ export { IInteraction, IInteractionCanvas, IInteractionConfig, IWheelConfig, IPo
 
 export { __Number, __Boolean, __String, __Object, __Value, 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, IMatrixDecompositionData, IMatrixDecompositionAttr } from './math/IMath'
+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'

package/src/interaction/IInteraction.ts

@@ -1,9 +1,9 @@
 import { INumberFunction, IPointDataFunction } from '../function/IFunction'
-import { IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent, IUIEvent } from '../event/IUIEvent'
-import { ILeaf } from '../display/ILeaf'
+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 } from '../selector/ISelector'
+import { ISelector, ISelectPathOptions } from '../selector/ISelector'
 import { IBounds } from '../math/IMath'
 import { IControl } from '../control/IControl'
 import { IKeepTouchData } from '../event/IEvent'
@@ -17,21 +17,25 @@ export interface IInteraction extends IControl {
 
     running: boolean
     readonly dragging: boolean
+    readonly moveMode: boolean
 
     config: IInteractionConfig
 
+    cursor: ICursorType | ICursorType[]
     readonly hitRadius: number
+
     shrinkCanvasBounds: IBounds
 
     downData: IPointerEvent
+    hoverData: IPointerEvent
     downTime: number
 
     receive(event: any): void
 
-    pointerDown(data: IPointerEvent, defaultPath?: boolean): void
-    pointerMove(data: IPointerEvent): void
+    pointerDown(data?: IPointerEvent, defaultPath?: boolean): void
+    pointerMove(data?: IPointerEvent): void
     pointerMoveReal(data: IPointerEvent): void
-    pointerUp(data: IPointerEvent): void
+    pointerUp(data?: IPointerEvent): void
     pointerCancel(): void
 
     multiTouch(data: IUIEvent, list: IKeepTouchData[]): void
@@ -40,6 +44,15 @@ export interface IInteraction extends IControl {
     zoom(data: IZoomEvent): void
     rotate(data: IRotateEvent): void
 
+    keyDown(data: IKeyEvent): void
+    keyUp(data: IKeyEvent): void
+
+    findPath(data: IPointerEvent, options?: ISelectPathOptions): ILeafList
+
+    updateDownData(data?: IPointerEvent): void
+    updateHoverData(data: IPointerEvent): void
+    updateCursor(hoverData?: IPointerEvent): void
+
     emit(type: string, data: IUIEvent, path?: ILeafList, excludePath?: ILeafList): void
 }
 
@@ -61,6 +74,7 @@ export interface IZoomConfig {
 }
 
 export interface IMoveConfig {
+    holdSpaceKey?: boolean
     dragEmpty?: boolean
     dragOut?: boolean
     autoDistance?: number

package/src/layout/ILeafLayout.ts

@@ -1,4 +1,4 @@
-import { IBoundsData, IMatrixData, IMatrixDecompositionData } from '../math/IMath'
+import { IBoundsData, IMatrixData } from '../math/IMath'
 import { ILeaf } from '../display/ILeaf'
 
 export type ILayoutLocationType = 'world' | 'local' | 'inner'
@@ -65,7 +65,6 @@ export interface ILeafLayout {
     checkUpdate(force?: boolean): void
 
     getTransform(locationType: ILayoutLocationType): IMatrixData
-    decomposeTransform(locationType: ILayoutLocationType): IMatrixDecompositionData
     getBounds(type: ILayoutBoundsType, locationType: ILayoutLocationType): IBoundsData
 
     // 独立 / 引用 boxBounds

package/src/math/IMath.ts

@@ -56,12 +56,13 @@ export interface IBounds extends IBoundsData {
     copy(bounds: IBoundsData): IBounds
     clone(): IBounds
 
-    scale(scale: number): IBounds
+    scale(scaleX: number, scaleY?: number): IBounds
     toOuterOf(matrix: IMatrixData, to?: IBoundsData): IBounds
     getFitMatrix(put: IBoundsData): IMatrix
 
     spread(size: number): IBounds
     ceil(): IBounds
+    unsign(): IBounds
 
     add(bounds: IBoundsData): IBounds
     addList(boundsList: IBounds[]): IBounds
@@ -71,7 +72,7 @@ export interface IBounds extends IBoundsData {
     setByPoints(points: IPointData[]): IBounds
 
     hitPoint(point: IPointData, pointMatrix?: IMatrixData): boolean
-    hitRadiusPoint(point: IRadiusPointData, pointMatrix?: IMatrixData): boolean
+    hitRadiusPoint(point: IRadiusPointData, pointMatrix?: IMatrixWithLayoutData): boolean
     hit(bounds: IBoundsData, boundsMatrix?: IMatrixData): boolean
     includes(bounds: IBoundsData, boundsMatrix?: IMatrixData): boolean
 
@@ -168,16 +169,14 @@ export interface IMatrix extends IMatrixData {
     preMultiply(matrix: IMatrixData): IMatrix
     invert(): IMatrix
 
-    toOuterPoint(inner: IPointData, to?: IPointData): void
-    toInnerPoint(outer: IPointData, to?: IPointData): void
+    toOuterPoint(inner: IPointData, to?: IPointData, distance?: boolean): void
+    toInnerPoint(outer: IPointData, to?: IPointData, distance?: boolean): void
 
     decompose(): IMatrixDecompositionData
 
     reset(): void
 }
 
+export interface IMatrixWithBoundsData extends IMatrixData, IBoundsData { }
 
-export interface IMatrixWithBoundsData extends IMatrixData, IBoundsData {
-    scaleX?: number
-    scaleY?: number
-}
+export interface IMatrixWithLayoutData extends IMatrixData, IMatrixDecompositionData, IBoundsData { }

package/src/path/IPathDrawer.ts

@@ -33,4 +33,9 @@ export interface IPathCreator {
 
     rect(x: number, y: number, width: number, height: number): IPathCreator
     roundRect(x: number, y: number, width: number, height: number, radius?: number | number[]): IPathCreator
+
+    // new
+    drawEllipse(x: number, y: number, radiusX: number, radiusY: number, rotation?: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator
+    drawArc(x: number, y: number, radius: number, startAngle?: number, endAngle?: number, anticlockwise?: boolean): IPathCreator
+    drawPoints(points: number[], curve?: boolean | number, close?: boolean): IPathCreator
 }

package/src/platform/IPlatform.ts

@@ -11,11 +11,13 @@ export interface IPlatform {
     requestRender?(render: IFunction): void
     canvas?: ILeaferCanvas
     isWorker?: boolean
+    isMobile?: boolean
     devicePixelRatio?: number
-    intWheelDeltaY?: boolean // firxfox / Windows need
+    intWheelDeltaY?: boolean // firefox / Windows need
     conicGradientSupport?: boolean
-    conicGradientRotate90?: boolean // fixfox need rotate
+    conicGradientRotate90?: boolean // firefox need rotate
     fullImageShadow?: boolean // safari need 
+    syncDomFont?: boolean // firefox need
     layout?(target: ILeaf): void
     realtimeLayout?: boolean
     origin?: {

package/src/watcher/IWatcher.ts

@@ -18,7 +18,11 @@ export interface IWatcher extends IControl {
     disabled: boolean
     running: boolean
     changed: boolean
-    hasRemoved: boolean
+
+    hasVisible: boolean
+    hasAdd: boolean
+    hasRemove: boolean
+    readonly childrenChanged: boolean
 
     config: IWatcherConfig