enable up to 17 version

facebook · May 28, 2020 · bede31a · bede31a
1 parent 51b3c89
commit bede31a
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 16 deletions.
diff --git a/packages/react-debug-tools/src/ReactDebugHooks.js b/packages/react-debug-tools/src/ReactDebugHooks.js
@@ -631,10 +631,14 @@ export function inspectHooks<Props>(
   return buildTree(rootStack, readHookLog);
 }
 
-function setupContexts(contextMap: Map<ReactContext<any>, any>, fiber: Fiber) {
+function setupContexts(
+  contextMap: Map<ReactContext<any>, any>,
+  fiber: Fiber,
+  enableLegacyContext: ?boolean,
+) {
   let current = fiber;
   let legacyContext = null;
-  if (current.elementType.contextTypes) {
+  if (enableLegacyContext && current.elementType.contextTypes) {
     let childContextFound = false;
     while (current !== null && childContextFound === false) {
       if (
@@ -709,6 +713,7 @@ function resolveDefaultProps(Component, baseProps) {
 export function inspectHooksOfFiber(
   fiber: Fiber,
   currentDispatcher: ?CurrentDispatcherRef,
+  enableLegacyContext: ?boolean,
 ) {
   // DevTools will pass the current renderer's injected dispatcher.
   // Other apps might compile debug hooks as part of their app though.
@@ -740,7 +745,7 @@ export function inspectHooksOfFiber(
   currentHook = (fiber.memoizedState: Hook);
   const contextMap = new Map();
   try {
-    const legacyContext = setupContexts(contextMap, fiber);
+    const legacyContext = setupContexts(contextMap, fiber, enableLegacyContext);
     if (fiber.tag === ForwardRef) {
       return inspectHooksOfForwardRef(
         type.render,

diff --git a/packages/react-devtools-shared/src/backend/renderer.js b/packages/react-devtools-shared/src/backend/renderer.js
@@ -111,6 +111,10 @@ type ReactTypeOfSideEffectType = {|
   Placement: number,
 |};
 
+type VersionFlags = {|
+  enableLegacyContext: boolean,
+|};
+
 // Some environments (e.g. React Native / Hermes) don't support the performace API yet.
 const getCurrentTime =
   typeof performance === 'object' && typeof performance.now === 'function'
@@ -125,6 +129,7 @@ export function getInternalReactConstants(
   ReactPriorityLevels: ReactPriorityLevelsType,
   ReactTypeOfSideEffect: ReactTypeOfSideEffectType,
   ReactTypeOfWork: WorkTagMap,
+  versionFlags: VersionFlags,
 |} {
   const ReactTypeOfSideEffect: ReactTypeOfSideEffectType = {
     NoEffect: 0b00,
@@ -239,6 +244,14 @@ export function getInternalReactConstants(
   // End of copied code.
   // **********************************************************
 
+  let versionFlags: VersionFlags = {
+    enableLegacyContext: true,
+  };
+
+  if (gte(version, '17.0.0')) {
+    versionFlags['enableLegacyContext'] = false;
+  }
+
   function getTypeSymbol(type: any): Symbol | number {
     const symbolOrNumber =
       typeof type === 'object' && type !== null ? type.$$typeof : type;
@@ -368,6 +381,7 @@ export function getInternalReactConstants(
     ReactPriorityLevels,
     ReactTypeOfWork,
     ReactTypeOfSideEffect,
+    versionFlags,
   };
 }
 
@@ -383,6 +397,7 @@ export function attach(
     ReactPriorityLevels,
     ReactTypeOfWork,
     ReactTypeOfSideEffect,
+    versionFlags,
   } = getInternalReactConstants(renderer.version);
   const {NoEffect, PerformedWork, Placement} = ReactTypeOfSideEffect;
   const {
@@ -2187,20 +2202,22 @@ export function attach(
           context = stateNode.context;
         }
       } else {
-        // Try to extract legacyContext from stateless components
-        // which do not have stateNode
-        let current = fiber.return;
-        let childContextFound = false;
-        while (current !== null && childContextFound === false) {
-          if (
-            current.stateNode &&
-            current.stateNode.__reactInternalMemoizedMergedChildContext
-          ) {
-            childContextFound = true;
-            context =
-              current.stateNode.__reactInternalMemoizedMergedChildContext;
+        if (versionFlags.enableLegacyContext) {
+          // Try to extract legacyContext from stateless components
+          // which do not have stateNode
+          let current = fiber.return;
+          let childContextFound = false;
+          while (current !== null && childContextFound === false) {
+            if (
+              current.stateNode &&
+              current.stateNode.__reactInternalMemoizedMergedChildContext
+            ) {
+              childContextFound = true;
+              context =
+                current.stateNode.__reactInternalMemoizedMergedChildContext;
+            }
+            current = current.return;
           }
-          current = current.return;
         }
       }
     } else if (
@@ -2282,6 +2299,7 @@ export function attach(
         hooks = inspectHooksOfFiber(
           fiber,
           (renderer.currentDispatcherRef: any),
+          versionFlags.enableLegacyContext,
         );
       } finally {
         // Restore original console functionality.