Skip to content

Fix bug #1919 #8274

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

Closed
wojtekmaj wants to merge 3 commits into from
Closed

Fix bug #1919 #8274

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c20c228
Fix bug #1919: Add warning when an array of PropTypes was supplied to…
wojtekmaj Nov 12, 2016
204099c
Fix bug #1919: Add warning when an array of PropTypes was supplied to…
wojtekmaj Nov 12, 2016
f62c214
Merge branch 'bugfix/1919' of https://github.com/wojtekmaj/react into…
wojtekmaj Nov 12, 2016
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
17 changes: 17 additions & 0 deletions src/isomorphic/classic/types/ReactPropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ function createChainableTypeChecker(validate) {
var chainedCheckType = checkType.bind(null, false);
chainedCheckType.isRequired = checkType.bind(null, true);

chainedCheckType.isReactTypeChecker = true;
chainedCheckType.isRequired.isReactTypeChecker = true;

return chainedCheckType;
}

Expand Down Expand Up @@ -286,6 +289,20 @@ function createEnumTypeChecker(expectedValues) {
return emptyFunction.thatReturnsNull;
}

// Check if the user used oneOf by mistake when they meant to use oneOfType
function isPropTypeFunction(prop) {
return typeof prop === 'function' && prop.isReactTypeChecker === true;
}

if (expectedValues.every(isPropTypeFunction)) {
warning(
false,
'Invalid argument supplied to oneOf, got an array of PropType functions, expected an array of values. ' +
'Did you mean to use oneOfType?'
);
return emptyFunction.thatReturnsNull;
}

function validate(props, propName, componentName, location, propFullName) {
var propValue = props[propName];
for (var i = 0; i < expectedValues.length; i++) {
Expand Down