Added a test for <Text><ScrollingView>foo case

Author: Brian Vaughn

packages/react-native-renderer/src/ReactFabricRenderer.js

@@ -191,7 +191,7 @@ const ReactFabricRenderer = ReactFiberReconciler({
     if (__DEV__) {
       warning(
         hostContext.isInAParentText,
-        'Text strings must have a <Text> ancestor.',
+        'Text strings must be rendered within a <Text>.',
       );
     }
 
@@ -229,16 +229,16 @@ const ReactFabricRenderer = ReactFiberReconciler({
     type: string,
   ): HostContext {
     if (__DEV__) {
-      if (parentHostContext.isInAParentText) {
-        return parentHostContext;
-      } else if (
+      const prevIsInAParentText = parentHostContext.isInAParentText;
+      const isInAParentText =
         type === 'AndroidTextInput' ||
         type === 'RCTMultilineTextInputView' ||
         type === 'RCTText' ||
         type === 'RCTSinglelineTextInputView' ||
-        type === 'RCTVirtualText'
-      ) {
-        return {isInAParentText: true};
+        type === 'RCTVirtualText';
+
+      if (prevIsInAParentText !== isInAParentText) {
+        return {isInAParentText};
       } else {
         return parentHostContext;
       }

packages/react-native-renderer/src/ReactNativeFiberRenderer.js

@@ -126,7 +126,7 @@ const NativeRenderer = ReactFiberReconciler({
     if (__DEV__) {
       warning(
         hostContext.isInAParentText,
-        'Text strings must have a <Text> ancestor.',
+        'Text strings must be rendered within a <Text>.',
       );
     }
 
@@ -181,16 +181,16 @@ const NativeRenderer = ReactFiberReconciler({
     type: string,
   ): HostContext {
     if (__DEV__) {
-      if (parentHostContext.isInAParentText) {
-        return parentHostContext;
-      } else if (
+      const prevIsInAParentText = parentHostContext.isInAParentText;
+      const isInAParentText =
         type === 'AndroidTextInput' ||
         type === 'RCTMultilineTextInputView' ||
         type === 'RCTText' ||
         type === 'RCTSinglelineTextInputView' ||
-        type === 'RCTVirtualText'
-      ) {
-        return {isInAParentText: true};
+        type === 'RCTVirtualText';
+
+      if (prevIsInAParentText !== isInAParentText) {
+        return {isInAParentText};
       } else {
         return parentHostContext;
       }

packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js

@@ -306,14 +306,31 @@ describe('ReactFabric', () => {
   });
 
   it('should warn about text not inside of a <Text> ancestor', () => {
+    const ScrollView = createReactNativeComponentClass('RCTScrollView', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTScrollView',
+    }));
+    const Text = createReactNativeComponentClass('RCTText', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTText',
+    }));
     const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {},
       uiViewClassName: 'RCTView',
     }));
 
     expect(() =>
       ReactFabric.render(<View>this should warn</View>, 11),
-    ).toWarnDev('Text strings must have a <Text> ancestor.');
+    ).toWarnDev('Text strings must be rendered within a <Text>.');
+
+    expect(() =>
+      ReactFabric.render(
+        <Text>
+          <ScrollView>hi hello hi</ScrollView>
+        </Text>,
+        11,
+      ),
+    ).toWarnDev('Text strings must be rendered within a <Text>.');
   });
 
   it('should not warn warn about text inside of an indirect <Text> ancestor', () => {

packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js

@@ -216,14 +216,31 @@ describe('ReactNative', () => {
   });
 
   it('should warn about text not inside of a <Text> ancestor', () => {
+    const ScrollView = createReactNativeComponentClass('RCTScrollView', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTScrollView',
+    }));
+    const Text = createReactNativeComponentClass('RCTText', () => ({
+      validAttributes: {},
+      uiViewClassName: 'RCTText',
+    }));
     const View = createReactNativeComponentClass('RCTView', () => ({
       validAttributes: {},
       uiViewClassName: 'RCTView',
     }));
 
     expect(() =>
       ReactNative.render(<View>this should warn</View>, 11),
-    ).toWarnDev('Text strings must have a <Text> ancestor.');
+    ).toWarnDev('Text strings must be rendered within a <Text>.');
+
+    expect(() =>
+      ReactNative.render(
+        <Text>
+          <ScrollView>hi hello hi</ScrollView>
+        </Text>,
+        11,
+      ),
+    ).toWarnDev('Text strings must be rendered within a <Text>.');
   });
 
   it('should not warn warn about text inside of an indirect <Text> ancestor', () => {