From 08b55e1c4fba0fcfd0df6e4c513f3c1b8e227527 Mon Sep 17 00:00:00 2001 From: Ben Alpert Date: Fri, 22 May 2015 00:46:32 -0700 Subject: [PATCH] Dedupe warnings in validateDOMNesting Fixes #3921. --- src/renderers/dom/client/validateDOMNesting.js | 9 +++++++++ .../dom/shared/__tests__/ReactDOMComponent-test.js | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/renderers/dom/client/validateDOMNesting.js b/src/renderers/dom/client/validateDOMNesting.js index 72a0082c92..d05a992275 100644 --- a/src/renderers/dom/client/validateDOMNesting.js +++ b/src/renderers/dom/client/validateDOMNesting.js @@ -319,6 +319,8 @@ if (__DEV__) { return stack; }; + var didWarn = {}; + validateDOMNesting = function(childTag, childInstance, ancestorInfo) { ancestorInfo = ancestorInfo || emptyAncestorInfo; var parentInfo = ancestorInfo.parentTag; @@ -374,6 +376,13 @@ if (__DEV__) { childTag ).join(' > '); + var warnKey = + !!invalidParent + '|' + childTag + '|' + ancestorTag + '|' + ownerInfo; + if (didWarn[warnKey]) { + return; + } + didWarn[warnKey] = true; + if (invalidParent) { var info = ''; if (ancestorTag === 'table' && childTag === 'tr') { diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js index 9a6eaaec57..599dabd0ca 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js @@ -733,7 +733,7 @@ describe('ReactDOMComponent', function() { it('warns on invalid nesting', () => { spyOn(console, 'error'); - ReactTestUtils.renderIntoDocument(
); + ReactTestUtils.renderIntoDocument(
); expect(console.error.calls.length).toBe(1); expect(console.error.calls[0].args[0]).toBe(