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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/interface",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.30",
   "description": "@leafer/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",

package/src/app/IApp.ts

@@ -1,6 +1,6 @@
-import { ILeafer } from './ILeafer'
+import { ILeaferBase } from './ILeafer'
 
-export interface IApp extends ILeafer {
-    children: ILeafer[]
+export interface IAppBase extends ILeaferBase {
+    children: ILeaferBase[]
     realCanvas: boolean
 }

package/src/app/ILeafer.ts

@@ -1,42 +1,40 @@
-import { ILeaf } from '../display/ILeaf'
+import { ILeaf, ICursorType } from '../display/ILeaf'
 import { IRenderer, IRendererConfig } from '../renderer/IRenderer'
 import { IHitCanvas, ILeaferCanvas, ILeaferCanvasConfig, IHitCanvasConfig } from '../canvas/ILeaferCanvas'
 import { ILayouter, ILayouterConfig } from '../layouter/ILayouter'
 import { ISelector, ISelectorConfig } from '../selector/ISelector'
 import { IInteraction, IInteractionCanvas, IInteractionConfig } from '../interaction/IInteraction'
 import { IWatcher, IWatcherConfig } from '../watcher/IWatcher'
-import { IAutoBounds, IScreenSizeData } from '../math/IMath'
+import { IAutoBounds, IBoundsData, IPointData, IScreenSizeData, IBounds, IClientPointData } from '../math/IMath'
 import { ICanvasManager } from '../canvas/ICanvasManager'
 import { IHitCanvasManager } from '../canvas/IHitCanvasManager'
 import { IEventListenerId } from '../event/IEventer'
-import { IObject } from '../data/IData'
+import { IFourNumber, IObject } from '../data/IData'
 import { IZoomView } from '../display/IView'
-import { IApp } from './IApp'
+import { IAppBase } from './IApp'
 import { ILeaferImage, ILeaferImageConfig } from '../image/ILeaferImage'
 import { IControl } from '../control/IControl'
 import { IFunction } from '../function/IFunction'
 
 
-export type ILeaferType = 'draw' | 'design' | 'board' | 'document' | 'user'
+export type ILeaferType = 'draw' | 'editor' | 'design' | 'board' | 'document' | 'app' | 'website' | 'game' | 'player' | 'chart' | 'custom'
 export interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IInteractionConfig, ILayouterConfig {
     start?: boolean
     type?: ILeaferType
     realCanvas?: boolean
+    lazySpeard?: IFourNumber
 }
 
-export interface ILeafer extends IZoomView, IControl {
-
-    readonly isApp: boolean
-    readonly app: ILeafer
-    parent?: IApp
-
+export interface ILeaferAttrData {
     running: boolean
     created: boolean
     ready: boolean
     viewReady: boolean
+    imageReady: boolean
     viewCompleted: boolean
+    layoutLocked: boolean
 
-    pixelRatio: number
+    transforming: boolean
 
     view: unknown
 
@@ -53,31 +51,55 @@ export interface ILeafer extends IZoomView, IControl {
     hitCanvasManager?: IHitCanvasManager
 
     autoLayout?: IAutoBounds
+    lazyBounds: IBounds
 
     config: ILeaferConfig
 
+    readonly cursorPoint: IPointData
+    readonly clientBounds: IBoundsData
+    leafs: number
+
     __eventIds: IEventListenerId[]
     __nextRenderWait: IFunction[]
 
-    init(userConfig?: ILeaferConfig, parentApp?: IApp): void
-    setZoomLayer(zoomLayer: ILeaf, moveLayer?: ILeaf): void
-    forceFullRender(): void
-    updateCursor(): void
+    init(userConfig?: ILeaferConfig, parentApp?: IAppBase): void
+
+    start(): void
+    stop(): void
+
+    unlockLayout(): void
+    lockLayout(): void
+
+    updateCursor(cursor?: ICursorType): void
     resize(size: IScreenSizeData): void
 
-    waitReady(item: IFunction): void
-    waitViewReady(item: IFunction): void
-    waitViewCompleted(item: IFunction): void
+    waitReady(item: IFunction, bind?: IObject): void
+    waitViewReady(item: IFunction, bind?: IObject): void
+    waitViewCompleted(item: IFunction, bind?: IObject): void
+
+    zoom(zoomType: IZoomType, padding?: IFourNumber, fixedScale?: boolean): IBoundsData
+    getValidMove(moveX: number, moveY: number): IPointData
+    getValidScale(changeScale: number): number
+
+    getWorldPointByClient(clientPoint: IClientPointData, updateClient?: boolean): IPointData
+}
+
+export type IZoomType = 'in' | 'out' | 'fit' | 'fit-width' | 'fit-height' | number | ILeaf | ILeaf[] | IBoundsData
+
+export interface ILeaferBase extends IZoomView, IControl, ILeaferAttrData {
+    readonly isApp: boolean
+    readonly app: ILeaferBase
+    parent?: IAppBase
 }
 
 export interface ILeaferTypeCreator {
     list: ILeaferTypeList
     register(name: string, fn: ILeaferTypeFunction): void
-    run(name: string, leafer: ILeafer): void
+    run(name: string, leafer: ILeaferBase): void
 }
 
 export interface ILeaferTypeFunction {
-    (leafer: ILeafer): void
+    (leafer: ILeaferBase): void
 }
 
 export interface ILeaferTypeList {
@@ -88,6 +110,7 @@ export interface ICreator {
     image?(options?: ILeaferImageConfig): ILeaferImage
     canvas?(options?: ILeaferCanvasConfig, manager?: ICanvasManager): ILeaferCanvas
     hitCanvas?(options?: IHitCanvasConfig, manager?: ICanvasManager): IHitCanvas
+    hitCanvasManager?(): IHitCanvasManager
 
     watcher?(target: ILeaf, options?: IWatcherConfig): IWatcher
     layouter?(target: ILeaf, options?: ILayouterConfig): ILayouter
@@ -95,6 +118,8 @@ export interface ICreator {
     selector?(target: ILeaf, options?: ISelectorConfig): ISelector
 
     interaction?(target: ILeaf, canvas: IInteractionCanvas, selector: ISelector, options?: IInteractionConfig): IInteraction
+
+    editor?(options?: IObject): ILeaf
 }
 
 export interface IUICreator {

package/src/canvas/ICanvas.ts

@@ -111,6 +111,8 @@ export interface CanvasPattern {
     setTransform(transform?: DOMMatrix2DInit): void
 }
 
+export type ICanvasPattern = CanvasPattern
+
 declare var CanvasPattern: {
     prototype: CanvasPattern
     new(): CanvasPattern
@@ -123,15 +125,18 @@ interface CanvasRect {
 }
 
 type PredefinedColorSpace = 'display-p3' | 'srgb'
-interface CanvasRenderingContext2DSettings {
+interface ICanvasRenderingContext2DSettings {
     alpha?: boolean
     colorSpace?: PredefinedColorSpace
     desynchronized?: boolean
     willReadFrequently?: boolean
 }
+
+export type ICanvasContext2DSettings = ICanvasRenderingContext2DSettings
+
 export interface ICanvasContext2D extends CanvasCompositing, CanvasDrawImage, CanvasDrawPath, CanvasFillStrokeStyles, CanvasFilters, CanvasImageData, CanvasImageSmoothing, CanvasPath, CanvasPathDrawingStyles, CanvasRect, CanvasShadowStyles, CanvasState, CanvasText, CanvasTextDrawingStyles, CanvasTransform, CanvasUserInterface {
     readonly canvas: HTMLCanvasElement
-    getContextAttributes(): CanvasRenderingContext2DSettings
+    getContextAttributes(): ICanvasRenderingContext2DSettings
 }
 
 declare var ICanvasContext2D: {

package/src/canvas/IHitCanvasManager.ts

@@ -1,9 +1,9 @@
 import { ILeaf } from '../display/ILeaf'
-import { IScreenSizeData } from '../math/IMath'
 import { ICanvasManager } from './ICanvasManager'
-import { IHitCanvas } from './ILeaferCanvas'
+import { IHitCanvas, ILeaferCanvasConfig } from './ILeaferCanvas'
 
 export interface IHitCanvasManager extends ICanvasManager {
+    maxTotal: number // 最多缓存多少张画布
     getPathType(leaf: ILeaf): IHitCanvas
-    getImageType(leaf: ILeaf, size: IScreenSizeData): IHitCanvas
+    getPixelType(leaf: ILeaf, config?: ILeaferCanvasConfig): IHitCanvas
 }

package/src/canvas/ILeaferCanvas.ts

@@ -1,11 +1,12 @@
 import { IObject } from '../data/IData'
-import { IBounds, IMatrixData, IBoundsData, IAutoBoundsData, IAutoBounds, IScreenSizeData, IMatrixWithBoundsData, IPointData } from '../math/IMath'
-import { ICanvasContext2D, IWindingRule, IPath2D, ITextMetrics, CanvasGradient, CanvasPattern } from './ICanvas'
+import { IBounds, IMatrixData, IBoundsData, IAutoBoundsData, IAutoBounds, IScreenSizeData, IMatrixWithBoundsData, IPointData, IRadiusPointData } from '../math/IMath'
+import { ICanvasContext2D, IWindingRule, IPath2D, ITextMetrics, CanvasGradient, CanvasPattern, ICanvasContext2DSettings } from './ICanvas'
 import { IResizeEventListener } from '../event/IEvent'
 import { IPathDrawer } from '../path/IPathDrawer'
 import { InnerId } from '../event/IEventer'
 import { ICanvasManager } from './ICanvasManager'
-import { ICursorType } from '../display/ILeaf'
+import { IExportFileType } from '../file/IFileType'
+import { IExportOptions } from '../file/IExport'
 
 export interface ILeaferCanvasConfig extends IAutoBoundsData {
     view?: string | IObject
@@ -14,6 +15,7 @@ export interface ILeaferCanvasConfig extends IAutoBoundsData {
     smooth?: boolean
     hittable?: boolean
     webgl?: boolean
+    contextSettings?: ICanvasContext2DSettings
 }
 
 export type IHitCanvasConfig = ILeaferCanvasConfig
@@ -29,6 +31,11 @@ export interface ICanvasStrokeOptions {
     miterLimit?: number
 }
 
+export interface ICanvasCacheOptions extends ICanvasStrokeOptions {
+    fillStyle?: string | object
+    strokeStyle?: string | object
+}
+
 export interface ICanvasAttr extends ICanvasStrokeOptions, IObject {
 
     smooth: boolean // imageSmoothingEnabled: boolean
@@ -105,6 +112,8 @@ interface ICanvasMethod {
 
     hitFill(point: IPointData, fillRule?: string): boolean
     hitStroke(point: IPointData, strokeWidth?: number): boolean
+    hitPixel(radiusPoint: IRadiusPointData, offset?: IPointData, scale?: number): boolean
+
 
     setStroke(strokeStyle: string | object, strokeWidth: number, options?: ICanvasStrokeOptions): void
     setStrokeOptions(options: ICanvasStrokeOptions): void
@@ -116,7 +125,7 @@ interface ICanvasMethod {
     setWorldBlur(blur: number): void
 
     copyWorld(canvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData, blendMode?: string): void
-    copyWorldByReset(canvas: ILeaferCanvas, from?: IBoundsData, to?: IBoundsData, blendMode?: string): void
+    copyWorldByReset(canvas: ILeaferCanvas, from?: IBoundsData, to?: IBoundsData, blendMode?: string, onlyResetTransform?: boolean): void
     copyWorldToInner(canvas: ILeaferCanvas, fromWorld: IMatrixWithBoundsData, toInnerBounds: IBoundsData, blendMode?: string): void
 
     useMask(maskCanvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData): void
@@ -130,6 +139,7 @@ interface ICanvasMethod {
     clear(): void
 }
 
+export type ILeaferCanvasView = any
 export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 
     readonly innerId: InnerId
@@ -148,6 +158,9 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     backgroundColor?: string
     hittable?: boolean
 
+    zIndex?: number
+    childIndex?: number
+
     bounds: IBounds
     clientBounds: IBoundsData
 
@@ -155,7 +168,7 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 
     autoLayout: boolean
 
-    view: any
+    view: ILeaferCanvasView
     parentView: any
 
     unreal?: boolean
@@ -168,6 +181,7 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 
     init(): void
 
+    export(filename: IExportFileType | string, options?: IExportOptions | number | boolean): string | Promise<any>
     toBlob(type?: string, quality?: number): Promise<IBlob>
     toDataURL(type?: string, quality?: number): string | Promise<string>
     saveAs(filename: string, quality?: number): Promise<boolean>
@@ -178,14 +192,12 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     resize(size: IScreenSizeData): void
     updateViewSize(): void
     updateClientBounds(): void
-
-    setCursor(cursor: ICursorType | ICursorType[]): void
+    getClientBounds(update?: boolean): IBoundsData
 
     // other
     isSameSize(options: ILeaferCanvasConfig): boolean
-    getSameCanvas(useSameWorldTransform?: boolean): ILeaferCanvas
-    getBiggerCanvas(addWidth: number, addHeight: number): ILeaferCanvas
-    recycle(): void
+    getSameCanvas(useSameWorldTransform?: boolean, useSameSmooth?: boolean): ILeaferCanvas
+    recycle(clearBounds?: IBoundsData): void
 
     updateRender(): void
     unrealCanvas(): void
@@ -194,7 +206,7 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 
 
 export interface IHitCanvas extends ILeaferCanvas {
-
+    hitScale?: number
 }
 
 

package/src/canvas/ISkiaCanvas.ts

@@ -1,7 +1,8 @@
 import { IExportFileType, IExportImageType } from '../file/IFileType'
 
-export type ICanvasType = 'skia' | 'canvas' | 'wx'
+export type ICanvasType = 'skia' | 'napi' | 'canvas' | 'wx'
 
+// skia
 export interface ISkiaCanvas {
     toBuffer(format: IExportFileType, config: ISkiaCanvasExportConfig): Promise<any>
     toBufferSync(format: IExportFileType, config: ISkiaCanvasExportConfig): any
@@ -17,4 +18,22 @@ export interface ISkiaCanvasExportConfig {
     density?: number,
     quality?: number,
     outline?: boolean
+}
+
+// skia-napi
+export interface ISkiaNAPICanvas {
+    encodeSync(format: 'webp' | 'jpeg', quality?: number): any
+    encodeSync(format: 'png'): any
+
+    encode(format: 'webp' | 'jpeg' | string, quality?: number): Promise<any>
+    encode(format: 'png'): Promise<any>
+
+    toBuffer(mime: 'image/png'): any
+    toBuffer(mime: 'image/jpeg' | 'image/webp' | string, quality?: number): any
+
+    toDataURL(mime?: 'image/png'): string
+    toDataURL(mime: 'image/jpeg' | 'image/webp' | string, quality?: number): string
+
+    toDataURLAsync(mime?: 'image/png'): Promise<string>
+    toDataURLAsync(mime: 'image/jpeg' | 'image/webp' | string, quality?: number): Promise<string>
 }

package/src/data/IData.ts

@@ -1,12 +1,15 @@
-export type __Number = number // number | string    will convert to number
-export type __Boolean = boolean // boolean | string  will convert to boolean
-export type __String = string //  string  | other   will convert to string
-export type __Object = IObject // will convert to object
-export type __Value = __Number | __Boolean | __String | __Object  // 
+import { IPointData } from '../math/IMath'
+
+export type INumber = number // number | string    will convert to number
+export type IBoolean = boolean // boolean | string  will convert to boolean
+export type IString = string //  string  | other   will convert to string
+export type IValue = INumber | IBoolean | IString | IObject
 export type ITimer = any
 
 export type IPathString = string
 
+export type IFourNumber = number | number[]
+
 export interface IObject {
     [name: string]: any
 }
@@ -23,6 +26,10 @@ export interface IStringMap {
     [name: string]: string
 }
 
+export interface IPointDataMap {
+    [name: string]: IPointData
+}
+
 export interface IDataTypeHandle {
     (target: any): void
 }

package/src/data/ILeafData.ts

@@ -1,20 +1,19 @@
 import { ILeaf, ILeafComputedData } from '../display/ILeaf'
+import { IJSONOptions } from '../file/IExport'
 import { IObject } from './IData'
 
-export interface IDataProcessor extends IObject {
+export interface IDataProcessor {
     __leaf: ILeaf
     __input: IObject
     __middle: IObject
 
-    __single: boolean
-    __checkSingle(): void
-
     __get(name: string): any
+    __getData(): IObject
 
     __setInput(name: string, value: any): void
     __getInput(name: string): any
     __removeInput(name: string): void
-    __getInputData(): IObject
+    __getInputData(names?: string[] | IObject, options?: IJSONOptions): IObject
 
     __setMiddle(name: string, value: any): void
     __getMiddle(name: string): any
@@ -22,6 +21,13 @@ export interface IDataProcessor extends IObject {
     destroy(): void
 }
 
-export interface ILeafData extends IDataProcessor, ILeafComputedData {
+export interface ILeafDataOptions {
+    attrs?: 'all' | string[]
+    children?: boolean
+}
 
+export interface ILeafData extends IDataProcessor, ILeafComputedData {
+    __single?: boolean
+    __checkSingle(): void
+    __removeNaturalSize(): void
 }

package/src/data/IList.ts

@@ -18,13 +18,16 @@ export interface ILeafList {
     has(leaf: ILeaf): boolean
     indexAt(index: number): ILeaf
     indexOf(leaf: ILeaf): number
-    unshift(leaf: ILeaf): void
-    pushList(list: ILeaf[]): void
-    push(leaf: ILeaf): void
-    sort(reverse?: boolean): void
+
+    add(leaf: ILeaf): void
+    addAt(leaf: ILeaf, index: number): void
+    addList(list: ILeaf[]): void
     remove(leaf: ILeaf): void
+
     forEach(itemCallback: ILeafListItemCallback): void
+    sort(reverse?: boolean): void
     clone(): ILeafList
+    update(): void
     reset(): void
     destroy(): void
 }
@@ -37,8 +40,8 @@ export interface ILeafLevelList {
     has(leaf: ILeaf): boolean
     without(leaf: ILeaf): boolean
     sort(reverse?: boolean): void
-    pushList(list: ILeaf[]): void
-    push(leaf: ILeaf): void
+    addList(list: ILeaf[]): void
+    add(leaf: ILeaf): void
     forEach(itemCallback: ILeafListItemCallback): void
     reset(): void
     destroy(): void

package/src/display/IBranch.ts

@@ -1,10 +1,11 @@
+import { ILeaf } from './ILeaf'
 import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
 import { IRenderOptions } from '../renderer/IRenderer'
-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
+    clear(): void
 }