@leafer-ui/interface 1.0.0-beta.9 → 1.0.0-rc.10

package/src/index.ts

@@ -1,7 +1,11 @@
 export * from '@leafer/interface'
 
+export { IApp, IAppConfig } from './app/IApp'
+export { ILeafer } from './app/ILeafer'
+
 export {
     ILine, ILineInputData, ILineData,
+    IArrow, IArrowInputData, IArrowData,
     IRect, IRectInputData, IRectData,
     IEllipse, IEllipseInputData, IEllipseData,
     IPolygon, IPolygonInputData, IPolygonData,
@@ -15,19 +19,24 @@ export {
     IBox, IBoxInputData, IBoxData,
     IGroup, IGroupInputData, IGroupData,
     ILeaferInputData, ILeaferData,
-    IUI, IUIInputData, IUIData,
-    IUITag, IUITagInputData
+    IAppInputData, IAppData,
+    IUI, IUIBaseInputData, IUIData, IFindUIMethod,
+    IUITag, IUIInputData
 } from './IUI'
-export { IUnitData, IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, IOverflow } from './type/IType'
-export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IColorString as IStringColor } from './type/IStringType'
-export { ILeafFill, ILeafPaint, ILeafPaintColor, ILeafStrokePaint, ILeafShadowEffect } from './type/IComputedType'
+
+export { IUnitData, IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IFill, IStroke, IPaintAttr, IStrokeAlign, IStrokeJoin, IStrokeCap, IArrowType, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IRepeat } from './type/IType'
+export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IColorString } from './type/IStringType'
+export { ILeafFill, ILeafPaint, ILeafPaintPatternData, ILeafPaintColor, ILeafStrokePaint, ILeafShadowEffect } from './type/IComputedType'
 
 export { IUIRenderModule, IRectRenderModule, IImageRenderModule, ITextRenderModule, IGroupRenderModule, IFrameRenderModule } from './module/IUIRender'
 export { IUIBoundsModule } from './module/IUIBounds'
 export { IUIHitModule } from './module/IUIHit'
-export { IExportModule, IExportOptions, IExportResult, IExportResultFunction } from './module/IExport'
+export { ITextConvertModule } from './module/ITextConvert'
+export { IColorConvertModule } from './module/IColorConvert'
+export { IExportModule } from './module/IExport'
 
-export { IPaintModule } from './module/IPaint'
+export { IPaintModule, IPaintImageModule, IPaintGradientModule } from './module/IPaint'
 export { IEffectModule } from './module/IEffect'
 export { ICachedShape } from './ICachedShape'
 
+export { IEditorBase, IEditorConfig } from './editor/IEditor'

package/src/module/IColorConvert.ts

@@ -0,0 +1,5 @@
+import { IColor } from '../type/IType'
+
+export interface IColorConvertModule {
+    string(color: IColor, opacity?: number): string
+}

package/src/module/IEffect.ts

@@ -1,12 +1,12 @@
-import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
+import { ILeaferCanvas } from '@leafer/interface'
 
 import { IUI } from '../IUI'
 import { ICachedShape } from '../ICachedShape'
 
 
 export interface IEffectModule {
-    shadow?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, options: IRenderOptions): void
-    innerShadow?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, options: IRenderOptions): void
-    blur?(ui: IUI, current: ILeaferCanvas, origin: ILeaferCanvas, options: IRenderOptions): void
-    backgroundBlur?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, options: IRenderOptions): void
+    shadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void
+    innerShadow(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void
+    blur(ui: IUI, current: ILeaferCanvas, origin: ILeaferCanvas): void
+    backgroundBlur(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void
 }

package/src/module/IExport.ts

@@ -1,19 +1,7 @@
-import { ILeaf, IExportFileType, IBlob } from '@leafer/interface'
-
-export interface IExportOptions {
-    quality?: number
-    blob?: boolean
-}
-
-export interface IExportResult {
-    data: IBlob | string | boolean
-}
-
-export interface IExportResultFunction {
-    (data: IExportResult): void
-}
+import { ILeaf, IExportFileType, IExportOptions, IExportResult } from '@leafer/interface'
 
 
 export interface IExportModule {
+    running?: boolean
     export(leaf: ILeaf, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>
 }

package/src/module/IPaint.ts

@@ -1,25 +1,42 @@
-import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage } from '@leafer/interface'
 
-import { ILeafPaint } from '../type/IComputedType'
-import { IUI } from '../IUI'
+import { ILeafPaint, ILeafPaintPatternData } from '../type/IComputedType'
+import { IUI, IUIData } from '../IUI'
 import { ICachedShape } from '../ICachedShape'
+import { IGradientPaint, IImagePaint, IImagePaintMode, IPaintAttr } from '../type/IType'
 
 export interface IPaintModule {
-    computeFill?(ui: IUI): void
-    computeStroke?(ui: IUI): void
+    compute(attrName: IPaintAttr, ui: IUI): void
 
-    fill?(ui: IUI, canvas: ILeaferCanvas, fill: string | object): void
-    fills?(ui: IUI, canvas: ILeaferCanvas, fills: ILeafPaint[]): void
+    fill(fill: string, ui: IUI, canvas: ILeaferCanvas,): void
+    fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
 
-    drawText?(ui: IUI, canvas: ILeaferCanvas): void
+    fillText(ui: IUI, canvas: ILeaferCanvas): void
 
-    stroke?(ui: IUI, canvas: ILeaferCanvas, stroke: string | object): void
-    strokes?(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void
+    stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas): void
+    strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
 
-    strokeText?(ui: IUI, canvas: ILeaferCanvas, stroke: string | object): void
-    strokesText?(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void
+    strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
+    drawTextStroke(ui: IUI, canvas: ILeaferCanvas): void
+
+    shape(ui: IUI, current: ILeaferCanvas, renderOptions: IRenderOptions): ICachedShape
+}
 
-    drawTextStroke?(ui: IUI, canvas: ILeaferCanvas): void
 
-    shape?(ui: IUI, current: ILeaferCanvas, options: IRenderOptions): ICachedShape
+export interface IPaintImageModule {
+    image(ui: IUI, attrName: string, paint: IImagePaint, boxBounds: IBoundsData, firstUse: boolean): ILeafPaint
+    checkImage(ui: IUI, canvas: ILeaferCanvas, paint: ILeafPaint, allowPaint?: boolean): boolean
+    createPattern(ui: IUI, paint: ILeafPaint, pixelRatio: number): boolean
+    recycleImage(attrName: IPaintAttr, data: IUIData): IBooleanMap
+
+    createData(leafPaint: ILeafPaint, image: ILeaferImage, paint: IImagePaint, box: IBoundsData): void
+    fillOrFitMode(data: ILeafPaintPatternData, mode: IImagePaintMode, box: IBoundsData, width: number, height: number, rotation: number): void
+    clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void
+    repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void
 }
+
+export interface IPaintGradientModule {
+    linearGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint
+    radialGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint
+    conicGradient(paint: IGradientPaint, box: IBoundsData): ILeafPaint
+}

package/src/module/ITextConvert.ts

@@ -0,0 +1,5 @@
+import { ITextData, ITextDrawData } from '../IUI'
+
+export interface ITextConvertModule {
+    getDrawData(content: string, style: ITextData): ITextDrawData
+}

package/src/type/IComputedType.ts

@@ -1,17 +1,33 @@
-import { IBlendMode, IMatrixData } from '@leafer/interface'
+import { IBlendMode, ILeaferImage, IMatrixData, ITaskItem } from '@leafer/interface'
 
 import { IColorString } from './IStringType'
-import { IStrokeAlign, IStrokeJoin, IStrokeCap } from './IType'
+import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode } from './IType'
 import { IPaintType } from './IType'
 
 export type ILeafPaintColor = IColorString | CanvasGradient | CanvasPattern
 
 export interface ILeafPaint {
-    type: IPaintType
-    style: ILeafPaintColor
+    type?: IPaintType
+    style?: ILeafPaintColor
     transform?: IMatrixData
     blendMode?: IBlendMode
     opacity?: number
+    image?: ILeaferImage
+    loadId?: number
+    patternId?: string
+    patternTask?: ITaskItem
+    data?: ILeafPaintPatternData
+}
+
+export interface ILeafPaintPatternData {
+    width?: number
+    height?: number
+    scaleX?: number
+    scaleY?: number
+    opacity?: number
+    transform?: IMatrixData
+    mode?: IImagePaintMode
+    repeat?: 'repeat' | 'repeat-x' | 'repeat-y'
 }
 
 export type ILeafFill = ILeafPaint

package/src/type/IType.ts

@@ -1,5 +1,5 @@
-import { IPointData, IPathCommandData, IWindingRule, IBlendMode } from '@leafer/interface'
-import { IColorString } from './IStringType'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, ISizeData } from '@leafer/interface'
+import { IColorString, IPaintString } from './IStringType'
 
 export interface IUnitData {
     type: 'percent' | 'px'
@@ -8,6 +8,12 @@ export interface IUnitData {
 
 export type IPaint = ISolidPaint | IGradientPaint | IImagePaint
 
+export type IFill = IPaint | IPaint[] | IPaintString
+
+export type IStroke = IPaint | IPaint[] | IPaintString
+
+export type IPaintAttr = 'fill' | 'stroke'
+
 export interface IPaintBase {
     type: IPaintType
     blendMode?: IBlendMode
@@ -61,12 +67,16 @@ export interface IImagePaint extends IPaintBase {
     type: "image"
     url: string
     mode?: IImagePaintMode
+    format?: IExportFileType
 
     filters?: IImageFilters
 
     offset?: IPointData
+    size?: number | ISizeData
     scale?: number | IPointData
     rotation?: number
+
+    repeat?: IRepeat
 }
 export interface IImageFilters {
     exposure?: number // 曝光
@@ -78,12 +88,16 @@ export interface IImageFilters {
     shadows?: number // 阴影
 }
 export type IImagePaintMode = 'cover' | 'fit' | 'strench' | 'clip' | 'repeat'
+export type IRepeat = boolean | 'x' | 'y'
 
 // 描边
 export type IStrokeAlign = 'inside' | 'outside' | 'center'
 export type IStrokeCap = 'none' | 'round' | 'square' | 'arrow-lines' | 'arrow-equilateral'
 export type IStrokeJoin = 'bevel' | 'round' | 'miter'
 
+// 箭头
+export type IArrowType = 'none' | 'line' | 'triangle' | 'circle'
+
 // 文本
 export type ITextAlign = 'left' | 'center' | 'right' | 'justify'
 export type IVerticalAlign = 'top' | 'middle' | 'bottom'
@@ -101,6 +115,7 @@ export type IFontWeightString =
     | 'extra-bold'
     | 'black'
 export type ITextDecoration = 'none' | 'under' | 'delete'
+export type ITextWrap = 'normal' | 'none' | 'break'
 
 // 路径
 export interface IVectorPath {