@leafer-ui/interface 2.1.4 → 2.1.5

package/package.json

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

package/src/IUI.ts

@@ -9,7 +9,7 @@ import {
     ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData,
     IStrokeComputedStyle
 } from './ICommonAttr'
-import { IFill, IOverflow } from './type/IType'
+import { IFill, IOverflow, IPaintAttr } from './type/IType'
 import { IAnimation, IAnimate, IKeyframe, IKeyframeId, IAnimateType } from './IAnimation'
 import { ILeafer } from './app/ILeafer'
 import { IEditorConfig } from './editor/IEditor'
@@ -634,8 +634,8 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
 
     __checkComplex(): void
 
-    __setPaint(attrName: 'fill' | 'stroke', value: IValue): void
-    __removePaint(attrName: 'fill' | 'stroke', removeInput?: boolean): void
+    __setPaint(attrName: IPaintAttr, value: IValue): void
+    __removePaint(attrName: IPaintAttr, removeInput?: boolean): void
 }
 export interface IUIComputedData extends IUIAttrData, IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {
 

package/src/module/IPaint.ts

@@ -15,7 +15,7 @@ export interface IPaintModule {
     fillPathOrText(ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
     fillText(ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
 
-    stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    stroke(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
     strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
 
     fillStroke?(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
@@ -29,7 +29,7 @@ export interface IPaintModule {
 
 
 export interface IPaintImageModule {
-    image(ui: IUI, attrName: string, paint: IImagePaint, boxBounds: IBoundsData, firstUse: boolean): ILeafPaint
+    image(ui: IUI, attrName: IPaintAttr, paint: IImagePaint, boxBounds: IBoundsData, firstUse: boolean): ILeafPaint
 
     film?(paint: ILeafPaint): void
     video?(paint: ILeafPaint): void
@@ -55,7 +55,7 @@ export interface IPaintImageModule {
     clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, clipScaleX?: number, clipScaleY?: number): void
     repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, align: IAlign, freeTransform?: boolean): void
 
-    brush?(paint: ILeafPaint, ui: IUI): void
+    brush?(paint: ILeafPaint, ui: IUI, attrName: IPaintAttr): void
     addBrushScale?(scaleData: IScaleData, paint: ILeafPaint, ui: IUI): void
     getBrushScale?(paint: ILeafPaint, ui: IUI): number
     cacheBrush?(paint: ILeafPaint, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void

package/src/type/IComputedType.ts

@@ -1,7 +1,7 @@
 import { IBlendMode, IDirection, IFilmPlayOptions, IInterlace, ILeaferImage, IMatrixData, IPointData, IScaleFixed, ITaskItem, ILeaf, ILeaferCanvas } from '@leafer/interface'
 
 import { IColorString } from './IStringType'
-import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode, IPaint } from './IType'
+import { IStrokeAlign, IStrokeJoin, IStrokeCap, IImagePaintMode, IPaint, IPaintAttr } from './IType'
 import { IPaintType } from './IType'
 import { IStrokeComputedStyle } from '../ICommonAttr'
 
@@ -33,6 +33,7 @@ export interface ILeafPaint extends IFilmPlayOptions {
 }
 
 export interface ILeafPaintBrush {
+    attrName: IPaintAttr
     cache?: ILeaferCanvas
     render(canvas: any, x: number, y: number, width: number, height: number, leaf: ILeaf, paint: any, imageScaleX: number, imageScaleY: number): void
     destroy(): void

package/types/index.d.ts

@@ -186,6 +186,7 @@ interface ILeafPaint extends IFilmPlayOptions {
     brush?: ILeafPaintBrush;
 }
 interface ILeafPaintBrush {
+    attrName: IPaintAttr;
     cache?: ILeaferCanvas;
     render(canvas: any, x: number, y: number, width: number, height: number, leaf: ILeaf, paint: any, imageScaleX: number, imageScaleY: number): void;
     destroy(): void;
@@ -1194,8 +1195,8 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __computePaint(): void;
     __getRealStrokeWidth(childStyle?: IStrokeComputedStyle): number;
     __checkComplex(): void;
-    __setPaint(attrName: 'fill' | 'stroke', value: IValue): void;
-    __removePaint(attrName: 'fill' | 'stroke', removeInput?: boolean): void;
+    __setPaint(attrName: IPaintAttr, value: IValue): void;
+    __removePaint(attrName: IPaintAttr, removeInput?: boolean): void;
 }
 interface IUIComputedData extends IUIAttrData, IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {
 }
@@ -1341,7 +1342,7 @@ interface IPaintModule {
     fills(fills: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     fillPathOrText(ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     fillText(ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
-    stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    stroke(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     fillStroke?(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
@@ -1351,7 +1352,7 @@ interface IPaintModule {
     shape(ui: IUI, current: ILeaferCanvas, renderOptions: IRenderOptions): ICachedShape;
 }
 interface IPaintImageModule {
-    image(ui: IUI, attrName: string, paint: IImagePaint, boxBounds: IBoundsData, firstUse: boolean): ILeafPaint;
+    image(ui: IUI, attrName: IPaintAttr, paint: IImagePaint, boxBounds: IBoundsData, firstUse: boolean): ILeafPaint;
     film?(paint: ILeafPaint): void;
     video?(paint: ILeafPaint): void;
     checkImage(paint: ILeafPaint, allowDraw: boolean, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): boolean;
@@ -1369,7 +1370,7 @@ interface IPaintImageModule {
     fillOrFitMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number): void;
     clipMode(data: ILeafPaintPatternData, box: IBoundsData, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, clipScaleX?: number, clipScaleY?: number): void;
     repeatMode(data: ILeafPaintPatternData, box: IBoundsData, width: number, height: number, x: number, y: number, scaleX: number, scaleY: number, rotation: number, skew: IPointData, align: IAlign, freeTransform?: boolean): void;
-    brush?(paint: ILeafPaint, ui: IUI): void;
+    brush?(paint: ILeafPaint, ui: IUI, attrName: IPaintAttr): void;
     addBrushScale?(scaleData: IScaleData$1, paint: ILeafPaint, ui: IUI): void;
     getBrushScale?(paint: ILeafPaint, ui: IUI): number;
     cacheBrush?(paint: ILeafPaint, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;