Cursor.set's nextValue parameter now expects a function

It remains backwards compatible with usages that pass non-functions, however.
dustingetz · Jul 23, 2015 · 154b986 · lijunle · Jul 23, 2015 · 154b986
1 parent 01ac5de
commit 154b986
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/examples/helloworld/webapp/js/Page.js b/examples/helloworld/webapp/js/Page.js
@@ -61,8 +61,8 @@ var ClickerDescriptor = React.createClass({
   },
 
   inc2: function () {
-    this.props.cursor.set(this.props.cursor.pendingValue() + 1);
-    this.props.cursor.set(this.props.cursor.pendingValue() + 1);
+    this.props.cursor.set(function (s) { return s + 1; });
+    this.props.cursor.set(function (s) { return s + 1; });
   },
 
   inc10: function () {

diff --git a/src/Cursor.js b/src/Cursor.js
@@ -33,16 +33,29 @@ function Cursor(cmp, path, value) {
   };
 }
 
-function update(cmp, path, operation, nextValue) {
+function update(cmp, path, operation, nextUpdate) {
+  // Backwards compatibility with non-function values of nextUpdate
+  if (typeof nextUpdate !== "function") {
+    var prevValue = nextUpdate;
+    nextUpdate = function ( ) { return prevValue; };
+  }
+
   cmp.setState(function (state) {
+    var nextState;
+
     if (path.length > 0) {
-      return React.addons.update(
+      nextState = React.addons.update(
         state,
-        path.concat(operation).reduceRight(util.unDeref, nextValue)
+        path.concat(operation).reduceRight(
+          util.unDeref,
+          nextUpdate(util.getRefAtPath(state, path))
+        )
       );
     } else if (path.length === 0) {
-      return nextValue;
+      nextState = nextUpdate(state);
     }
+
+    return nextState;
   });
 }