Always do useCreateElement for updates

Initial render can still be a markup string.
This commit is contained in:
Ben Alpert committed 2015-11-03 17:03:40 -08:00
1 parent 276ef737fe
commit 5a7c273a1b
4 files changed
+9 -8

No files matched your search

+3 -1
View File
@@ -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,
@@ -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 = {
@@ -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(
+1 -1
View File
@@ -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);
};