feat(helper-text): remove helper text when invalid

carbon-design-system · Apr 15, 2020 · cecc972 · cecc972
1 parent db2a3df
commit cecc972
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/packages/react/src/components/ComboBox/ComboBox.js b/packages/react/src/components/ComboBox/ComboBox.js
@@ -446,7 +446,7 @@ export default class ComboBox extends React.Component {
       <div className={wrapperClasses}>
         {title}
         {input}
-        {helper}
+        {invalid ? null : helper}
       </div>
     );
   }

diff --git a/packages/react/src/components/Dropdown/Dropdown.js b/packages/react/src/components/Dropdown/Dropdown.js
@@ -330,7 +330,7 @@ export default class Dropdown extends React.Component {
             );
           }}
         </Downshift>
-        {!inline && helper}
+        {!inline && !invalid ? helper : null}
       </div>
     );
   }

diff --git a/packages/react/src/components/MultiSelect/FilterableMultiSelect.js b/packages/react/src/components/MultiSelect/FilterableMultiSelect.js
@@ -461,7 +461,7 @@ export default class FilterableMultiSelect extends React.Component {
       <div className={wrapperClasses}>
         {title}
         {input}
-        {!inline && helper}
+        {!inline && !invalid ? helper : null}
       </div>
     );
   }

diff --git a/packages/react/src/components/MultiSelect/MultiSelect.js b/packages/react/src/components/MultiSelect/MultiSelect.js
@@ -422,7 +422,7 @@ export default class MultiSelect extends React.Component {
       <div className={wrapperClasses}>
         {title}
         {input}
-        {!inline && helper}
+        {!inline && !invalid ? helper : null}
       </div>
     );
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -446,7 +446,7 @@ export default class ComboBox extends React.Component { @@
           <div className={wrapperClasses}>
             {title}
             {input}
-            {helper}
+            {invalid ? null : helper}
           </div>
         );
       }
@@ Expand Down @@