Custom placeholder removed

cerner · Oct 31, 2023 · 649218f · 649218f
1 parent b701e56
commit 649218f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/packages/terra-form-select/CHANGELOG.md b/packages/terra-form-select/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+*Fixed
+  *Fixed the `combobox` won't take custom placeholder text and only string `-Select- ` will be shown.
+
 ## 6.49.0 - (October 23, 2023)
 
 * Changed

diff --git a/packages/terra-form-select/src/Combobox.jsx b/packages/terra-form-select/src/Combobox.jsx
@@ -88,10 +88,6 @@ const propTypes = {
    * Callback function invoked for each option on search change. function(searchValue, option)
    */
   optionFilter: PropTypes.func,
-  /**
-   * Placeholder text.
-   */
-  placeholder: PropTypes.string,
   /**
    * Whether the field is required.
    */
@@ -122,7 +118,6 @@ const defaultProps = {
   onSearch: undefined,
   onSelect: undefined,
   optionFilter: undefined,
-  placeholder: undefined,
   required: false,
   value: undefined,
   inputId: undefined,
@@ -200,20 +195,10 @@ class Combobox extends React.Component {
 
   render() {
     const {
-      allowClear, children, defaultValue, onChange, placeholder, required, value, intl, inputId, ...otherProps
+      allowClear, children, defaultValue, onChange, required, value, intl, inputId, ...otherProps
     } = this.props;
 
     const defaultPlaceholder = intl.formatMessage({ id: 'Terra.form.select.defaultDisplay' });
-    const selectPlaceholder = placeholder === undefined ? defaultPlaceholder : placeholder;
-    let clearOptionDisplay;
-
-    if (allowClear) {
-      if (selectPlaceholder.length === 0) {
-        clearOptionDisplay = defaultPlaceholder;
-      } else {
-        clearOptionDisplay = selectPlaceholder;
-      }
-    }
 
     return (
       <Frame
@@ -223,10 +208,10 @@ class Combobox extends React.Component {
         display={this.display()}
         onDeselect={this.handleDeselect}
         onSelect={this.handleSelect}
-        placeholder={selectPlaceholder}
+        placeholder={defaultPlaceholder}
         required={required}
         totalOptions={SelectUtil.getTotalNumberOfOptions(children)}
-        clearOptionDisplay={clearOptionDisplay}
+        clearOptionDisplay={defaultPlaceholder}
         inputId={inputId}
       >
         {this.state.tags}