Start timer after update

In anticipation of React Fiber

Author: cvle

src/composables/withTimeout.ts

@@ -1,4 +1,4 @@
-import { withHandlers, isolate, onWillReceiveProps, onWillUnmount } from "reassemble";
+import { withHandlers, isolate, onWillReceiveProps, onDidUpdate, onWillUnmount } from "reassemble";
 
 import { CSSTransitionProps } from "../csstransition";
 import { WithTransitionStateProps } from "./withTransitionState";
@@ -28,18 +28,31 @@ export const withTimeout =
         };
       }),
     onWillReceiveProps<PropsUnion>(
+      (
+        {transitionState: {inTransition}, active},
+        {
+          transitionState: {inTransition: nextInTransition},
+          cancel, active: nextActive,
+        },
+      ) => {
+        const inTransitionChanged = inTransition !== nextInTransition;
+        const interrupted = nextInTransition && active !== nextActive;
+        if (inTransitionChanged || interrupted) {
+          cancel();
+        }
+      }),
+    onDidUpdate<PropsUnion>(
       (
         {transitionState: {inTransition}, active},
         {
           transitionState: {inTransition: nextInTransition},
           transitionInfo: {totalDuration},
-          cancel, timeoutIn, active: nextActive,
+          timeoutIn, active: nextActive,
         },
       ) => {
-        const newTransition = inTransition !== nextInTransition;
+        const newTransition = !inTransition && nextInTransition;
         const interrupted = nextInTransition && active !== nextActive;
         if (newTransition || interrupted) {
-          cancel();
           if (nextInTransition) {
             timeoutIn(totalDuration * timeoutMultiplier);
           }