Fix cursor to list failing to iterate, immutable-js#283

leebyron · leebyron · commit 3a018646ff98 · 2015-01-12T16:02:39.000-05:00
diff --git a/contrib/cursor/__tests__/Cursor.ts b/contrib/cursor/__tests__/Cursor.ts
@@ -194,6 +194,16 @@ describe('Cursor', () => {
     );
   });
 
+  it('returns wrapped values for iteration API', () => {
+    var jsData = [{val: 0}, {val: 1}, {val: 2}];
+    var data = Immutable.fromJS(jsData);
+    var cursor = Cursor.from(data);
+    cursor.forEach(function (c, i) {
+      expect(typeof c.deref).toBe('function'); // is a cursor!
+      expect(c.get('val')).toBe(i);
+    });
+  });
+
   it('can map over values to get subcursors', () => {
     var data = Immutable.fromJS({a: {v: 1}, b: {v: 2}, c: {v: 3}});
     var cursor = Cursor.from(data);
diff --git a/contrib/cursor/index.js b/contrib/cursor/index.js
@@ -254,7 +254,7 @@ function updateCursor(cursor, changeFn, changeKey) {
     undefined,
     newRootData,
     cursor._rootData,
-    newKeyPath(keyPath, changeKey)
+    arguments.length > 2 ? newKeyPath(keyPath, changeKey) : keyPath
   );
   if (result !== undefined) {
     newRootData = result;
@@ -263,7 +263,7 @@ function updateCursor(cursor, changeFn, changeKey) {
 }
 
 function newKeyPath(head, tail) {
-  return tail ? Seq(head).concat(tail).toArray() : head;
+  return Seq(head).concat(tail).toArray();
 }
 
 exports.from = cursorFrom;
