From f319d8fb6ac43b6cab3873c36948c2f3a5473ac0 Mon Sep 17 00:00:00 2001
From: Thom Heymann <thom.heymann@elastic.co>
Date: Mon, 3 Jul 2023 17:24:13 +0100
Subject: [PATCH 1/6] Expose EuiSearchFilters component

---
 src/components/search_bar/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/search_bar/index.ts b/src/components/search_bar/index.ts
index dc304a83a10..303414d2444 100644
--- a/src/components/search_bar/index.ts
+++ b/src/components/search_bar/index.ts
@@ -12,5 +12,6 @@ export type {
   QueryType,
 } from './search_bar';
 export { EuiSearchBar, Query, Ast } from './search_bar';
+export { EuiSearchFilters } from './search_filters';
 export type { SearchFilterConfig } from './search_filters';
 export type { FieldValueOptionType } from './filters/field_value_selection_filter';

From 6c145365bcab8b7371c1d20e8e39f56de4602ee0 Mon Sep 17 00:00:00 2001
From: Thom Heymann <thom.heymann@elastic.co>
Date: Mon, 3 Jul 2023 17:36:24 +0100
Subject: [PATCH 2/6] Fix styling for filter buttons with icon

---
 src/components/filter_group/_filter_group.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/filter_group/_filter_group.scss b/src/components/filter_group/_filter_group.scss
index 22d22a54c6b..54cb4fcf428 100644
--- a/src/components/filter_group/_filter_group.scss
+++ b/src/components/filter_group/_filter_group.scss
@@ -18,10 +18,6 @@
     min-width: $euiSize * 6;
   }
 
-  > .euiFilterButton--hasIcon {
-    min-width: $euiSize * 8;
-  }
-
   // Force popover anchors to expand for now
   .euiPopover__anchor {
     display: block;

From d594861fbc658faccc8ef2cc8b92b5b5e4c74338 Mon Sep 17 00:00:00 2001
From: Cee Chen <constance.chen@elastic.co>
Date: Mon, 3 Jul 2023 10:29:37 -0700
Subject: [PATCH 3/6] Tweak opinionated icon styling to only affect the
 intended dropdown arrow

---
 .../filter_group/__snapshots__/filter_button.test.tsx.snap    | 2 +-
 src/components/filter_group/_filter_button.scss               | 2 +-
 src/components/filter_group/_filter_group.scss                | 4 ++++
 src/components/filter_group/filter_button.tsx                 | 3 ++-
 .../search_bar/__snapshots__/search_bar.test.tsx.snap         | 2 +-
 .../search_bar/__snapshots__/search_filters.test.tsx.snap     | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap b/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
index 795af39c062..0b9154859cf 100644
--- a/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
+++ b/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
@@ -82,7 +82,7 @@ exports[`EuiFilterButton props grow can be turned off 1`] = `
 
 exports[`EuiFilterButton props iconType and iconSide is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiFilterButton euiFilterButton--hasIcon emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
+  class="euiButtonEmpty euiFilterButton emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
   type="button"
 >
   <span
diff --git a/src/components/filter_group/_filter_button.scss b/src/components/filter_group/_filter_button.scss
index 3c1a6d2bdd8..c814719e45b 100644
--- a/src/components/filter_group/_filter_button.scss
+++ b/src/components/filter_group/_filter_button.scss
@@ -31,7 +31,7 @@
   font-weight: $euiFontWeightBold;
 }
 
-.euiFilterButton--hasIcon .euiButtonEmpty__content {
+.euiFilterButton--hasDropdownArrow .euiButtonEmpty__content {
   justify-content: space-between;
 }
 
diff --git a/src/components/filter_group/_filter_group.scss b/src/components/filter_group/_filter_group.scss
index 54cb4fcf428..10f276efc33 100644
--- a/src/components/filter_group/_filter_group.scss
+++ b/src/components/filter_group/_filter_group.scss
@@ -18,6 +18,10 @@
     min-width: $euiSize * 6;
   }
 
+  > .euiFilterButton--hasDropdownArrow {
+    min-width: $euiSize * 8;
+  }
+
   // Force popover anchors to expand for now
   .euiPopover__anchor {
     display: block;
diff --git a/src/components/filter_group/filter_button.tsx b/src/components/filter_group/filter_button.tsx
index fd6ac77d84b..02fe350dcf1 100644
--- a/src/components/filter_group/filter_button.tsx
+++ b/src/components/filter_group/filter_button.tsx
@@ -78,7 +78,8 @@ export const EuiFilterButton: FunctionComponent<EuiFilterButtonProps> = ({
       'euiFilterButton-isSelected': isSelected,
       'euiFilterButton-hasActiveFilters': hasActiveFilters,
       'euiFilterButton-hasNotification': numFiltersDefined,
-      'euiFilterButton--hasIcon': iconType,
+      'euiFilterButton--hasDropdownArrow':
+        iconType === 'arrowDown' && iconSide === 'right',
       'euiFilterButton--noGrow': !grow,
       'euiFilterButton--withNext': withNext,
     },
diff --git a/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap b/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
index b834ed4e297..e0955b15850 100644
--- a/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
+++ b/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
@@ -164,7 +164,7 @@ exports[`SearchBar render - provided query, filters 1`] = `
           class="euiPopover__anchor css-16vtueo-render"
         >
           <button
-            class="euiButtonEmpty euiFilterButton euiFilterButton--hasIcon emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
+            class="euiButtonEmpty euiFilterButton euiFilterButton--hasDropdownArrow emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
             type="button"
           >
             <span
diff --git a/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap b/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
index 6f4c6ef3667..14b1d96a2b6 100644
--- a/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
+++ b/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
@@ -38,7 +38,7 @@ exports[`EuiSearchFilters render - with filters 1`] = `
       class="euiPopover__anchor css-16vtueo-render"
     >
       <button
-        class="euiButtonEmpty euiFilterButton euiFilterButton--hasIcon emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
+        class="euiButtonEmpty euiFilterButton euiFilterButton--hasDropdownArrow emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
         type="button"
       >
         <span

From 8553b76b2f692a71b7df3e07c5dfb792e4e28d19 Mon Sep 17 00:00:00 2001
From: Cee Chen <constance.chen@elastic.co>
Date: Wed, 5 Jul 2023 20:23:45 -0700
Subject: [PATCH 4/6] Revert "Tweak opinionated icon styling to only affect the
 intended dropdown arrow"

This reverts commit d594861fbc658faccc8ef2cc8b92b5b5e4c74338.
---
 .../filter_group/__snapshots__/filter_button.test.tsx.snap    | 2 +-
 src/components/filter_group/_filter_button.scss               | 2 +-
 src/components/filter_group/_filter_group.scss                | 4 ----
 src/components/filter_group/filter_button.tsx                 | 3 +--
 .../search_bar/__snapshots__/search_bar.test.tsx.snap         | 2 +-
 .../search_bar/__snapshots__/search_filters.test.tsx.snap     | 2 +-
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap b/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
index 0b9154859cf..795af39c062 100644
--- a/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
+++ b/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
@@ -82,7 +82,7 @@ exports[`EuiFilterButton props grow can be turned off 1`] = `
 
 exports[`EuiFilterButton props iconType and iconSide is rendered 1`] = `
 <button
-  class="euiButtonEmpty euiFilterButton emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
+  class="euiButtonEmpty euiFilterButton euiFilterButton--hasIcon emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
   type="button"
 >
   <span
diff --git a/src/components/filter_group/_filter_button.scss b/src/components/filter_group/_filter_button.scss
index c814719e45b..3c1a6d2bdd8 100644
--- a/src/components/filter_group/_filter_button.scss
+++ b/src/components/filter_group/_filter_button.scss
@@ -31,7 +31,7 @@
   font-weight: $euiFontWeightBold;
 }
 
-.euiFilterButton--hasDropdownArrow .euiButtonEmpty__content {
+.euiFilterButton--hasIcon .euiButtonEmpty__content {
   justify-content: space-between;
 }
 
diff --git a/src/components/filter_group/_filter_group.scss b/src/components/filter_group/_filter_group.scss
index 10f276efc33..54cb4fcf428 100644
--- a/src/components/filter_group/_filter_group.scss
+++ b/src/components/filter_group/_filter_group.scss
@@ -18,10 +18,6 @@
     min-width: $euiSize * 6;
   }
 
-  > .euiFilterButton--hasDropdownArrow {
-    min-width: $euiSize * 8;
-  }
-
   // Force popover anchors to expand for now
   .euiPopover__anchor {
     display: block;
diff --git a/src/components/filter_group/filter_button.tsx b/src/components/filter_group/filter_button.tsx
index 02fe350dcf1..fd6ac77d84b 100644
--- a/src/components/filter_group/filter_button.tsx
+++ b/src/components/filter_group/filter_button.tsx
@@ -78,8 +78,7 @@ export const EuiFilterButton: FunctionComponent<EuiFilterButtonProps> = ({
       'euiFilterButton-isSelected': isSelected,
       'euiFilterButton-hasActiveFilters': hasActiveFilters,
       'euiFilterButton-hasNotification': numFiltersDefined,
-      'euiFilterButton--hasDropdownArrow':
-        iconType === 'arrowDown' && iconSide === 'right',
+      'euiFilterButton--hasIcon': iconType,
       'euiFilterButton--noGrow': !grow,
       'euiFilterButton--withNext': withNext,
     },
diff --git a/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap b/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
index e0955b15850..b834ed4e297 100644
--- a/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
+++ b/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
@@ -164,7 +164,7 @@ exports[`SearchBar render - provided query, filters 1`] = `
           class="euiPopover__anchor css-16vtueo-render"
         >
           <button
-            class="euiButtonEmpty euiFilterButton euiFilterButton--hasDropdownArrow emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
+            class="euiButtonEmpty euiFilterButton euiFilterButton--hasIcon emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
             type="button"
           >
             <span
diff --git a/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap b/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
index 14b1d96a2b6..6f4c6ef3667 100644
--- a/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
+++ b/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
@@ -38,7 +38,7 @@ exports[`EuiSearchFilters render - with filters 1`] = `
       class="euiPopover__anchor css-16vtueo-render"
     >
       <button
-        class="euiButtonEmpty euiFilterButton euiFilterButton--hasDropdownArrow emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
+        class="euiButtonEmpty euiFilterButton euiFilterButton--hasIcon emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text"
         type="button"
       >
         <span

From d52a4587c9f96077a709b54676c2e278dd4b866a Mon Sep 17 00:00:00 2001
From: Cee Chen <constance.chen@elastic.co>
Date: Wed, 5 Jul 2023 20:32:32 -0700
Subject: [PATCH 5/6] [PR feedback] Namespacing

- to make it clearer that the new export is intended to be a subcomponent of `EuiSearchBar`
---
 .../search_bar/__snapshots__/search_filters.test.tsx.snap | 4 ++--
 src/components/search_bar/index.ts                        | 2 +-
 src/components/search_bar/search_bar.tsx                  | 4 ++--
 src/components/search_bar/search_filters.test.tsx         | 8 ++++----
 src/components/search_bar/search_filters.tsx              | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap b/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
index 6f4c6ef3667..d76d41f8aff 100644
--- a/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
+++ b/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
@@ -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"
 >
diff --git a/src/components/search_bar/index.ts b/src/components/search_bar/index.ts
index 303414d2444..503dab55789 100644
--- a/src/components/search_bar/index.ts
+++ b/src/components/search_bar/index.ts
@@ -12,6 +12,6 @@ export type {
   QueryType,
 } from './search_bar';
 export { EuiSearchBar, Query, Ast } from './search_bar';
-export { EuiSearchFilters } from './search_filters';
+export { EuiSearchBarFilters } from './search_filters';
 export type { SearchFilterConfig } from './search_filters';
 export type { FieldValueOptionType } from './filters/field_value_selection_filter';
diff --git a/src/components/search_bar/search_bar.tsx b/src/components/search_bar/search_bar.tsx
index bab5a1e8d49..a91f60c8b54 100644
--- a/src/components/search_bar/search_bar.tsx
+++ b/src/components/search_bar/search_bar.tsx
@@ -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';
@@ -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}
diff --git a/src/components/search_bar/search_filters.test.tsx b/src/components/search_bar/search_filters.test.tsx
index 2cb1a274f49..b817dc09a87 100644
--- a/src/components/search_bar/search_filters.test.tsx
+++ b/src/components/search_bar/search_filters.test.tsx
@@ -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,
@@ -22,7 +22,7 @@ describe('EuiSearchFilters', () => {
       filters: [],
     };
 
-    const { container } = render(<EuiSearchFilters {...props} />);
+    const { container } = render(<EuiSearchBarFilters {...props} />);
 
     expect(container.firstChild).toMatchSnapshot();
   });
@@ -49,7 +49,7 @@ describe('EuiSearchFilters', () => {
       filters,
     };
 
-    const { container } = render(<EuiSearchFilters {...props} />);
+    const { container } = render(<EuiSearchBarFilters {...props} />);
 
     expect(container.firstChild).toMatchSnapshot();
   });
diff --git a/src/components/search_bar/search_filters.tsx b/src/components/search_bar/search_filters.tsx
index 4b02380b24b..242624379e4 100644
--- a/src/components/search_bar/search_filters.tsx
+++ b/src/components/search_bar/search_filters.tsx
@@ -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: [],
   };

From 6b9dc0bb205705712f625c73eeb9b43716f771db Mon Sep 17 00:00:00 2001
From: Cee Chen <constance.chen@elastic.co>
Date: Wed, 5 Jul 2023 20:35:09 -0700
Subject: [PATCH 6/6] chagnelog

---
 upcoming_changelogs/6900.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 upcoming_changelogs/6900.md

diff --git a/upcoming_changelogs/6900.md b/upcoming_changelogs/6900.md
new file mode 100644
index 00000000000..14619862faa
--- /dev/null
+++ b/upcoming_changelogs/6900.md
@@ -0,0 +1,3 @@
+**Bug fixes**
+
+- Fixed `EuiFilterButton` icon display