From 79fc73e6742d0548d6d6af56e95074707d8189f1 Mon Sep 17 00:00:00 2001 From: Antonio Ruberto Date: Wed, 24 Jun 2015 15:17:48 -0400 Subject: [PATCH] check entry type iterables check that the value is a node for map iterables --- src/isomorphic/classic/types/ReactPropTypes.js | 14 ++++++++++++-- .../types/__tests__/ReactPropTypes-test.js | 17 +++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/isomorphic/classic/types/ReactPropTypes.js b/src/isomorphic/classic/types/ReactPropTypes.js index e80692c590..250531f2e7 100644 --- a/src/isomorphic/classic/types/ReactPropTypes.js +++ b/src/isomorphic/classic/types/ReactPropTypes.js @@ -349,14 +349,24 @@ function isNode(propValue) { var iteratorFn = getIteratorFn(propValue); if (iteratorFn) { + var iterator = iteratorFn.call(propValue); + var step; if (iteratorFn !== propValue.entries) { - var iterator = iteratorFn.call(propValue); - var step; while (!(step = iterator.next()).done) { if (!isNode(step.value)) { return false; } } + } else { + // Iterator will provide entry [k,v] tuples rather than values. + while (!(step = iterator.next()).done) { + var entry = step.value; + if (entry) { + if (!isNode(entry[1])) { + return false; + } + } + } } } else { propValue = ReactFragment.extractIfFragment(propValue); diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js index d99af002fe..412d0f2e69 100644 --- a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js +++ b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js @@ -421,6 +421,23 @@ describe('ReactPropTypes', function() { typeCheckPass(PropTypes.node, iterable); }); + it('should not warn for entry iterables', function() { + var iterable = { + '@@iterator': function() { + var i = 0; + return { + next: function() { + var done = ++i > 2; + return {value: done ? undefined : ['#' + i, ], done: done}; + }, + }; + }, + }; + iterable.entries = iterable['@@iterator']; + + typeCheckPass(PropTypes.node, iterable); + }); + it('should not warn for null/undefined if not required', function() { typeCheckPass(PropTypes.node, null); typeCheckPass(PropTypes.node, undefined);