[terra-form-select] Fix Search field value clears out issue

packages/terra-form-select/CHANGELOG.md

@@ -2,12 +2,14 @@
 
 ## Unreleased
 
+* Fixed
+  * Search field value now persists when navigating to another component.
+
 ## 6.62.1 - (May 13, 2024)
 
 * Fixed
   * Fixed a "prop not recognized" console error.
 
-
 ## 6.62.0 - (May 8, 2024)
 
 * Added

packages/terra-form-select/src/search/Frame.jsx

@@ -232,10 +232,9 @@ class Frame extends React.Component {
     this.setState({ isFocused: false, focusedByTouch: false });
 
     if (this.state.hasSearchChanged) {
-      this.setState({
-        searchValue: this.props.display,
-        hasSearchChanged: false,
-      });
+      this.setState((prevState) => ({
+        searchValue: prevState.searchValue.trim(),
+      }));
     }
 
     this.closeDropdown();

packages/terra-form-select/tests/wdio/select-spec.js

@@ -1795,6 +1795,33 @@ Terra.describeViewports('Select', ['tiny'], () => {
 
       after(() => $('#root').click());
     });
+
+    describe('should retain input value on fucusing another component', () => {
+      it('retain input and focus using tab key', () => {
+        $('[data-terra-select]').click();
+        const input = $('[data-terra-select-combobox] input');
+        input.setValue('Test');
+
+        // Pressing Tab key twice to focus the body
+        browser.keys('Tab');
+        browser.keys('Tab');
+
+        expect($('body')).toBeFocused();
+        expect(input).toHaveValue('Test');
+      });
+
+      it('should retain input value and focus body when body is clicked', () => {
+        const input = $('[data-terra-select-combobox] input');
+
+        $('[data-terra-select]').click();
+        input.setValue('Test');
+
+        $('body').click();
+
+        expect($('body')).toBeFocused();
+        expect(input).toHaveValue('Test');
+      });
+    });
   });
 
   describe('Search Variant - controlled', () => {