@leafer-ui/interface 2.0.8 → 2.1.0

package/package.json

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

package/src/ICommonAttr.ts

@@ -130,8 +130,8 @@ export interface ITextStyleComputedData {
     italic?: boolean
     textCase?: ITextCase
     textDecoration?: ITextDecoration
-    letterSpacing?: number
-    lineHeight?: number
+    letterSpacing?: number | IUnitData
+    lineHeight?: number | IUnitData
 
     paraIndent?: number
     paraSpacing?: number

package/src/IUI.ts

@@ -1,4 +1,4 @@
-import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPathDrawer, IPointData, IPathCommandData, IBoundsData, IObject, IPathString, ILeaferImage, IPathCreator, IAnswer, IPickOptions, IPickResult, IValue, ICanvasContext2DSettings, IFourNumber, IFindCondition, IBoolean, ICanvasContext2D, IJSONOptions, IMatrixData, ISizeData, ITransition, IAround, IMultimediaType, IDirection4, IOptionPointData, IDirection } from '@leafer/interface'
+import { ILeaf, ILeafComputedData, ILeafData, ILeafInputData, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPathDrawer, IPointData, IPathCommandData, IBoundsData, IObject, IPathString, ILeaferImage, IPathCreator, IAnswer, IPickOptions, IPickResult, IValue, ICanvasContext2DSettings, IFourNumber, IFindCondition, IBoolean, ICanvasContext2D, IJSONOptions, IMatrixData, ISizeData, ITransition, IAround, IMultimediaType, IDirection4, IOptionPointData, IDirection, IPathCommandDataWithWindingRule } from '@leafer/interface'
 
 import {
     IFillAttrData, IFillInputData, IFillComputedData,
@@ -129,6 +129,7 @@ export interface IPolygon extends IPolygonAttrData, IUI {
 }
 interface IPolygonAttrData {
     sides?: number
+    startAngle?: number
     points?: number[] | IPointData[]
     curve?: boolean | number
 }
@@ -143,6 +144,7 @@ export interface IStar extends IStarAttrData, IUI {
 interface IStarAttrData {
     corners?: number
     innerRadius?: number
+    startAngle?: number
 }
 
 export interface IStarData extends IStarAttrData, IUIData { }
@@ -600,6 +602,7 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __strokeWidthCache?: number // 一般用于固定线宽的箭头做缓存对比
     __hasMultiStrokeStyle?: number // 是否存在多个不同的描述样式（同时存储多个描边样式中的最大宽度用于运算）
     readonly __hasMultiPaint?: boolean
+    __hasStrokeSides?: number // 是否存在多边，存在时存储最大值
 
     __isAlphaPixelFill?: boolean // png / svg / webp
     __isAlphaPixelStroke?: boolean
@@ -619,6 +622,7 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __blendLayer?: boolean
 
     __boxStroke?: boolean // box闭合描边，可不用计算miterLimit造成的渲染包围盒变化
+    __pathForStroke?: IPathCommandDataWithWindingRule // 笔触的填充路径，一般用于多个strokeWidth的矩形
 
     // text
     __font?: string
@@ -628,6 +632,8 @@ export 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
 }

package/src/module/IPaint.ts

@@ -18,6 +18,7 @@ export interface IPaintModule {
     stroke(stroke: string, 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
     strokeArrow?(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void
     drawStrokesStyle(strokes: ILeafStrokePaint[], strokeWidthScale: number, isText: boolean, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IMultimediaType, IBlendMode, IScaleFixed, IAlign, IUnitPointData, IFilmOptions, IImageLOD, IExportFileType, IFourNumber, IPointData, IOptionSizeData, ISizeData, IGap, IPointGap, IPercentData, IInterlace, IPathCommandData, IAxis, IAxisReverse, IDirection, IWindingRule, IFilter, IFilmPlayOptions, IMatrixData, ILeaferImage, ITaskItem, INumber, IString, IBoolean, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventParamsMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IBounds, ILeafInputData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IBoundsData, IValue, IDirection4 as IDirection4$1, IAround, IOptionPointData, IPathCreator, IJSONOptions, IFindCondition, IAnswer, IPathString, IPathDrawer, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPickOptions, IPickResult, ICanvasContext2DSettings, ICanvasContext2D, ILeaferAttrData, IControl, ILeaferType, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IScaleData as IScaleData$1, IBooleanMap, IFunction, IMatrixWithBoundsScaleData } from '@leafer/interface';
+import { IMultimediaType, IBlendMode, IScaleFixed, IAlign, IUnitPointData, IFilmOptions, IImageLOD, IExportFileType, IFourNumber, IPointData, IOptionSizeData, ISizeData, IGap, IPointGap, IPercentData, IInterlace, IPathCommandData, IAxis, IAxisReverse, IDirection, IWindingRule, IFilter, IFilmPlayOptions, IMatrixData, ILeaferImage, ITaskItem, INumber, IString, IBoolean, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventParamsMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IBounds, ILeafInputData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IPathCommandDataWithWindingRule, IBoundsData, IValue, IDirection4 as IDirection4$1, IAround, IOptionPointData, IPathCreator, IJSONOptions, IFindCondition, IAnswer, IPathString, IPathDrawer, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPickOptions, IPickResult, ICanvasContext2DSettings, ICanvasContext2D, ILeaferAttrData, IControl, ILeaferType, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IScaleData as IScaleData$1, IBooleanMap, IFunction, IMatrixWithBoundsScaleData } from '@leafer/interface';
 export * from '@leafer/interface';
 import { IObject as IObject$1, IEditSize, IStroke as IStroke$1, IFourNumber as IFourNumber$1, IFill as IFill$1, IBoxInputData as IBoxInputData$1, IRectInputData as IRectInputData$1, IColorString as IColorString$1, IDirection4, ICursorType, IImageCursor, IAlign as IAlign$1, IUnitPointData as IUnitPointData$1, IUIInputData as IUIInputData$1, IShortcutKeysCheck, IShortcutKeys, IUI as IUI$1, IPointData as IPointData$1, IScaleData, ISkewData, IGroup as IGroup$1, ISelectorProxy, IBox as IBox$1, ILayoutBoundsData, IKeyEvent, IUIEvent, IDragEvent, IMoveEvent, IZoomEvent, IRotateEvent, ITransition as ITransition$1, ILeafList, ILeafer as ILeafer$1, ILeaf, IGroupInputData as IGroupInputData$1, IStateName as IStateName$1, IString as IString$1, IBoolean as IBoolean$1, IStateStyle as IStateStyle$1 } from '@leafer-ui/interface';
 
@@ -321,8 +321,8 @@ interface ITextStyleComputedData {
     italic?: boolean;
     textCase?: ITextCase;
     textDecoration?: ITextDecoration;
-    letterSpacing?: number;
-    lineHeight?: number;
+    letterSpacing?: number | IUnitData;
+    lineHeight?: number | IUnitData;
     paraIndent?: number;
     paraSpacing?: number;
     writingMode?: IWritingMode;
@@ -792,6 +792,7 @@ interface IPolygon extends IPolygonAttrData, IUI {
 }
 interface IPolygonAttrData {
     sides?: number;
+    startAngle?: number;
     points?: number[] | IPointData[];
     curve?: boolean | number;
 }
@@ -805,6 +806,7 @@ interface IStar extends IStarAttrData, IUI {
 interface IStarAttrData {
     corners?: number;
     innerRadius?: number;
+    startAngle?: number;
 }
 interface IStarData extends IStarAttrData, IUIData {
 }
@@ -1163,6 +1165,7 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __strokeWidthCache?: number;
     __hasMultiStrokeStyle?: number;
     readonly __hasMultiPaint?: boolean;
+    __hasStrokeSides?: number;
     __isAlphaPixelFill?: boolean;
     __isAlphaPixelStroke?: boolean;
     __isTransparentFill?: boolean;
@@ -1176,11 +1179,13 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     readonly __hasSurface?: boolean;
     __blendLayer?: boolean;
     __boxStroke?: boolean;
+    __pathForStroke?: IPathCommandDataWithWindingRule;
     __font?: string;
     __textDrawData?: ITextDrawData;
     __needComputePaint?: boolean;
     __computePaint(): void;
     __getRealStrokeWidth(childStyle?: IStrokeComputedStyle): number;
+    __checkComplex(): void;
     __setPaint(attrName: 'fill' | 'stroke', value: IValue): void;
     __removePaint(attrName: 'fill' | 'stroke', removeInput?: boolean): void;
 }
@@ -1330,6 +1335,7 @@ interface IPaintModule {
     fillText(ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     stroke(stroke: string, 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;
     strokeArrow?(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;
     drawStrokesStyle(strokes: ILeafStrokePaint[], strokeWidthScale: number, isText: boolean, ui: IUI, canvas: ILeaferCanvas, renderOptions: IRenderOptions): void;