Skip to content

Commit 82a48b0

Browse files
philiptzoualex-shamshurin
authored andcommitted
Fix re-focusing problem related with usage of Tab (Hacker0x01#885)
1 parent b5d26ae commit 82a48b0

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/datepicker.jsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,23 +258,26 @@ export default class DatePicker extends React.Component {
258258
}
259259

260260
onInputKeyDown = (event) => {
261+
const eventKey = event.key
261262
if (!this.state.open && !this.props.inline) {
262-
this.onInputClick()
263+
if (eventKey !== 'Enter' && eventKey !== 'Escape' && eventKey !== 'Tab') {
264+
this.onInputClick()
265+
}
263266
return
264267
}
265268
const copy = moment(this.state.preSelection)
266-
if (event.key === 'Enter') {
269+
if (eventKey === 'Enter') {
267270
event.preventDefault()
268271
this.handleSelect(copy, event)
269-
} else if (event.key === 'Escape') {
272+
} else if (eventKey === 'Escape') {
270273
event.preventDefault()
271274
this.setOpen(false)
272-
} else if (event.key === 'Tab') {
275+
} else if (eventKey === 'Tab') {
273276
this.setOpen(false)
274277
}
275278
if (!this.props.disabledKeyboardNavigation) {
276279
let newSelection
277-
switch (event.key) {
280+
switch (eventKey) {
278281
case 'ArrowLeft':
279282
event.preventDefault()
280283
newSelection = copy.subtract(1, 'days')

0 commit comments

Comments
 (0)