Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(SelectDeprecated): use textinput component for typeahead #9317

Merged
merged 3 commits into from
Jul 6, 2023
Merged

fix(SelectDeprecated): use textinput component for typeahead #9317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
112bc3b
fix(SelectDeprecated): use textinput component for typeahead
gitdallas Jun 28, 2023
8284c5f
remove commented out code
gitdallas Jun 28, 2023
41ba2e6
remove duplicate form control class
gitdallas Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions packages/react-core/src/deprecated/components/Select/Select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { Popper } from '../../../helpers/Popper/Popper';
import { createRenderableFavorites, extendItemsWithFavorite } from '../../../helpers/favorites';
import { ValidatedOptions } from '../../../helpers/constants';
import { findTabbableElements } from '../../../helpers/util';
import { TextInput } from '../../../components/TextInput';

// seed for the aria-labelledby ID
let currentId = 0;
Expand Down Expand Up @@ -1381,8 +1382,8 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
<React.Fragment>
<div className={css(styles.selectToggleWrapper)}>
{toggleIcon && <span className={css(styles.selectToggleIcon)}>{toggleIcon}</span>}
<div className={css(formStyles.formControl, styles.selectToggleTypeahead)}>
<input
<TextInput
className={css(styles.selectToggleTypeahead)}
aria-activedescendant={typeaheadActiveChild && typeaheadActiveChild.id}
id={`${selectToggleId}-select-typeahead`}
aria-label={typeAheadAriaLabel}
Expand All @@ -1393,14 +1394,12 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
? typeaheadInputValue
: this.getDisplay(selections[0] as string, 'text') || ''
}
type="text"
onChange={(event) => this.onChange(event as React.ChangeEvent<HTMLInputElement>)}
onClick={this.onClick}
onChange={this.onChange}
autoComplete={inputAutoComplete}
disabled={isDisabled}
isDisabled={isDisabled}
ref={this.inputRef}
/>
</div>
/>
</div>
{hasOnClear && (selections[0] || typeaheadInputValue) && clearBtn}
</React.Fragment>
Expand All @@ -1410,23 +1409,21 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
<div className={css(styles.selectToggleWrapper)}>
{toggleIcon && <span className={css(styles.selectToggleIcon)}>{toggleIcon}</span>}
{selections && Array.isArray(selections) && selections.length > 0 && selectedChips}
<div className={css(formStyles.formControl, styles.selectToggleTypeahead)}>
<input
<TextInput
className={css(styles.selectToggleTypeahead)}
aria-activedescendant={typeaheadActiveChild && typeaheadActiveChild.id}
id={`${selectToggleId}-select-multi-typeahead-typeahead`}
aria-label={typeAheadAriaLabel}
aria-invalid={validated === ValidatedOptions.error}
{...(typeAheadAriaDescribedby && { 'aria-describedby': typeAheadAriaDescribedby })}
placeholder={placeholderText as string}
value={typeaheadInputValue !== null ? typeaheadInputValue : ''}
type="text"
onChange={this.onChange}
onChange={(event) => this.onChange(event as React.ChangeEvent<HTMLInputElement>)}
onClick={this.onClick}
autoComplete={inputAutoComplete}
disabled={isDisabled}
isDisabled={isDisabled}
ref={this.inputRef}
/>
</div>
/>
</div>
{hasOnClear && ((selections && selections.length > 0) || typeaheadInputValue) && clearBtn}
</React.Fragment>
Expand Down
21 changes: 21 additions & 0 deletions .../react-core/src/deprecated/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1673,6 +1673,9 @@ exports[`typeahead multi select renders closed successfully 1`] = `
aria-invalid="false"
aria-label=""
autocomplete="off"
data-ouia-component-id="OUIA-Generated-TextInputBase-6"
data-ouia-component-type="PF5/TextInput"
data-ouia-safe="true"
id="typeahead-multi-select-closed-select-multi-typeahead-typeahead"
placeholder=""
type="text"
Expand Down Expand Up @@ -1730,6 +1733,9 @@ exports[`typeahead multi select renders expanded successfully 1`] = `
aria-invalid="false"
aria-label=""
autocomplete="off"
data-ouia-component-id="OUIA-Generated-TextInputBase-7"
data-ouia-component-type="PF5/TextInput"
data-ouia-safe="true"
id="pf-select-toggle-id-19-select-multi-typeahead-typeahead"
placeholder=""
type="text"
Expand Down Expand Up @@ -1963,6 +1969,9 @@ exports[`typeahead multi select renders selected successfully 1`] = `
aria-invalid="false"
aria-label=""
autocomplete="off"
data-ouia-component-id="OUIA-Generated-TextInputBase-8"
data-ouia-component-type="PF5/TextInput"
data-ouia-safe="true"
id="typeahead-multi-select-selected-select-multi-typeahead-typeahead"
placeholder=""
type="text"
Expand Down Expand Up @@ -2111,8 +2120,12 @@ exports[`typeahead select renders closed successfully 1`] = `
class="pf-v5-c-form-control pf-v5-c-select__toggle-typeahead"
>
<input
aria-invalid="false"
aria-label=""
autocomplete="off"
data-ouia-component-id="OUIA-Generated-TextInputBase-2"
data-ouia-component-type="PF5/TextInput"
data-ouia-safe="true"
id="typeahead-select-closed-select-typeahead"
placeholder=""
type="text"
Expand Down Expand Up @@ -2167,8 +2180,12 @@ exports[`typeahead select renders expanded successfully 1`] = `
class="pf-v5-c-form-control pf-v5-c-select__toggle-typeahead"
>
<input
aria-invalid="false"
aria-label=""
autocomplete="off"
data-ouia-component-id="OUIA-Generated-TextInputBase-3"
data-ouia-component-type="PF5/TextInput"
data-ouia-safe="true"
id="pf-select-toggle-id-9-select-typeahead"
placeholder=""
type="text"
Expand Down Expand Up @@ -2281,8 +2298,12 @@ exports[`typeahead select renders selected successfully 1`] = `
class="pf-v5-c-form-control pf-v5-c-select__toggle-typeahead"
>
<input
aria-invalid="false"
aria-label=""
autocomplete="off"
data-ouia-component-id="OUIA-Generated-TextInputBase-4"
data-ouia-component-type="PF5/TextInput"
data-ouia-safe="true"
id="pf-select-toggle-id-10-select-typeahead"
placeholder=""
type="text"
Expand Down
Loading