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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/interface",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.5",
   "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.5"
   }
 }

package/src/IUI.ts

@@ -257,6 +257,8 @@ export interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrDa
     __: IUIData
     parent?: IGroup
 
+    reset(_data?: IUIInputData): void
+
     set(data: IUIInputData): void
     toJSON(): IUIInputData
 
@@ -279,13 +281,17 @@ export interface IUIData extends IUIComputedData, ILeafData {
     // 非数据属性, 自动计算的缓存数据
     __isFills?: boolean
     __isStrokes?: boolean
+
+    __pixelFill?: boolean // png / svg / webp
+    __pixelStroke?: boolean
+
+    __opacityFill?: boolean  // 半透明的
+    __opacityStroke?: boolean
+
     __drawAfterFill?: boolean
     __isOverflow?: boolean
     __blendLayer?: boolean
 
-    __isTranslucentFill?: boolean  // 半透明的
-    __isTranslucentStroke?: boolean
-
     __useEffect?: boolean
 
     // path

package/src/module/IEffect.ts

@@ -5,8 +5,8 @@ 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, renderOptions: IRenderOptions): void
+    innerShadow?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, renderOptions: IRenderOptions): void
+    blur?(ui: IUI, current: ILeaferCanvas, origin: ILeaferCanvas, renderOptions: IRenderOptions): void
+    backgroundBlur?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, renderOptions: IRenderOptions): void
 }

package/src/module/IPaint.ts

@@ -5,22 +5,22 @@ import { IUI, IUIData } from '../IUI'
 import { ICachedShape } from '../ICachedShape'
 
 export interface IPaintModule {
-    compute?(ui: IUI, attrName: 'fill' | 'stroke'): void
+    compute?(attrName: 'fill' | 'stroke', 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
 
-    stroke?(ui: IUI, canvas: ILeaferCanvas, stroke: string): void
-    strokes?(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void
+    stroke?(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    strokes?(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
 
-    strokeText?(ui: IUI, canvas: ILeaferCanvas, stroke: string): void
-    strokesText?(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void
+    strokeText?(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
+    strokesText?(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
 
     drawTextStroke?(ui: IUI, canvas: ILeaferCanvas): void
 
-    shape?(ui: IUI, current: ILeaferCanvas, options: IRenderOptions): ICachedShape
+    shape?(ui: IUI, current: ILeaferCanvas, renderOptions: IRenderOptions): ICachedShape
 
-    recycleImage?(data: IUIData, attrName: string): IBooleanMap
+    recycleImage?(attrName: 'fill' | 'stroke', data: IUIData): IBooleanMap
 }

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
 }
 

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IPointData, IExportFileType, IWindingRule, IPathCommandData, IBlendMode, IMatrixData, ILeaferImage, IBlob, ILeaf, IPathString, IPathCreator, IBoundsData, ILeaferImageConfig, ILeaferCanvas, IRenderOptions, IPathDrawer, ILeafData, IPath2D, ILeafComputedData, ILeafInputData, IObject, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap } from '@leafer/interface';
+import { IPointData, IExportFileType, IWindingRule, IPathCommandData, IBlendMode, IMatrixData, ILeaferImage, ITaskItem, IBlob, ILeaf, IPathString, IPathCreator, IBoundsData, ILeaferImageConfig, ILeaferCanvas, IRenderOptions, IPathDrawer, ILeafData, IPath2D, ILeafComputedData, ILeafInputData, IObject, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap } from '@leafer/interface';
 export * from '@leafer/interface';
 
 type IPercent = string;
@@ -114,6 +114,7 @@ interface ILeafPaint {
     image?: ILeaferImage;
     loadId?: number;
     patternId?: string;
+    patternTask?: ITaskItem;
     data?: ILeafPaintPatternData;
 }
 interface ILeafPaintPatternData {
@@ -491,6 +492,7 @@ interface IGroupInputData extends IUIBaseInputData {
 interface IUI extends IFillAttrData, IStrokeAttrData, ICornerRadiusAttrData, IEffectAttrData, ILeaf {
     __: IUIData;
     parent?: IGroup;
+    reset(_data?: IUIInputData): void;
     set(data: IUIInputData): void;
     toJSON(): IUIInputData;
     getPath(curve?: boolean): IPathCommandData;
@@ -505,11 +507,13 @@ interface IUIData extends IUIComputedData, ILeafData {
     locked?: boolean;
     __isFills?: boolean;
     __isStrokes?: boolean;
+    __pixelFill?: boolean;
+    __pixelStroke?: boolean;
+    __opacityFill?: boolean;
+    __opacityStroke?: boolean;
     __drawAfterFill?: boolean;
     __isOverflow?: boolean;
     __blendLayer?: boolean;
-    __isTranslucentFill?: boolean;
-    __isTranslucentStroke?: boolean;
     __useEffect?: boolean;
     path?: IPathCommandData;
     windingRule?: IWindingRule;
@@ -574,24 +578,24 @@ interface ICachedShape extends ICachedLeaf {
 }
 
 interface IPaintModule {
-    compute?(ui: IUI, attrName: 'fill' | 'stroke'): void;
-    fill?(ui: IUI, canvas: ILeaferCanvas, fill: string): void;
-    fills?(ui: IUI, canvas: ILeaferCanvas, fills: ILeafPaint[]): void;
+    compute?(attrName: 'fill' | 'stroke', ui: IUI): void;
+    fill?(fill: string, ui: IUI, canvas: ILeaferCanvas): void;
+    fills?(fills: ILeafPaint[], 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;
-    strokeText?(ui: IUI, canvas: ILeaferCanvas, stroke: string): void;
-    strokesText?(ui: IUI, canvas: ILeaferCanvas, strokes: ILeafPaint[]): void;
+    stroke?(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    strokes?(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    strokeText?(stroke: string, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    strokesText?(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     drawTextStroke?(ui: IUI, canvas: ILeaferCanvas): void;
-    shape?(ui: IUI, current: ILeaferCanvas, options: IRenderOptions): ICachedShape;
-    recycleImage?(data: IUIData, attrName: string): IBooleanMap;
+    shape?(ui: IUI, current: ILeaferCanvas, renderOptions: IRenderOptions): ICachedShape;
+    recycleImage?(attrName: 'fill' | 'stroke', data: IUIData): IBooleanMap;
 }
 
 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, renderOptions: IRenderOptions): void;
+    innerShadow?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, renderOptions: IRenderOptions): void;
+    blur?(ui: IUI, current: ILeaferCanvas, origin: ILeaferCanvas, renderOptions: IRenderOptions): void;
+    backgroundBlur?(ui: IUI, current: ILeaferCanvas, shape: ICachedShape, renderOptions: IRenderOptions): void;
 }
 
 export type { IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, ICornerRadiusString, IDashPatternString, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IExportOptions, IExportResult, IExportResultFunction, IFontWeight, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGradientPaint, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintModule, IPaintString, IPath, IPathData, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IShadowEffect, IShadowString, IStar, IStarData, IStarInputData, IColorString as IStringColor, IStrokeAlign, IStrokeCap, IStrokeJoin, IStrokeWidthString, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextWordData, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIRenderModule, IUITag, IUnitData, IVectorPath, IVerticalAlign };