{"body":"","parents":["1a0e3a32150468223d6f9fd0125db0f8503b76d6"],"patch":"diff --git a\/src\/renderers\/dom\/server\/ReactServerRendering.js b\/src\/renderers\/dom\/server\/ReactServerRendering.js\nindex e72c1ccbfc..fefb9af9d5 100644\n--- a\/src\/renderers\/dom\/server\/ReactServerRendering.js\n+++ b\/src\/renderers\/dom\/server\/ReactServerRendering.js\n@@ -25,6 +25,8 @@ var emptyObject = require('emptyObject');\n var instantiateReactComponent = require('instantiateReactComponent');\n var invariant = require('invariant');\n \n+var pendingTransactions = 0;\n+\n \/**\n * @param {ReactElement} element\n * @return {string} the HTML markup\n@@ -36,6 +38,8 @@ function renderToStringImpl(element, makeStaticMarkup) {\n \n transaction = ReactServerRenderingTransaction.getPooled(makeStaticMarkup);\n \n+ pendingTransactions++;\n+\n return transaction.perform(function() {\n var componentInstance = instantiateReactComponent(element, true);\n var markup = ReactReconciler.mountComponent(\n@@ -56,10 +60,15 @@ function renderToStringImpl(element, makeStaticMarkup) {\n return markup;\n }, null);\n } finally {\n+ pendingTransactions--;\n ReactServerRenderingTransaction.release(transaction);\n \/\/ Revert to the DOM batching strategy since these two renderers\n \/\/ currently share these stateful modules.\n- ReactUpdates.injection.injectBatchingStrategy(ReactDefaultBatchingStrategy);\n+ if (!pendingTransactions) {\n+ ReactUpdates.injection.injectBatchingStrategy(\n+ ReactDefaultBatchingStrategy\n+ );\n+ }\n }\n }\n \ndiff --git a\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js b\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\nindex 8ee8f18551..cd5d30f7f6 100644\n--- a\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\n+++ b\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\n@@ -399,6 +399,37 @@ describe('ReactServerRendering', function() {\n );\n expect(markup.indexOf('hello, world') >= 0).toBe(true);\n });\n+\n+ it('renders components with different batching strategies', function() {\n+ var StaticComponent = React.createClass({\n+ render: function() {\n+ const staticContent = ReactServerRendering.renderToStaticMarkup(\n+

\n+

\n+ <\/div>\n+ );\n+ return

;\n+ },\n+ });\n+\n+ var Component = React.createClass({\n+ componentWillMount: function() {\n+ this.setState({text: 'hello, world'});\n+ },\n+ render: function() {\n+ return

{this.state.text}<\/div>;\n+ },\n+ });\n+ expect(\n+ ReactServerRendering.renderToString.bind(\n+ ReactServerRendering,\n+

\n+ \n+ \n+ <\/div>\n+ )\n+ ).not.toThrow();\n+ });\n });\n \n it('warns with a no-op when an async setState is triggered', function() {\n","commit":{"authorName":"Brandon Dail","authoredAt":"2016-07-08T12:52:14-05:00","revision":"b6e1eb27185dd90e74ad8a67f98f6c5b35043c1a","subject":"Inject default batching after pending transactions (#7033)","authorEmail":"Aweary@users.noreply.github.com","shortRevision":"b6e1eb2718"},"files":[{"status":"M","path":"src\/renderers\/dom\/server\/ReactServerRendering.js"},{"status":"M","path":"src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js"}]}

dillon1000/react

Files changed