@leafer-ui/interface 1.3.2 → 1.4.0

package/package.json

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

package/src/IAnimation.ts

@@ -1,12 +1,10 @@
-import { IEventer, IEventMap, IObject, IPercentData } from '@leafer/interface'
+import { IEventer, IEventMap, IObject, IPercentData, ITransition, IAnimateEasing, IAnimateEasingFunction, IAnimateEnding, IAnimateOptions } from '@leafer/interface'
 
 import { IUIInputData, IUI } from './IUI'
 
 
 export type IAnimation = IStyleAnimation | IKeyframesAnimation
 
-export type ITransition = IAnimateOptions | IAnimateEasingName | number | boolean
-
 export type IAnimateType = 'all' | 'animation' | 'transition' | 'animate'
 
 export interface IStyleAnimation extends IAnimateOptions {
@@ -17,28 +15,6 @@ export interface IKeyframesAnimation extends IAnimateOptions {
     keyframes: IKeyframe[]
 }
 
-export interface IAnimateOptions {
-    easing?: IAnimateEasing
-
-    delay?: number
-    duration?: number
-    ending?: IAnimateEnding
-
-    reverse?: boolean
-    swing?: boolean | number
-
-    loop?: boolean | number
-    loopDelay?: number
-
-    speed?: number
-
-    join?: boolean
-    autoplay?: boolean
-
-    attrs?: string[]
-    event?: IAnimateEvents
-}
-
 
 export type IKeyframe = IUIInputData | IAnimateKeyframe
 
@@ -77,67 +53,6 @@ export interface IComputedKeyframe {
     totalTime?: number // 存在delay 时， 才会有这个属性
 }
 
-export interface IAnimateEasingFunction {
-    (t: number): number
-}
-
-export interface ICustomEasingFunction {
-    (...arg: any): IAnimateEasingFunction
-}
-
-
-export type IAnimateEasing =
-    | IAnimateEasingName
-    | ICubicBezierEasing
-    | IStepsEasing
-    | IObject
-
-export interface ICubicBezierEasing {
-    name: 'cubic-bezier',
-    value: [number, number, number, number]
-}
-
-export interface IStepsEasing {
-    name: 'steps',
-    value: number | [number, 'floor' | 'round' | 'ceil']
-}
-
-
-export type IAnimateEasingName =
-    | 'linear'
-    | 'ease'
-    | 'ease-in' | 'ease-out' | 'ease-in-out'
-    | 'sine-in' | 'sine-out' | 'sine-in-out'
-    | 'quad-in' | 'quad-out' | 'quad-in-out'
-    | 'cubic-in' | 'cubic-out' | 'cubic-in-out'
-    | 'quart-in' | 'quart-out' | 'quart-in-out'
-    | 'quint-in' | 'quint-out' | 'quint-in-out'
-    | 'expo-in' | 'expo-out' | 'expo-in-out'
-    | 'circ-in' | 'circ-out' | 'circ-in-out'
-    | 'back-in' | 'back-out' | 'back-in-out'
-    | 'elastic-in' | 'elastic-out' | 'elastic-in-out'
-    | 'bounce-in' | 'bounce-out' | 'bounce-in-out'
-
-
-export type IAnimateEnding = 'auto' | 'from' | 'to'
-
-export interface IAnimateEvents {
-    created?: IAnimateEventFunction
-
-    play?: IAnimateEventFunction
-    pause?: IAnimateEventFunction
-    stop?: IAnimateEventFunction
-    seek?: IAnimateEventFunction
-
-    update?: IAnimateEventFunction
-    completed?: IAnimateEventFunction
-}
-
-export interface IAnimateEventFunction {
-    (animate?: IAnimate): any
-}
-
-
 
 export interface IAnimate extends IAnimateOptions, IEventer {
     target: IUI | IObject
@@ -171,8 +86,6 @@ export interface IAnimate extends IAnimateOptions, IEventer {
     seek(time: number | IPercentData): void
     kill(complete?: boolean, killStyle?: IUIInputData): void
 
-
-
     destroy(complete?: boolean): void
 }
 

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 } 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 } from '@leafer/interface'
 
 import {
     IFillAttrData, IFillInputData, IFillComputedData,
@@ -9,7 +9,7 @@ import {
     ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData
 } from './ICommonAttr'
 import { IOverflow } from './type/IType'
-import { IAnimation, IAnimate, IKeyframe, IKeyframeId, ITransition, IAnimateType } from './IAnimation'
+import { IAnimation, IAnimate, IKeyframe, IKeyframeId, IAnimateType } from './IAnimation'
 import { ILeafer } from './app/ILeafer'
 import { IEditorConfig } from './editor/IEditor'
 
@@ -445,6 +445,7 @@ interface IUIAttrData {
     focusStyle?: IStateStyle
     selectedStyle?: IStateStyle
     disabledStyle?: IStateStyle
+    placeholderStyle?: IStateStyle
 }
 
 export interface IFindUIMethod {
@@ -474,6 +475,7 @@ export interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
 
     __drawAfterFill?: boolean
     readonly __clipAfterFill?: boolean
+    readonly __hasSurface?: boolean
 
     __isOverflow?: boolean
     __blendLayer?: boolean

package/src/index.ts

@@ -33,7 +33,7 @@ export { ICornerRadiusString, IStrokeWidthString, IPaintString, IShadowString, I
 export { ILeafFill, ILeafPaint, ILeafPaintPatternData, ILeafPaintColor, ILeafStrokePaint, ILeafShadowEffect } from './type/IComputedType'
 export { IStrokeAttrData, IStrokeInputData, IStrokeComputedData, ITextStyleAttrData, ITextStyleInputData, ITextStyleComputedData, IEffectAttrData, IEffectInputData, IEffectComputedData } from './ICommonAttr'
 
-export { IAnimation, ITransition, IAnimate, IAnimateList, IAnimateType, IKeyframe, IKeyframeId, IAnimateEasing, ICubicBezierEasing, IStepsEasing, IAnimateEasingFunction, IAnimateEasingName, IAnimateEnding, IAnimateEvents, IAnimateEventFunction, ICustomEasingFunction, IAnimateKeyframe, IComputedKeyframe, IStyleAnimation, IKeyframesAnimation, IAnimateOptions } from './IAnimation'
+export { IAnimation, IAnimate, IAnimateList, IAnimateType, IKeyframe, IKeyframeId, IAnimateKeyframe, IComputedKeyframe, IStyleAnimation, IKeyframesAnimation } from './IAnimation'
 
 export { IUIRenderModule, IRectRenderModule, IImageRenderModule, ITextRenderModule, IGroupRenderModule, IFrameRenderModule } from './module/IUIRender'
 export { IUIBoundsModule } from './module/IUIBounds'

package/types/index.d.ts

@@ -1,4 +1,4 @@
-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';
+import { IBlendMode, IAlign, IUnitPointData, IExportFileType, IFourNumber, IPointData, ISizeData, IPathCommandData, IAxis, IAxisReverse, IWindingRule, IObject, IMatrixData, ILeaferImage, ITaskItem, IBoolean, INumber, IString, IUnitData, IAnimateOptions, IAnimateEasing, IAnimateEasingFunction, IEventer, IEventMap, IAnimateEnding, ITransition, 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';
 
@@ -313,7 +313,6 @@ interface IEffectComputedData {
 }
 
 type IAnimation = IStyleAnimation | IKeyframesAnimation;
-type ITransition = IAnimateOptions | IAnimateEasingName | number | boolean;
 type IAnimateType = 'all' | 'animation' | 'transition' | 'animate';
 interface IStyleAnimation extends IAnimateOptions {
     style: IUIInputData;
@@ -321,21 +320,6 @@ interface IStyleAnimation extends IAnimateOptions {
 interface IKeyframesAnimation extends IAnimateOptions {
     keyframes: IKeyframe[];
 }
-interface IAnimateOptions {
-    easing?: IAnimateEasing;
-    delay?: number;
-    duration?: number;
-    ending?: IAnimateEnding;
-    reverse?: boolean;
-    swing?: boolean | number;
-    loop?: boolean | number;
-    loopDelay?: number;
-    speed?: number;
-    join?: boolean;
-    autoplay?: boolean;
-    attrs?: string[];
-    event?: IAnimateEvents;
-}
 type IKeyframe = IUIInputData | IAnimateKeyframe;
 type IKeyframeId = number;
 interface IAnimateKeyframe {
@@ -361,35 +345,6 @@ interface IComputedKeyframe {
     autoDuration?: number;
     totalTime?: number;
 }
-interface IAnimateEasingFunction {
-    (t: number): number;
-}
-interface ICustomEasingFunction {
-    (...arg: any): IAnimateEasingFunction;
-}
-type IAnimateEasing = IAnimateEasingName | ICubicBezierEasing | IStepsEasing | IObject;
-interface ICubicBezierEasing {
-    name: 'cubic-bezier';
-    value: [number, number, number, number];
-}
-interface IStepsEasing {
-    name: 'steps';
-    value: number | [number, 'floor' | 'round' | 'ceil'];
-}
-type IAnimateEasingName = 'linear' | 'ease' | 'ease-in' | 'ease-out' | 'ease-in-out' | 'sine-in' | 'sine-out' | 'sine-in-out' | 'quad-in' | 'quad-out' | 'quad-in-out' | 'cubic-in' | 'cubic-out' | 'cubic-in-out' | 'quart-in' | 'quart-out' | 'quart-in-out' | 'quint-in' | 'quint-out' | 'quint-in-out' | 'expo-in' | 'expo-out' | 'expo-in-out' | 'circ-in' | 'circ-out' | 'circ-in-out' | 'back-in' | 'back-out' | 'back-in-out' | 'elastic-in' | 'elastic-out' | 'elastic-in-out' | 'bounce-in' | 'bounce-out' | 'bounce-in-out';
-type IAnimateEnding = 'auto' | 'from' | 'to';
-interface IAnimateEvents {
-    created?: IAnimateEventFunction;
-    play?: IAnimateEventFunction;
-    pause?: IAnimateEventFunction;
-    stop?: IAnimateEventFunction;
-    seek?: IAnimateEventFunction;
-    update?: IAnimateEventFunction;
-    completed?: IAnimateEventFunction;
-}
-interface IAnimateEventFunction {
-    (animate?: IAnimate): any;
-}
 interface IAnimate extends IAnimateOptions, IEventer {
     target: IUI | IObject;
     keyframes: IKeyframe[];
@@ -895,6 +850,7 @@ interface IUIAttrData {
     focusStyle?: IStateStyle;
     selectedStyle?: IStateStyle;
     disabledStyle?: IStateStyle;
+    placeholderStyle?: IStateStyle;
 }
 interface IFindUIMethod {
     (leaf: IUI, options?: any): IAnswer;
@@ -913,6 +869,7 @@ interface IUIData extends IUIAttrData, IUIComputedData, ILeafData {
     __opacityStroke?: boolean;
     __drawAfterFill?: boolean;
     readonly __clipAfterFill?: boolean;
+    readonly __hasSurface?: boolean;
     __isOverflow?: boolean;
     __blendLayer?: boolean;
     __boxStroke?: boolean;
@@ -1082,4 +1039,4 @@ interface IEffectModule {
     backgroundBlur(ui: IUI, current: ILeaferCanvas, shape: ICachedShape): void;
 }
 
-export type { IAnimate, IAnimateEasing, IAnimateEasingFunction, IAnimateEasingName, IAnimateEnding, IAnimateEventFunction, IAnimateEvents, IAnimateKeyframe, IAnimateList, 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 };
+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, 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, 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, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };