RN: Consistently Throw for <Text><View /></Text>

Reviewed By: sahrens Differential Revision: D7898238 fbshipit-source-id: a2b74e691a116b1beae3c6bb266252a722aacbb1
facebook · May 9, 2018 · 6a1b416 · 6a1b416 · mpyw · Nov 6, 2018
1 parent 3e534b9
commit 6a1b416
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
@@ -63,10 +63,9 @@ if (__DEV__) {
   ViewToExport = React.forwardRef((props, ref) => (
     <TextAncestor.Consumer>
       {hasTextAncestor => {
-        // TODO: Change iOS to behave the same as Android.
         invariant(
-          !hasTextAncestor || Platform.OS !== 'android',
-          'Nesting of <View> within <Text> is not supported on Android.',
+          !hasTextAncestor,
+          'Nesting of <View> within <Text> is not currently supported.',
         );
         return <RCTView {...props} ref={ref} />;
       }}

diff --git a/RNTester/js/TextInputExample.ios.js b/RNTester/js/TextInputExample.ios.js
@@ -872,14 +872,6 @@ exports.examples = [
             style={styles.multiline}
             dataDetectorTypes="phoneNumber"
           />
-          <TextInput
-            placeholder="multiline with children"
-            multiline={true}
-            enablesReturnKeyAutomatically={true}
-            returnKeyType="go"
-            style={styles.multiline}>
-            <View style={styles.multilineChild}/>
-          </TextInput>
         </View>
       );
     }