From 255e5aeb3eeb5d3e8de5ab450bb9ac9682f647b4 Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Mon, 6 Feb 2017 14:22:16 -0800 Subject: [PATCH] Rendering into an empty React-rendered element should not warn Only warn if the container has a React-rendered child. --- src/renderers/dom/fiber/ReactDOMFiber.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js index 65b547fb5a..5718e45c18 100644 --- a/src/renderers/dom/fiber/ReactDOMFiber.js +++ b/src/renderers/dom/fiber/ReactDOMFiber.js @@ -399,10 +399,11 @@ var ReactDOM = { if (__DEV__) { const isRootRenderedBySomeReact = Boolean(container._reactRootContainer); - const isInTreeRenderedByThisReact = ReactDOMComponentTree.getInstanceFromNode(container); + const rootEl = getReactRootElementInContainer(container); + const hasNonRootReactChild = Boolean(rootEl && ReactDOMComponentTree.getInstanceFromNode(rootEl)); warning( - !isInTreeRenderedByThisReact || + !hasNonRootReactChild || isRootRenderedBySomeReact, 'render(...): Replacing React-rendered children with a new root ' + 'component. If you intended to update the children of this node, ' +