@leafer-ui/interface 1.0.0-rc.2 → 1.0.0-rc.20

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 {
-    export?(leaf: ILeaf, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>
+    running?: boolean
+    export(leaf: ILeaf, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult>
 }

package/src/module/IPaint.ts

@@ -1,26 +1,42 @@
-import { ILeaferCanvas, IRenderOptions, IBooleanMap } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions, IBooleanMap, IBoundsData, ILeaferImage } from '@leafer/interface'
 
-import { ILeafPaint } from '../type/IComputedType'
+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 {
-    compute?(ui: IUI, attrName: 'fill' | 'stroke'): void
+    compute(attrName: IPaintAttr, ui: IUI): void
 
-    fill?(ui: IUI, canvas: ILeaferCanvas, fill: string): 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
 
-    fillText?(ui: IUI, canvas: ILeaferCanvas): void
+    fillText(ui: IUI, canvas: ILeaferCanvas): void
 
-    stroke?(ui: IUI, canvas: ILeaferCanvas, stroke: string): 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): 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
 
-    recycleImage?(data: IUIData, attrName: string): 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/IPathArrow.ts

@@ -0,0 +1,8 @@
+import { IPathDataArrowMap } from '../type/IType'
+import { IUI } from '../IUI'
+
+
+export interface IPathArrowModule {
+    list: IPathDataArrowMap
+    addArrows(ui: IUI, changeRenderPath?: boolean): void
+}

package/src/module/IState.ts

@@ -0,0 +1,11 @@
+import { ILeaf, IStateStyleType } from '@leafer/interface'
+
+export interface IStateModule {
+    isHover(leaf: ILeaf): boolean
+    isPress(leaf: ILeaf): boolean
+    isFocus(leaf: ILeaf): boolean
+    isDrag(leaf: ILeaf): boolean
+
+    setStyle(leaf: ILeaf, stateType: IStateStyleType, value: boolean): void
+    updateEventStyle(leaf: ILeaf, eventType: string): void
+}

package/src/module/ITextConvert.ts

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

package/src/type/IComputedType.ts

@@ -1,4 +1,4 @@
-import { IBlendMode, ILeaferImage, IMatrixData } from '@leafer/interface'
+import { IBlendMode, ILeaferImage, IMatrixData, ITaskItem } from '@leafer/interface'
 
 import { IColorString } from './IStringType'
 import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode } from './IType'
@@ -15,6 +15,7 @@ export interface ILeafPaint {
     image?: ILeaferImage
     loadId?: number
     patternId?: string
+    patternTask?: ITaskItem
     data?: ILeafPaintPatternData
 }
 
@@ -26,6 +27,7 @@ export interface ILeafPaintPatternData {
     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, IExportFileType } from '@leafer/interface'
-import { IColorString } from './IStringType'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, ISizeData, IFourNumber } 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
@@ -65,9 +71,13 @@ export interface IImagePaint extends IPaintBase {
 
     filters?: IImageFilters
 
+    padding?: IFourNumber
     offset?: IPointData
+    size?: number | ISizeData
     scale?: number | IPointData
     rotation?: number
+
+    repeat?: IRepeat
 }
 export interface IImageFilters {
     exposure?: number // 曝光
@@ -79,12 +89,32 @@ 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 IStrokeCap = 'none' | 'round' | 'square'
 export type IStrokeJoin = 'bevel' | 'round' | 'miter'
 
+// 箭头
+export type IArrowType = IPathDataArrow | 'none' | 'angle' | 'angle-side' | 'arrow' | 'triangle' | 'triangle-flip' | 'circle' | 'circle-line' | 'square' | 'square-line' | 'diamond' | 'diamond-line' | 'mark'
+
+export interface IPathDataArrowMap {
+    [name: string]: IPathDataArrow
+}
+
+export interface IPathDataArrow {
+    connect?: IPathDataArrowOffset // 箭头与线条的连接点位置
+    offset?: IPathDataArrowOffset  // 箭头偏移距离，与末端对齐
+    path: IPathCommandData
+}
+
+export interface IPathDataArrowOffset {
+    x?: number // 偏移距离（x轴）
+    bevelJoin?: number // strokeJoin 为 bevel 时增加的偏移距离（x轴）
+    roundJoin?: number // strokeJoin 为 round 时增加的偏移距离（x轴）
+}
+
 // 文本
 export type ITextAlign = 'left' | 'center' | 'right' | 'justify'
 export type IVerticalAlign = 'top' | 'middle' | 'bottom'
@@ -102,6 +132,7 @@ export type IFontWeightString =
     | 'extra-bold'
     | 'black'
 export type ITextDecoration = 'none' | 'under' | 'delete'
+export type ITextWrap = 'normal' | 'none' | 'break'
 
 // 路径
 export interface IVectorPath {