estimated transition end

Author: anakin_karrot

core/src/Stack.ts

@@ -28,7 +28,7 @@ export type Activity = {
   id: string;
   name: string;
   transitionState: ActivityTransitionState;
-  estimatedTransitionEnd?: number;
+  estimatedTransitionEnd: number;
   params: {
     [key: string]: string | undefined;
   };

core/src/activity-utils/makeActivitiesReducer.ts

@@ -25,10 +25,9 @@ export function makeActivitiesReducer({
      * Push new activity to activities
      */
     Pushed(activities: Activity[], event: PushedEvent): Activity[] {
-      const isTransitionDone =
-        now - (resumedAt ?? event.eventDate) >= transitionDuration;
       const estimatedTransitionEnd =
         (resumedAt ?? event.eventDate) + transitionDuration;
+      const isTransitionDone = estimatedTransitionEnd <= now;
 
       const transitionState: ActivityTransitionState =
         event.skipEnterActiveState || isTransitionDone
@@ -48,10 +47,9 @@ export function makeActivitiesReducer({
      * Replace activity at reservedIndex with new activity
      */
     Replaced(activities: Activity[], event: ReplacedEvent): Activity[] {
-      const isTransitionDone =
-        now - (resumedAt ?? event.eventDate) >= transitionDuration;
       const estimatedTransitionEnd =
         (resumedAt ?? event.eventDate) + transitionDuration;
+      const isTransitionDone = estimatedTransitionEnd <= now;
 
       const reservedIndex = findNewActivityIndex(activities, event);
 

core/src/activity-utils/makeActivityReducer.ts

@@ -30,16 +30,16 @@ export function makeActivityReducer(context: {
       ...activity,
       exitedBy: event,
       transitionState: "exit-done",
-      estimatedTransitionEnd: context.now,
+      estimatedTransitionEnd: context.resumedAt ?? event.eventDate,
     }),
 
     /**
      * Change transition state to exit-done or exit-active depending on skipExitActiveState
      */
     Popped: (activity: Activity, event: PoppedEvent): Activity => {
-      const isTransitionDone =
-        context.now - (context.resumedAt ?? event.eventDate) >=
-        context.transitionDuration;
+      const estimatedTransitionEnd =
+        (context.resumedAt ?? event.eventDate) + context.transitionDuration;
+      const isTransitionDone = estimatedTransitionEnd <= context.now;
 
       const transitionState: ActivityTransitionState =
         event.skipExitActiveState || isTransitionDone
@@ -50,8 +50,7 @@ export function makeActivityReducer(context: {
         ...activity,
         exitedBy: event,
         transitionState,
-        estimatedTransitionEnd:
-          (context.resumedAt ?? event.eventDate) + context.transitionDuration,
+        estimatedTransitionEnd,
         params:
           transitionState === "exit-done"
             ? activity.steps[0].params