Skip to content

fix(select): fixed deprecated menu filter styles #9551

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

Merged
merged 1 commit into from
Aug 31, 2023
Merged

fix(select): fixed deprecated menu filter styles #9551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
92 changes: 47 additions & 45 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 @@ -1149,54 +1149,56 @@ class Select extends React.Component<SelectProps & OUIAProps, SelectState> {
if (hasInlineFilter) {
const filterBox = (
<React.Fragment>
<div key="inline-filter" className={css(styles.selectMenuSearch, formStyles.formControl)}>
<input
key="inline-filter-input"
type="search"
onChange={this.onChange}
placeholder={inlineFilterPlaceholderText}
onKeyDown={(event) => {
if (event.key === KeyTypes.ArrowUp) {
this.handleMenuKeys(0, 0, 'up');
event.preventDefault();
} else if (event.key === KeyTypes.ArrowDown) {
this.handleMenuKeys(0, 0, 'down');
event.preventDefault();
} else if (event.key === KeyTypes.ArrowLeft) {
this.handleMenuKeys(0, 0, 'left');
event.preventDefault();
} else if (event.key === KeyTypes.ArrowRight) {
this.handleMenuKeys(0, 0, 'right');
event.preventDefault();
} else if (event.key === KeyTypes.Tab && variant !== SelectVariant.checkbox && this.props.footer) {
// tab to footer or close menu if shift key
if (event.shiftKey) {
this.onToggle(event, false);
} else {
const tabbableItems = findTabbableElements(this.footerRef, SelectFooterTabbableItems);
if (tabbableItems.length > 0) {
tabbableItems[0].focus();
event.stopPropagation();
event.preventDefault();
} else {
this.onToggle(event, false);
}
}
} else if (event.key === KeyTypes.Tab && variant === SelectVariant.checkbox) {
// More modal-like experience for checkboxes
// Let SelectOption handle this
if (event.shiftKey) {
<div key="inline-filter" className={css(styles.selectMenuSearch)}>
<div key="inline-filter" className={css(formStyles.formControl)}>
<input
key="inline-filter-input"
type="search"
onChange={this.onChange}
placeholder={inlineFilterPlaceholderText}
onKeyDown={(event) => {
if (event.key === KeyTypes.ArrowUp) {
this.handleMenuKeys(0, 0, 'up');
} else {
event.preventDefault();
} else if (event.key === KeyTypes.ArrowDown) {
this.handleMenuKeys(0, 0, 'down');
event.preventDefault();
} else if (event.key === KeyTypes.ArrowLeft) {
this.handleMenuKeys(0, 0, 'left');
event.preventDefault();
} else if (event.key === KeyTypes.ArrowRight) {
this.handleMenuKeys(0, 0, 'right');
event.preventDefault();
} else if (event.key === KeyTypes.Tab && variant !== SelectVariant.checkbox && this.props.footer) {
// tab to footer or close menu if shift key
if (event.shiftKey) {
this.onToggle(event, false);
} else {
const tabbableItems = findTabbableElements(this.footerRef, SelectFooterTabbableItems);
if (tabbableItems.length > 0) {
tabbableItems[0].focus();
event.stopPropagation();
event.preventDefault();
} else {
this.onToggle(event, false);
}
}
} else if (event.key === KeyTypes.Tab && variant === SelectVariant.checkbox) {
// More modal-like experience for checkboxes
// Let SelectOption handle this
if (event.shiftKey) {
this.handleMenuKeys(0, 0, 'up');
} else {
this.handleMenuKeys(0, 0, 'down');
}
event.stopPropagation();
event.preventDefault();
}
event.stopPropagation();
event.preventDefault();
}
}}
ref={this.filterRef}
autoComplete={inputAutoComplete}
/>
}}
ref={this.filterRef}
autoComplete={inputAutoComplete}
/>
</div>
</div>
<Divider key="inline-filter-divider" />
</React.Fragment>
Expand Down
14 changes: 9 additions & 5 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 @@ -1220,12 +1220,16 @@ exports[`checkbox select renders expanded with filtering successfully 1`] = `
class="pf-v5-c-form__fieldset"
>
<div
class="pf-v5-c-select__menu-search pf-v5-c-form-control"
class="pf-v5-c-select__menu-search"
>
<input
autocomplete="off"
type="search"
/>
<div
class="pf-v5-c-form-control"
>
<input
autocomplete="off"
type="search"
/>
</div>
</div>
<hr
class="pf-v5-c-divider"
Expand Down