diff --git a/src/renderers/dom/client/ReactMount.js b/src/renderers/dom/client/ReactMount.js index a1704f47fc..dca4ac180a 100644 --- a/src/renderers/dom/client/ReactMount.js +++ b/src/renderers/dom/client/ReactMount.js @@ -17,6 +17,7 @@ var DOMProperty = require('DOMProperty'); var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); var ReactCurrentOwner = require('ReactCurrentOwner'); var ReactDOMContainerInfo = require('ReactDOMContainerInfo'); +var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); var ReactElement = require('ReactElement'); var ReactInstanceHandles = require('ReactInstanceHandles'); var ReactMarkupChecksum = require('ReactMarkupChecksum'); @@ -287,7 +288,8 @@ function batchedMountComponentIntoNode( context ) { var transaction = ReactUpdates.ReactReconcileTransaction.getPooled( - /* forceHTML */ shouldReuseMarkup + /* useCreateElement */ + !shouldReuseMarkup && ReactDOMFeatureFlags.useCreateElement ); transaction.perform( mountComponentIntoNode, diff --git a/src/renderers/dom/client/ReactReconcileTransaction.js b/src/renderers/dom/client/ReactReconcileTransaction.js index a460629e31..fdd43ac781 100644 --- a/src/renderers/dom/client/ReactReconcileTransaction.js +++ b/src/renderers/dom/client/ReactReconcileTransaction.js @@ -15,7 +15,6 @@ var CallbackQueue = require('CallbackQueue'); var PooledClass = require('PooledClass'); var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); -var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags'); var ReactInputSelection = require('ReactInputSelection'); var Transaction = require('Transaction'); @@ -107,7 +106,7 @@ var TRANSACTION_WRAPPERS = [ * * @class ReactReconcileTransaction */ -function ReactReconcileTransaction(forceHTML) { +function ReactReconcileTransaction(useCreateElement) { this.reinitializeTransaction(); // Only server-side rendering really needs this option (see // `ReactServerRendering`), but server-side uses @@ -116,8 +115,7 @@ function ReactReconcileTransaction(forceHTML) { // `ReactTextComponent` checks it in `mountComponent`.` this.renderToStaticMarkup = false; this.reactMountReady = CallbackQueue.getPooled(null); - this.useCreateElement = - !forceHTML && ReactDOMFeatureFlags.useCreateElement; + this.useCreateElement = useCreateElement; } var Mixin = { diff --git a/src/renderers/shared/reconciler/ReactUpdates.js b/src/renderers/shared/reconciler/ReactUpdates.js index 479488b8ed..841213f7c1 100644 --- a/src/renderers/shared/reconciler/ReactUpdates.js +++ b/src/renderers/shared/reconciler/ReactUpdates.js @@ -68,8 +68,9 @@ function ReactUpdatesFlushTransaction() { this.reinitializeTransaction(); this.dirtyComponentsLength = null; this.callbackQueue = CallbackQueue.getPooled(); - this.reconcileTransaction = - ReactUpdates.ReactReconcileTransaction.getPooled(/* forceHTML */ false); + this.reconcileTransaction = ReactUpdates.ReactReconcileTransaction.getPooled( + /* useCreateElement */ true + ); } assign( diff --git a/src/test/ReactTestUtils.js b/src/test/ReactTestUtils.js index 7efb77da10..8be0366f4b 100644 --- a/src/test/ReactTestUtils.js +++ b/src/test/ReactTestUtils.js @@ -432,7 +432,7 @@ ReactShallowRenderer.prototype.render = function(element, context) { if (!context) { context = emptyObject; } - var transaction = ReactUpdates.ReactReconcileTransaction.getPooled(false); + var transaction = ReactUpdates.ReactReconcileTransaction.getPooled(true); transaction.perform(this._render, this, element, transaction, context); ReactUpdates.ReactReconcileTransaction.release(transaction); };