Skip to content

Commit d57b054

Browse files
authored
chore(package): use keyboard-key package (Semantic-Org#2707)
* chore(package): use keyboard-key package * chore(package): use keyboard-key * chore(lint): disable noisable eslint rule
1 parent 94e5684 commit d57b054

File tree

14 files changed

+54
-572
lines changed

14 files changed

+54
-572
lines changed

.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"jsx-quotes": [2, "prefer-single"],
1414
"max-len": [2, 120, 4],
1515
"no-console": 2,
16+
"no-mixed-operators": 0,
1617
"no-multi-spaces": [2, { "ignoreEOLComments": true }],
1718
"no-return-assign": [2, "except-parens"],
1819
"no-underscore-dangle": 0,

docs/app/Components/Sidebar/Sidebar.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import keyboardKey from 'keyboard-key'
12
import _ from 'lodash/fp'
23
import PropTypes from 'prop-types'
34
import React, { Component } from 'react'
@@ -14,7 +15,7 @@ import CarbonAd from 'docs/app/Components/CarbonAd/CarbonAd'
1415
import Logo from 'docs/app/Components/Logo/Logo'
1516
import { typeOrder, parentComponents, repoURL } from 'docs/app/utils'
1617
import pkg from 'package.json'
17-
import { keyboardKey, META } from 'src/lib'
18+
import { META } from 'src/lib'
1819

1920
const getRoute = _meta => `/${_meta.type}s/${_.kebabCase(_meta.name)}`
2021

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"babel-runtime": "^6.25.0",
7474
"classnames": "^2.2.5",
7575
"fbjs": "^0.8.16",
76+
"keyboard-key": "^1.0.1",
7677
"lodash": "^4.17.4",
7778
"prop-types": "^15.5.10"
7879
},

src/addons/Pagination/PaginationItem.js

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1+
import keyboardKey from 'keyboard-key'
12
import _ from 'lodash'
23
import PropTypes from 'prop-types'
34
import { Component } from 'react'
45

5-
import {
6-
createShorthandFactory,
7-
keyboardKey,
8-
META,
9-
} from '../../lib'
6+
import { createShorthandFactory, META } from '../../lib'
107
import MenuItem from '../../collections/Menu/MenuItem'
118

129
/**
@@ -37,14 +34,7 @@ class PaginationItem extends Component {
3734
onKeyDown: PropTypes.func,
3835

3936
/** A pagination should have a type. */
40-
type: PropTypes.oneOf([
41-
'ellipsisItem',
42-
'firstItem',
43-
'prevItem',
44-
'pageItem',
45-
'nextItem',
46-
'lastItem',
47-
]),
37+
type: PropTypes.oneOf(['ellipsisItem', 'firstItem', 'prevItem', 'pageItem', 'nextItem', 'lastItem']),
4838
}
4939

5040
static _meta = {

src/addons/Portal/Portal.js

+10-19
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import keyboardKey from 'keyboard-key'
12
import _ from 'lodash'
23
import PropTypes from 'prop-types'
34
import React, { Children, cloneElement } from 'react'
@@ -8,7 +9,6 @@ import {
89
doesNodeContainClick,
910
eventStack,
1011
isBrowser,
11-
keyboardKey,
1212
makeDebugger,
1313
META,
1414
} from '../../lib'
@@ -134,9 +134,7 @@ class Portal extends Component {
134134
openOnTriggerClick: true,
135135
}
136136

137-
static autoControlledProps = [
138-
'open',
139-
]
137+
static autoControlledProps = ['open']
140138

141139
static _meta = {
142140
name: 'Portal',
@@ -179,11 +177,11 @@ class Portal extends Component {
179177
const { closeOnDocumentClick, closeOnRootNodeClick } = this.props
180178

181179
if (
182-
!this.rootNode // not mounted
183-
|| !this.portalNode // no portal
184-
|| doesNodeContainClick(this.triggerNode, e) // event happened in trigger (delegate to trigger handlers)
185-
|| doesNodeContainClick(this.portalNode, e) // event happened in the portal
186-
) return // ignore the click
180+
!this.rootNode || // not mounted
181+
!this.portalNode || // no portal
182+
doesNodeContainClick(this.triggerNode, e) || // event happened in trigger (delegate to trigger handlers)
183+
doesNodeContainClick(this.portalNode, e) // event happened in the portal
184+
) { return } // ignore the click
187185

188186
const didClickInRootNode = doesNodeContainClick(this.rootNode, e)
189187

@@ -359,11 +357,8 @@ class Portal extends Component {
359357
eventStack.unsub('mouseenter', this.handlePortalMouseEnter, { pool: eventPool, target: this.portalNode })
360358
}
361359

362-
ReactDOM.unstable_renderSubtreeIntoContainer(
363-
this,
364-
Children.only(children),
365-
this.rootNode,
366-
() => this.attachRenderSubTreeSubscribers(eventPool),
360+
ReactDOM.unstable_renderSubtreeIntoContainer(this, Children.only(children), this.rootNode, () =>
361+
this.attachRenderSubTreeSubscribers(eventPool),
367362
)
368363
}
369364

@@ -383,11 +378,7 @@ class Portal extends Component {
383378

384379
debug('mountPortal()')
385380

386-
const {
387-
eventPool,
388-
mountNode = isBrowser() ? document.body : null,
389-
prepend,
390-
} = this.props
381+
const { eventPool, mountNode = isBrowser() ? document.body : null, prepend } = this.props
391382

392383
this.rootNode = document.createElement('div')
393384

src/lib/index.js

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export * as META from './META'
3939
export createPaginationItems from './createPaginationItems'
4040
export * as SUI from './SUI'
4141

42-
export { default as keyboardKey } from './keyboardKey'
4342
export { numberToWordMap, numberToWord } from './numberToWord'
4443
export normalizeOffset from './normalizeOffset'
4544
export normalizeTransitionDuration from './normalizeTransitionDuration'

0 commit comments

Comments
 (0)