Better name for server-side rendering without React ID & checksum
"staticMarkup" sounds way better than "noChecksumNoID". Also avoids some double negations.
Cheng Lou committed
Mar 3, 2014 at 09:39 UTC
f734083a1713431e68213dbd566cf4a77e6a4482
6 files changed
+16
-13
src/browser/ReactDOMComponent.js
+3
-1
@@ -164,7 +164,9 @@ ReactDOMComponent.Mixin = {
164
}
165
}
166
167
- if (!transaction.renderChecksumAndReactID) {
167
+ // For static pages, no need to put React ID and checksum. Saves lots of
168
+ // bytes.
169
+ if (transaction.renderToStaticMarkup) {
170
return ret + '>';
171
}
172
src/browser/ReactReconcileTransaction.js
+2
-2
@@ -129,9 +129,9 @@ function ReactReconcileTransaction() {
129
// Only server-side rendering really needs this option (see
130
// `ReactServerRendering`), but server-side uses
131
// `ReactServerRenderingTransaction` instead. This option is here so that it's
132
- // accessible and defaults to true when `ReactDOMComponent` and
132
+ // accessible and defaults to false when `ReactDOMComponent` and
133
// `ReactTextComponent` checks it in `mountComponent`.`
134
- this.renderChecksumAndReactID = true;
134
+ this.renderToStaticMarkup = false;
135
this.reactMountReady = ReactMountReady.getPooled(null);
136
this.putListenerQueue = ReactPutListenerQueue.getPooled();
137
}
src/browser/ReactTextComponent.js
+1
-1
@@ -69,7 +69,7 @@ mixInto(ReactTextComponent, {
69
70
var escapedText = escapeTextForBrowser(this.props.text);
71
72
- if (!transaction.renderChecksumAndReactID) {
72
+ if (transaction.renderToStaticMarkup) {
73
// Normally we'd wrap this in a `span` for the reasons stated above, but
74
// since this is a situation where React won't take over (static pages),
75
// we can simply return the text as it is.
src/browser/server/ReactServerRendering.js
+5
-4
@@ -29,7 +29,8 @@ var invariant = require('invariant');
29
30
/**
31
* @param {ReactComponent} component
32
- * @param {?object} options pass a boolean for the key `noChecksumNoID`
32
+ * @param {?object} options pass a boolean for the key `staticMarkup`. If true,
33
+ * the React ID and checksum won't be rendered. Used for rendering static pages.
34
*/
35
function renderComponentToString(component, options) {
36
invariant(
@@ -47,15 +48,15 @@ function renderComponentToString(component, options) {
48
49
var transaction;
50
try {
50
- if (options.noChecksumNoID) {
51
- transaction = ReactServerRenderingTransaction.getPooled(false);
51
+ if (options.staticMarkup) {
52
+ transaction = ReactServerRenderingTransaction.getPooled(true);
53
54
return transaction.perform(function() {
55
return component.mountComponent(id, transaction, 0);
56
}, null);
57
} else {
58
var id = ReactInstanceHandles.createReactRootID();
58
- transaction = ReactServerRenderingTransaction.getPooled(true);
59
+ transaction = ReactServerRenderingTransaction.getPooled(false);
60
61
return transaction.perform(function() {
62
var markup = component.mountComponent(id, transaction, 0);
src/browser/server/__tests__/ReactServerRendering-test.js
+2
-2
@@ -279,7 +279,7 @@ describe('ReactServerRendering', function() {
279
280
var response = ReactServerRendering.renderComponentToString(
281
<TestComponent />,
282
- {noChecksumNoID: true}
282
+ {staticMarkup: true}
283
);
284
285
expect(response).toBe('<span><div>inner text</div></span>');
@@ -296,7 +296,7 @@ describe('ReactServerRendering', function() {
296
297
var response = ReactServerRendering.renderComponentToString(
298
<TestComponent />,
299
- {noChecksumNoID: true}
299
+ {staticMarkup: true}
300
);
301
302
expect(response).toBe('<span>hello world</span>');
src/core/ReactServerRenderingTransaction.js
+3
-3
@@ -62,11 +62,11 @@ var TRANSACTION_WRAPPERS = [
62
63
/**
64
* @class ReactServerRenderingTransaction
65
- * @param {boolean} renderChecksumAndReactID
65
+ * @param {boolean} renderToStaticMarkup
66
*/
67
-function ReactServerRenderingTransaction(renderChecksumAndReactID) {
67
+function ReactServerRenderingTransaction(renderToStaticMarkup) {
68
this.reinitializeTransaction();
69
- this.renderChecksumAndReactID = renderChecksumAndReactID;
69
+ this.renderToStaticMarkup = renderToStaticMarkup;
70
this.reactMountReady = ReactMountReady.getPooled(null);
71
this.putListenerQueue = ReactPutListenerQueue.getPooled();
72
}