Remove feature flag guard around getInspectorDataForInstance export

facebook · May 26, 2021 · f54a048 · f54a048
1 parent 74eaf3e
commit f54a048
Show file tree

Hide file tree

Showing 10 changed files with 98 additions and 112 deletions.
diff --git a/packages/react-native-renderer/src/ReactNativeFiberInspector.js b/packages/react-native-renderer/src/ReactNativeFiberInspector.js
@@ -19,128 +19,117 @@ import {HostComponent} from 'react-reconciler/src/ReactWorkTags';
 import invariant from 'shared/invariant';
 // Module provided by RN:
 import {UIManager} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
-import {enableGetInspectorDataForInstanceInProduction} from 'shared/ReactFeatureFlags';
 import {getClosestInstanceFromNode} from './ReactNativeComponentTree';
 
 const emptyObject = {};
 if (__DEV__) {
   Object.freeze(emptyObject);
 }
 
-let createHierarchy;
-let getHostNode;
-let getHostProps;
-let lastNonHostInstance;
-let getInspectorDataForInstance;
-let getOwnerHierarchy;
-let traverseOwnerTreeUp;
-
-if (__DEV__ || enableGetInspectorDataForInstanceInProduction) {
-  createHierarchy = function(fiberHierarchy) {
-    return fiberHierarchy.map(fiber => ({
-      name: getComponentNameFromType(fiber.type),
-      getInspectorData: findNodeHandle => {
-        return {
-          props: getHostProps(fiber),
-          source: fiber._debugSource,
-          measure: callback => {
-            // If this is Fabric, we'll find a ShadowNode and use that to measure.
-            const hostFiber = findCurrentHostFiber(fiber);
-            const shadowNode =
-              hostFiber != null &&
-              hostFiber.stateNode !== null &&
-              hostFiber.stateNode.node;
-
-            if (shadowNode) {
-              nativeFabricUIManager.measure(shadowNode, callback);
-            } else {
-              return UIManager.measure(
-                getHostNode(fiber, findNodeHandle),
-                callback,
-              );
-            }
-          },
-        };
-      },
-    }));
-  };
+function createHierarchy(fiberHierarchy) {
+  return fiberHierarchy.map(fiber => ({
+    name: getComponentNameFromType(fiber.type),
+    getInspectorData: findNodeHandle => {
+      return {
+        props: getHostProps(fiber),
+        source: fiber._debugSource,
+        measure: callback => {
+          // If this is Fabric, we'll find a ShadowNode and use that to measure.
+          const hostFiber = findCurrentHostFiber(fiber);
+          const shadowNode =
+            hostFiber != null &&
+            hostFiber.stateNode !== null &&
+            hostFiber.stateNode.node;
 
-  getHostNode = function(fiber: Fiber | null, findNodeHandle) {
-    let hostNode;
-    // look for children first for the hostNode
-    // as composite fibers do not have a hostNode
-    while (fiber) {
-      if (fiber.stateNode !== null && fiber.tag === HostComponent) {
-        hostNode = findNodeHandle(fiber.stateNode);
-      }
-      if (hostNode) {
-        return hostNode;
-      }
-      fiber = fiber.child;
-    }
-    return null;
-  };
+          if (shadowNode) {
+            nativeFabricUIManager.measure(shadowNode, callback);
+          } else {
+            return UIManager.measure(
+              getHostNode(fiber, findNodeHandle),
+              callback,
+            );
+          }
+        },
+      };
+    },
+  }));
+}
 
-  getHostProps = function(fiber) {
-    const host = findCurrentHostFiber(fiber);
-    if (host) {
-      return host.memoizedProps || emptyObject;
+function getHostNode(fiber: Fiber | null, findNodeHandle) {
+  let hostNode;
+  // look for children first for the hostNode
+  // as composite fibers do not have a hostNode
+  while (fiber) {
+    if (fiber.stateNode !== null && fiber.tag === HostComponent) {
+      hostNode = findNodeHandle(fiber.stateNode);
     }
-    return emptyObject;
-  };
-
-  getInspectorDataForInstance = function(
-    closestInstance: Fiber | null,
-  ): InspectorData {
-    // Handle case where user clicks outside of ReactNative
-    if (!closestInstance) {
-      return {
-        hierarchy: [],
-        props: emptyObject,
-        selectedIndex: null,
-        source: null,
-      };
+    if (hostNode) {
+      return hostNode;
     }
+    fiber = fiber.child;
+  }
+  return null;
+}
 
-    const fiber = findCurrentFiberUsingSlowPath(closestInstance);
-    const fiberHierarchy = getOwnerHierarchy(fiber);
-    const instance = lastNonHostInstance(fiberHierarchy);
-    const hierarchy = createHierarchy(fiberHierarchy);
-    const props = getHostProps(instance);
-    const source = instance._debugSource;
-    const selectedIndex = fiberHierarchy.indexOf(instance);
+function getHostProps(fiber) {
+  const host = findCurrentHostFiber(fiber);
+  if (host) {
+    return host.memoizedProps || emptyObject;
+  }
+  return emptyObject;
+}
 
+function getInspectorDataForInstance(
+  closestInstance: Fiber | null,
+): InspectorData {
+  // Handle case where user clicks outside of ReactNative
+  if (!closestInstance) {
     return {
-      hierarchy,
-      props,
-      selectedIndex,
-      source,
+      hierarchy: [],
+      props: emptyObject,
+      selectedIndex: null,
+      source: null,
     };
-  };
+  }
+
+  const fiber = findCurrentFiberUsingSlowPath(closestInstance);
+  const fiberHierarchy = getOwnerHierarchy(fiber);
+  const instance = lastNonHostInstance(fiberHierarchy);
+  const hierarchy = createHierarchy(fiberHierarchy);
+  const props = getHostProps(instance);
+  const source = instance._debugSource;
+  const selectedIndex = fiberHierarchy.indexOf(instance);
 
-  getOwnerHierarchy = function(instance: any) {
-    const hierarchy = [];
-    traverseOwnerTreeUp(hierarchy, instance);
-    return hierarchy;
+  return {
+    hierarchy,
+    props,
+    selectedIndex,
+    source,
   };
+}
+
+function getOwnerHierarchy(instance: any) {
+  const hierarchy = [];
+  traverseOwnerTreeUp(hierarchy, instance);
+  return hierarchy;
+}
 
-  lastNonHostInstance = function(hierarchy) {
-    for (let i = hierarchy.length - 1; i > 1; i--) {
-      const instance = hierarchy[i];
+function lastNonHostInstance(hierarchy) {
+  for (let i = hierarchy.length - 1; i > 1; i--) {
+    const instance = hierarchy[i];
 
-      if (instance.tag !== HostComponent) {
-        return instance;
-      }
+    if (instance.tag !== HostComponent) {
+      return instance;
     }
-    return hierarchy[0];
-  };
+  }
+  return hierarchy[0];
+}
 
-  traverseOwnerTreeUp = function(hierarchy, instance: any) {
-    if (instance) {
-      hierarchy.unshift(instance);
-      traverseOwnerTreeUp(hierarchy, instance._debugOwner);
-    }
-  };
+function traverseOwnerTreeUp(hierarchy, instance: any) {
+  if (instance) {
+    hierarchy.unshift(instance);
+    traverseOwnerTreeUp(hierarchy, instance._debugOwner);
+  }
 }
 
 let getInspectorDataForViewTag;

diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
@@ -106,9 +106,6 @@ export const enableNewReconciler = false;
 
 export const disableNativeComponentFrames = false;
 
-// Used by React Native in Facebook internal builds for UI review tools.
-export const enableGetInspectorDataForInstanceInProduction = false;
-
 // Errors that are thrown while unmounting (or after in the case of passive effects)
 // should bypass any error boundaries that are also unmounting (or have unmounted)
 // and be handled by the nearest still-mounted boundary.

diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -48,7 +48,7 @@ export const disableNativeComponentFrames = false;
 export const skipUnmountedBoundaries = false;
 export const deletedTreeCleanUpLevel = 1;
 export const enableSuspenseLayoutEffectSemantics = false;
-export const enableGetInspectorDataForInstanceInProduction = true;
+
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;
 

diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js
@@ -47,7 +47,7 @@ export const disableNativeComponentFrames = false;
 export const skipUnmountedBoundaries = false;
 export const deletedTreeCleanUpLevel = 1;
 export const enableSuspenseLayoutEffectSemantics = false;
-export const enableGetInspectorDataForInstanceInProduction = false;
+
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;
 

diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -47,7 +47,7 @@ export const disableNativeComponentFrames = false;
 export const skipUnmountedBoundaries = false;
 export const deletedTreeCleanUpLevel = 1;
 export const enableSuspenseLayoutEffectSemantics = false;
-export const enableGetInspectorDataForInstanceInProduction = false;
+
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;
 

diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js
@@ -47,7 +47,7 @@ export const disableNativeComponentFrames = false;
 export const skipUnmountedBoundaries = false;
 export const deletedTreeCleanUpLevel = 1;
 export const enableSuspenseLayoutEffectSemantics = false;
-export const enableGetInspectorDataForInstanceInProduction = false;
+
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;
 

diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
@@ -47,7 +47,7 @@ export const disableNativeComponentFrames = false;
 export const skipUnmountedBoundaries = false;
 export const deletedTreeCleanUpLevel = 1;
 export const enableSuspenseLayoutEffectSemantics = false;
-export const enableGetInspectorDataForInstanceInProduction = false;
+
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;
 

diff --git a/packages/shared/forks/ReactFeatureFlags.testing.js b/packages/shared/forks/ReactFeatureFlags.testing.js
@@ -47,7 +47,7 @@ export const disableNativeComponentFrames = false;
 export const skipUnmountedBoundaries = false;
 export const deletedTreeCleanUpLevel = 1;
 export const enableSuspenseLayoutEffectSemantics = false;
-export const enableGetInspectorDataForInstanceInProduction = false;
+
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;
 

diff --git a/packages/shared/forks/ReactFeatureFlags.testing.www.js b/packages/shared/forks/ReactFeatureFlags.testing.www.js
@@ -47,7 +47,7 @@ export const disableNativeComponentFrames = false;
 export const skipUnmountedBoundaries = true;
 export const deletedTreeCleanUpLevel = 1;
 export const enableSuspenseLayoutEffectSemantics = false;
-export const enableGetInspectorDataForInstanceInProduction = false;
+
 export const enableNewReconciler = false;
 export const deferRenderPhaseUpdateToNextBatch = true;
 

diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -60,7 +60,7 @@ export const warnAboutDeprecatedLifecycles = true;
 export const disableLegacyContext = __EXPERIMENTAL__;
 export const warnAboutStringRefs = false;
 export const warnAboutDefaultPropsOnFunctionComponents = false;
-export const enableGetInspectorDataForInstanceInProduction = false;
+
 export const enableSuspenseServerRenderer = true;
 export const enableSelectiveHydration = true;