Merge branch 'interaction-tracking' into interaction-tracking-profiler-integration

Author: Brian Vaughn

packages/interaction-tracking/src/InteractionTracking.js

@@ -157,7 +157,8 @@ export function track(
     // Update before calling callback in case it schedules follow-up work.
     interaction.__count = 1;
 
-    let caughtError = null;
+    let caughtError;
+    let didCatch = false;
     let returnValue;
     const subscriber = ((subscriberRef: any): SubscriberRef).current;
 
@@ -166,13 +167,15 @@ export function track(
         subscriber.onInteractionTracked(interaction);
         subscriber.onWorkStarted(interactions, threadID);
       } catch (error) {
+        didCatch = true;
         caughtError = caughtError || error;
       }
     }
 
     try {
       returnValue = callback();
     } catch (error) {
+      didCatch = true;
       caughtError = caughtError || error;
     }
 
@@ -182,6 +185,7 @@ export function track(
       try {
         subscriber.onWorkStopped(interactions, threadID);
       } catch (error) {
+        didCatch = true;
         caughtError = caughtError || error;
       }
     }
@@ -194,11 +198,12 @@ export function track(
       try {
         subscriber.onInteractionScheduledWorkCompleted(interaction);
       } catch (error) {
+        didCatch = true;
         caughtError = caughtError || error;
       }
     }
 
-    if (caughtError !== null) {
+    if (didCatch) {
       throw caughtError;
     } else {
       return returnValue;
@@ -249,20 +254,23 @@ export function wrap(
       const subscriber = ((subscriberRef: any): SubscriberRef).current;
 
       try {
-        let caughtError = null;
+        let caughtError;
+        let didCatch = false;
         let returnValue;
 
         try {
           if (subscriber !== null) {
             subscriber.onWorkStarted(wrappedInteractions, threadID);
           }
         } catch (error) {
+          didCatch = true;
           caughtError = caughtError || error;
         }
 
         try {
           returnValue = callback(...args);
         } catch (error) {
+          didCatch = true;
           caughtError = caughtError || error;
         }
 
@@ -273,10 +281,11 @@ export function wrap(
             subscriber.onWorkStopped(wrappedInteractions, threadID);
           }
         } catch (error) {
+          didCatch = true;
           caughtError = caughtError || error;
         }
 
-        if (caughtError !== null) {
+        if (didCatch) {
           throw caughtError;
         } else {
           return returnValue;