@leafer-ui/interface 1.5.2 → 1.6.0

package/package.json

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

package/src/IUI.ts

@@ -209,6 +209,12 @@ interface ITextAttrData {
     text?: string | number
     padding?: IFourNumber
     resizeFontSize?: boolean
+    boxStyle?: IBackgroundBoxStyle
+    textEditing?: boolean
+}
+
+export interface IBackgroundBoxStyle extends IRectInputData {
+
 }
 
 export interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIData {
@@ -379,6 +385,7 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
 
     children?: IUI[]
 
+    __box?: IUI // 背景box, 一般用于文本背景框
     __animate?: IAnimate
 
     readonly pen: IPathCreator
@@ -464,6 +471,7 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
 
     readonly __strokeWidth: number
     readonly __hasStroke: boolean
+    readonly __hasHalf: number // 是否存在半逻辑像素渲染（奇数线宽的居中线条），可以半像素为起点绘制，防止模糊
 
 
     __pixelFill?: boolean // png / svg / webp
@@ -479,7 +487,6 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     readonly __clipAfterFill?: boolean
     readonly __hasSurface?: boolean
 
-    __isOverflow?: boolean
     __blendLayer?: boolean
 
     __boxStroke?: boolean // box闭合描边，可不用计算miterLimit造成的渲染包围盒变化

package/src/app/IApp.ts

@@ -6,6 +6,7 @@ import { IEditorConfig } from '../editor/IEditor'
 export interface IApp extends ILeafer {
     children: ILeafer[]
     realCanvas: boolean
+    forEach(fn: IAppForEachFn): void
 }
 
 export interface IAppConfig extends ILeaferConfig {
@@ -13,4 +14,8 @@ export interface IAppConfig extends ILeaferConfig {
     tree?: ILeaferConfig
     sky?: ILeaferConfig
     editor?: IEditorConfig
+}
+
+export interface IAppForEachFn {
+    (value: ILeafer, index: number, array: ILeafer[]): void
 }

package/src/editor/IEditor.ts

@@ -2,7 +2,8 @@ import { IGroup, IUI, IBox, IRectInputData, ISelectorProxy, IEditSize, ICursorTy
 
 export interface IEditorBase extends IGroup, ISelectorProxy {
     config: IEditorConfig
-    readonly mergeConfig: IEditorConfig // 实际使用，合并了选中元素上的editConfig
+    readonly mergeConfig: IEditorConfig // 实际使用，合并了选中元素上的editConfig，频繁访问会消耗性能
+    readonly mergedConfig: IEditorConfig // 合并之后的缓存配置
 
     hoverTarget?: IUI
     target?: IUI | IUI[]
@@ -29,6 +30,7 @@ export interface IEditorBase extends IGroup, ISelectorProxy {
     editBox: IEditBoxBase
     editTool?: IObject
     innerEditor?: IObject
+    editMask: IUI
 
     select(target: IUI | IUI[]): void
     cancel(): void
@@ -120,6 +122,7 @@ export interface IEditorConfig extends IObject {
     rotateable?: boolean | 'rotate'
     skewable?: boolean
 
+    beforeSelect?: IEditorBeforeSelect
     beforeMove?: IEditorBeforeMove
     beforeScale?: IEditorBeforeScale
     beforeRotate?: IEditorBeforeRotate
@@ -129,6 +132,10 @@ export interface IEditorConfig extends IObject {
     pathEditor?: IObject
 }
 
+export interface IEditorSelectData {
+    target: IUI | IUI[]
+}
+
 export interface IEditorMoveData extends IPointData, IObject {
     target: IUI
 }
@@ -149,6 +156,9 @@ export interface IEditorSkewData extends ISkewData, IObject {
     origin: IPointData | IAlign
 }
 
+export interface IEditorBeforeSelect {
+    (data: IEditorSelectData): IUI | IUI[] | boolean | void
+}
 
 export interface IEditorBeforeMove {
     (data: IEditorMoveData): IPointData | boolean | void

package/src/index.ts

@@ -1,6 +1,6 @@
 export * from '@leafer/interface'
 
-export { IApp, IAppConfig } from './app/IApp'
+export { IApp, IAppConfig, IAppForEachFn } from './app/IApp'
 export { ILeafer } from './app/ILeafer'
 
 export {
@@ -12,7 +12,7 @@ export {
     IStar, IStarInputData, IStarData,
     IPath, IPathInputData, IPathData,
     IPen, IPenInputData, IPenData,
-    IText, ITextInputData, ITextData, ITextRowData, ITextWordData, ITextCharData, ITextDrawData,
+    IText, ITextInputData, ITextData, ITextRowData, ITextWordData, ITextCharData, ITextDrawData, IBackgroundBoxStyle,
     IImage, IImageInputData, IImageData,
     ICanvas, ICanvasInputData, ICanvasData,
     IFrame, IFrameInputData, IFrameData,
@@ -50,4 +50,4 @@ export { IEffectModule } from './module/IEffect'
 export { IFilterModule, IFilterProcessor, IFilterFunction } from './module/IFilter'
 export { ICachedShape } from './ICachedShape'
 
-export { IEditorBase, IEditorConfig, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditorDragStartData, IEditToolFunction, IEditorConfigFunction, IEditorBeforeMove, IEditorBeforeScale, IEditorBeforeRotate, IEditorBeforeSkew, IEditorMoveData, IEditorScaleData, IEditorRotationData, IEditorSkewData } from './editor/IEditor'
+export { IEditorBase, IEditorConfig, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditorDragStartData, IEditToolFunction, IEditorConfigFunction, IEditorBeforeSelect, IEditorBeforeMove, IEditorBeforeScale, IEditorBeforeRotate, IEditorBeforeSkew, IEditorSelectData, IEditorMoveData, IEditorScaleData, IEditorRotationData, IEditorSkewData } from './editor/IEditor'

package/src/module/ITransition.ts

@@ -6,6 +6,8 @@ export interface ITransitionModule {
     register(attrName: string, fn: ITransitionFunction): void
     get(attrName: string): ITransitionFunction
 
+    setBetweenStyle(betweenStyle: IObject, fromStyle: IObject, toStyle: IObject, bothStyle: IObject, t: number, target: any, attrs?: IObject): void
+
     value(from: any, to: any, t: number, target?: IObject): any
     number(from: number, to: number, t: number, roundValue?: number): number
     color(from: IColor, to: IColor, t: number): string

package/src/type/IComputedType.ts

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

package/src/type/IType.ts

@@ -78,7 +78,7 @@ export interface IImagePaint extends IPaintBase {
 
     repeat?: IRepeat
 
-    changeful?: boolean // 会频繁变化 url（有特殊性能优化，一般用于游戏精灵、动图场景）
+    changeful?: boolean // 会频繁变化，不生成图案（有特殊性能优化，一般用于游戏精灵、动图场景）
     sync?: boolean // 同步显示，不走任务列表生成图案
 }
 export interface IImageFilters {

package/types/index.d.ts

@@ -1,6 +1,6 @@
 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';
 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, IPointData as IPointData$1, IUI as IUI$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';
+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';
 
 type IPercent = string;
 type IColorString = string;
@@ -145,6 +145,7 @@ interface ILeafPaint {
     loadId?: number;
     patternId?: string;
     patternTask?: ITaskItem;
+    changeful?: boolean;
     sync?: boolean;
     data?: ILeafPaintPatternData;
 }
@@ -385,6 +386,7 @@ interface IAnimateList extends IAnimate {
 interface IEditorBase extends IGroup$1, ISelectorProxy {
     config: IEditorConfig;
     readonly mergeConfig: IEditorConfig;
+    readonly mergedConfig: IEditorConfig;
     hoverTarget?: IUI$1;
     target?: IUI$1 | IUI$1[];
     readonly list: IUI$1[];
@@ -404,6 +406,7 @@ interface IEditorBase extends IGroup$1, ISelectorProxy {
     editBox: IEditBoxBase;
     editTool?: IObject$1;
     innerEditor?: IObject$1;
+    editMask: IUI$1;
     select(target: IUI$1 | IUI$1[]): void;
     cancel(): void;
     hasItem(item: IUI$1): boolean;
@@ -473,6 +476,7 @@ interface IEditorConfig extends IObject$1 {
     flipable?: boolean;
     rotateable?: boolean | 'rotate';
     skewable?: boolean;
+    beforeSelect?: IEditorBeforeSelect;
     beforeMove?: IEditorBeforeMove;
     beforeScale?: IEditorBeforeScale;
     beforeRotate?: IEditorBeforeRotate;
@@ -480,6 +484,9 @@ interface IEditorConfig extends IObject$1 {
     textEditor?: IObject$1;
     pathEditor?: IObject$1;
 }
+interface IEditorSelectData {
+    target: IUI$1 | IUI$1[];
+}
 interface IEditorMoveData extends IPointData$1, IObject$1 {
     target: IUI$1;
 }
@@ -496,6 +503,9 @@ interface IEditorSkewData extends ISkewData, IObject$1 {
     target: IUI$1;
     origin: IPointData$1 | IAlign$1;
 }
+interface IEditorBeforeSelect {
+    (data: IEditorSelectData): IUI$1 | IUI$1[] | boolean | void;
+}
 interface IEditorBeforeMove {
     (data: IEditorMoveData): IPointData$1 | boolean | void;
 }
@@ -718,6 +728,10 @@ interface ITextAttrData {
     text?: string | number;
     padding?: IFourNumber;
     resizeFontSize?: boolean;
+    boxStyle?: IBackgroundBoxStyle;
+    textEditing?: boolean;
+}
+interface IBackgroundBoxStyle extends IRectInputData {
 }
 interface ITextData extends ITextAttrData, ITextStyleComputedData, IUIData {
     __baseLine?: number;
@@ -857,6 +871,7 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     animation?: IAnimation | IAnimation[];
     animationOut?: IAnimation | IAnimation[];
     children?: IUI[];
+    __box?: IUI;
     __animate?: IAnimate;
     readonly pen: IPathCreator;
     reset(data?: IUIInputData): void;
@@ -913,6 +928,7 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __isStrokes?: boolean;
     readonly __strokeWidth: number;
     readonly __hasStroke: boolean;
+    readonly __hasHalf: number;
     __pixelFill?: boolean;
     __pixelStroke?: boolean;
     __isHitPixel?: boolean;
@@ -922,7 +938,6 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __drawAfterFill?: boolean;
     readonly __clipAfterFill?: boolean;
     readonly __hasSurface?: boolean;
-    __isOverflow?: boolean;
     __blendLayer?: boolean;
     __boxStroke?: boolean;
     __font?: string;
@@ -961,6 +976,7 @@ interface ILeafer extends IGroup, ILeaferAttrData, IControl {
 interface IApp extends ILeafer {
     children: ILeafer[];
     realCanvas: boolean;
+    forEach(fn: IAppForEachFn): void;
 }
 interface IAppConfig extends ILeaferConfig {
     ground?: ILeaferConfig;
@@ -968,6 +984,9 @@ interface IAppConfig extends ILeaferConfig {
     sky?: ILeaferConfig;
     editor?: IEditorConfig;
 }
+interface IAppForEachFn {
+    (value: ILeafer, index: number, array: ILeafer[]): void;
+}
 
 type IUIRenderModule = IUIRender & ThisType<IUI>;
 interface IUIRender extends ILeafRender {
@@ -1005,6 +1024,7 @@ interface ITransitionModule {
     list: ITransitionMap;
     register(attrName: string, fn: ITransitionFunction): void;
     get(attrName: string): ITransitionFunction;
+    setBetweenStyle(betweenStyle: IObject, fromStyle: IObject, toStyle: IObject, bothStyle: IObject, t: number, target: any, attrs?: IObject): void;
     value(from: any, to: any, t: number, target?: IObject): any;
     number(from: number, to: number, t: number, roundValue?: number): number;
     color(from: IColor, to: IColor, t: number): string;
@@ -1109,4 +1129,4 @@ interface IFilterFunction {
     (filter: IFilter, ui: IUI, bounds: IMatrixWithBoundsScaleData, currentCanvas: ILeaferCanvas, originCanvas: ILeaferCanvas, shape: ICachedShape): void;
 }
 
-export type { IAnimate, IAnimateKeyframe, IAnimateList, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorBeforeMove, IEditorBeforeRotate, IEditorBeforeScale, IEditorBeforeSkew, IEditorConfig, IEditorConfigFunction, IEditorDragStartData, IEditorMoveData, IEditorRotationData, IEditorScaleData, IEditorSkewData, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFilterFunction, IFilterModule, IFilterProcessor, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFontWeightNumer, IFontWeightString, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGIF, IGIFData, IGIFInputData, IGradientPaint, IGradientType, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageFilters, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, IKeyframe, IKeyframeId, IKeyframesAnimation, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintBase, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPaintType, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathDataArrowOffset, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IRobot, IRobotActionName, IRobotActions, IRobotAnimation, IRobotComputedKeyframe, IRobotData, IRobotInputData, IRobotKeyframe, IShadowEffect, IShadowString, ISolidPaint, IStar, IStarData, IStarInputData, IStateModule, IStateName, IStateStyle, IStates, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDecorationData, ITextDecorationType, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };
+export type { IAnimate, IAnimateKeyframe, IAnimateList, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppForEachFn, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBackgroundBoxStyle, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorBeforeMove, IEditorBeforeRotate, IEditorBeforeScale, IEditorBeforeSelect, IEditorBeforeSkew, IEditorConfig, IEditorConfigFunction, IEditorDragStartData, IEditorMoveData, IEditorRotationData, IEditorScaleData, IEditorSelectData, IEditorSkewData, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFilterFunction, IFilterModule, IFilterProcessor, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFontWeightNumer, IFontWeightString, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGIF, IGIFData, IGIFInputData, IGradientPaint, IGradientType, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageFilters, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, IKeyframe, IKeyframeId, IKeyframesAnimation, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintBase, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPaintType, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathDataArrowOffset, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IRobot, IRobotActionName, IRobotActions, IRobotAnimation, IRobotComputedKeyframe, IRobotData, IRobotInputData, IRobotKeyframe, IShadowEffect, IShadowString, ISolidPaint, IStar, IStarData, IStarInputData, IStateModule, IStateName, IStateStyle, IStates, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDecorationData, ITextDecorationType, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };