From 4346f810a98dadc861b9562c79b678c8f9349a28 Mon Sep 17 00:00:00 2001
From: TJ Egan <tw15egan@gmail.com>
Date: Tue, 12 May 2020 10:30:31 -0700
Subject: [PATCH] fix(helper-text): update PR after downshift updates

---
 packages/react/src/components/ComboBox/ComboBox.js     | 10 +++++-----
 packages/react/src/components/Dropdown/Dropdown.js     |  2 +-
 .../react/src/components/MultiSelect/MultiSelect.js    | 10 +++++-----
 packages/react/src/components/TextInput/TextInput.js   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/react/src/components/ComboBox/ComboBox.js b/packages/react/src/components/ComboBox/ComboBox.js
index eca975a783d4..0ba127249819 100644
--- a/packages/react/src/components/ComboBox/ComboBox.js
+++ b/packages/react/src/components/ComboBox/ComboBox.js
@@ -338,11 +338,6 @@ export default class ComboBox extends React.Component {
                 {titleText}
               </label>
             )}
-            {helperText && (
-              <div id={comboBoxHelperId} className={helperClasses}>
-                {helperText}
-              </div>
-            )}
             <ListBox
               className={className}
               disabled={disabled}
@@ -431,6 +426,11 @@ export default class ComboBox extends React.Component {
                 </ListBox.Menu>
               )}
             </ListBox>
+            {helperText && !invalid && (
+              <div id={comboBoxHelperId} className={helperClasses}>
+                {helperText}
+              </div>
+            )}
           </div>
         )}
       </Downshift>
diff --git a/packages/react/src/components/Dropdown/Dropdown.js b/packages/react/src/components/Dropdown/Dropdown.js
index 4edc58df3bc2..181cd83aeea2 100644
--- a/packages/react/src/components/Dropdown/Dropdown.js
+++ b/packages/react/src/components/Dropdown/Dropdown.js
@@ -118,7 +118,6 @@ function Dropdown({
           {titleText}
         </label>
       )}
-      {!inline && helper}
       <ListBox
         aria-label={ariaLabel}
         size={size}
@@ -169,6 +168,7 @@ function Dropdown({
             })}
         </ListBox.Menu>
       </ListBox>
+      {!inline && !invalid && helper}
     </div>
   );
 }
diff --git a/packages/react/src/components/MultiSelect/MultiSelect.js b/packages/react/src/components/MultiSelect/MultiSelect.js
index ea9d1932da0b..7e915e8bf893 100644
--- a/packages/react/src/components/MultiSelect/MultiSelect.js
+++ b/packages/react/src/components/MultiSelect/MultiSelect.js
@@ -176,11 +176,6 @@ function MultiSelect({
           {titleText}
         </label>
       )}
-      {!inline && helperText && (
-        <div id={helperId} className={helperClasses}>
-          {helperText}
-        </div>
-      )}
       <ListBox
         id={id}
         type={type}
@@ -245,6 +240,11 @@ function MultiSelect({
             })}
         </ListBox.Menu>
       </ListBox>
+      {!inline && !invalid && helperText && (
+        <div id={helperId} className={helperClasses}>
+          {helperText}
+        </div>
+      )}
     </div>
   );
 }
diff --git a/packages/react/src/components/TextInput/TextInput.js b/packages/react/src/components/TextInput/TextInput.js
index 9fca7079da3e..b842d3d94caa 100644
--- a/packages/react/src/components/TextInput/TextInput.js
+++ b/packages/react/src/components/TextInput/TextInput.js
@@ -96,7 +96,6 @@ const TextInput = React.forwardRef(function TextInput(
   return (
     <div className={inputWrapperClasses}>
       {label}
-      {helper}
       <div
         className={`${prefix}--text-input__field-wrapper`}
         data-invalid={invalid || null}>
@@ -109,6 +108,7 @@ const TextInput = React.forwardRef(function TextInput(
         {isFluid ? error : null}
       </div>
       {isFluid ? null : error}
+      {!invalid && !isFluid && helper}
     </div>
   );
 });