break render recursion, fix #882

gaearon · Mar 8, 2018 · 33f2376 · 33f2376
1 parent b639bc6
commit 33f2376
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/proxy/createClassProxy.js b/src/proxy/createClassProxy.js
@@ -27,6 +27,7 @@ const blackListedClassMembers = [
   'componentDidMount',
   'componentWillReceiveProps',
   'componentWillUnmount',
+  'hotComponentRender',
 
   'getInitialState',
   'getDefaultProps',
@@ -135,10 +136,10 @@ function createClassProxy(InitialComponent, proxyKey, options) {
     },
   )
 
-  function proxiedRender() {
-    proxiedUpdate.call(this)
+  function hotComponentRender() {
+    // repeating subrender call to keep RENDERED_GENERATION up to date
     renderOptions.componentWillRender(this)
-
+    proxiedUpdate.call(this)
     let result
 
     // We need to use hasOwnProperty here, as the cached result is a React node
@@ -155,10 +156,16 @@ function createClassProxy(InitialComponent, proxyKey, options) {
     return renderOptions.componentDidRender(result)
   }
 
+  function proxiedRender() {
+    renderOptions.componentWillRender(this)
+    return hotComponentRender.call(this)
+  }
+
   const defineProxyMethods = (Proxy, Base = {}) => {
     defineClassMembers(Proxy, {
       ...fakeBasePrototype(Base),
       render: proxiedRender,
+      hotComponentRender,
       componentDidMount,
       componentWillReceiveProps,
       componentWillUnmount,

diff --git a/src/reconciler/hotReplacementRender.js b/src/reconciler/hotReplacementRender.js
@@ -101,7 +101,11 @@ const render = component => {
     return []
   }
   if (isReactClass(component)) {
-    return component.render()
+    // not calling real render method to prevent call recursion.
+    // stateless componets does not have hotComponentRender
+    return component.hotComponentRender
+      ? component.hotComponentRender()
+      : component.render()
   }
   if (isArray(component)) {
     return component.map(render)

diff --git a/test/proxy/consistency.test.js b/test/proxy/consistency.test.js
@@ -278,6 +278,7 @@ describe('consistency', () => {
           'methodA',
           'methodB',
           'render',
+          'hotComponentRender',
           'componentDidMount',
           'componentWillReceiveProps',
           'componentWillUnmount',