Merge pull request #224 from spicyj/cb-context

Call callbacks from setState in component context
facebook · Jul 25, 2013 · a41aa76 · a41aa76
2 parents bdf2a9b + f1231e6
commit a41aa76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/core/ReactUpdates.js b/src/core/ReactUpdates.js
@@ -54,7 +54,7 @@ function batchedUpdates(callback) {
         component.performUpdateIfNecessary();
         if (callbacks) {
           for (var j = 0; j < callbacks.length; j++) {
-            callbacks[j]();
+            callbacks[j].call(component);
           }
         }
       }

diff --git a/src/core/__tests__/ReactUpdates-test.js b/src/core/__tests__/ReactUpdates-test.js
@@ -237,6 +237,7 @@ describe('ReactUpdates', function() {
     ReactUpdates.batchedUpdates(function() {
       instance.setState({x: 1}, function() {
         instance.setState({x: 2}, function() {
+          expect(this).toBe(instance);
           innerCallbackRun = true;
           expect(instance.state.x).toBe(2);
           expect(updateCount).toBe(2);