From 7645d35f6f4aa345e4424a6c02ed5c59dea77a68 Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Wed, 4 May 2022 12:35:34 -0500
Subject: [PATCH] update newsfeed flyout to use shards

---
 src/plugins/newsfeed/public/components/flyout_list.tsx    | 4 +++-
 .../public/components/newsfeed_header_nav_button.tsx      | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/plugins/newsfeed/public/components/flyout_list.tsx b/src/plugins/newsfeed/public/components/flyout_list.tsx
index 622ae287bd0c16..8abc0896fff4f8 100644
--- a/src/plugins/newsfeed/public/components/flyout_list.tsx
+++ b/src/plugins/newsfeed/public/components/flyout_list.tsx
@@ -11,6 +11,7 @@ import {
   EuiFlyout,
   EuiFlyoutBody,
   EuiFlyoutHeader,
+  EuiFlyoutProps,
   EuiTitle,
   EuiLink,
   EuiFlyoutFooter,
@@ -28,13 +29,14 @@ import { NewsfeedItem } from '../types';
 import { NewsEmptyPrompt } from './empty_news';
 import { NewsLoadingPrompt } from './loading_news';
 
-export const NewsfeedFlyout = () => {
+export const NewsfeedFlyout = (props: Partial<EuiFlyoutProps>) => {
   const { newsFetchResult, setFlyoutVisible } = useContext(NewsfeedContext);
   const closeFlyout = useCallback(() => setFlyoutVisible(false), [setFlyoutVisible]);
 
   return (
     <EuiPortal>
       <EuiFlyout
+        {...props}
         onClose={closeFlyout}
         size="s"
         aria-labelledby="flyoutSmallTitle"
diff --git a/src/plugins/newsfeed/public/components/newsfeed_header_nav_button.tsx b/src/plugins/newsfeed/public/components/newsfeed_header_nav_button.tsx
index 7060adcc2a4ec0..0fbcafdb7bd59a 100644
--- a/src/plugins/newsfeed/public/components/newsfeed_header_nav_button.tsx
+++ b/src/plugins/newsfeed/public/components/newsfeed_header_nav_button.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import React, { useState, useEffect, useMemo, useCallback } from 'react';
+import React, { useState, useEffect, useMemo, useCallback, useRef } from 'react';
 import { EuiHeaderSectionItemButton, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import type { NewsfeedApi } from '../lib/api';
@@ -31,6 +31,9 @@ export const NewsfeedNavButton = ({ newsfeedApi }: Props) => {
     return newsFetchResult ? newsFetchResult.hasNew : false;
   }, [newsFetchResult]);
 
+  const buttonRef = useRef<HTMLButtonElement | null>(null);
+  const setButtonRef = (node: HTMLButtonElement | null) => (buttonRef.current = node);
+
   useEffect(() => {
     const subscription = newsfeedApi.fetchResults$.subscribe((results) => {
       setNewsFetchResult(results);
@@ -49,6 +52,7 @@ export const NewsfeedNavButton = ({ newsfeedApi }: Props) => {
     <NewsfeedContext.Provider value={{ setFlyoutVisible, newsFetchResult }}>
       <>
         <EuiHeaderSectionItemButton
+          ref={setButtonRef}
           data-test-subj="newsfeed"
           aria-controls="keyPadMenu"
           aria-expanded={flyoutVisible}
@@ -67,7 +71,7 @@ export const NewsfeedNavButton = ({ newsfeedApi }: Props) => {
         >
           <EuiIcon type="cheer" size="m" />
         </EuiHeaderSectionItemButton>
-        {flyoutVisible ? <NewsfeedFlyout /> : null}
+        {flyoutVisible ? <NewsfeedFlyout focusTrapProps={{ shards: [buttonRef] }} /> : null}
       </>
     </NewsfeedContext.Provider>
   );