Skip to content

Commit 5101a6e

Browse files
revert
1 parent 01bea9d commit 5101a6e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

core/src/activity-utils/makeActivitiesReducer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export function makeActivitiesReducer({
2626
*/
2727
Pushed(activities: Activity[], event: PushedEvent): Activity[] {
2828
const isTransitionDone =
29-
(resumedAt ?? event.eventDate) + transitionDuration <= now;
29+
now - (resumedAt ?? event.eventDate) >= transitionDuration;
3030

3131
const transitionState: ActivityTransitionState =
3232
event.skipEnterActiveState || isTransitionDone
@@ -47,7 +47,7 @@ export function makeActivitiesReducer({
4747
*/
4848
Replaced(activities: Activity[], event: ReplacedEvent): Activity[] {
4949
const isTransitionDone =
50-
(resumedAt ?? event.eventDate) + transitionDuration <= now;
50+
now - (resumedAt ?? event.eventDate) >= transitionDuration;
5151

5252
const reservedIndex = findNewActivityIndex(activities, event);
5353

core/src/activity-utils/makeActivityReducer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ export function makeActivityReducer(context: {
3737
*/
3838
Popped: (activity: Activity, event: PoppedEvent): Activity => {
3939
const isTransitionDone =
40-
(context.resumedAt ?? event.eventDate) + context.transitionDuration <=
41-
context.now;
40+
context.now - (context.resumedAt ?? event.eventDate) >=
41+
context.transitionDuration;
4242

4343
const transitionState: ActivityTransitionState =
4444
event.skipExitActiveState || isTransitionDone

0 commit comments

Comments
 (0)