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.

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

[EuiSearchBar] Export EuiSearchBarFilters; [EuiFilterButton] Fix icon display #6900

Merged
merged 6 commits into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions src/components/filter_group/_filter_group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
min-width: $euiSize * 6;
}

> .euiFilterButton--hasIcon {
min-width: $euiSize * 8;
}

cee-chen marked this conversation as resolved.
Show resolved Hide resolved
// Force popover anchors to expand for now
.euiPopover__anchor {
display: block;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`EuiSearchFilters render - no filters 1`] = `
exports[`EuiSearchBarFilters render - no filters 1`] = `
<div
class="euiFilterGroup"
/>
`;

exports[`EuiSearchFilters render - with filters 1`] = `
exports[`EuiSearchBarFilters render - with filters 1`] = `
<div
class="euiFilterGroup"
>
Expand Down
1 change: 1 addition & 0 deletions src/components/search_bar/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ export type {
QueryType,
} from './search_bar';
export { EuiSearchBar, Query, Ast } from './search_bar';
export { EuiSearchBarFilters } from './search_filters';
export type { SearchFilterConfig } from './search_filters';
export type { FieldValueOptionType } from './filters/field_value_selection_filter';
4 changes: 2 additions & 2 deletions src/components/search_bar/search_bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { htmlIdGenerator } from '../../services/accessibility';
import { isString } from '../../services/predicate';
import { EuiFlexGroup, EuiFlexItem } from '../flex';
import { EuiSearchBox, SchemaType } from './search_box';
import { EuiSearchFilters, SearchFilterConfig } from './search_filters';
import { EuiSearchBarFilters, SearchFilterConfig } from './search_filters';
import { Query } from './query';
import { CommonProps } from '../common';
import { EuiFieldSearchProps } from '../form/field_search';
Expand Down Expand Up @@ -255,7 +255,7 @@ export class EuiSearchBar extends Component<EuiSearchBarProps, State> {

const filtersBar = !filters ? undefined : (
<EuiFlexItem className="euiSearchBar__filtersHolder" grow={false}>
<EuiSearchFilters
<EuiSearchBarFilters
filters={filters}
query={query}
onChange={this.onFiltersChange}
Expand Down
8 changes: 4 additions & 4 deletions src/components/search_bar/search_filters.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import React from 'react';
import { render } from '../../test/rtl';
import { requiredProps } from '../../test';

import { EuiSearchFilters, SearchFilterConfig } from './search_filters';
import { EuiSearchBarFilters, SearchFilterConfig } from './search_filters';
import { Query } from './query';

describe('EuiSearchFilters', () => {
describe('EuiSearchBarFilters', () => {
test('render - no filters', () => {
const props = {
...requiredProps,
Expand All @@ -22,7 +22,7 @@ describe('EuiSearchFilters', () => {
filters: [],
};

const { container } = render(<EuiSearchFilters {...props} />);
const { container } = render(<EuiSearchBarFilters {...props} />);

expect(container.firstChild).toMatchSnapshot();
});
Expand All @@ -49,7 +49,7 @@ describe('EuiSearchFilters', () => {
filters,
};

const { container } = render(<EuiSearchFilters {...props} />);
const { container } = render(<EuiSearchBarFilters {...props} />);

expect(container.firstChild).toMatchSnapshot();
});
Expand Down
6 changes: 3 additions & 3 deletions src/components/search_bar/search_filters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import { EuiFilterGroup } from '../filter_group';

export type { SearchFilterConfig } from './filters';

interface EuiSearchFiltersProps {
interface EuiSearchBarFiltersProps {
query: Query;
onChange: (query: Query) => void;
filters: SearchFilterConfig[];
}

type DefaultProps = Pick<EuiSearchFiltersProps, 'filters'>;
type DefaultProps = Pick<EuiSearchBarFiltersProps, 'filters'>;

export class EuiSearchFilters extends Component<EuiSearchFiltersProps> {
export class EuiSearchBarFilters extends Component<EuiSearchBarFiltersProps> {
static defaultProps: DefaultProps = {
filters: [],
};
Expand Down
3 changes: 3 additions & 0 deletions upcoming_changelogs/6900.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**Bug fixes**

- Fixed `EuiFilterButton` icon display