maxjhandsome
/
react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable numeric element types

This commit is contained in:
Grant Timmerman 2015-03-26 10:07:56 -07:00
parent 3c9ea72795
commit 59a914aac0
3 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/classic/element/ReactElementValidator.js
View File

@ -362,7 +362,7 @@ function checkAndWarnForMutatedProps(element) {
* @param {ReactElement} element
*/
function validatePropTypes(element) {
if (element.type == null || !(typeof element.type === 'string' ||
if (!(typeof element.type === 'string' ||
typeof element.type === 'function')) {
// This has already warned. Don't throw.
return;
@ -399,10 +399,9 @@ var ReactElementValidator = {
createElement: function(type, props, children) {
// We warn in this case but don't throw. We expect the element creation to
// succeed and there will likely be errors in render.
warning(
type != null && (typeof type === 'string' || typeof type === 'function'),
'React.createElement: type should not be null, undefined, or boolean. ' +
'It should be a string (for DOM elements) or a ReactClass ' +
warning(typeof type === 'string' || typeof type === 'function',
'React.createElement: type should not be null, undefined, boolean, or ' +
'number. It should be a string (for DOM elements) or a ReactClass ' +
'(for composite components).%s',
getDeclarationErrorAddendum()
);

33
src/classic/element/__tests__/ReactElementValidator-test.js
View File

@ -258,32 +258,40 @@ describe('ReactElementValidator', function() {
);
});
it('gives a helpful error when passing null, undefined, or boolean', () => {
it('gives a helpful error when passing null, undefined, boolean, or number',
() => {
spyOn(console, 'error');
React.createElement(undefined);
React.createElement(null);
React.createElement(true);
expect(console.error.calls.length).toBe(3);
React.createElement(123);
expect(console.error.calls.length).toBe(4);
expect(console.error.calls[0].args[0]).toBe(
'Warning: React.createElement: type should not be null, undefined, ' +
'or boolean. It should be a string (for DOM elements) or a ReactClass ' +
'(for composite components).'
'boolean, or number. It should be a string (for DOM elements) or a ' +
'ReactClass (for composite components).'
);
expect(console.error.calls[1].args[0]).toBe(
'Warning: React.createElement: type should not be null, undefined, ' +
'or boolean. It should be a string (for DOM elements) or a ReactClass ' +
'(for composite components).'
'boolean, or number. It should be a string (for DOM elements) or a ' +
'ReactClass (for composite components).'
);
expect(console.error.calls[2].args[0]).toBe(
'Warning: React.createElement: type should not be null, undefined, ' +
'or boolean. It should be a string (for DOM elements) or a ReactClass ' +
'(for composite components).'
'boolean, or number. It should be a string (for DOM elements) or a ' +
'ReactClass (for composite components).'
);
expect(console.error.calls[3].args[0]).toBe(
'Warning: React.createElement: type should not be null, undefined, ' +
'boolean, or number. It should be a string (for DOM elements) or a ' +
'ReactClass (for composite components).'
);
React.createElement('div');
expect(console.error.calls.length).toBe(3);
expect(console.error.calls.length).toBe(4);
});
it('includes the owner name when passing null, undefined, or boolean', () => {
it('includes the owner name when passing null, undefined, boolean, or number',
() => {
spyOn(console, 'error');
var ParentComp = React.createClass({
render: function() {
@ -296,8 +304,9 @@ describe('ReactElementValidator', function() {
expect(console.error.calls.length).toBe(2);
expect(console.error.calls[0].args[0]).toBe(
'Warning: React.createElement: type should not be null, undefined, ' +
'or boolean. It should be a string (for DOM elements) or a ReactClass ' +
'(for composite components). Check the render method of `ParentComp`.'
'boolean, or number. It should be a string (for DOM elements) or a ' +
'ReactClass (for composite components). Check the render method of ' +
'`ParentComp`.'
);
expect(console.error.calls[1].args[0]).toBe(
'Warning: Only functions or strings can be mounted as React components.'

24
src/modern/element/__tests__/ReactJSXElementValidator-test.js
View File

@ -211,23 +211,33 @@ describe('ReactJSXElementValidator', function() {
it('gives a helpful error when passing null, undefined, or boolean', () => {
var Undefined = undefined;
var Null = null;
var Div = 'div';
var True = true;
var Num = 123;
var Div = 'div';
spyOn(console, 'error');
<Undefined />;
<Null />;
<True />;
expect(console.error.calls.length).toBe(3);
<Num />;
expect(console.error.calls.length).toBe(4);
expect(console.error.calls[0].args[0]).toContain(
'type should not be null, undefined, or boolean. It should be a ' +
'string (for DOM elements) or a ReactClass (for composite components).'
'type should not be null, undefined, boolean, or number. It should be ' +
'a string (for DOM elements) or a ReactClass (for composite components).'
);
expect(console.error.calls[1].args[0]).toContain(
'type should not be null, undefined, or boolean. It should be a ' +
'string (for DOM elements) or a ReactClass (for composite components).'
'type should not be null, undefined, boolean, or number. It should be ' +
'a string (for DOM elements) or a ReactClass (for composite components).'
);
expect(console.error.calls[2].args[0]).toContain(
'type should not be null, undefined, boolean, or number. It should be ' +
'a string (for DOM elements) or a ReactClass (for composite components).'
);
expect(console.error.calls[3].args[0]).toContain(
'type should not be null, undefined, boolean, or number. It should be ' +
'a string (for DOM elements) or a ReactClass (for composite components).'
);
<Div />;
expect(console.error.calls.length).toBe(3);
expect(console.error.calls.length).toBe(4);
});
it('should check default prop values', function() {