fix(Dropdown): handle on enter focusing when options are disabled (#2025

)
patternfly · May 17, 2019 · 8903702 · 8903702
1 parent a25c4bf
commit 8903702
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/DropdownMenu.js b/packages/patternfly-4/react-core/src/components/Dropdown/DropdownMenu.js
@@ -39,10 +39,14 @@ class DropdownMenu extends React.Component {
 
   componentDidMount() {
     if (this.props.openedOnEnter) {
-      if (this.props.component === 'ul') this.refsCollection[0].focus();
+      const focusTarget =
+        this.refsCollection.filter(
+          ref => ref && ((ref.current && !ref.current.hasAttribute('disabled')) || !ref.hasAttribute('disabled'))
+        )[0] || null;
+      if (this.props.component === 'ul') focusTarget && focusTarget.focus();
       else {
-        (this.refsCollection[0].current.focus && this.refsCollection[0].current.focus()) ||
-          ReactDOM.findDOMNode(this.refsCollection[0].current).focus();
+        (focusTarget.current.focus && focusTarget.current.focus()) ||
+          (focusTarget && ReactDOM.findDOMNode(focusTarget.current).focus());
       }
     }
   }