diff --git a/packages/terra-form-select/src/search/Frame.jsx b/packages/terra-form-select/src/search/Frame.jsx index cc0c05ff339..875f8604f5a 100644 --- a/packages/terra-form-select/src/search/Frame.jsx +++ b/packages/terra-form-select/src/search/Frame.jsx @@ -231,6 +231,12 @@ class Frame extends React.Component { this.setState({ isFocused: false, focusedByTouch: false }); + if (this.state.hasSearchChanged) { + this.setState({ + searchValue: this.state.searchValue.trim(), + }); + } + this.closeDropdown(); if (this.props.onBlur) { diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png index ff03ad2afdf..f616e3633b8 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png index ff03ad2afdf..f616e3633b8 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png index 676c48bd226..00c6db301c1 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png index 4fb39f540e7..d40c6c58e6a 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png index fd161678d8f..1cc0faa5797 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png index 19661147640..7b19a93e3ba 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png index 476b1c24e07..a332a9a1dcd 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png index 476b1c24e07..a332a9a1dcd 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png index 70876cf76cc..71b53293cb0 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png index ba0618712f3..c0263e3c443 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png index 0ca7aa8aef5..c0263e3c443 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png index 0ca7aa8aef5..c0263e3c443 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png index 092eb9bd07d..f0b88b1c96c 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_close_on_outside_click_after_toggle_open.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png index 092eb9bd07d..f0b88b1c96c 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_closes_dropdown_after_clicking_off.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png index 4db5037f404..c0231a2a5b1 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_does_not_open_on_enter.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png index aad7cdd3b96..befe7158132 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_open_dropdown_by_down_arrow.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png index a39d327212e..befe7158132 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_opened-dropdown.png differ diff --git a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png index a39d327212e..befe7158132 100644 Binary files a/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png and b/packages/terra-form-select/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_tiny/select-spec/search_toggle-opened-dropdown.png differ diff --git a/packages/terra-form-select/tests/wdio/select-spec.js b/packages/terra-form-select/tests/wdio/select-spec.js index 0f665b41628..530e5ed5648 100644 --- a/packages/terra-form-select/tests/wdio/select-spec.js +++ b/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', () => {