Skip to content

Commit debc05e

Browse files
committed
Latest
1 parent 9798602 commit debc05e

File tree

4 files changed

+28
-8
lines changed

4 files changed

+28
-8
lines changed

dev/html/public/playwright/animate/animate-cancel.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,13 @@
5151
mini.finished.then(() => {
5252
miniElement.innerHTML = "finished"
5353
})
54-
js.finished.then(() => {
55-
jsElement.innerHTML = "finished"
56-
})
54+
js.finished
55+
.then(() => {
56+
jsElement.innerHTML = "finished"
57+
})
58+
.catch(() => {
59+
console.log("js rejected")
60+
})
5761
waapi.finished.then(() => {
5862
waapiElement.innerHTML = "finished"
5963
})

dev/html/public/playwright/animate/animate-stop.html

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,26 @@
4444
options
4545
)
4646

47-
mini.finished.then(() => {
47+
mini.then(() => {
4848
document.getElementById("mini").innerHTML = "finished"
4949
})
50-
js.finished.then(() => {
50+
js.then(() => {
5151
document.getElementById("js").innerHTML = "finished"
5252
})
53-
waapi.finished.then(() => {
53+
waapi.then(() => {
5454
document.getElementById("waapi").innerHTML = "finished"
5555
})
5656

57+
// mini.finished.then(() => {
58+
// document.getElementById("mini").innerHTML = "finished"
59+
// })
60+
// js.finished.then(() => {
61+
// document.getElementById("js").innerHTML = "finished"
62+
// })
63+
// waapi.finished.then(() => {
64+
// document.getElementById("waapi").innerHTML = "finished"
65+
// })
66+
5767
delay(() => {
5868
mini.stop()
5969
js.stop()
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { noop } from "motion-utils"
12
import { GroupAnimation } from "./GroupAnimation"
23
import { AnimationPlaybackControlsWithThen } from "./types"
34

@@ -6,6 +7,11 @@ export class GroupAnimationWithThen
67
implements AnimationPlaybackControlsWithThen
78
{
89
then(onResolve: VoidFunction, _onReject?: VoidFunction) {
9-
return this.finished.finally(onResolve).then(() => {})
10+
return this.finished
11+
.then(() => {
12+
onResolve()
13+
console.log("onResolve")
14+
})
15+
.catch(noop)
1016
}
1117
}

packages/motion-dom/src/animation/__tests__/JSAnimation.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ describe("JSAnimation", () => {
8888
onUpdate: (v) => numeric.push(v),
8989
onComplete: () => {
9090
expect(numeric).toEqual([0, 40, 80, 120, 160, 200])
91-
91+
console.log("first animation complete")
9292
animateValue({
9393
driver: syncDriver(20),
9494
duration: 100,

0 commit comments

Comments
 (0)