feat(animate): 当前后两个动画不冲突时，可以同时进行

leaferjs · Jan 9, 2025 · 7e17547 · 7e17547
1 parent 6bd06a0
commit 7e17547
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/packages/display/src/UI.ts b/packages/display/src/UI.ts
@@ -471,7 +471,7 @@ export class UI extends Leaf implements IUI { // tip: rewrited Box
         return Plugin.need('animate')
     }
 
-    public killAnimate(_type?: IAnimateType, _killStyle?: IUIInputData): void { }
+    public killAnimate(_type?: IAnimateType, _nextStyle?: IUIInputData): void { }
 
 
     // create

diff --git a/packages/interface/src/IAnimation.ts b/packages/interface/src/IAnimation.ts
@@ -141,7 +141,6 @@ export interface IAnimateEventFunction {
 
 export interface IAnimate extends IAnimateOptions, IEventer {
     target: IUI | IObject
-    list?: IAnimate[] // AnimateList 专用
 
     keyframes: IKeyframe[]
     config?: IAnimateOptions
@@ -172,5 +171,12 @@ export interface IAnimate extends IAnimateOptions, IEventer {
     seek(time: number | IPercentData): void
     kill(complete?: boolean, killStyle?: IUIInputData): void
 
+
+
     destroy(complete?: boolean): void
+}
+
+export interface IAnimateList extends IAnimate {
+    list: IAnimate[]
+    updateList(animation?: IAnimation[] | IAnimate[], isTemp?: boolean): void
 }
diff --git a/packages/interface/src/IUI.ts b/packages/interface/src/IUI.ts
@@ -410,7 +410,7 @@ export interface IUI extends IUIAttrData, IFillAttrData, IStrokeAttrData, ICorne
     __drawContent?(canvas: ILeaferCanvas, options: IRenderOptions): void
 
     animate(keyframe?: IUIInputData | IKeyframe[] | IAnimation | IAnimation[], options?: ITransition, type?: IAnimateType, isTemp?: boolean): IAnimate
-    killAnimate(type?: IAnimateType, killStyle?: IUIInputData): void
+    killAnimate(type?: IAnimateType, nextStyle?: IUIInputData): void
 
     export(filename: string, options?: IExportOptions | number | boolean): Promise<IExportResult>
     clone(data?: IUIInputData): IUI

diff --git a/packages/interface/src/index.ts b/packages/interface/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, IAnimateType, IKeyframe, IKeyframeId, IAnimateEasing, ICubicBezierEasing, IStepsEasing, IAnimateEasingFunction, IAnimateEasingName, IAnimateEnding, IAnimateEvents, IAnimateEventFunction, ICustomEasingFunction, IAnimateKeyframe, IComputedKeyframe, IStyleAnimation, IKeyframesAnimation, IAnimateOptions } from './IAnimation'
+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 { IUIRenderModule, IRectRenderModule, IImageRenderModule, ITextRenderModule, IGroupRenderModule, IFrameRenderModule } from './module/IUIRender'
 export { IUIBoundsModule } from './module/IUIBounds'