mirror of
https://github.com/facebook/react.git
synced 2026-11-18 20:15:56 +00:00
Merge pull request #3872 from spicyj/nested-num
Split message for deep numeric key warning too
This commit is contained in:
commit
05b98ac70c
1 file changed
+7
-3
@@ -116,13 +116,17 @@ function validateExplicitKey(element, parentType, deep) {
|
||||
* @param {string} name Property name of the key.
|
||||
* @param {ReactElement} element Component that requires a key.
|
||||
* @param {*} parentType element's parent's type.
|
||||
* @param {boolean} deep false if top-level collection, true if nested
|
||||
*/
|
||||
function validatePropertyKey(name, element, parentType) {
|
||||
function validatePropertyKey(name, element, parentType, deep) {
|
||||
if (!NUMERIC_PROPERTY_REGEX.test(name)) {
|
||||
return;
|
||||
}
|
||||
warnAndMonitorForKeyUse(
|
||||
'Child objects should have non-numeric keys so ordering is preserved.',
|
||||
deep ?
|
||||
'Nested child objects should have non-numeric keys ' +
|
||||
'so ordering is preserved.' :
|
||||
'Child objects should have non-numeric keys so ordering is preserved.',
|
||||
element,
|
||||
parentType
|
||||
);
|
||||
@@ -226,7 +230,7 @@ function validateChildKeys(node, parentType, deep) {
|
||||
var fragment = ReactFragment.extractIfFragment(node);
|
||||
for (var key in fragment) {
|
||||
if (fragment.hasOwnProperty(key)) {
|
||||
validatePropertyKey(key, fragment[key], parentType);
|
||||
validatePropertyKey(key, fragment[key], parentType, deep);
|
||||
validateChildKeys(fragment[key], parentType, true);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user