From e4ad5562302c5f11662953fcd11c1666ec13156d Mon Sep 17 00:00:00 2001
From: Adam Archibald <adam.archibald@shopify.com>
Date: Wed, 6 Mar 2019 12:22:13 -0500
Subject: [PATCH] Remove tabIndex prop from ComboBox

---
 UNRELEASED.md                                                | 1 +
 src/components/Autocomplete/components/ComboBox/ComboBox.tsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/UNRELEASED.md b/UNRELEASED.md
index c5395159e5d..da1c1495ed4 100644
--- a/UNRELEASED.md
+++ b/UNRELEASED.md
@@ -17,6 +17,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f
 ### Bug fixes
 
 - Fixed `Popover` fade-in flutter on iOS by switching Transition component for CSSTransition [#1400](https://github.com/Shopify/polaris-react/pull/1400)
+- Removed `tabIndex={0}` prop from `ComboBox` to allow proper tab key navigation of `Autocomplete` ([#1089](https://github.com/Shopify/polaris-react/issues/1089))
 
 ### Documentation
 
diff --git a/src/components/Autocomplete/components/ComboBox/ComboBox.tsx b/src/components/Autocomplete/components/ComboBox/ComboBox.tsx
index 791b081ab06..9214a6177c6 100644
--- a/src/components/Autocomplete/components/ComboBox/ComboBox.tsx
+++ b/src/components/Autocomplete/components/ComboBox/ComboBox.tsx
@@ -236,6 +236,7 @@ export default class ComboBox extends React.PureComponent<Props, State> {
       emptyState && <div className={styles.EmptyState}>{emptyState}</div>;
 
     return (
+      /*  eslint-disable-next-line jsx-a11y/interactive-supports-focus */
       <div
         onClick={this.handleClick}
         role="combobox"
@@ -245,7 +246,6 @@ export default class ComboBox extends React.PureComponent<Props, State> {
         aria-haspopup
         onFocus={this.handleFocus}
         onBlur={this.handleBlur}
-        tabIndex={0}
       >
         <KeypressListener
           keyCode={Key.DownArrow}