Skip to content

React Native: Allow Views to be nested inside of Text #15464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2019
Merged

React Native: Allow Views to be nested inside of Text #15464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions packages/react-native-renderer/src/ReactFabricHostConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,6 @@ export function createInstance(
}
}

invariant(
type !== 'RCTView' || !hostContext.isInAParentText,
'Nesting of <View> within <Text> is not currently supported.',
);

const updatePayload = create(props, viewConfig.validAttributes);

const node = createNode(
Expand Down
5 changes: 0 additions & 5 deletions packages/react-native-renderer/src/ReactNativeHostConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,6 @@ export function createInstance(
}
}

invariant(
type !== 'RCTView' || !hostContext.isInAParentText,
'Nesting of <View> within <Text> is not currently supported.',
);

const updatePayload = create(props, viewConfig.validAttributes);

UIManager.createView(
Expand Down
17 changes: 7 additions & 10 deletions packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ describe('ReactFabric', () => {
expect(snapshots).toMatchSnapshot();
});

it('should throw when <View> is used inside of a <Text> ancestor', () => {
it('should not throw when <View> is used inside of a <Text> ancestor', () => {
const Image = createReactNativeComponentClass('RCTImage', () => ({
validAttributes: {},
uiViewClassName: 'RCTImage',
Expand All @@ -624,16 +624,13 @@ describe('ReactFabric', () => {
uiViewClassName: 'RCTView',
}));

expect(() =>
ReactFabric.render(
<Text>
<View />
</Text>,
11,
),
).toThrow('Nesting of <View> within <Text> is not currently supported.');
ReactFabric.render(
<Text>
<View />
</Text>,
11,
);

// Non-View things (e.g. Image) are fine
ReactFabric.render(
<Text>
<Image />
Expand Down
16 changes: 7 additions & 9 deletions packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ describe('ReactNative', () => {
expect(mockArgs.length).toEqual(0);
});

it('should throw when <View> is used inside of a <Text> ancestor', () => {
it('should not throw when <View> is used inside of a <Text> ancestor', () => {
const Image = createReactNativeComponentClass('RCTImage', () => ({
validAttributes: {},
uiViewClassName: 'RCTImage',
Expand All @@ -500,14 +500,12 @@ describe('ReactNative', () => {
uiViewClassName: 'RCTView',
}));

expect(() =>
ReactNative.render(
<Text>
<View />
</Text>,
11,
),
).toThrow('Nesting of <View> within <Text> is not currently supported.');
ReactNative.render(
<Text>
<View />
</Text>,
11,
);

// Non-View things (e.g. Image) are fine
ReactNative.render(
Expand Down