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

package/package.json

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

package/src/ICommonAttr.ts

@@ -1,15 +1,17 @@
-import { IPaint, IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, IUnitData } from './type/IType'
+import { INumber, IBoolean, IString, IFourNumber, IUnitData } from '@leafer/interface'
+import { IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IStroke, IFill, IArrowType } from './type/IType'
 import { ILeafStrokePaint, ILeafShadowEffect, ILeafPaint } from './type/IComputedType'
-import { IPaintString, IDashPatternString, IShadowString, IColorString, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
+import { IDashPatternString, IShadowString, IColorString, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
+
 
 // corner---
 export interface ICornerRadiusAttrData {
-    cornerRadius: number | number[] | ICornerRadiusString
-    cornerSmoothing: number
+    cornerRadius?: IFourNumber | ICornerRadiusString
+    cornerSmoothing?: INumber
 }
 export interface ICornerRadiusInputData {
-    cornerRadius?: number | number[] | ICornerRadiusString
-    cornerSmoothing?: number
+    cornerRadius?: IFourNumber | ICornerRadiusString
+    cornerSmoothing?: INumber
 }
 export interface ICornerRadiusComputedData {
     cornerRadius?: number
@@ -18,10 +20,10 @@ export interface ICornerRadiusComputedData {
 
 // fill---
 export interface IFillAttrData {
-    fill: IPaint | IPaint[] | IPaintString
+    fill?: IFill
 }
 export interface IFillInputData {
-    fill?: IPaint | IPaint[] | IPaintString
+    fill?: IFill
 }
 export interface IFillComputedData {
     fill?: IColorString | ILeafPaint[]
@@ -35,26 +37,34 @@ export interface IBorderComputedData {
 
 // stroke---
 export interface IStrokeAttrData {
-    stroke: IPaint | IPaint[] | IPaintString
+    stroke?: IStroke
 
-    strokeAlign: IStrokeAlign
-    strokeWidth: number | number[] | IStrokeWidthString
-    strokeCap: IStrokeCap
-    strokeJoin: IStrokeJoin
-    dashPattern: number[] | IDashPatternString
-    dashOffset: number
-    miterLimit: number
+    strokeAlign?: IStrokeAlign
+    strokeWidth?: IFourNumber | IStrokeWidthString
+    strokeWidthFixed?: IBoolean
+    strokeCap?: IStrokeCap
+    strokeJoin?: IStrokeJoin
+    dashPattern?: INumber[] | IDashPatternString
+    dashOffset?: INumber
+    miterLimit?: INumber
+
+    startArrow?: IArrowType
+    endArrow?: IArrowType
 }
 export interface IStrokeInputData {
-    stroke?: IPaint | IPaint[] | IPaintString
+    stroke?: IStroke
 
     strokeAlign?: IStrokeAlign
-    strokeWidth?: number | number[] | IStrokeWidthString
+    strokeWidth?: IFourNumber | IStrokeWidthString
+    strokeWidthFixed?: IBoolean
     strokeCap?: IStrokeCap
     strokeJoin?: IStrokeJoin
-    dashPattern?: number[] | IDashPatternString
-    dashOffset?: number
-    miterLimit?: number
+    dashPattern?: INumber[] | IDashPatternString
+    dashOffset?: INumber
+    miterLimit?: INumber
+
+    startArrow?: IArrowType
+    endArrow?: IArrowType
 }
 export interface IStrokeComputedData {
     stroke?: IColorString | ILeafStrokePaint[]
@@ -62,48 +72,54 @@ export interface IStrokeComputedData {
     strokeAlign?: IStrokeAlign
     strokeWidth?: number
     strokeWidths?: number[]
+    strokeWidthFixed?: boolean
     strokeCap?: IStrokeCap
     strokeJoin?: IStrokeJoin
     dashPattern?: number[]
     dashOffset?: number
     miterLimit?: number
+
+    startArrow?: IArrowType
+    endArrow?: IArrowType
 }
 
 // text---
 export interface ITextStyleAttrData {
-    fontFamily: string
-    fontSize: number
-    fontWeight: IFontWeight
-    italic: boolean
-    textCase: ITextCase
-    textDecoration: ITextDecoration
-    letterSpacing: number | IUnitData
-    lineHeight: number | IUnitData
+    fontFamily?: IString
+    fontSize?: INumber
+    fontWeight?: IFontWeight
+    italic?: IBoolean
+    textCase?: ITextCase
+    textDecoration?: ITextDecoration
+    letterSpacing?: INumber | IUnitData
+    lineHeight?: INumber | IUnitData
 
-    paraIndent: number
-    paraSpacing: number
+    paraIndent?: INumber
+    paraSpacing?: INumber
 
-    textAlign: ITextAlign
-    verticalAlign: IVerticalAlign
+    textAlign?: ITextAlign
+    verticalAlign?: IVerticalAlign
 
-    textOverflow: IOverflow | string
+    textWrap?: ITextWrap
+    textOverflow?: IOverflow | string
 }
 export interface ITextStyleInputData {
-    fontFamily?: string
-    fontSize?: number
+    fontFamily?: IString
+    fontSize?: INumber
     fontWeight?: IFontWeight
-    italic?: boolean
+    italic?: IBoolean
     textCase?: ITextCase
     textDecoration?: ITextDecoration
-    letterSpacing?: number | IUnitData
-    lineHeight?: number | IUnitData
+    letterSpacing?: INumber | IUnitData
+    lineHeight?: INumber | IUnitData
 
-    paraIndent?: number
-    paraSpacing?: number
+    paraIndent?: INumber
+    paraSpacing?: INumber
 
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
 
+    textWrap?: ITextWrap
     textOverflow?: IOverflow | string
 }
 export interface ITextStyleComputedData {
@@ -121,23 +137,25 @@ export interface ITextStyleComputedData {
 
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
-    textOverflow?: IOverflow
+
+    textWrap?: ITextWrap
+    textOverflow?: IOverflow | string
 }
 
 // effect---
 export interface IEffectAttrData {
-    shadow: IShadowEffect | IShadowEffect[] | IShadowString
-    innerShadow: IShadowEffect | IShadowEffect[] | IShadowString
-    blur: number | IBlurEffect
-    backgroundBlur: number | IBlurEffect
-    grayscale: number | IGrayscaleEffect
+    shadow?: IShadowEffect | IShadowEffect[] | IShadowString
+    innerShadow?: IShadowEffect | IShadowEffect[] | IShadowString
+    blur?: INumber | IBlurEffect
+    backgroundBlur?: INumber | IBlurEffect
+    grayscale?: INumber | IGrayscaleEffect
 }
 export interface IEffectInputData {
     shadow?: IShadowEffect | IShadowEffect[] | IShadowString
     innerShadow?: IShadowEffect | IShadowEffect[] | IShadowString
-    blur?: number | IBlurEffect
-    backgroundBlur?: number | IBlurEffect
-    grayscale?: number | IGrayscaleEffect
+    blur?: INumber | IBlurEffect
+    backgroundBlur?: INumber | IBlurEffect
+    grayscale?: INumber | IGrayscaleEffect
 }
 export interface IEffectComputedData {
     shadow?: ILeafShadowEffect[]

package/src/IUI.ts

@@ -1,4 +1,4 @@
-import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IPathDrawer, IPointData, IPath2D, IPathCommandData, IWindingRule, ILeaferImageConfig, IBoundsData, IObject, __Number, IPathString, ILeaferImage, IBlob, IPathCreator } from '@leafer/interface'
+import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPathDrawer, IPointData, IPathCommandData, ILeaferImageConfig, IBoundsData, IObject, IPathString, ILeaferImage, IPathCreator, IAnswer, IPickOptions, IPickResult, IValue, ICanvasContext2DSettings, IFourNumber, IFindCondition, IBoolean, ICanvasContext2D, IJSONOptions, IMatrixData } from '@leafer/interface'
 
 import {
     IFillAttrData, IFillInputData, IFillComputedData,
@@ -9,22 +9,47 @@ import {
     ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData
 } from './ICommonAttr'
 import { IOverflow } from './type/IType'
-import { IExportOptions } from './module/IExport'
-
+import { ILeafer } from './app/ILeafer'
+import { IEditorConfig } from './editor/IEditor'
 
 // Line
 export interface ILine extends IUI {
     __: ILineData
-    toPoint: IPointData
-    points: number[]
-    curve: boolean | number
+    toPoint?: IPointData
+    points?: number[]
+    curve?: boolean | number
 }
-export interface ILineData extends IUIData { }
-export interface ILineInputData extends IUIBaseInputData {
+
+interface ILineAttrData {
     toPoint?: IPointData
     points?: number[]
     curve?: boolean | number
 }
+export interface ILineData extends ILineAttrData, IUIData { }
+export interface ILineInputData extends ILineAttrData, IUIBaseInputData { }
+
+
+// Arrow
+export interface IArrow extends ILine {
+    __: IArrowData
+}
+
+interface IArrowAttrData {
+
+}
+export interface IArrowData extends IArrowAttrData, ILineData { }
+export interface IArrowInputData extends IArrowAttrData, ILineInputData { }
+
+// Flow
+export interface IFlow extends IBox {
+    __: IFlowData
+}
+
+interface IFlowAttrData {
+
+}
+export interface IFlowData extends IFlowAttrData, IBoxData { }
+export interface IFlowInputData extends IFlowAttrData, IBoxInputData { }
 
 
 // Rect
@@ -38,9 +63,9 @@ export interface IRectInputData extends IUIBaseInputData { }
 // Ellipse
 export interface IEllipse extends IUI {
     __: IEllipseData
-    startAngle: number
-    endAngle: number
-    innerRadius: number
+    startAngle?: number
+    endAngle?: number
+    innerRadius?: number
 }
 interface IEllipseAttrData {
     startAngle?: number
@@ -54,9 +79,9 @@ export interface IEllipseInputData extends IEllipseAttrData, IUIBaseInputData {
 // Polygon
 export interface IPolygon extends IUI {
     __: IPolygonData
-    sides: number
-    points: number[]
-    curve: boolean | number
+    sides?: number
+    points?: number[]
+    curve?: boolean | number
 }
 interface IPolygonAttrData {
     sides?: number
@@ -70,8 +95,8 @@ export interface IPolygonInputData extends IPolygonAttrData, IUIBaseInputData {
 // Star
 export interface IStar extends IUI {
     __: IStarData
-    corners: number
-    innerRadius: number
+    corners?: number
+    innerRadius?: number
 }
 interface IStarAttrData {
     corners?: number
@@ -84,16 +109,10 @@ export interface IStarInputData extends IStarAttrData, IUIBaseInputData { }
 // Path
 export interface IPath extends IUI {
     __: IPathData
-    path: IPathCommandData | IPathString
-    windingRule: IWindingRule
 }
 export interface IPathData extends IUIData {
-    path?: IPathCommandData
-    windingRule?: IWindingRule
 }
 export interface IPathInputData extends IUIBaseInputData {
-    path?: IPathCommandData | IPathString
-    windingRule?: IWindingRule
 }
 
 // Pen
@@ -104,7 +123,6 @@ export interface IPen extends IGroup, IPathCreator {
     pathStyle: IPathInputData
     path: IPathCommandData
     paint(): void
-    clear(): void
 }
 
 export interface IPenData extends IGroupData { }
@@ -114,16 +132,23 @@ export interface IPenInputData extends IGroupInputData { }
 // Text
 export interface IText extends ITextStyleAttrData, IUI {
     __: ITextData
-    text: string
+    text?: string
+    padding?: IFourNumber
+    resizeFontSize?: IBoolean
 }
 interface ITextAttrData {
     text?: string
+    padding?: IFourNumber
+    resizeFontSize?: boolean
 }
 
 export interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIData {
     __baseLine?: number
     __lineHeight?: number
     __letterSpacing?: number
+    __padding?: number[]
+    __clipText?: boolean
+    __textBoxBounds?: IBoundsData
 }
 export interface ITextInputData extends ITextAttrData, ITextStyleInputData, IUIBaseInputData {
 
@@ -144,6 +169,7 @@ export interface ITextRowData {
     paraStart?: boolean // paragraph start
     paraEnd?: boolean // paragraph end
     isOverflow?: boolean
+    textMode?: boolean
 }
 
 export interface ITextWordData {
@@ -182,19 +208,22 @@ export interface IImage extends IRect, ILeaferImageConfig {
 interface IImageAttrData {
     url?: string
 }
-export interface IImageData extends IImageAttrData, IRectData { }
+export interface IImageData extends IImageAttrData, IRectData {
+    __setImageFill(value: string): void
+}
 export interface IImageInputData extends IImageAttrData, IUIBaseInputData { }
 
 export interface ICanvas extends IRect {
     __: ICanvasData
-    pixelRatio: number
-    smooth: boolean
-    canvas: ILeaferCanvas
+    smooth?: boolean
+    contextSettings?: ICanvasContext2DSettings
+    canvas?: ILeaferCanvas
+    context?: ICanvasContext2D
     __updateSize(): void
 }
 interface ICanvasAttrData {
-    pixelRatio?: number
     smooth?: boolean
+    contextSettings?: ICanvasContext2DSettings
 }
 export interface ICanvasData extends ICanvasAttrData, IRectData { }
 export interface ICanvasInputData extends ICanvasAttrData, IUIBaseInputData { }
@@ -202,13 +231,19 @@ export interface ICanvasInputData extends ICanvasAttrData, IUIBaseInputData { }
 
 // Leafer
 export interface ILeaferData extends IGroupData {
-    pixelRatio?: number
+
 }
 
 export interface ILeaferInputData extends IGroupInputData {
-    pixelRatio?: number
+
 }
 
+export interface IAppData extends ILeaferData {
+
+}
+export interface IAppInputData extends ILeaferInputData {
+
+}
 
 // Frame
 export interface IFrame extends IBox {
@@ -225,14 +260,17 @@ export interface IFrameInputData extends IBoxInputData {
 // Box
 export interface IBox extends IGroup {
     __: IBoxData
-    overflow: IOverflow
+    resizeChildren?: IBoolean
+    overflow?: IOverflow
     __updateRectRenderBounds(): void
     __renderGroup(canvas: ILeaferCanvas, options: IRenderOptions): void
 }
 export interface IBoxData extends IGroupData {
+    resizeChildren?: boolean
     overflow?: IOverflow
 }
 export interface IBoxInputData extends IGroupInputData {
+    resizeChildren?: boolean
     overflow?: IOverflow
 }
 
@@ -241,13 +279,15 @@ export interface IBoxInputData extends IGroupInputData {
 export interface IGroup extends IUI {
     __: IGroupData
     children: IUI[]
-    mask?: IUI
+    pick(hitPoint: IPointData, options?: IPickOptions): IPickResult
     add(child: IUI, index?: number): void
     addAt(child: IUI, index: number): void
     addAfter(child: IUI, after: IUI): void
     addBefore(child: IUI, before: IUI): void
+    addMany(...children: ILeaf[]): void
     remove(child?: IUI): void
     removeAll(): void
+    clear(): void
 }
 export interface IGroupData extends IUIData { }
 export interface IGroupInputData extends IUIBaseInputData { }
@@ -255,45 +295,90 @@ export interface IGroupInputData extends IUIBaseInputData { }
 // UI
 export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEffectAttrData, ILeaf {
     __: IUIData
+
+    readonly app: ILeafer
+    leafer?: ILeafer
     parent?: IGroup
+    zoomLayer?: IGroup
+    readonly isFrame?: boolean
+
+    proxyData?: IUIInputData
+    __proxyData?: IUIInputData
+
+    normalStyle?: IUIInputData
+    hoverStyle?: IUIInputData
+    pressStyle?: IUIInputData
+    focusStyle?: IUIInputData
+    selectedStyle?: IUIInputData
+    disabledStyle?: IUIInputData
+
+    editConfig?: IEditorConfig
+    editOuter: string
+    editInner: string
+
+    children?: IUI[]
+
+    readonly pen: IPathCreator
+
+    reset(data?: IUIInputData): void
 
     set(data: IUIInputData): void
-    toJSON(): IUIInputData
+    toJSON(options?: IJSONOptions): IUIJSONData
+
+    get(name?: string | string[] | IUIInputData): IUIInputData | IValue
+    createProxyData(): IUIInputData
+
+    find(condition: number | string | IFindCondition | IFindUIMethod, options?: any): IUI[]
+    findTag(tag: string | string[]): IUI[]
+    findOne(condition: number | string | IFindCondition | IFindUIMethod, options?: any): IUI | undefined
+    findId(id: number | string): IUI | undefined
 
-    getPath(curve?: boolean): IPathCommandData
-    getPathString(curve?: boolean): IPathString
+    getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData
+    getPathString(curve?: boolean, pathForRender?: boolean): IPathString
+
+    load(): void
 
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void
+    __drawPathByBox(drawer: IPathDrawer): void
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
-    export(filename: string, options?: IExportOptions | number): Promise<IBlob | string | boolean>
+    export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>
     clone(): IUI
+}
 
+export interface IFindUIMethod {
+    (leaf: IUI, options?: any): IAnswer
 }
 
 export interface IUIData extends IUIComputedData, ILeafData {
 
     padding?: number | number[]
-    locked?: boolean
+
+    normalStyle?: IUIInputData
+    hoverStyle?: IUIInputData
+    pressStyle?: IUIInputData
+    focusStyle?: IUIInputData
+    selectedStyle?: IUIInputData
+    disabledStyle?: IUIInputData
 
     // 非数据属性, 自动计算的缓存数据
     __isFills?: boolean
     __isStrokes?: boolean
-    __drawAfterFill?: boolean
-    __isOverflow?: boolean
-    __blendLayer?: boolean
 
-    __isTranslucentFill?: boolean  // 半透明的
-    __isTranslucentStroke?: boolean
+    readonly __strokeWidth: number
 
-    __useEffect?: boolean
+    __pixelFill?: boolean // png / svg / webp
+    __pixelStroke?: boolean
 
-    // path
-    path?: IPathCommandData
-    windingRule?: IWindingRule
+    __isHitPixel?: boolean
+    __isCanvas?: boolean // canvas 等需单独绘制的元素
 
-    __pathForRender?: IPathCommandData
-    __path2DForRender?: IPath2D
+    __opacityFill?: boolean  // 半透明的
+    __opacityStroke?: boolean
+
+    __drawAfterFill?: boolean
+    __isOverflow?: boolean
+    __blendLayer?: boolean
 
     __boxStroke?: boolean
 
@@ -301,17 +386,25 @@ export interface IUIData extends IUIComputedData, ILeafData {
     __font?: string
     __textDrawData?: ITextDrawData
 
+    __needComputePaint: boolean
+    __computePaint(): void
+
 }
 export interface IUIComputedData extends IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {
     padding?: number | number[]
-
-    locked?: boolean
 }
 
 export interface IUIBaseInputData extends IFillInputData, IStrokeInputData, ITextStyleInputData, ICornerRadiusInputData, IEffectInputData, ILeafInputData {
     padding?: number | number[]
-    locked?: boolean
-    children?: IUIBaseInputData[]
+
+    normalStyle?: IUIInputData
+    hoverStyle?: IUIInputData
+    pressStyle?: IUIInputData
+    focusStyle?: IUIInputData
+    selectedStyle?: IUIInputData
+    disabledStyle?: IUIInputData
+
+    children?: IUIInputData[]
 }
 
 
@@ -334,5 +427,9 @@ export type IUITag =
 
 
 export interface IUIInputData extends IRectInputData, IEllipseInputData, IPolygonInputData, IStarInputData, ILineInputData, IPathInputData, ITextInputData, IImageInputData, IGroupInputData, IFrameInputData, IUIBaseInputData, IObject {
+    children?: IUIInputData[]
+}
 
+export interface IUIJSONData extends IUIInputData {
+    matrix?: IMatrixData
 }

package/src/app/IApp.ts

@@ -0,0 +1,16 @@
+import { ILeaferConfig } from '@leafer/interface'
+
+import { ILeafer } from './ILeafer'
+import { IEditorConfig } from '../editor/IEditor'
+
+export interface IApp extends ILeafer {
+    children: ILeafer[]
+    realCanvas: boolean
+}
+
+export interface IAppConfig extends ILeaferConfig {
+    ground?: ILeaferConfig
+    tree?: ILeaferConfig
+    sky?: ILeaferConfig
+    editor?: IEditorConfig
+}

package/src/app/ILeafer.ts

@@ -0,0 +1,22 @@
+import { IControl, ILeaferAttrData, ILeaferConfig, ILeaferType } from '@leafer/interface'
+import { IApp } from './IApp'
+import { IGroup } from '../IUI'
+import { IEditorBase } from '../editor/IEditor'
+
+export interface ILeafer extends IGroup, ILeaferAttrData, IControl {
+    readonly isApp: boolean
+    readonly app: ILeafer
+    parent?: IApp
+    zoomLayer: IGroup
+    editor: IEditorBase
+
+    ground?: ILeafer
+    tree?: ILeafer
+    sky?: ILeafer
+
+    userConfig?: ILeaferConfig
+
+    onInit(): void
+    initType(type: ILeaferType): void
+    destroy(sync?: boolean): void
+}