Merge pull request #970 from TLadd/master

Split find-key.js to a plain javascript and immutable version

Author: davidkpiano

src/immutable.js

@@ -15,6 +15,7 @@ import getValue from './utils/get-value';
 import immutableGetFromState from './utils/get-from-immutable-state';
 import getForm, { getFormStateKey } from './utils/get-form';
 import isPlainObject from './utils/is-plain-object';
+import immutableFindKey from './utils/find-key-immutable';
 import Immutable from 'immutable';
 
 import {
@@ -73,6 +74,7 @@ const immutableStrategy = {
   ...baseStrategy,
   getForm: immutableGetForm,
   getFieldFromState: immutableGetFieldFromState,
+  findKey: immutableFindKey,
 };
 
 function transformAction(action) {

src/utils/find-key-immutable.js

@@ -0,0 +1,22 @@
+import { List } from 'immutable';
+
+export default function findKey(object, predicate) {
+  let resultKey;
+
+  if (List.isList(object)) {
+    resultKey = object.findKey(predicate);
+  } else {
+    Object.keys(object).some((key) => {
+      const isKey = predicate(object[key], key, object);
+
+      if (isKey) {
+        resultKey = key;
+        return true;
+      }
+
+      return false;
+    });
+  }
+
+  return resultKey;
+}

src/utils/find-key.js

@@ -1,22 +1,17 @@
-import { List } from 'immutable';
 
 export default function findKey(object, predicate) {
   let resultKey;
 
-  if (List.isList(object)) {
-    resultKey = object.findKey(predicate);
-  } else {
-    Object.keys(object).some((key) => {
-      const isKey = predicate(object[key], key, object);
+  Object.keys(object).some((key) => {
+    const isKey = predicate(object[key], key, object);
 
-      if (isKey) {
-        resultKey = key;
-        return true;
-      }
+    if (isKey) {
+      resultKey = key;
+      return true;
+    }
 
-      return false;
-    });
-  }
+    return false;
+  });
 
   return resultKey;
 }

src/utils/track.js

@@ -1,9 +1,10 @@
-import findKey from '../utils/find-key';
+import _findKey from '../utils/find-key';
 import _get from '../utils/get';
 import { createIteratee } from '../utils/iteratee';
 import isMulti from '../utils/is-multi';
 
 const defaultStrategy = {
+  findKey: _findKey,
   get: _get,
 };
 
@@ -34,8 +35,8 @@ function createTrack(s = defaultStrategy) {
         const predicateIteratee = iteratee(predicate);
 
         const subPath = childModelPath
-          ? `${findKey(subState, predicateIteratee)}.${childModelPath}`
-          : `${findKey(subState, predicateIteratee)}`;
+          ? `${s.findKey(subState, predicateIteratee)}.${childModelPath}`
+          : `${s.findKey(subState, predicateIteratee)}`;
 
         subState = s.get(subState, subPath);
         fullPath += `.${subPath}`;