From fd675282a15f9b4eacfc9276e3b690ea93262a9a Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Wed, 15 Jun 2022 15:12:46 -0500
Subject: [PATCH 1/5] props table workaround

---
 src-docs/src/views/accordion/accordion_example.js | 3 ++-
 src-docs/src/views/accordion/accordion_props.tsx  | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 src-docs/src/views/accordion/accordion_props.tsx

diff --git a/src-docs/src/views/accordion/accordion_example.js b/src-docs/src/views/accordion/accordion_example.js
index ff28c277b0a..c0fcb0e09a4 100644
--- a/src-docs/src/views/accordion/accordion_example.js
+++ b/src-docs/src/views/accordion/accordion_example.js
@@ -3,7 +3,8 @@ import { Link } from 'react-router-dom';
 
 import { GuideSectionTypes } from '../../components';
 
-import { EuiAccordion, EuiCode, EuiCallOut } from '../../../../src/components';
+import { EuiCode, EuiCallOut } from '../../../../src/components';
+import { EuiAccordion } from './accordion_props';
 
 import { accordionConfig } from './playground';
 
diff --git a/src-docs/src/views/accordion/accordion_props.tsx b/src-docs/src/views/accordion/accordion_props.tsx
new file mode 100644
index 00000000000..73e2b4f48bc
--- /dev/null
+++ b/src-docs/src/views/accordion/accordion_props.tsx
@@ -0,0 +1,4 @@
+import React, { FunctionComponent } from 'react';
+import { EuiAccordionProps } from '../../../../src/components';
+
+export const EuiAccordion: FunctionComponent<EuiAccordionProps> = () => <div />;

From e7b04b4f797867725b7ca9df38e9ec0cf1e64a97 Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Mon, 27 Jun 2022 14:34:55 -0500
Subject: [PATCH 2/5] Revert "props table workaround"

This reverts commit fd675282a15f9b4eacfc9276e3b690ea93262a9a.
---
 src-docs/src/views/accordion/accordion_example.js | 3 +--
 src-docs/src/views/accordion/accordion_props.tsx  | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 src-docs/src/views/accordion/accordion_props.tsx

diff --git a/src-docs/src/views/accordion/accordion_example.js b/src-docs/src/views/accordion/accordion_example.js
index c0fcb0e09a4..ff28c277b0a 100644
--- a/src-docs/src/views/accordion/accordion_example.js
+++ b/src-docs/src/views/accordion/accordion_example.js
@@ -3,8 +3,7 @@ import { Link } from 'react-router-dom';
 
 import { GuideSectionTypes } from '../../components';
 
-import { EuiCode, EuiCallOut } from '../../../../src/components';
-import { EuiAccordion } from './accordion_props';
+import { EuiAccordion, EuiCode, EuiCallOut } from '../../../../src/components';
 
 import { accordionConfig } from './playground';
 
diff --git a/src-docs/src/views/accordion/accordion_props.tsx b/src-docs/src/views/accordion/accordion_props.tsx
deleted file mode 100644
index 73e2b4f48bc..00000000000
--- a/src-docs/src/views/accordion/accordion_props.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import React, { FunctionComponent } from 'react';
-import { EuiAccordionProps } from '../../../../src/components';
-
-export const EuiAccordion: FunctionComponent<EuiAccordionProps> = () => <div />;

From d5f27cc6aa91fd7f6742d97d99bf5eff768d913a Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Mon, 27 Jun 2022 14:43:33 -0500
Subject: [PATCH 3/5] pass prop interface as withEuiTheme generic

---
 src/components/accordion/accordion.tsx | 2 +-
 src/services/theme/hooks.tsx           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/accordion/accordion.tsx b/src/components/accordion/accordion.tsx
index 59f7047ab2d..d186a349bb3 100644
--- a/src/components/accordion/accordion.tsx
+++ b/src/components/accordion/accordion.tsx
@@ -403,4 +403,4 @@ export class EuiAccordionClass extends Component<
   }
 }
 
-export const EuiAccordion = withEuiTheme(EuiAccordionClass);
+export const EuiAccordion = withEuiTheme<EuiAccordionProps>(EuiAccordionClass);
diff --git a/src/services/theme/hooks.tsx b/src/services/theme/hooks.tsx
index b34e80c49b5..db6abad2e3c 100644
--- a/src/services/theme/hooks.tsx
+++ b/src/services/theme/hooks.tsx
@@ -40,6 +40,8 @@ export const useEuiTheme = <T extends {} = {}>(): UseEuiTheme<T> => {
 export interface WithEuiThemeProps<P = {}> {
   theme: UseEuiTheme<P>;
 }
+// Provide the component props interface as the generic to allow the docs props table to populate.
+// e.g., `const EuiComponent = withEuiTheme<EuiComponentProps>(_EuiComponent)`
 export const withEuiTheme = <T extends {} = {}, U extends {} = {}>(
   Component: React.ComponentType<T & WithEuiThemeProps<U>>
 ) => {

From 83343fcb6583d528af568f865ae72a09c1007ea6 Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Mon, 27 Jun 2022 14:48:51 -0500
Subject: [PATCH 4/5] CL

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

diff --git a/upcoming_changelogs/5974.md b/upcoming_changelogs/5974.md
new file mode 100644
index 00000000000..c936417f3bb
--- /dev/null
+++ b/upcoming_changelogs/5974.md
@@ -0,0 +1,4 @@
+**Bug fixes**
+
+- Fixed `EuiAccordion` props table not containing all props
+

From dab0830b6f64f8ea44c036a6438254dcc6bd6ca1 Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Mon, 27 Jun 2022 14:52:26 -0500
Subject: [PATCH 5/5] change CL entry

---
 upcoming_changelogs/5974.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/upcoming_changelogs/5974.md b/upcoming_changelogs/5974.md
index c936417f3bb..616abdd60ba 100644
--- a/upcoming_changelogs/5974.md
+++ b/upcoming_changelogs/5974.md
@@ -1,4 +1,3 @@
 **Bug fixes**
 
-- Fixed `EuiAccordion` props table not containing all props
-
+- Fixed `EuiAccordion` props type not being correctly inferred