@leafer-ui/interface 1.6.2 → 1.6.3

package/package.json

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

package/src/IAnimation.ts

@@ -1,4 +1,4 @@
-import { IEventer, IEventMap, IObject, IPercentData, ITransition, IAnimateEasing, IAnimateEasingFunction, IAnimateEnding, IAnimateOptions } from '@leafer/interface'
+import { IEventer, IEventParamsMap, IObject, IPercentData, ITransition, IAnimateEasing, IAnimateEasingFunction, IAnimateEnding, IAnimateOptions } from '@leafer/interface'
 
 import { IUIInputData, IUI } from './IUI'
 
@@ -59,7 +59,7 @@ export interface IAnimate extends IAnimateOptions, IEventer {
 
     keyframes: IKeyframe[]
     config?: IAnimateOptions
-    event?: IEventMap
+    event?: IEventParamsMap
 
     readonly frames: IComputedKeyframe[]
 

package/src/IUI.ts

@@ -281,8 +281,8 @@ export interface ITextDrawData {
 // Image
 export interface IImage extends IImageAttrData, IRect {
     __: IImageData
-    ready: boolean
-    image?: ILeaferImage
+    readonly ready: boolean
+    readonly image?: ILeaferImage
 }
 interface IImageAttrData {
     url?: string
@@ -295,7 +295,7 @@ export interface IImageInputData extends IImageAttrData, IUIBaseInputData { }
 export interface ICanvas extends ICanvasAttrData, IRect {
     __: ICanvasData
     canvas?: ILeaferCanvas
-    context?: ICanvasContext2D
+    readonly context?: ICanvasContext2D
     __updateSize(): void
 }
 interface ICanvasAttrData {
@@ -379,6 +379,7 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     zoomLayer?: IGroup
     readonly isFrame?: boolean
     isOverflow?: boolean
+    useFastShadow?: boolean // 将忽略 stroke 产生的阴影，只对单个 fill 有效
 
     proxyData?: IUIInputData
     __proxyData?: IUIInputData
@@ -457,6 +458,7 @@ interface IUIAttrData {
     disabledStyle?: IStateStyle
     placeholderStyle?: IStateStyle
     placeholderColor?: IColorString
+    placeholderDelay?: number
 
     editConfig?: IEditorConfig
     editOuter?: string
@@ -480,15 +482,17 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     readonly __hasHalf: number // 是否存在半逻辑像素渲染（奇数线宽的居中线条），可以半像素为起点绘制，防止模糊
 
 
-    __pixelFill?: boolean // png / svg / webp
-    __pixelStroke?: boolean
+    __isAlphaPixelFill?: boolean // png / svg / webp
+    __isAlphaPixelStroke?: boolean
+
+    __isTransparentFill?: boolean  // 半透明的填充色 
+    __isTransparentStroke?: boolean
 
     __isHitPixel?: boolean
     __isCanvas?: boolean // canvas 等需单独绘制的元素
+    __isFastShadow?: boolean // 高性能绘制阴影，需满足一定的条件
 
-    __opacityFill?: boolean  // 半透明的
-    __opacityStroke?: boolean
-
+    __fillAfterStroke?: boolean // 填充在描边之后绘制，一般用于高性能的外描边场景
     __drawAfterFill?: boolean
     readonly __clipAfterFill?: boolean
     readonly __hasSurface?: boolean
@@ -503,6 +507,9 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
 
     __needComputePaint?: boolean
     __computePaint(): void
+
+    __setPaint(attrName: 'fill' | 'stroke', value: IValue): void
+    __removePaint(attrName: 'fill' | 'stroke', removeInput?: boolean): void
 }
 export interface IUIComputedData extends IUIAttrData, IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {
 

package/src/module/IColorConvert.ts

@@ -3,4 +3,5 @@ import { IColor, IRGBA } from '../type/IType'
 export interface IColorConvertModule {
     string(color: IColor, opacity?: number): string
     object(color: IColor, opacity?: number): IRGBA
+    hasTransparent(color: string): boolean
 }

package/src/module/IPaint.ts

@@ -19,6 +19,7 @@ export interface IPaintModule {
     strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
 
     strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
+    strokeArrow?(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void
     drawTextStroke(ui: IUI, canvas: ILeaferCanvas): void
 
     shape(ui: IUI, current: ILeaferCanvas, renderOptions: IRenderOptions): ICachedShape

package/src/type/IComputedType.ts

@@ -17,6 +17,7 @@ export interface ILeafPaint {
     patternTask?: ITaskItem
     changeful?: boolean // 会频繁变化，不生成图案（有特殊性能优化，一般用于游戏精灵、动图场景）
     sync?: boolean // 同步显示图片，不走任务列表生成图案
+    isTransparent?: boolean // 是否为透明色
     data?: ILeafPaintPatternData
 }
 

package/src/type/IType.ts

@@ -178,4 +178,4 @@ export interface IEffect extends IFilter {
 
 }
 
-export type IOverflow = 'show' | 'hide'
+export type IOverflow = 'show' | 'hide' | 'scroll' | 'auto'

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, IOptionSizeData, IPathCommandData, IAxis, IAxisReverse, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IPercentData, ILeafInputData, ISizeData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IBoundsData as IBoundsData$1, IPathCreator, IJSONOptions, IValue, IFindCondition, IAnswer, IPathString, IPathDrawer, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPickOptions, IPickResult, ICanvasContext2DSettings, ICanvasContext2D, ILeaferAttrData, IControl, ILeaferType, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap, IAround, IMatrixWithBoundsScaleData } from '@leafer/interface';
+import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, IOptionSizeData, IPathCommandData, IAxis, IAxisReverse, IWindingRule, IFilter, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IAnimateOptions, IAnimateEasing, IEventer, IObject, IEventParamsMap, IAnimateEasingFunction, IAnimateEnding, ITransition, IPercentData, ILeafInputData, ISizeData, ILeaf as ILeaf$1, ILeafComputedData, ILeafData, IBoundsData as IBoundsData$1, IValue, IPathCreator, IJSONOptions, IFindCondition, IAnswer, IPathString, IPathDrawer, ILeaferCanvas, IRenderOptions, IExportOptions, IExportResult, IPickOptions, IPickResult, ICanvasContext2DSettings, ICanvasContext2D, ILeaferAttrData, IControl, ILeaferType, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap, IAround, IMatrixWithBoundsScaleData } from '@leafer/interface';
 export * from '@leafer/interface';
 import { IObject as IObject$1, IEditSize, IStroke as IStroke$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, IUI as IUI$1, IPointData as IPointData$1, IScaleData, ISkewData, IGroup as IGroup$1, ISelectorProxy, ILeafList, IBox as IBox$1, IRect as IRect$1, ILayoutBoundsData, IBoundsData, IKeyEvent, ILeaf, IDragEvent, IZoomEvent, IRotateEvent, IGroupInputData as IGroupInputData$1, IStateName as IStateName$1, IString as IString$1, IBoolean as IBoolean$1, IStateStyle as IStateStyle$1 } from '@leafer-ui/interface';
 
@@ -134,7 +134,7 @@ interface IGrayscaleEffect {
 }
 interface IEffect extends IFilter {
 }
-type IOverflow = 'show' | 'hide';
+type IOverflow = 'show' | 'hide' | 'scroll' | 'auto';
 
 type ILeafPaintColor = IColorString | CanvasGradient | CanvasPattern;
 interface ILeafPaint {
@@ -148,6 +148,7 @@ interface ILeafPaint {
     patternTask?: ITaskItem;
     changeful?: boolean;
     sync?: boolean;
+    isTransparent?: boolean;
     data?: ILeafPaintPatternData;
 }
 interface ILeafPaintPatternData {
@@ -358,7 +359,7 @@ interface IAnimate extends IAnimateOptions, IEventer {
     target: IUI | IObject;
     keyframes: IKeyframe[];
     config?: IAnimateOptions;
-    event?: IEventMap;
+    event?: IEventParamsMap;
     readonly frames: IComputedKeyframe[];
     readonly style: IUIInputData;
     readonly fromStyle: IUIInputData;
@@ -788,8 +789,8 @@ interface ITextDrawData {
 }
 interface IImage extends IImageAttrData, IRect {
     __: IImageData;
-    ready: boolean;
-    image?: ILeaferImage;
+    readonly ready: boolean;
+    readonly image?: ILeaferImage;
 }
 interface IImageAttrData {
     url?: string;
@@ -802,7 +803,7 @@ interface IImageInputData extends IImageAttrData, IUIBaseInputData {
 interface ICanvas extends ICanvasAttrData, IRect {
     __: ICanvasData;
     canvas?: ILeaferCanvas;
-    context?: ICanvasContext2D;
+    readonly context?: ICanvasContext2D;
     __updateSize(): void;
 }
 interface ICanvasAttrData {
@@ -869,6 +870,7 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     zoomLayer?: IGroup;
     readonly isFrame?: boolean;
     isOverflow?: boolean;
+    useFastShadow?: boolean;
     proxyData?: IUIInputData;
     __proxyData?: IUIInputData;
     animation?: IAnimation | IAnimation[];
@@ -920,6 +922,7 @@ interface IUIAttrData {
     disabledStyle?: IStateStyle;
     placeholderStyle?: IStateStyle;
     placeholderColor?: IColorString;
+    placeholderDelay?: number;
     editConfig?: IEditorConfig;
     editOuter?: string;
     editInner?: string;
@@ -934,12 +937,14 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     readonly __strokeWidth: number;
     readonly __hasStroke: boolean;
     readonly __hasHalf: number;
-    __pixelFill?: boolean;
-    __pixelStroke?: boolean;
+    __isAlphaPixelFill?: boolean;
+    __isAlphaPixelStroke?: boolean;
+    __isTransparentFill?: boolean;
+    __isTransparentStroke?: boolean;
     __isHitPixel?: boolean;
     __isCanvas?: boolean;
-    __opacityFill?: boolean;
-    __opacityStroke?: boolean;
+    __isFastShadow?: boolean;
+    __fillAfterStroke?: boolean;
     __drawAfterFill?: boolean;
     readonly __clipAfterFill?: boolean;
     readonly __hasSurface?: boolean;
@@ -949,6 +954,8 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __textDrawData?: ITextDrawData;
     __needComputePaint?: boolean;
     __computePaint(): void;
+    __setPaint(attrName: 'fill' | 'stroke', value: IValue): void;
+    __removePaint(attrName: 'fill' | 'stroke', removeInput?: boolean): void;
 }
 interface IUIComputedData extends IUIAttrData, IFillComputedData, IBorderComputedData, IStrokeComputedData, ITextStyleComputedData, ICornerRadiusComputedData, IEffectComputedData, ILeafComputedData {
 }
@@ -1049,6 +1056,7 @@ interface ITextConvertModule {
 interface IColorConvertModule {
     string(color: IColor, opacity?: number): string;
     object(color: IColor, opacity?: number): IRGBA;
+    hasTransparent(color: string): boolean;
 }
 
 interface IExportModule {
@@ -1091,6 +1099,7 @@ interface IPaintModule {
     stroke(stroke: string, ui: IUI, canvas: ILeaferCanvas): void;
     strokes(strokes: ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
     strokeText(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
+    strokeArrow?(stroke: string | ILeafPaint[], ui: IUI, canvas: ILeaferCanvas): void;
     drawTextStroke(ui: IUI, canvas: ILeaferCanvas): void;
     shape(ui: IUI, current: ILeaferCanvas, renderOptions: IRenderOptions): ICachedShape;
 }