diff --git a/packages/animate/src/animater.ts b/packages/animate/src/animater.ts index 95138de..7285d92 100644 --- a/packages/animate/src/animater.ts +++ b/packages/animate/src/animater.ts @@ -290,8 +290,8 @@ export class Animater implements IAnimater { plan: number = this.executingGroup ): Promise { const raw = this.query(content, index, plan); - if (!raw) return Promise.resolve(); - else return raw.promise; + if (raw) return raw.promise; + else return Promise.resolve(); } planEnd(preTime: number = 0, postTime: number = 0): number { diff --git a/packages/animate/src/types.ts b/packages/animate/src/types.ts index 2e2bbe6..35c1b1b 100644 --- a/packages/animate/src/types.ts +++ b/packages/animate/src/types.ts @@ -337,7 +337,7 @@ export interface IAnimater extends IExcitable { /** * 等待指定动画计划执行完毕,参考 {@link query} 的描述。 - * 如果对象没有正在执行动画或在指定计划中不存在,那么返回的 `Promise` 会立刻兑现。 + * 如果对象的动画已经执行完毕或在指定计划中不存在,那么返回的 `Promise` 会立刻兑现。 * @param content 动画对象 * @param index 动画计划索引 * @param plan 计划组索引,不填时表示当前正在执行动画的计划组。 diff --git a/packages/animate/src/utils.ts b/packages/animate/src/utils.ts index edeadd1..80c8c4c 100644 --- a/packages/animate/src/utils.ts +++ b/packages/animate/src/utils.ts @@ -171,12 +171,12 @@ export function sequenceCurve( scale: number[], move: number[] ): ExcitationCurve { - const keep = cumsum(duration); + const keep = [0, ...cumsum(duration)]; return p => { - const index = keep.findIndex(sum => p >= sum); - if (index === -1) return 0; - const progress = (p - keep[index]) / duration[index]; - return seq[index](progress) * scale[index] + move[index]; + const index = keep.findIndex(sum => p <= sum); + if (index <= 0) return 0; + const progress = (p - keep[index - 1]) / duration[index - 1]; + return seq[index - 1](progress) * scale[index - 1] + move[index - 1]; }; }