Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make React 0.14 compatible with prop-types (#9412)

Browse Source
This commit is contained in:
Dan Abramov
2017-04-12 16:32:52 +01:00
committed by GitHub
parent 66fff86415
commit e1208624eb
4 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/isomorphic/classic/element/ReactElementValidator.js
+8 -1
View File
@@ -195,7 +195,14 @@ function checkPropTypes(componentName, propTypes, props, location) {
ReactPropTypeLocationNames[location],
propName
);
error = propTypes[propName](props, propName, componentName, location);
error = propTypes[propName](
props,
propName,
componentName,
location,
null,
'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED'
);
} catch (ex) {
error = ex;
}
src/isomorphic/classic/types/ReactPropTypes.js
+14 -4
View File
@@ -159,7 +159,8 @@ function createArrayOfTypeChecker(typeChecker) {
i,
componentName,
location,
`${propFullName}[${i}]`
`${propFullName}[${i}]`,
'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED'
);
if (error instanceof Error) {
return error;
@@ -246,7 +247,8 @@ function createObjectOfTypeChecker(typeChecker) {
key,
componentName,
location,
`${propFullName}.${key}`
`${propFullName}.${key}`,
'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED'
);
if (error instanceof Error) {
return error;
@@ -271,7 +273,14 @@ function createUnionTypeChecker(arrayOfTypeCheckers) {
for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
var checker = arrayOfTypeCheckers[i];
if (
checker(props, propName, componentName, location, propFullName) == null
checker(
props,
propName,
componentName,
location,
propFullName,
'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED'
) == null
) {
return null;
}
@@ -321,7 +330,8 @@ function createShapeTypeChecker(shapeTypes) {
key,
componentName,
location,
`${propFullName}.${key}`
`${propFullName}.${key}`,
'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED'
);
if (error) {
return error;
src/renderers/dom/client/wrappers/LinkedValueUtils.js
+3 -1
View File
@@ -110,7 +110,9 @@ var LinkedValueUtils = {
props,
propName,
tagName,
ReactPropTypeLocations.prop
ReactPropTypeLocations.prop,
null,
'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED'
);
}
if (error instanceof Error && !(error.message in loggedTypeFailures)) {
src/renderers/shared/reconciler/ReactCompositeComponent.js
+8 -1
View File
@@ -471,7 +471,14 @@ var ReactCompositeComponentMixin = {
ReactPropTypeLocationNames[location],
propName
);
error = propTypes[propName](props, propName, componentName, location);
error = propTypes[propName](
props,
propName,
componentName,
location,
null,
'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED'
);
} catch (ex) {
error = ex;
}