Fix batchedUpdates return value (#7444)

(cherry picked from commit 7d57c1f)
facebook · Oct 3, 2016 · bada298 · bada298
1 parent 5a540f7
commit bada298
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js b/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js
@@ -60,9 +60,9 @@ var ReactDefaultBatchingStrategy = {
 
     // The code is written this way to avoid extra allocations
     if (alreadyBatchingUpdates) {
-      callback(a, b, c, d, e);
+      return callback(a, b, c, d, e);
     } else {
-      transaction.perform(callback, null, a, b, c, d, e);
+      return transaction.perform(callback, null, a, b, c, d, e);
     }
   },
 };

diff --git a/src/renderers/shared/stack/reconciler/ReactUpdates.js b/src/renderers/shared/stack/reconciler/ReactUpdates.js
@@ -108,7 +108,7 @@ PooledClass.addPoolingTo(ReactUpdatesFlushTransaction);
 
 function batchedUpdates(callback, a, b, c, d, e) {
   ensureInjected();
-  batchingStrategy.batchedUpdates(callback, a, b, c, d, e);
+  return batchingStrategy.batchedUpdates(callback, a, b, c, d, e);
 }
 
 /**

diff --git a/src/renderers/shared/stack/reconciler/__tests__/ReactUpdates-test.js b/src/renderers/shared/stack/reconciler/__tests__/ReactUpdates-test.js
@@ -1147,4 +1147,10 @@ describe('ReactUpdates', function() {
     ReactDOM.render(<App />, document.createElement('div'));
   });
 
+  it('unstable_batchedUpdates should return value from a callback', function() {
+    var result = ReactDOM.unstable_batchedUpdates(function() {
+      return 42;
+    });
+    expect(result).toEqual(42);
+  });
 });