From 8bc2abd367232eca66e4d38ff63b335c8cf23c45 Mon Sep 17 00:00:00 2001 From: CommitSyncScript Date: Fri, 28 Jun 2013 13:46:33 -0700 Subject: [PATCH] .reactRoot[base10] -> .r[base36] Just a bit of byte savings for server rendering. Props to @benjamn for the base36 idea (and for making this diff easy). With a little work we could probably get rid of the .r as well. --- src/core/ReactInstanceHandles.js | 4 +-- src/core/ReactMount.js | 2 +- src/core/__tests__/ReactIdentity-test.js | 26 +++++++++---------- .../__tests__/ReactInstanceHandles-test.js | 4 +-- .../__tests__/ResponderEventPlugin-test.js | 6 ++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/core/ReactInstanceHandles.js b/src/core/ReactInstanceHandles.js index f9678056ff..000856604b 100644 --- a/src/core/ReactInstanceHandles.js +++ b/src/core/ReactInstanceHandles.js @@ -48,7 +48,7 @@ var GLOBAL_MOUNT_POINT_MAX = 9999999; * @internal */ function getReactRootIDString(index) { - return '.reactRoot[' + index + ']'; + return SEPARATOR + 'r[' + index.toString(36) + ']'; } /** @@ -316,7 +316,7 @@ var ReactInstanceHandles = { * @internal */ getReactRootIDFromNodeID: function(id) { - var regexResult = /\.reactRoot\[[^\]]+\]/.exec(id); + var regexResult = /\.r\[[^\]]+\]/.exec(id); return regexResult && regexResult[0]; }, diff --git a/src/core/ReactMount.js b/src/core/ReactMount.js index 62d9bc6b13..14f93055b9 100644 --- a/src/core/ReactMount.js +++ b/src/core/ReactMount.js @@ -56,7 +56,7 @@ function getReactRootID(container) { * ReactMount.renderComponent(component, $('container')); * *
<-- Supplied `container`. - *
<-- Rendered reactRoot of React + *
<-- Rendered reactRoot of React * // ... component. *
*
diff --git a/src/core/__tests__/ReactIdentity-test.js b/src/core/__tests__/ReactIdentity-test.js index 9edf0f73ef..36998e9f62 100644 --- a/src/core/__tests__/ReactIdentity-test.js +++ b/src/core/__tests__/ReactIdentity-test.js @@ -34,7 +34,7 @@ describe('ReactIdentity', function() { ReactID = require('ReactID'); }); - var idExp = /^\.reactRoot\[\d+\](.*)$/; + var idExp = /^\.r\[.+?\](.*)$/; function checkId(child, expectedId) { var actual = idExp.exec(ReactID.getID(child)); var expected = idExp.exec(expectedId); @@ -55,8 +55,8 @@ describe('ReactIdentity', function() { React.renderComponent(instance, document.createElement('div')); var node = instance.getDOMNode(); reactComponentExpect(instance).toBeDOMComponentWithChildCount(2); - checkId(node.childNodes[0], '.reactRoot[0].[0]{first}'); - checkId(node.childNodes[1], '.reactRoot[0].[0]{second}'); + checkId(node.childNodes[0], '.r[0].[0]{first}'); + checkId(node.childNodes[1], '.r[0].[0]{second}'); }); it('should allow key property to express identity', function() { @@ -71,10 +71,10 @@ describe('ReactIdentity', function() { React.renderComponent(instance, document.createElement('div')); var node = instance.getDOMNode(); reactComponentExpect(instance).toBeDOMComponentWithChildCount(4); - checkId(node.childNodes[0], '.reactRoot[0].[0:apple]'); - checkId(node.childNodes[1], '.reactRoot[0].[0:banana]'); - checkId(node.childNodes[2], '.reactRoot[0].[0:0]'); - checkId(node.childNodes[3], '.reactRoot[0].[0:123]'); + checkId(node.childNodes[0], '.r[0].[0:apple]'); + checkId(node.childNodes[1], '.r[0].[0:banana]'); + checkId(node.childNodes[2], '.r[0].[0:0]'); + checkId(node.childNodes[3], '.r[0].[0:123]'); }); it('should use instance identity', function() { @@ -95,15 +95,15 @@ describe('ReactIdentity', function() { React.renderComponent(instance, document.createElement('div')); var node = instance.getDOMNode(); reactComponentExpect(instance).toBeDOMComponentWithChildCount(3); - checkId(node.childNodes[0], '.reactRoot[0].[0:wrap1]'); + checkId(node.childNodes[0], '.r[0].[0:wrap1]'); checkId( node.childNodes[0].firstChild, - '.reactRoot[0].[0:wrap1].[0:squirrel]' + '.r[0].[0:wrap1].[0:squirrel]' ); - checkId(node.childNodes[1], '.reactRoot[0].[0:wrap2]'); - checkId(node.childNodes[1].firstChild, '.reactRoot[0].[0:wrap2].[0:bunny]'); - checkId(node.childNodes[2], '.reactRoot[0].[0:2]'); - checkId(node.childNodes[2].firstChild, '.reactRoot[0].[0:2].[0:chipmunk]'); + checkId(node.childNodes[1], '.r[0].[0:wrap2]'); + checkId(node.childNodes[1].firstChild, '.r[0].[0:wrap2].[0:bunny]'); + checkId(node.childNodes[2], '.r[0].[0:2]'); + checkId(node.childNodes[2].firstChild, '.r[0].[0:2].[0:chipmunk]'); }); it('should let restructured components retain their uniqueness', function() { diff --git a/src/core/__tests__/ReactInstanceHandles-test.js b/src/core/__tests__/ReactInstanceHandles-test.js index 331b47a183..4cde75ab5d 100644 --- a/src/core/__tests__/ReactInstanceHandles-test.js +++ b/src/core/__tests__/ReactInstanceHandles-test.js @@ -149,8 +149,8 @@ describe('ReactInstanceHandles', function() { describe('getReactRootIDFromNodeID', function() { it('should support strings', function() { - var test = '.reactRoot[s_0_1][0]..[1]'; - var expected = '.reactRoot[s_0_1]'; + var test = '.r[s_0_1][0]..[1]'; + var expected = '.r[s_0_1]'; var actual = ReactInstanceHandles.getReactRootIDFromNodeID(test); expect(actual).toEqual(expected); }); diff --git a/src/eventPlugins/__tests__/ResponderEventPlugin-test.js b/src/eventPlugins/__tests__/ResponderEventPlugin-test.js index 6917e6e8b7..5db1e6138b 100644 --- a/src/eventPlugins/__tests__/ResponderEventPlugin-test.js +++ b/src/eventPlugins/__tests__/ResponderEventPlugin-test.js @@ -25,9 +25,9 @@ var ReactInstanceHandles; var ResponderEventPlugin; var SyntheticEvent; -var GRANDPARENT_ID = '.reactRoot[0]'; -var PARENT_ID = '.reactRoot[0].0'; -var CHILD_ID = '.reactRoot[0].0.0'; +var GRANDPARENT_ID = '.r[0]'; +var PARENT_ID = '.r[0].0'; +var CHILD_ID = '.r[0].0.0'; var topLevelTypes; var responderEventTypes;