chore(package): use keyboard-key package (#2707)

* chore(package): use keyboard-key package * chore(package): use keyboard-key * chore(lint): disable noisable eslint rule
Semantic-Org · Apr 30, 2018 · d57b054 · d57b054
1 parent 94e5684
commit d57b054
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 572 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -13,6 +13,7 @@
     "jsx-quotes": [2, "prefer-single"],
     "max-len": [2, 120, 4],
     "no-console": 2,
+    "no-mixed-operators": 0,
     "no-multi-spaces": [2, { "ignoreEOLComments": true }],
     "no-return-assign": [2, "except-parens"],
     "no-underscore-dangle": 0,

diff --git a/docs/app/Components/Sidebar/Sidebar.js b/docs/app/Components/Sidebar/Sidebar.js
@@ -1,3 +1,4 @@
+import keyboardKey from 'keyboard-key'
 import _ from 'lodash/fp'
 import PropTypes from 'prop-types'
 import React, { Component } from 'react'
@@ -14,7 +15,7 @@ import CarbonAd from 'docs/app/Components/CarbonAd/CarbonAd'
 import Logo from 'docs/app/Components/Logo/Logo'
 import { typeOrder, parentComponents, repoURL } from 'docs/app/utils'
 import pkg from 'package.json'
-import { keyboardKey, META } from 'src/lib'
+import { META } from 'src/lib'
 
 const getRoute = _meta => `/${_meta.type}s/${_.kebabCase(_meta.name)}`
 

diff --git a/package.json b/package.json
@@ -73,6 +73,7 @@
     "babel-runtime": "^6.25.0",
     "classnames": "^2.2.5",
     "fbjs": "^0.8.16",
+    "keyboard-key": "^1.0.1",
     "lodash": "^4.17.4",
     "prop-types": "^15.5.10"
   },

diff --git a/src/addons/Pagination/PaginationItem.js b/src/addons/Pagination/PaginationItem.js
@@ -1,12 +1,9 @@
+import keyboardKey from 'keyboard-key'
 import _ from 'lodash'
 import PropTypes from 'prop-types'
 import { Component } from 'react'
 
-import {
-  createShorthandFactory,
-  keyboardKey,
-  META,
-} from '../../lib'
+import { createShorthandFactory, META } from '../../lib'
 import MenuItem from '../../collections/Menu/MenuItem'
 
 /**
@@ -37,14 +34,7 @@ class PaginationItem extends Component {
     onKeyDown: PropTypes.func,
 
     /** A pagination should have a type. */
-    type: PropTypes.oneOf([
-      'ellipsisItem',
-      'firstItem',
-      'prevItem',
-      'pageItem',
-      'nextItem',
-      'lastItem',
-    ]),
+    type: PropTypes.oneOf(['ellipsisItem', 'firstItem', 'prevItem', 'pageItem', 'nextItem', 'lastItem']),
   }
 
   static _meta = {

diff --git a/src/addons/Portal/Portal.js b/src/addons/Portal/Portal.js
@@ -1,3 +1,4 @@
+import keyboardKey from 'keyboard-key'
 import _ from 'lodash'
 import PropTypes from 'prop-types'
 import React, { Children, cloneElement } from 'react'
@@ -8,7 +9,6 @@ import {
   doesNodeContainClick,
   eventStack,
   isBrowser,
-  keyboardKey,
   makeDebugger,
   META,
 } from '../../lib'
@@ -134,9 +134,7 @@ class Portal extends Component {
     openOnTriggerClick: true,
   }
 
-  static autoControlledProps = [
-    'open',
-  ]
+  static autoControlledProps = ['open']
 
   static _meta = {
     name: 'Portal',
@@ -179,11 +177,11 @@ class Portal extends Component {
     const { closeOnDocumentClick, closeOnRootNodeClick } = this.props
 
     if (
-      !this.rootNode                                      // not mounted
-      || !this.portalNode                                 // no portal
-      || doesNodeContainClick(this.triggerNode, e)        // event happened in trigger (delegate to trigger handlers)
-      || doesNodeContainClick(this.portalNode, e)         // event happened in the portal
-    ) return                                              // ignore the click
+      !this.rootNode || // not mounted
+      !this.portalNode || // no portal
+      doesNodeContainClick(this.triggerNode, e) || // event happened in trigger (delegate to trigger handlers)
+      doesNodeContainClick(this.portalNode, e) // event happened in the portal
+    ) { return } // ignore the click
 
     const didClickInRootNode = doesNodeContainClick(this.rootNode, e)
 
@@ -359,11 +357,8 @@ class Portal extends Component {
       eventStack.unsub('mouseenter', this.handlePortalMouseEnter, { pool: eventPool, target: this.portalNode })
     }
 
-    ReactDOM.unstable_renderSubtreeIntoContainer(
-      this,
-      Children.only(children),
-      this.rootNode,
-      () => this.attachRenderSubTreeSubscribers(eventPool),
+    ReactDOM.unstable_renderSubtreeIntoContainer(this, Children.only(children), this.rootNode, () =>
+      this.attachRenderSubTreeSubscribers(eventPool),
     )
   }
 
@@ -383,11 +378,7 @@ class Portal extends Component {
 
     debug('mountPortal()')
 
-    const {
-      eventPool,
-      mountNode = isBrowser() ? document.body : null,
-      prepend,
-    } = this.props
+    const { eventPool, mountNode = isBrowser() ? document.body : null, prepend } = this.props
 
     this.rootNode = document.createElement('div')
 

diff --git a/src/lib/index.js b/src/lib/index.js
@@ -39,7 +39,6 @@ export * as META from './META'
 export createPaginationItems from './createPaginationItems'
 export * as SUI from './SUI'
 
-export { default as keyboardKey } from './keyboardKey'
 export { numberToWordMap, numberToWord } from './numberToWord'
 export normalizeOffset from './normalizeOffset'
 export normalizeTransitionDuration from './normalizeTransitionDuration'