@leafer/interface 1.0.0-alpha.10 → 1.0.0-alpha.21

package/package.json

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

package/src/app/ILeafer.ts

@@ -17,9 +17,9 @@ import { IEvent } from '../event/IEvent'
 
 
 export interface ILeaferConfig extends IRendererConfig, ILeaferCanvasConfig, IInteractionConfig, ILayouterConfig {
-    start?: boolean
-    zoom?: boolean
-    move?: boolean
+    autoStart?: boolean
+    useZoom?: boolean
+    useMove?: boolean
 }
 
 export interface ILeafer extends IZoomView {
@@ -46,6 +46,8 @@ export interface ILeafer extends IZoomView {
     hitCanvasManager?: IHitCanvasManager
     imageManager: IImageManager
 
+    config: ILeaferConfig
+
     start(): void
     stop(): void
 

package/src/canvas/ILeaferCanvas.ts

@@ -10,6 +10,8 @@ export interface ILeaferCanvasConfig extends IAutoBoundsData {
     view?: string | IObject
     fill?: string
     pixelRatio?: number
+    hittable?: boolean
+    offscreen?: boolean
     webgl?: boolean
 }
 
@@ -96,24 +98,23 @@ interface ICanvasMethod {
 
     // custom
 
-    setStroke(strokeStyle: string | object, strokeWidth: number, options?: ICanvasStrokeOptions): void
-    setShadow(x: number, y: number, blur: number, color?: string): void
-    setBlur(blur: number): void
+    hitPath(point: IPointData, fillRule?: string): boolean
+    hitStroke(point: IPointData): boolean
 
+    setStroke(strokeStyle: string | object, strokeWidth: number, options?: ICanvasStrokeOptions): void
 
     setWorld(matrix: IMatrixData, parentMatrix?: IMatrixData): void
 
+    setWorldShadow(x: number, y: number, blur: number, color?: string): void
+    setWorldBlur(blur: number): void
 
-    hitPath(point: IPointData, fillRule?: string): boolean
-    hitStroke(point: IPointData): boolean
-
-    replaceBy(canvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData): void
-    copy(canvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData, blendMode?: string): void
+    copyWorld(canvas: ILeaferCanvas, fromBounds?: IBoundsData, toBounds?: IBoundsData, blendMode?: string): void
     copyWorldToLocal(canvas: ILeaferCanvas, fromWorld: IMatrixWithBoundsData, toLocalBounds: IBoundsData, blendMode?: string): void
-    fillBounds(bounds: IBoundsData, color: string | object, blendMode?: string): void
-    strokeBounds(bounds: IBoundsData, color: string | object, blendMode?: string): void
-    clipBounds(bounds: IBoundsData): void
-    clearBounds(bounds: IBoundsData): void
+    fillWorld(bounds: IBoundsData, color: string | object, blendMode?: string): void
+    strokeWorld(bounds: IBoundsData, color: string | object, blendMode?: string): void
+    clipWorld(bounds: IBoundsData, ceilPixel?: boolean): void
+    clearWorld(bounds: IBoundsData, ceilPixel?: boolean): void
+
     clear(): void
 }
 
@@ -133,13 +134,12 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
     bounds: IBounds
 
     view: unknown
+    offscreen: boolean
     context: ICanvasContext2D
 
     recycled?: boolean
 
-    debug(): void
-
-    autoLayout(autoBounds: IAutoBounds, listener: IResizeEventListener): void
+    startAutoLayout(autoBounds: IAutoBounds, listener: IResizeEventListener): void
     stopAutoLayout(): void
 
     resize(size: IScreenSizeData): void

package/src/display/ILeaf.ts

@@ -23,6 +23,7 @@ export interface ICachedLeaf {
     bounds: IBoundsData
 }
 
+
 export interface ILeafAttrData {
     // layer data
     id: __String
@@ -45,8 +46,14 @@ export interface ILeafAttrData {
     skewY: __Number
 
     draggable: __Boolean
+
+    hittable: __Boolean
+    hitType: IHitType
+    hitChildren: __Boolean
 }
 
+export type IHitType = 'visible' | 'fill-visible' | 'stroke-visible' | 'all' | 'fill' | 'stroke'
+
 export interface ILeafInputData {
     // layer data
     id?: __String
@@ -69,6 +76,10 @@ export interface ILeafInputData {
     skewY?: __Number
 
     draggable?: __Boolean
+
+    hittable?: __Boolean
+    hitType?: IHitType
+    hitChildren?: __Boolean
 }
 export interface ILeafComputedData {
     // layer data
@@ -92,6 +103,14 @@ export interface ILeafComputedData {
     skewY?: number
 
     draggable?: boolean
+
+    hittable?: boolean
+    hitType?: IHitType
+    hitChildren?: boolean
+
+    // other
+    __childBranchNumber?: number // 存在子分支的个数
+    __complex?: boolean // 外观是否复杂
 }
 
 export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix, ILeafDataProxy, ILeafInputData, IEventer {
@@ -103,9 +122,6 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     root?: ILeaf
     parent?: ILeaf
 
-    __interactionOff?: boolean
-    __childrenInteractionOff?: boolean
-
     __isRoot?: boolean
     __isBranch?: boolean
     __isBranchLeaf?: boolean
@@ -118,7 +134,6 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     __worldOpacity: number
     __renderTime: number // μs 1000微秒 = 1毫秒
-    __complex: boolean // 外观是否复杂
 
     __level: number // 图层级别 root(1) -> hight
     __tempNumber?: number // 用于临时运算储存状态
@@ -171,6 +186,7 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
     __draw(canvas: ILeaferCanvas, options: IRenderOptions): void
 
     __updateWorldOpacity(): void
+    __updateRenderTime(): void
     __updateChange(): void
 
     // path
@@ -181,7 +197,6 @@ export interface ILeaf extends ILeafRender, ILeafHit, ILeafBounds, ILeafMatrix,
 
     // branch
     children?: ILeaf[]
-    __childBranchNumber?: number // 存在子分支的个数
 
     __updateSortChildren(): void
     add(child: ILeaf, index?: number): void

package/src/display/module/ILeafRender.ts

@@ -6,12 +6,13 @@ export type ILeafRenderModule = ILeafRender & ThisType<ILeaf>
 
 export interface ILeafRender {
     __render?(canvas: ILeaferCanvas, options: IRenderOptions): void
-    __drawFast?(canvas: ILeaferCanvas, options: IRenderOptions): void
     __draw?(canvas: ILeaferCanvas, options: IRenderOptions): void
+    __drawFast?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
     __drawBefore?(canvas: ILeaferCanvas, options: IRenderOptions): void
     __drawAfter?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
     __updateWorldOpacity?(): void
+    __updateRenderTime?(): void
     __updateChange?(): void
 }

package/src/image/ILeaferImage.ts

@@ -7,4 +7,6 @@ export interface ILeaferImageConfig {
 
 export interface ILeaferImage {
     //load(url: string):Promise<>
-}
+}
+
+export type IImageStatus = 'wait' | 'thumb-loading' | 'thumb-success' | 'thumb-error' | 'loading' | 'success' | 'error' 

package/src/index.ts

@@ -1,6 +1,6 @@
 export { IApp } from './app/IApp'
 export { ILeafer, ILeaferConfig, ICreator, IUICreator } from './app/ILeafer'
-export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf } from './display/ILeaf'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType } from './display/ILeaf'
 export { IBranch } from './display/IBranch'
 export { IZoomView } from './display/IView'
 

package/src/math/IMath.ts

@@ -10,10 +10,10 @@ export interface IPoint extends IPointData {
     copy(point: IPointData): IPoint
     clone(): IPoint
 
-    rotate(angle: number, center?: IPointData): void
+    rotate(angle: number, center?: IPointData): IPoint
 
-    toLocal(matrix: IMatrixData): void
-    toWorld(matrix: IMatrixData): void
+    toLocal(matrix: IMatrixData, to?: IPointData): IPoint
+    toWorld(matrix: IMatrixData, to?: IPointData): IPoint
 
     getCenter(to: IPointData): IPointData
     getDistance(to: IPointData): number
@@ -54,27 +54,27 @@ export interface IBounds extends IBoundsData {
     copy(bounds: IBoundsData): IBounds
     clone(): IBounds
 
-    timesMatrix(matrix: IMatrixData): IBounds
-    divideMatrix(matrix: IMatrixData): IBounds
+    scale(scale: number): IBounds
+    toWorld(matrix: IMatrixData, to?: IBoundsData): IBounds
     getFitMatrix(put: IBoundsData): IMatrix
-    spread(size: number): void
-    ceil(): void
 
-    add(bounds: IBoundsData): void
-    addList(boundsList: IBounds[]): void
-    setByList(boundsList: IBounds[], addMode?: boolean): void
-    addListWithHandle(list: IObject[], boundsDataHandle: IBoundsDataHandle): void
-    setByListWithHandle(list: IObject[], boundsDataHandle: IBoundsDataHandle, addMode: boolean): void
-    setByBoundsTimesMatrix(fromBounds: IBoundsData, fromMatrix: IMatrixData): void
-    setByPoints(points: IPointData[]): void
+    spread(size: number): IBounds
+    ceil(): IBounds
+
+    add(bounds: IBoundsData): IBounds
+    addList(boundsList: IBounds[]): IBounds
+    setByList(boundsList: IBounds[], addMode?: boolean): IBounds
+    addListWithHandle(list: IObject[], boundsDataHandle: IBoundsDataHandle): IBounds
+    setByListWithHandle(list: IObject[], boundsDataHandle: IBoundsDataHandle, addMode: boolean): IBounds
+    setByPoints(points: IPointData[]): IBounds
 
     hitPoint(point: IPointData, pointMatrix?: IMatrixData): boolean
     hitRadiusPoint(point: IRadiusPointData, pointMatrix?: IMatrixData): boolean
     hit(bounds: IBoundsData, boundsMatrix?: IMatrixData): boolean
     includes(bounds: IBoundsData, boundsMatrix?: IMatrixData): boolean
 
+    intersect(bounds: IBoundsData, boundsMatrix?: IMatrixData): IBounds
     getIntersect(bounds: IBoundsData, boundsMatrix?: IMatrixData): IBounds
-    setByIntersect(bounds: IBoundsData, boundsMatrix?: IMatrixData): void
 
     isSame(bounds: IBoundsData): boolean
     isEmpty(): boolean
@@ -129,12 +129,12 @@ export interface IMatrix extends IMatrixData {
     scale(x: number, y?: number): IMatrix
     rotate(angle: number): IMatrix
 
-    times(matrix: IMatrixData): void
-    divide(matrix: IMatrixData): void
-    invert(): void
+    times(matrix: IMatrixData): IMatrix
+    divide(matrix: IMatrixData): IMatrix
+    invert(): IMatrix
 
-    toWorldPoint(local: IPointData, world?: IPointData): void
-    toLocalPoint(world: IPointData, local?: IPointData): void
+    toWorldPoint(local: IPointData, to?: IPointData): void
+    toLocalPoint(world: IPointData, to?: IPointData): void
 }
 
 

package/src/platform/IPlatform.ts

@@ -4,4 +4,5 @@ import { ILeaferCanvas } from '../canvas/ILeaferCanvas'
 export interface IPlatform {
     requestRender?(render: IFunction): void
     canvas?: ILeaferCanvas
+    isWorker?: boolean
 }