Inform DevTools of commit priority level

facebook · May 15, 2019 · a925a01 · a925a01
1 parent af19e2e
commit a925a01
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 27 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.js
@@ -9,6 +9,7 @@
 
 import type {Fiber} from './ReactFiber';
 import type {FiberRoot} from './ReactFiberRoot';
+import type {ReactPriorityLevel} from './SchedulerWithReactIntegration';
 
 import warningWithoutStack from 'shared/warningWithoutStack';
 
@@ -18,23 +19,6 @@ let onCommitFiberRoot = null;
 let onCommitFiberUnmount = null;
 let hasLoggedError = false;
 
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {
-      if (__DEV__ && !hasLoggedError) {
-        hasLoggedError = true;
-        warningWithoutStack(
-          false,
-          'React DevTools encountered an error: %s',
-          err,
-        );
-      }
-    }
-  };
-}
-
 export const isDevToolsPresent =
   typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== 'undefined';
 
@@ -65,12 +49,34 @@ export function injectInternals(internals: Object): boolean {
   try {
     const rendererID = hook.inject(internals);
     // We have successfully injected, so now it is safe to set up hooks.
-    onCommitFiberRoot = catchErrors(root =>
-      hook.onCommitFiberRoot(rendererID, root),
-    );
-    onCommitFiberUnmount = catchErrors(fiber =>
-      hook.onCommitFiberUnmount(rendererID, fiber),
-    );
+    onCommitFiberRoot = (root, priorityLevel) => {
+      try {
+        hook.onCommitFiberRoot(rendererID, root, priorityLevel);
+      } catch (err) {
+        if (__DEV__ && !hasLoggedError) {
+          hasLoggedError = true;
+          warningWithoutStack(
+            false,
+            'React DevTools encountered an error: %s',
+            err,
+          );
+        }
+      }
+    };
+    onCommitFiberUnmount = fiber => {
+      try {
+        hook.onCommitFiberUnmount(rendererID, fiber);
+      } catch (err) {
+        if (__DEV__ && !hasLoggedError) {
+          hasLoggedError = true;
+          warningWithoutStack(
+            false,
+            'React DevTools encountered an error: %s',
+            err,
+          );
+        }
+      }
+    };
   } catch (err) {
     // Catch all errors because it is unsafe to throw during initialization.
     if (__DEV__) {
@@ -85,9 +91,12 @@ export function injectInternals(internals: Object): boolean {
   return true;
 }
 
-export function onCommitRoot(root: FiberRoot) {
+export function onCommitRoot(
+  root: FiberRoot,
+  priorityLevel: ReactPriorityLevel,
+) {
   if (typeof onCommitFiberRoot === 'function') {
-    onCommitFiberRoot(root);
+    onCommitFiberRoot(root, priorityLevel);
   }
 }
 

diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js
@@ -1467,8 +1467,8 @@ function commitRootImpl(root) {
 
   // Check if there's remaining work on this root
   const remainingExpirationTime = root.firstPendingTime;
+  const currentTime = requestCurrentTime();
   if (remainingExpirationTime !== NoWork) {
-    const currentTime = requestCurrentTime();
     const priorityLevel = inferPriorityFromExpirationTime(
       currentTime,
       remainingExpirationTime,
@@ -1480,7 +1480,11 @@ function commitRootImpl(root) {
     legacyErrorBoundariesThatAlreadyFailed = null;
   }
 
-  onCommitRoot(finishedWork.stateNode);
+  const priorityLevel = inferPriorityFromExpirationTime(
+    currentTime,
+    expirationTime,
+  );
+  onCommitRoot(finishedWork.stateNode, priorityLevel);
 
   if (remainingExpirationTime === Sync) {
     // Count the number of times the root synchronously re-renders without