Remove lodash in favour of ES6 syntax and lodash.* dependencies (greena13#73)

* Remove lodash in favour of ES6 syntax and lodash.* dependencies

* Update lodash reference in example

Author: greena13

examples/master/index.js

@@ -1,7 +1,7 @@
 import {HotKeys, HotKeyMapMixin} from 'react-hotkeys';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import rand from 'lodash/number/random';
+import rand from 'lodash.random';
 
 const DEFAULT_NODE_SIZE = 100;
 const SIZE_INCREMENT = 5;

lib/HotKeyMapMixin.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import assign from 'lodash/assign';
-import isEqual from 'lodash/isEqual';
+import isEqual from 'lodash.isequal';
 
 export default function HotKeyMapMixin(hotKeyMap = {}) {
 
@@ -40,7 +39,7 @@ export default function HotKeyMapMixin(hotKeyMap = {}) {
       const parentMap = this.context.hotKeyMap || {};
       const thisMap = this.props.keyMap || {};
 
-      return assign({}, parentMap, hotKeyMap, thisMap);
+      return {...parentMap, ...hotKeyMap, ...thisMap};
     },
 
     getMap() {

lib/HotKeys.js

@@ -4,11 +4,10 @@ import createReactClass from 'create-react-class';
 import ReactDOM from 'react-dom';
 import FocusTrap from './FocusTrap';
 import HotKeyMapMixin from './HotKeyMapMixin';
-import isBool from 'lodash/isBoolean';
-import isArray from 'lodash/isArray';
-import isObject from 'lodash/isObject';
-import forEach from 'lodash/forEach';
-import isEqual from 'lodash/isEqual';
+
+import isBool from 'lodash.isboolean';
+import isObject from 'lodash.isobject';
+import isEqual from 'lodash.isequal';
 
 function getSequencesFromMap(hotKeyMap, hotKeyName) {
   const sequences = hotKeyMap[hotKeyName];
@@ -19,7 +18,7 @@ function getSequencesFromMap(hotKeyMap, hotKeyName) {
     return [hotKeyName];
   }
 
-  if (isArray(sequences)) {
+  if (Array.isArray(sequences)) {
     return sequences;
   }
 
@@ -96,12 +95,14 @@ const HotKeys = createReactClass({
     const mousetrap = this.__mousetrap__;
 
     // Group all our handlers by sequence
-    forEach(handlers, (handler, hotKey) => {
+    Object.keys(handlers).forEach((hotKey) => {
+      const handler = handlers[hotKey];
+
       const handlerSequences = getSequencesFromMap(hotKeyMap, hotKey);
 
       // Could be optimized as every handler will get called across every bound
       // component - imagine making a node a focus point and then having hundreds!
-      forEach(handlerSequences, (sequence) => {
+      handlerSequences.forEach((sequence) => {
         let action;
 
         const callback = (event, sequence) => {
@@ -130,7 +131,7 @@ const HotKeys = createReactClass({
 
     // Hard reset our handlers (probably could be more efficient)
     mousetrap.reset();
-    forEach(sequenceHandlers, (handler) =>
+    sequenceHandlers.forEach((handler) =>
       mousetrap.bind(handler.sequence, handler.callback, handler.action));
   },
 

package.json

@@ -20,12 +20,14 @@
     "chai-enzyme": "^1.0.0-beta.0",
     "cheerio": "^1.0.0-0",
     "css-loader": "^0.9.1",
+    "enzyme": "^3.0.0",
     "enzyme-adapter-react-14": "^1.0.3",
     "eslint": "^1.10.3",
     "eslint-plugin-react": "^3.16.1",
     "estraverse": "^4.2.0",
     "jsdom": "^11.3.0",
     "jsdom-global": "^3.0.2",
+    "lodash.random": "^3.2.0",
     "mocha": "^2.4.5",
     "prompt": "^0.2.14",
     "react": "^0.14.0",
@@ -39,8 +41,9 @@
   },
   "dependencies": {
     "create-react-class": "^15.5.2",
-    "enzyme": "^3.0.0",
-    "lodash": "^4.13.1",
+    "lodash.isboolean": "^3.0.3",
+    "lodash.isequal": "^4.5.0",
+    "lodash.isobject": "^3.0.2",
     "mousetrap": "^1.5.2",
     "prop-types": "^15.5.8"
   },

yarn.lock

@@ -2597,6 +2597,18 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
+lodash.isboolean@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
+
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+
+lodash.isobject@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
+
 lodash.isplainobject@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz#9a8238ae16b200432960cd7346512d0123fbf4c5"
@@ -2657,6 +2669,10 @@ lodash.pickby@^4.0.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
 
+lodash.random@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.random/-/lodash.random-3.2.0.tgz#96e24e763333199130d2c9e2fd57f91703cc262d"
+
 lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"