@leafer/interface 1.0.0-rc.5 → 1.0.0-rc.7

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 } from './app/ILeafer'
+export { ILeaf, ILeafAttrData, ILeafComputedData, ILeafInputData, ICachedLeaf, IHitType, IBlendMode, IEditSize, ICursorType, ICursorTypeMap, IAround } 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'
@@ -20,7 +20,7 @@ export { IBranchRender, IBranchRenderModule } from './display/module/IBranchRend
 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, ISelectPathResult, ISelectPathOptions, AnswerType } from './selector/ISelector'
 
 export { ICanvasManager } from './canvas/ICanvasManager'
 export { IHitCanvasManager } from './canvas/IHitCanvasManager'
@@ -35,7 +35,7 @@ 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 { ISkiaCanvas, ISkiaCanvasExportConfig, ICanvasType, ISkiaNAPICanvas } from './canvas/ISkiaCanvas'
 export { IPathDrawer, IPathCreator } from './path/IPathDrawer'
 export { IWindingRule, ICanvasContext2D, ITextMetrics, IPath2D } from './canvas/ICanvas'
 export { CanvasPathCommand, IPathCommandData, MCommandData, HCommandData, VCommandData, LCommandData, CCommandData, SCommandData, QCommandData, TCommandData, ZCommandData, ACommandData, RectCommandData, RoundRectCommandData, EllipseCommandData, ArcCommandData, ArcToCommandData } from './path/IPathCommand'
@@ -49,7 +49,7 @@ export { IUIEvent, IPointerEvent, PointerType, IDragEvent, IDropEvent, ISwipeEve
 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, 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, IMatrixWithLayoutData, IScaleRotationData, IScaleData, ISkewData, ILayoutBoundsData, ILayoutData, ILayoutAttr } from './math/IMath'
+export { IFunction, IAttrDecorator } from './function/IFunction'

package/src/interaction/IInteraction.ts

@@ -17,6 +17,7 @@ export interface IInteraction extends IControl {
 
     running: boolean
     readonly dragging: boolean
+    readonly isDragEmpty: boolean
     readonly moveMode: boolean
 
     config: IInteractionConfig
@@ -77,13 +78,14 @@ export interface IZoomConfig {
 
 export interface IMoveConfig {
     holdSpaceKey?: boolean
+    drag?: 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

package/src/layout/ILeafLayout.ts

@@ -1,8 +1,8 @@
-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' | 'local' | 'inner'
+export type IBoundsType = 'content' | 'box' | 'stroke' | 'margin' | 'render'
 
 export interface ILeafLayout {
 
@@ -23,10 +23,12 @@ 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
@@ -60,10 +62,20 @@ export interface ILeafLayout {
     strokeBoxSpread: number
     renderShapeSpread: number
 
-    checkUpdate(force?: boolean): void
+    // temp local
+    a: number
+    b: number
+    c: number
+    d: number
+    e: number
+    f: number
 
-    getTransform(locationType: ILayoutLocationType): IMatrixData
-    getBounds(type: ILayoutBoundsType, locationType: ILayoutLocationType): IBoundsData
+    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

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

package/src/math/IMath.ts

@@ -6,21 +6,25 @@ export interface IPointData {
 }
 
 export interface IPoint extends IPointData {
-    set(x?: number, y?: number): void
-    copy(point: IPointData): IPoint
+    set(x?: number | IPointData, y?: number): IPoint
+    get(): IPointData
     clone(): IPoint
 
-    rotate(angle: number, center?: IPointData): IPoint
+    rotate(rotation: number, origin?: IPointData): IPoint
+    rotateOf(origin: IPointData, rotation: number): IPoint
+    getRotation(origin: IPointData, to: IPointData, toOrigin?: IPointData): number
 
     toInnerOf(matrix: IMatrixData, to?: IPointData): IPoint
     toOuterOf(matrix: IMatrixData, to?: IPointData): IPoint
 
-    getCenter(to: IPointData): IPointData
+    getCenter(to: IPointData): IPoint
     getDistance(to: IPointData): number
+    getDistancePoint(to: IPointData, distance: number): IPoint
+
     getAngle(to: IPointData): number
     getAtan2(to: IPointData): number
 
-    reset(): void
+    reset(): IPoint
 }
 
 export interface IRadiusPointData extends IPointData {
@@ -47,16 +51,17 @@ export interface IOffsetBoundsData extends IBoundsData {
     offsetY: number
 }
 
-export interface IBoundsDataHandle {
+export interface IBoundsDataFn {
     (target: any): IBoundsData
 }
 
-export interface IBounds extends IBoundsData {
-    set(x?: number, y?: number, width?: number, height?: number): void
-    copy(bounds: IBoundsData): IBounds
+export interface IBounds extends IBoundsData, ITwoPointBoundsData {
+    set(x?: number | IBoundsData, y?: number, width?: number, height?: number): IBounds
+    get(): IBoundsData
     clone(): 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
 
@@ -65,11 +70,13 @@ export interface IBounds extends IBoundsData {
     unsign(): 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
+    addList(boundsList: IBoundsData[]): IBounds
+    setList(boundsList: IBoundsData[]): IBounds
+    addListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds
+    setListWithFn(list: IObject[], boundsDataHandle: IBoundsDataFn): IBounds
+
+    setPoints(points: IPointData[]): IBounds
+    getPoints(): IPointData[] // topLeft, topRight, bottomRight, bottomLeft
 
     hitPoint(point: IPointData, pointMatrix?: IMatrixData): boolean
     hitRadiusPoint(point: IRadiusPointData, pointMatrix?: IMatrixWithLayoutData): boolean
@@ -91,12 +98,6 @@ export interface ITwoPointBoundsData {
     maxY: number
 }
 
-export interface ITwoPointBounds extends ITwoPointBoundsData {
-    addPoint(x: number, y: number): void
-    addBounds(x: number, y: number, width: number, height: number): void
-    add(pointBounds: ITwoPointBoundsData): void
-}
-
 
 export interface IAutoBoundsData {
     top?: number
@@ -125,17 +126,24 @@ export interface IMatrixData {
     f: number
 }
 
-export interface IMatrixDecompositionData {
-    x: number
-    y: number
+export interface IScaleData {
     scaleX: number
     scaleY: number
+}
+
+export interface IScaleRotationData extends IScaleData {
     rotation: number
+}
+
+export interface ISkewData {
     skewX: number
     skewY: number
 }
 
-export type IMatrixDecompositionAttr =
+export interface ILayoutData extends IScaleRotationData, ISkewData, IPointData {
+}
+
+export type ILayoutAttr =
     | 'x'
     | 'y'
     | 'scaleX'
@@ -144,9 +152,12 @@ export type IMatrixDecompositionAttr =
     | 'skewX'
     | 'skewY'
 
+
+export interface ILayoutBoundsData extends ILayoutData, IBoundsData {
+}
 export interface IMatrix extends IMatrixData {
-    set(a: number, b: number, c: number, d: number, e: number, f: number): void
-    copy(matrix: IMatrixData): IMatrix
+    set(a: number | IMatrixData, b: number, c: number, d: number, e: number, f: number): IMatrix
+    get(): IMatrixData
     clone(): IMatrix
 
     translate(x: number, y: number): IMatrix
@@ -164,19 +175,24 @@ export interface IMatrix extends IMatrixData {
     skewOfOuter(origin: IPointData, x: number, y?: number): IMatrix
     skewOfInner(origin: IPointData, x: number, y?: number): IMatrix
 
-    multiply(matrix: IMatrixData): IMatrix
-    divide(matrix: IMatrixData): IMatrix
-    preMultiply(matrix: IMatrixData): IMatrix
+    multiply(child: IMatrixData): IMatrix
+    multiplyParent(parent: IMatrixData): IMatrix
+
+    divide(child: IMatrixData): IMatrix
+    divideParent(parent: IMatrixData): IMatrix
     invert(): IMatrix
 
     toOuterPoint(inner: IPointData, to?: IPointData, distance?: boolean): void
     toInnerPoint(outer: IPointData, to?: IPointData, distance?: boolean): void
 
-    decompose(): IMatrixDecompositionData
+    setLayout(data: ILayoutData, origin?: IPointData): IMatrix
+    getLayout(origin?: IPointData, firstSkewY?: boolean): ILayoutData
 
     reset(): void
 }
 
 export interface IMatrixWithBoundsData extends IMatrixData, IBoundsData { }
 
-export interface IMatrixWithLayoutData extends IMatrixData, IMatrixDecompositionData, IBoundsData { }
+export interface IMatrixWithScaleData extends IMatrixData, IScaleData { }
+
+export interface IMatrixWithLayoutData extends IMatrixData, ILayoutBoundsData { }

package/src/platform/IPlatform.ts

@@ -4,12 +4,14 @@ import { ILeaf } from '../display/ILeaf'
 import { IExportFileType, IExportImageType } from '../file/IFileType'
 import { IBoundsData, ISizeData } from '../math/IMath'
 import { IObject } from '../data/IData'
+import { ICanvasType } from '../canvas/ISkiaCanvas'
 
 export interface IPlatform {
     name?: 'web' | 'node' | 'miniapp'
     os?: 'Mac' | 'Windows' | 'Linux'
     requestRender?(render: IFunction): void
     canvas?: ILeaferCanvas
+    canvasType?: ICanvasType
     isWorker?: boolean
     isMobile?: boolean
     devicePixelRatio?: number
@@ -19,7 +21,6 @@ export interface IPlatform {
     fullImageShadow?: boolean // safari need 
     syncDomFont?: boolean // firefox need
     layout?(target: ILeaf): void
-    realtimeLayout?: boolean
     origin?: {
         createCanvas(width: number, height: number, format?: 'svg' | 'pdf'): any
         canvasToDataURL(canvas: any, type?: IExportImageType, quality?: number): string | Promise<string>
@@ -28,13 +29,19 @@ export interface IPlatform {
         loadImage(url: string): Promise<any>
         noRepeat?: string  // fix: 微信小程序 createPattern 直接使用 no-repeat 有bug，导致无法显示
     },
+    roundRectPatch?: boolean //  fix: skia-canvas roundRect
+    ellipseToCurve?: boolean, // fix: skia 绘制圆环和椭圆弧
     event?: {
         stopDefault(origin: IObject): void
         stopNow(origin: IObject): void
         stop(origin: IObject): void
     },
     miniapp?: IMiniapp
-    imageSuffix?: string // 需要带上后缀区分dom中image标签的缓存，否则会导致浏览器缓存跨域问题
+    image: {
+        maxCacheSize: number // 最大等级缓存，一般取当前屏幕大小，默认2k: 2560 * 1600
+        maxPatternSize: number // 最大repeat pattern缓存, 默认4k: 4096 * 2160
+        suffix: string  // 需要带上后缀区分dom中image标签的缓存，否则会导致浏览器缓存跨域问题
+    }
 }
 
 

package/src/plugin/IPlugin.ts

@@ -1,4 +1,4 @@
-import { ILeafer } from '../app/ILeafer'
+import { ILeaferBase } from '../app/ILeafer'
 import { IObject } from '../data/IData'
 
 export interface IPlugin extends IObject {
@@ -6,5 +6,5 @@ export interface IPlugin extends IObject {
     importVersion: string
     import: string[]
     run(LeaferUI: IObject, config: IObject): void
-    onLeafer?(leafer: ILeafer): void
+    onLeafer?(leafer: ILeaferBase): void
 }

package/src/selector/ISelector.ts

@@ -19,19 +19,35 @@ export interface ISelectorConfig {
 
 }
 
+export enum AnswerType {
+    No = 0,
+    Yes = 1,
+    NoAndSkip = 2,
+    YesAndSkip = 3
+}
+
+export interface IFindMethod {
+    (leaf: ILeaf, options?: any): AnswerType
+}
+
+export interface ISelectorProxy {
+    list: ILeaf[]
+}
+
 export interface ISelector {
     target: ILeaf
 
-    list: ILeafList
+    proxy?: ISelectorProxy
 
     config: ISelectorConfig
 
     getByPoint(hitPoint: IPointData, hitRadius: number, options?: ISelectPathOptions): ISelectPathResult
 
-    find(name: number | string, branch?: ILeaf): ILeaf | ILeaf[]
-    getByInnerId(name: number, branch?: ILeaf): ILeaf
-    getById(name: string, branch?: ILeaf): ILeaf
-    getByClassName(name: string, branch?: ILeaf): ILeaf[]
-    getByTagName(name: string, branch?: ILeaf): ILeaf[]
+    getBy(condition: number | string | IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[]
+    getByInnerId(innerId: number, branch?: ILeaf): ILeaf
+    getById(id: string, branch?: ILeaf): ILeaf
+    getByClassName(className: string, branch?: ILeaf): ILeaf[]
+    getByTag(tag: string, branch?: ILeaf): ILeaf[]
+    getByMethod(method: IFindMethod, branch?: ILeaf, one?: boolean, options?: any): ILeaf | ILeaf[]
     destroy(): void
 }