@leafer-ui/interface 1.0.0-bate → 1.0.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/interface",
-  "version": "1.0.0-bate",
+  "version": "1.0.0-beta.10",
   "description": "@leafer-ui/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,6 +19,6 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/interface": "1.0.0-bate"
+    "@leafer/interface": "1.0.0-beta.10"
   }
 }

package/src/ICommonAttr.ts

@@ -1,6 +1,6 @@
 import { IPaint, IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, IUnitData } from './type/IType'
 import { ILeafStrokePaint, ILeafShadowEffect, ILeafPaint } from './type/IComputedType'
-import { IPaintString, IDashPatternString, IShadowString, IStringColor, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
+import { IPaintString, IDashPatternString, IShadowString, IColorString, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
 
 // corner---
 export interface ICornerRadiusAttrData {
@@ -24,7 +24,7 @@ export interface IFillInputData {
     fill?: IPaint | IPaint[] | IPaintString
 }
 export interface IFillComputedData {
-    fill?: IStringColor | ILeafPaint[]
+    fill?: IColorString | ILeafPaint[]
 }
 
 // border 
@@ -57,7 +57,7 @@ export interface IStrokeInputData {
     miterLimit?: number
 }
 export interface IStrokeComputedData {
-    stroke?: IStringColor | ILeafStrokePaint[]
+    stroke?: IColorString | ILeafStrokePaint[]
 
     strokeAlign?: IStrokeAlign
     strokeWidth?: number

package/src/IUI.ts

@@ -1,7 +1,4 @@
-import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IPathDrawer, IPointData, IPath2D, IPathCommandData, IWindingRule, ILeaferImageConfig, IBoundsData, IObject, __Number, ILeaferImage } from '@leafer/interface'
-
-import { IPathString, IVectorPathString } from './type/IStringType'
-import { IOverflow, IVectorPath } from './type/IType'
+import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IPathDrawer, IPointData, IPath2D, IPathCommandData, IWindingRule, ILeaferImageConfig, IBoundsData, IObject, __Number, IPathString, ILeaferImage, IBlob, IBooleanMap } from '@leafer/interface'
 
 import {
     IFillAttrData, IFillInputData, IFillComputedData,
@@ -11,6 +8,8 @@ import {
     IEffectAttrData, IEffectInputData, IEffectComputedData,
     ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData
 } from './ICommonAttr'
+import { IOverflow } from './type/IType'
+import { IExportOptions } from './module/IExport'
 
 
 // Line
@@ -117,18 +116,6 @@ export interface IPen extends IGroup {
 export interface IPenData extends IGroupData { }
 export interface IPenInputData extends IGroupInputData { }
 
-// Vector
-export interface IVector extends IUI {
-    __: IVectorData
-    paths: IVectorPath[] | IVectorPathString
-}
-export interface IVectorData extends IUIData {
-    paths?: IVectorPath[]
-}
-export interface IVectorInputData extends IUIInputData {
-    paths?: IVectorPath[] | IVectorPathString
-}
-
 
 // Text
 export interface IText extends ITextStyleAttrData, IUI {
@@ -259,10 +246,11 @@ export interface IGroup extends IUI {
     children: IUI[]
     mask?: IUI
     add(child: IUI, index?: number): void
-    remove(child?: IUI): void
     addAt(child: IUI, index: number): void
     addAfter(child: IUI, after: IUI): void
     addBefore(child: IUI, before: IUI): void
+    remove(child?: IUI): void
+    removeAll(): void
 }
 export interface IGroupData extends IUIData { }
 export interface IGroupInputData extends IUIInputData { }
@@ -280,6 +268,8 @@ export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrDa
 
     __drawPathByData(drawer: IPathDrawer, data: IPathCommandData): void
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
+
+    export(filename: string, options?: IExportOptions | number): Promise<IBlob | string | boolean>
 }
 
 export interface IUIData extends IUIComputedData, ILeafData {
@@ -306,10 +296,14 @@ export interface IUIData extends IUIComputedData, ILeafData {
     __pathForRender?: IPathCommandData
     __path2DForRender?: IPath2D
 
+    __boxStroke?: boolean
+
     // text
     __font?: string
     __textDrawData?: ITextDrawData
 
+    __recycleImage(attrName: string): IBooleanMap
+
 }
 export interface IUIComputedData extends IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {
     padding?: number | number[]
@@ -329,10 +323,13 @@ export type IUITag =
     | 'Star'
     | 'Line'
     | 'Path'
+    | 'Pen'
     | 'Text'
     | 'Image'
+    | 'Canvas'
     | 'Group'
     | 'Frame'
+    | 'Box'
 
 
 export interface IUITagInputData extends IRectInputData, IEllipseInputData, IPolygonInputData, IStarInputData, ILineInputData, IPathInputData, ITextInputData, IImageInputData, IGroupInputData, IFrameInputData, IObject {

package/src/index.ts

@@ -8,7 +8,6 @@ export {
     IStar, IStarInputData, IStarData,
     IPath, IPathInputData, IPathData,
     IPen, IPenInputData, IPenData,
-    IVector, IVectorInputData, IVectorData,
     IText, ITextInputData, ITextData, ITextRowData, ITextWordData, ITextCharData, ITextDrawData,
     IImage, IImageInputData, IImageData,
     ICanvas, ICanvasInputData, ICanvasData,
@@ -20,12 +19,13 @@ export {
     IUITag, IUITagInputData
 } 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, IPathString, IVectorPathString, IStringColor } from './type/IStringType'
-export { ILeafFill, ILeafPaint, ILeafPaintColor, ILeafStrokePaint, ILeafShadowEffect } from './type/IComputedType'
+export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IColorString as IStringColor } 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 { IPaintModule } from './module/IPaint'
 export { IEffectModule } from './module/IEffect'

package/src/module/IEffect.ts

@@ -1,12 +1,12 @@
-import { ILeaferCanvas } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
 
 import { IUI } from '../IUI'
 import { ICachedShape } from '../ICachedShape'
 
 
 export interface IEffectModule {
-    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
+    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
 }

package/src/module/IExport.ts

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

package/src/module/IPaint.ts

@@ -5,18 +5,17 @@ import { IUI } from '../IUI'
 import { ICachedShape } from '../ICachedShape'
 
 export interface IPaintModule {
-    computeFill?(ui: IUI): void
-    computeStroke?(ui: IUI): void
+    compute?(ui: IUI, attrName: 'fill' | 'stroke'): void
 
-    fill?(ui: IUI, canvas: ILeaferCanvas, fill: string | object): void
+    fill?(ui: IUI, canvas: ILeaferCanvas, fill: string): void
     fills?(ui: IUI, canvas: ILeaferCanvas, fills: ILeafPaint[]): void
 
-    drawText?(ui: IUI, canvas: ILeaferCanvas): void
+    fillText?(ui: IUI, canvas: ILeaferCanvas): void
 
-    stroke?(ui: IUI, canvas: ILeaferCanvas, stroke: string | object): void
+    stroke?(ui: IUI, canvas: ILeaferCanvas, stroke: string): void
     strokes?(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void
 
-    strokeText?(ui: IUI, canvas: ILeaferCanvas, stroke: string | object): void
+    strokeText?(ui: IUI, canvas: ILeaferCanvas, stroke: string): void
     strokesText?(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void
 
     drawTextStroke?(ui: IUI, canvas: ILeaferCanvas): void

package/src/type/IComputedType.ts

@@ -1,17 +1,31 @@
-import { IBlendMode, IMatrixData } from '@leafer/interface'
+import { IBlendMode, ILeaferImage, IMatrixData } from '@leafer/interface'
 
-import { IStringColor } from './IStringType'
-import { IStrokeAlign, IStrokeJoin, IStrokeCap } from './IType'
+import { IColorString } from './IStringType'
+import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode } from './IType'
 import { IPaintType } from './IType'
 
-export type ILeafPaintColor = IStringColor | CanvasGradient | CanvasPattern
+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?: number
+    data?: ILeafPaintPatternData
+}
+
+export interface ILeafPaintPatternData {
+    width?: number
+    height?: number
+    scaleX?: number
+    scaleY?: number
+    opacity?: number
+    transform?: IMatrixData
+    mode?: IImagePaintMode
 }
 
 export type ILeafFill = ILeafPaint
@@ -30,7 +44,7 @@ export interface ILeafShadowEffect {
     y: number
     blur: number
     spread?: number
-    color: IStringColor
+    color: IColorString
     blendMode?: IBlendMode
     box?: boolean
 }

package/src/type/IStringType.ts

@@ -1,12 +1,9 @@
 export type IPercent = string
-
-export type IStringColor = string
+export type IColorString = string
 
 export type ICornerRadiusString = string
 export type IStrokeWidthString = string
 export type IDashPatternString = string
-export type IVectorPathString = string
-export type IPathString = string
 
 export type IPaintString = ISolidPaintString | IGradientPaintString | IImagePaintString
 export type ISolidPaintString = string

package/src/type/IType.ts

@@ -1,5 +1,5 @@
 import { IPointData, IPathCommandData, IWindingRule, IBlendMode } from '@leafer/interface'
-import { IStringColor } from './IStringType'
+import { IColorString } from './IStringType'
 
 export interface IUnitData {
     type: 'percent' | 'px'
@@ -32,7 +32,7 @@ export interface ISolidPaint extends IPaintBase {
     color: IColor
 }
 
-export type IColor = IStringColor | IRGB | IRGBA
+export type IColor = IColorString | IRGB | IRGBA
 export interface IRGB {
     r: number
     g: number
@@ -114,7 +114,7 @@ export interface IShadowEffect {
     y: number
     blur: number
     spread?: number
-    color: IStringColor | IColor
+    color: IColorString | IColor
     blendMode?: IBlendMode
     visible?: boolean
     box?: boolean