From 5f4afe126039e4c2005eb050fefecddb3f983743 Mon Sep 17 00:00:00 2001 From: Ben Biggs Date: Wed, 29 Jul 2020 11:39:58 -0500 Subject: [PATCH] fix(popover): remove universal overwrite of anchor onKeyDown --- react/src/lib/Popover/index.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/react/src/lib/Popover/index.js b/react/src/lib/Popover/index.js index 163b08f0b2..c82c4f8bc8 100644 --- a/react/src/lib/Popover/index.js +++ b/react/src/lib/Popover/index.js @@ -21,7 +21,11 @@ class Popover extends React.Component { const { isOpen } = this.state; const { autoFocusOnFirstElt } = this.props; - if (autoFocusOnFirstElt && isOpen && !prevState.isOpen && this.overlay) { + if (autoFocusOnFirstElt + && isOpen + && !prevState.isOpen + && this.overlay + ) { const eventOverlay = ReactDOM.findDOMNode(this.overlay); if (eventOverlay) { @@ -277,7 +281,10 @@ class Popover extends React.Component { triggerProps.onFocus = includeFocusOnHover ? this.handleFocus : undefined; triggerProps.onBlur = includeFocusOnHover ? this.handleBlur : undefined; - triggerProps.onKeyDown = includeFocusOnHover ? undefined : this.handleKeyDownTrigger; + if(!includeFocusOnHover) { + triggerProps.onKeyDown = this.handleKeyDownTrigger; + } + break; case 'Click':