Move architecture indicator to internal only

Summary: Since it's only relevant/used internally at FB. Reviewed By: JoshuaGross Differential Revision: D17273015 fbshipit-source-id: 0ac6cc48d1c7625c5c867fd8b3a896b44b2b9940
sebadima · Sep 10, 2019 · e92235d · e92235d
1 parent d0c618a
commit e92235d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 68 deletions.
diff --git a/Libraries/ReactNative/AppContainer.js b/Libraries/ReactNative/AppContainer.js
@@ -25,7 +25,9 @@ type Context = {
 
 type Props = $ReadOnly<{|
   children?: React.Node,
+  fabric?: boolean,
   rootTag: number,
+  showArchitectureIndicator?: boolean,
   WrapperComponent?: ?React.ComponentType<any>,
 |}>;
 
@@ -112,7 +114,15 @@ class AppContainer extends React.Component<Props, State> {
 
     const Wrapper = this.props.WrapperComponent;
     if (Wrapper != null) {
-      innerView = <Wrapper>{innerView}</Wrapper>;
+      innerView = (
+        <Wrapper
+          fabric={this.props.fabric === true}
+          showArchitectureIndicator={
+            this.props.showArchitectureIndicator === true
+          }>
+          {innerView}
+        </Wrapper>
+      );
     }
     return (
       <RootTagContext.Provider value={this.props.rootTag}>

diff --git a/Libraries/ReactNative/ReactNativeArchitectureIndicator.js b/Libraries/ReactNative/ReactNativeArchitectureIndicator.js
diff --git a/Libraries/ReactNative/renderApplication.js b/Libraries/ReactNative/renderApplication.js
@@ -15,7 +15,6 @@ import GlobalPerformanceLogger from '../Utilities/GlobalPerformanceLogger';
 import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
 import PerformanceLoggerContext from '../Utilities/PerformanceLoggerContext';
 const React = require('react');
-const ReactNativeArchitectureIndicator = require('./ReactNativeArchitectureIndicator');
 
 const invariant = require('invariant');
 
@@ -36,11 +35,12 @@ function renderApplication<Props: Object>(
   const renderable = (
     <PerformanceLoggerContext.Provider
       value={scopedPerformanceLogger ?? GlobalPerformanceLogger}>
-      <AppContainer rootTag={rootTag} WrapperComponent={WrapperComponent}>
+      <AppContainer
+        rootTag={rootTag}
+        fabric={fabric}
+        showArchitectureIndicator={showArchitectureIndicator}
+        WrapperComponent={WrapperComponent}>
         <RootComponent {...initialProps} rootTag={rootTag} />
-        {showArchitectureIndicator === true ? (
-          <ReactNativeArchitectureIndicator fabric={!!fabric} />
-        ) : null}
       </AppContainer>
     </PerformanceLoggerContext.Provider>
   );