From bf61a9ced91089cce93b288e063a0eebfabf4d0c Mon Sep 17 00:00:00 2001
From: Abbey Hart <abbeyhrt@gmail.com>
Date: Thu, 3 Oct 2019 12:17:39 -0500
Subject: [PATCH] fix(ComboBox): removes all DAP violations

---
 packages/react/src/components/ComboBox/ComboBox-story.js | 2 +-
 packages/react/src/components/ComboBox/ComboBox.js       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/react/src/components/ComboBox/ComboBox-story.js b/packages/react/src/components/ComboBox/ComboBox-story.js
index a32aff37356f..f6f95713cee4 100644
--- a/packages/react/src/components/ComboBox/ComboBox-story.js
+++ b/packages/react/src/components/ComboBox/ComboBox-story.js
@@ -54,7 +54,7 @@ const itemToElement = item => {
   return (
     <div>
       <span>{itemAsArray[0]}</span>
-      <span style={{ color: 'red' }}> {itemAsArray[1]}</span>
+      <span style={{ color: 'blue' }}> {itemAsArray[1]}</span>
     </div>
   );
 };
diff --git a/packages/react/src/components/ComboBox/ComboBox.js b/packages/react/src/components/ComboBox/ComboBox.js
index 316279a041ad..54e386980dfc 100644
--- a/packages/react/src/components/ComboBox/ComboBox.js
+++ b/packages/react/src/components/ComboBox/ComboBox.js
@@ -320,8 +320,8 @@ export default class ComboBox extends React.Component {
                 aria-labelledby={comboBoxA11yId}
                 tabIndex="0"
                 aria-disabled={disabled}
-                aria-controls={`${id}__menu`}
-                aria-owns={`${id}__menu`}
+                aria-controls={isOpen ? `${id}__menu` : null}
+                aria-owns={isOpen ? `${id}__menu` : null}
                 aria-autocomplete="list"
                 ref={this.textInput}
                 {...rest}