kylefang/react-native-web
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-web.git synced 2026-03-29 00:38:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] disallow text node children of View

Browse Source 
Fix #627
This commit is contained in:
Nicolas Gallagher
2017-09-14 14:59:37 -07:00
parent 32a23136af
commit 0ad6ab948b
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/View/__tests__/index-test.js
View File

@@ -12,10 +12,18 @@ describe('components/View', () => {
});
});
test('prop "children"', () => {
const children = <View testID="1" />;
const component = shallow(<View>{children}</View>);
expect(component.contains(children)).toEqual(true);
describe('prop "children"', () => {
test('text node throws error', () => {
const children = 'hello';
const render = () => shallow(<View>{children}</View>);
expect(render).toThrow();
});
test('non-text is rendered', () => {
const children = <View testID="1" />;
const component = shallow(<View>{children}</View>);
expect(component.contains(children)).toEqual(true);
});
});
describe('prop "hitSlop"', () => {

8
src/components/View/index.js
View File

@@ -11,6 +11,7 @@ import applyLayout from '../../modules/applyLayout';
import applyNativeMethods from '../../modules/applyNativeMethods';
import { bool } from 'prop-types';
import createElement from '../../modules/createElement';
import invariant from 'fbjs/lib/invariant';
import StyleSheet from '../../apis/StyleSheet';
import ViewPropTypes from './ViewPropTypes';
import React, { Component } from 'react';
@@ -49,6 +50,13 @@ class View extends Component {
...otherProps
} = this.props;
if (process.env.NODE_ENV !== 'production') {
invariant(
typeof this.props.children !== 'string',
'A text node cannot be a child of a <View>'
);
}
const { isInAParentText } = this.context;
otherProps.style = [styles.initial, isInAParentText && styles.inline, style];