OSSForks/react
1
0
Fork 0
mirror of https://github.com/zebrajr/react.git synced 2026-01-15 12:15:22 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #3872 from spicyj/nested-num

Browse Source 
Split message for deep numeric key warning too
This commit is contained in:
Ben Alpert
2015-05-13 15:32:13 -07:00
parent db25a63c12 0a3aa8493a
commit 05b98ac70c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
}