@leafer-ui/interface 1.2.2 → 1.3.1

package/package.json

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

package/src/IAnimation.ts

@@ -134,7 +134,7 @@ export interface IAnimateEventFunction {
 
 
 export interface IAnimate extends IAnimateOptions, IEventer {
-    target: IUI
+    target: IUI | IObject
 
     keyframes: IKeyframe[]
     config?: IAnimateOptions
@@ -142,6 +142,7 @@ export interface IAnimate extends IAnimateOptions, IEventer {
 
     readonly frames: IComputedKeyframe[]
 
+    readonly style: IUIInputData
     readonly fromStyle: IUIInputData
     readonly toStyle: IUIInputData
     readonly endingStyle: IUIInputData
@@ -156,13 +157,13 @@ export interface IAnimate extends IAnimateOptions, IEventer {
 
     readonly realEnding: IAnimateEnding
 
-    init(target: IUI, keyframe: IUIInputData | IKeyframe[], options?: ITransition, isTemp?: boolean): void
+    init(target: IUI | IObject, keyframe: IUIInputData | IKeyframe[], options?: ITransition, isTemp?: boolean): void
 
     play(): void
     pause(): void
     stop(): void
     seek(time: number | IPercentData): void
-    kill(): void
+    kill(complete?: boolean, killStyle?: IUIInputData): void
 
     destroy(complete?: boolean): void
 }

package/src/ICommonAttr.ts

@@ -1,5 +1,5 @@
 import { INumber, IBoolean, IString, IFourNumber, IUnitData } from '@leafer/interface'
-import { IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IStroke, IFill, IArrowType } from './type/IType'
+import { IStrokeAlign, IStrokeCap, IStrokeJoin, IBlurEffect, IFontWeight, ITextCase, ITextDecoration, IShadowEffect, IGrayscaleEffect, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IStroke, IFill, IArrowType, IWritingMode } from './type/IType'
 import { ILeafStrokePaint, ILeafShadowEffect, ILeafPaint } from './type/IComputedType'
 import { IDashPatternString, IShadowString, IColorString, IStrokeWidthString, ICornerRadiusString } from './type/IStringType'
 
@@ -97,6 +97,7 @@ export interface ITextStyleAttrData {
     paraIndent?: INumber
     paraSpacing?: INumber
 
+    writingMode?: IWritingMode
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
     autoSizeAlign?: IBoolean
@@ -117,6 +118,7 @@ export interface ITextStyleInputData {
     paraIndent?: INumber
     paraSpacing?: INumber
 
+    writingMode?: IWritingMode
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
     autoSizeAlign?: IBoolean
@@ -137,6 +139,7 @@ export interface ITextStyleComputedData {
     paraIndent?: number
     paraSpacing?: number
 
+    writingMode?: IWritingMode
     textAlign?: ITextAlign
     verticalAlign?: IVerticalAlign
     autoSizeAlign?: boolean // 自动宽高的文本，是否仍进行整体对齐操作

package/src/IUI.ts

@@ -373,8 +373,8 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     proxyData?: IUIInputData
     __proxyData?: IUIInputData
 
-    animation?: IAnimation
-    animationOut?: IAnimation
+    animation?: IAnimation | IAnimation[]
+    animationOut?: IAnimation | IAnimation[]
 
     editConfig?: IEditorConfig
     editOuter: string
@@ -409,8 +409,8 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void
     __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
-    animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation, options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate
-    killAnimate(type?: IAnimateType): void
+    animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate
+    killAnimate(type?: IAnimateType, killStyle?: IUIInputData): void
 
     export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>
     clone(data?: IUIInputData): IUI
@@ -431,8 +431,8 @@ export type IStateName = string
 
 
 interface IUIAttrData {
-    animation?: IAnimation
-    animationOut?: IAnimation
+    animation?: IAnimation | IAnimation[]
+    animationOut?: IAnimation | IAnimation[]
 
     transition?: ITransition
     transitionOut?: ITransition

package/src/index.ts

@@ -28,7 +28,7 @@ export {
     IUITag, IUIInputData, IUIJSONData, IStateStyle, IStates, IStateName
 } from './IUI'
 
-export { IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IEffect, IFill, IStroke, IPaintAttr, IStrokeAlign, IStrokeJoin, IStrokeCap, IArrowType, IPathDataArrow, IPathDataArrowMap, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, IFontWeightNumer, IFontWeightString, ITextCase, ITextDecoration, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IRepeat, IGradientType, IPaintType, IImageFilters, IPathDataArrowOffset, ISolidPaint, IPaintBase } from './type/IType'
+export { IVectorPath, IShadowEffect, IBlurEffect, IGrayscaleEffect, IEffect, IFill, IStroke, IPaintAttr, IStrokeAlign, IStrokeJoin, IStrokeCap, IArrowType, IPathDataArrow, IPathDataArrowMap, IRGB, IRGBA, IColor, IColorStop, IPaint, IGradientPaint, IImagePaint, IImagePaintMode, IFontWeight, IFontWeightNumer, IFontWeightString, ITextCase, ITextDecoration, IWritingMode, ITextAlign, IVerticalAlign, IOverflow, ITextWrap, IRepeat, IGradientType, IPaintType, IImageFilters, IPathDataArrowOffset, ISolidPaint, IPaintBase } from './type/IType'
 export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, IPercent, IDashPatternString, IColorString } from './type/IStringType'
 export { ILeafFill, ILeafPaint, ILeafPaintPatternData, ILeafPaintColor, ILeafStrokePaint, ILeafShadowEffect } from './type/IComputedType'
 export { IStrokeAttrData, IStrokeInputData, IStrokeComputedData, ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData, IEffectAttrData, IEffectInputData, IEffectComputedData } from './ICommonAttr'

package/src/type/IType.ts

@@ -1,4 +1,4 @@
-import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, ISizeData, IFourNumber, IAlign, IUnitPointData, IObject } from '@leafer/interface'
+import { IPointData, IPathCommandData, IWindingRule, IBlendMode, IExportFileType, ISizeData, IFourNumber, IAlign, IUnitPointData, IObject, IAxis, IAxisReverse } from '@leafer/interface'
 import { IColorString, IPaintString } from './IStringType'
 
 export type IPaint = ISolidPaint | IGradientPaint | IImagePaint
@@ -132,6 +132,7 @@ export type IFontWeightString =
     | 'black'
 export type ITextDecoration = 'none' | 'under' | 'delete'
 export type ITextWrap = 'normal' | 'none' | 'break'
+export type IWritingMode = IAxis | IAxisReverse
 
 // 路径
 export interface IVectorPath {

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, ISizeData, IPathCommandData, IWindingRule, IObject, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IEventer, IEventMap, IPercentData, IBoundsData as IBoundsData$1, IPathCreator, ILeaferCanvas, ICanvasContext2D, ICanvasContext2DSettings, IRenderOptions, IPickOptions, IPickResult, ILeaf as ILeaf$1, IFindCondition, IJSONOptions, IValue, IPathString, IPathDrawer, IExportOptions, IExportResult, IAnswer, ILeafData, ILeafComputedData, ILeafInputData, ILeaferAttrData, IControl, ILeaferType, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap, IAround } from '@leafer/interface';
+import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, ISizeData, IPathCommandData, IAxis, IAxisReverse, IWindingRule, IObject, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IEventer, IEventMap, IPercentData, IBoundsData as IBoundsData$1, IPathCreator, ILeaferCanvas, ICanvasContext2D, ICanvasContext2DSettings, IRenderOptions, IPickOptions, IPickResult, ILeaf as ILeaf$1, IFindCondition, IJSONOptions, IValue, IPathString, IPathDrawer, IExportOptions, IExportResult, IAnswer, ILeafData, ILeafComputedData, ILeafInputData, ILeaferAttrData, IControl, ILeaferType, ILeaferConfig, ILeafRender, ILeafBounds, ILeafHit, ICachedLeaf, IBooleanMap, IAround } from '@leafer/interface';
 export * from '@leafer/interface';
 import { IGroup as IGroup$1, ISelectorProxy, IUI as IUI$1, ILeafList, IObject as IObject$1, ILeaf, IEditSize, IDragEvent, IZoomEvent, IRotateEvent, IGroupInputData as IGroupInputData$1, 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, IBox as IBox$1, IRect as IRect$1, IBoundsData, IKeyEvent, IStateName as IStateName$1, IString as IString$1, IBoolean as IBoolean$1, IStateStyle as IStateStyle$1 } from '@leafer-ui/interface';
 
@@ -102,6 +102,7 @@ type IFontWeightNumer = 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;
 type IFontWeightString = 'thin' | 'extra-light' | 'light' | 'normal' | 'medium' | 'semi-bold' | 'bold' | 'extra-bold' | 'black';
 type ITextDecoration = 'none' | 'under' | 'delete';
 type ITextWrap = 'normal' | 'none' | 'break';
+type IWritingMode = IAxis | IAxisReverse;
 interface IVectorPath {
     rule?: IWindingRule;
     data: string | IPathCommandData;
@@ -246,6 +247,7 @@ interface ITextStyleAttrData {
     lineHeight?: INumber | IUnitData;
     paraIndent?: INumber;
     paraSpacing?: INumber;
+    writingMode?: IWritingMode;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
     autoSizeAlign?: IBoolean;
@@ -263,6 +265,7 @@ interface ITextStyleInputData {
     lineHeight?: INumber | IUnitData;
     paraIndent?: INumber;
     paraSpacing?: INumber;
+    writingMode?: IWritingMode;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
     autoSizeAlign?: IBoolean;
@@ -280,6 +283,7 @@ interface ITextStyleComputedData {
     lineHeight?: number;
     paraIndent?: number;
     paraSpacing?: number;
+    writingMode?: IWritingMode;
     textAlign?: ITextAlign;
     verticalAlign?: IVerticalAlign;
     autoSizeAlign?: boolean;
@@ -383,11 +387,12 @@ interface IAnimateEventFunction {
     (animate?: IAnimate): any;
 }
 interface IAnimate extends IAnimateOptions, IEventer {
-    target: IUI;
+    target: IUI | IObject;
     keyframes: IKeyframe[];
     config?: IAnimateOptions;
     event?: IEventMap;
     readonly frames: IComputedKeyframe[];
+    readonly style: IUIInputData;
     readonly fromStyle: IUIInputData;
     readonly toStyle: IUIInputData;
     readonly endingStyle: IUIInputData;
@@ -398,12 +403,12 @@ interface IAnimate extends IAnimateOptions, IEventer {
     readonly time: number;
     readonly looped: number;
     readonly realEnding: IAnimateEnding;
-    init(target: IUI, keyframe: IUIInputData | IKeyframe[], options?: ITransition, isTemp?: boolean): void;
+    init(target: IUI | IObject, keyframe: IUIInputData | IKeyframe[], options?: ITransition, isTemp?: boolean): void;
     play(): void;
     pause(): void;
     stop(): void;
     seek(time: number | IPercentData): void;
-    kill(): void;
+    kill(complete?: boolean, killStyle?: IUIInputData): void;
     destroy(complete?: boolean): void;
 }
 
@@ -835,8 +840,8 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     isOverflow?: boolean;
     proxyData?: IUIInputData;
     __proxyData?: IUIInputData;
-    animation?: IAnimation;
-    animationOut?: IAnimation;
+    animation?: IAnimation | IAnimation[];
+    animationOut?: IAnimation | IAnimation[];
     editConfig?: IEditorConfig;
     editOuter: string;
     editInner: string;
@@ -859,8 +864,8 @@ interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICornerRadius
     __drawPathByBox(drawer: IPathDrawer): void;
     __drawAfterFill?(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void;
-    animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation, options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate;
-    killAnimate(type?: IAnimateType): void;
+    animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate;
+    killAnimate(type?: IAnimateType, killStyle?: IUIInputData): void;
     export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>;
     clone(data?: IUIInputData): IUI;
 }
@@ -871,8 +876,8 @@ interface IStates {
 }
 type IStateName = string;
 interface IUIAttrData {
-    animation?: IAnimation;
-    animationOut?: IAnimation;
+    animation?: IAnimation | IAnimation[];
+    animationOut?: IAnimation | IAnimation[];
     transition?: ITransition;
     transitionOut?: ITransition;
     states?: IStates;
@@ -1069,4 +1074,4 @@ interface IEffectModule {
     backgroundBlur(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void;
 }
 
-export type { IAnimate, IAnimateEasing, IAnimateEasingFunction, IAnimateEasingName, IAnimateEnding, IAnimateEventFunction, IAnimateEvents, IAnimateKeyframe, IAnimateOptions, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, ICubicBezierEasing, ICustomEasingFunction, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorConfig, IEditorConfigFunction, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, 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, IStepsEasing, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransition, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData };
+export type { IAnimate, IAnimateEasing, IAnimateEasingFunction, IAnimateEasingName, IAnimateEnding, IAnimateEventFunction, IAnimateEvents, IAnimateKeyframe, IAnimateOptions, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, ICubicBezierEasing, ICustomEasingFunction, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorConfig, IEditorConfigFunction, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, 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, IStepsEasing, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeInputData, IStrokeJoin, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDrawData, ITextInputData, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransition, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };