Skip to content

[EuiSearchBar][FieldValueSelectionFilter] Fix autoClose: false to always be respected regardless of multiSelect #7806

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
cee-chen merged 4 commits into from
Jun 4, 2024
Merged

[EuiSearchBar][FieldValueSelectionFilter] Fix autoClose: false to always be respected regardless of multiSelect #7806

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b4baa0
Respect `autoClose: false` ergardless of `multiSelect`
cee-chen May 31, 2024
908333c
Add tests
cee-chen May 31, 2024
5253902
Update prop docs
cee-chen May 31, 2024
bf4b71c
changelog
cee-chen May 31, 2024
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
38 changes: 20 additions & 18 deletions packages/eui/src/components/search_bar/filters/field_value_selection_filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,35 +252,37 @@ export class FieldValueSelectionFilter extends Component<
) {
const multiSelect = this.resolveMultiSelect();
const {
config: { autoClose = true, operator = Operator.EQ },
config: { autoClose, operator = Operator.EQ },
} = this.props;

// we're closing popover only if the user can only select one item... if the
// user can select more, we'll leave it open so she can continue selecting

if (!multiSelect && autoClose) {
// If the consumer explicitly sets `autoClose`, always defer to that.
// Otherwise, default to auto-closing for single selections and leaving the
// popover open for multi-select (so users can continue selecting options)
const shouldClosePopover = autoClose ?? !multiSelect;
Comment thread
mgadewoll marked this conversation as resolved.
if (shouldClosePopover) {
this.closePopover();
}

if (!multiSelect) {
const query = checked
? this.props.query
.removeSimpleFieldClauses(field)
.addSimpleFieldValue(field, value, true, operator)
: this.props.query.removeSimpleFieldClauses(field);

this.props.onChange(query);
} else if (multiSelect === 'or') {
const query = checked
? this.props.query.addOrFieldValue(field, value, true, operator)
: this.props.query.removeOrFieldValue(field, value);

this.props.onChange(query);
} else {
if (multiSelect === 'or') {
const query = checked
? this.props.query.addOrFieldValue(field, value, true, operator)
: this.props.query.removeOrFieldValue(field, value);

this.props.onChange(query);
} else {
const query = checked
? this.props.query.addSimpleFieldValue(field, value, true, operator)
: this.props.query.removeSimpleFieldValue(field, value);

this.props.onChange(query);
}
const query = checked
? this.props.query.addSimpleFieldValue(field, value, true, operator)
: this.props.query.removeSimpleFieldValue(field, value);

this.props.onChange(query);
}
}

Expand Down