Skip to content

Commit be71f76

Browse files
committed
Revert "Warn if PropType function is called manually (#7132)"
This reverts commit e75e8dc.
1 parent f565aef commit be71f76

File tree

6 files changed

+8
-271
lines changed

6 files changed

+8
-271
lines changed

src/addons/link/__tests__/ReactLinkPropTypes-test.js

-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
var emptyFunction = require('emptyFunction');
1515
var LinkPropTypes = require('ReactLink').PropTypes;
1616
var React = require('React');
17-
var ReactPropTypesSecret = require('ReactPropTypesSecret');
1817

1918
var invalidMessage = 'Invalid prop `testProp` supplied to `testComponent`.';
2019
var requiredMessage = 'The prop `testProp` is marked as required in ' +
@@ -27,8 +26,6 @@ function typeCheckFail(declaration, value, message) {
2726
'testProp',
2827
'testComponent',
2928
'prop',
30-
null,
31-
ReactPropTypesSecret
3229
);
3330
expect(error instanceof Error).toBe(true);
3431
expect(error.message).toBe(message);
@@ -41,8 +38,6 @@ function typeCheckPass(declaration, value) {
4138
'testProp',
4239
'testComponent',
4340
'prop',
44-
null,
45-
ReactPropTypesSecret
4641
);
4742
expect(error).toBe(null);
4843
}

src/isomorphic/classic/types/ReactPropTypes.js

+7-57
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
var ReactElement = require('ReactElement');
1515
var ReactPropTypeLocationNames = require('ReactPropTypeLocationNames');
16-
var ReactPropTypesSecret = require('ReactPropTypesSecret');
1716

1817
var emptyFunction = require('emptyFunction');
1918
var getIteratorFn = require('getIteratorFn');
@@ -153,42 +152,16 @@ function PropTypeError(message) {
153152
PropTypeError.prototype = Error.prototype;
154153

155154
function createChainableTypeChecker(validate) {
156-
if (__DEV__) {
157-
var manualPropTypeCallCache = {};
158-
}
159155
function checkType(
160156
isRequired,
161157
props,
162158
propName,
163159
componentName,
164160
location,
165-
propFullName,
166-
secret
161+
propFullName
167162
) {
168163
componentName = componentName || ANONYMOUS;
169164
propFullName = propFullName || propName;
170-
if (__DEV__) {
171-
if (
172-
secret !== ReactPropTypesSecret &&
173-
typeof console !== 'undefined'
174-
) {
175-
var cacheKey = `${componentName}:${propName}`;
176-
if (!manualPropTypeCallCache[cacheKey]) {
177-
warning(
178-
false,
179-
'You are manually calling a React.PropTypes validation ' +
180-
'function for the `%s` prop on `%s`. This is deprecated ' +
181-
'and will not work in production with the next major version. ' +
182-
'You may be seeing this warning due to a third-party PropTypes ' +
183-
'library. See https://fb.me/react-warning-dont-call-proptypes ' +
184-
'for details.',
185-
propFullName,
186-
componentName
187-
);
188-
manualPropTypeCallCache[cacheKey] = true;
189-
}
190-
}
191-
}
192165
if (props[propName] == null) {
193166
var locationName = ReactPropTypeLocationNames[location];
194167
if (isRequired) {
@@ -205,13 +178,7 @@ function createChainableTypeChecker(validate) {
205178
}
206179
return null;
207180
} else {
208-
return validate(
209-
props,
210-
propName,
211-
componentName,
212-
location,
213-
propFullName,
214-
);
181+
return validate(props, propName, componentName, location, propFullName);
215182
}
216183
}
217184

@@ -222,14 +189,7 @@ function createChainableTypeChecker(validate) {
222189
}
223190

224191
function createPrimitiveTypeChecker(expectedType) {
225-
function validate(
226-
props,
227-
propName,
228-
componentName,
229-
location,
230-
propFullName,
231-
secret
232-
) {
192+
function validate(props, propName, componentName, location, propFullName) {
233193
var propValue = props[propName];
234194
var propType = getPropType(propValue);
235195
if (propType !== expectedType) {
@@ -276,8 +236,7 @@ function createArrayOfTypeChecker(typeChecker) {
276236
i,
277237
componentName,
278238
location,
279-
`${propFullName}[${i}]`,
280-
ReactPropTypesSecret
239+
`${propFullName}[${i}]`
281240
);
282241
if (error instanceof Error) {
283242
return error;
@@ -368,8 +327,7 @@ function createObjectOfTypeChecker(typeChecker) {
368327
key,
369328
componentName,
370329
location,
371-
`${propFullName}.${key}`,
372-
ReactPropTypesSecret
330+
`${propFullName}.${key}`
373331
);
374332
if (error instanceof Error) {
375333
return error;
@@ -391,14 +349,7 @@ function createUnionTypeChecker(arrayOfTypeCheckers) {
391349
for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
392350
var checker = arrayOfTypeCheckers[i];
393351
if (
394-
checker(
395-
props,
396-
propName,
397-
componentName,
398-
location,
399-
propFullName,
400-
ReactPropTypesSecret
401-
) == null
352+
checker(props, propName, componentName, location, propFullName) == null
402353
) {
403354
return null;
404355
}
@@ -448,8 +399,7 @@ function createShapeTypeChecker(shapeTypes) {
448399
key,
449400
componentName,
450401
location,
451-
`${propFullName}.${key}`,
452-
ReactPropTypesSecret
402+
`${propFullName}.${key}`
453403
);
454404
if (error) {
455405
return error;

0 commit comments

Comments
 (0)