Address CR feedback

elastic · Oct 27, 2022 · 7fa168b · cee-chen · Oct 27, 2022 · 7fa168b
1 parent 3ba98f0
commit 7fa168b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/components/popover/popover.tsx b/src/components/popover/popover.tsx
@@ -625,9 +625,10 @@ export class EuiPopover extends Component<Props, State> {
       container,
       focusTrapProps,
       initialFocus: initialFocusProp,
-      tabIndex: tabIndexProp,
+      tabIndex: _tabIndexProp,
       ...rest
     } = this.props;
+    const tabIndexProp = panelProps?.tabIndex ?? _tabIndexProp;
 
     const styles = euiPopoverStyles();
     const popoverStyles = [styles.euiPopover, { display }];

diff --git a/src/components/search_bar/search_bar.tsx b/src/components/search_bar/search_bar.tsx
@@ -53,7 +53,6 @@ type HintPopOverProps = Partial<
     | 'repositionOnScroll'
     | 'zIndex'
     | 'data-test-subj'
-    | 'id'
   >
 >;
 
@@ -268,9 +267,6 @@ export class EuiSearchBar extends Component<EuiSearchBarProps, State> {
 
     const toolsRightEl = this.renderTools(toolsRight);
 
-    const popoverProps: HintPopOverProps | undefined = hint
-      ? { id: this.hintId, ...hint.popoverProps }
-      : undefined;
     const isHintVisible = hint?.popoverProps?.isOpen ?? isHintVisibleState;
 
     return (
@@ -291,8 +287,8 @@ export class EuiSearchBar extends Component<EuiSearchBarProps, State> {
                     setIsVisible: (isVisible: boolean) => {
                       this.setState({ isHintVisible: isVisible });
                     },
+                    id: this.hintId,
                     ...hint,
-                    popoverProps,
                   }
                 : undefined
             }

diff --git a/src/components/search_bar/search_box.tsx b/src/components/search_bar/search_box.tsx
@@ -22,6 +22,7 @@ export interface EuiSearchBoxProps extends EuiFieldSearchProps {
   // This is optional in EuiFieldSearchProps
   onSearch: (queryText: string) => void;
   hint?: {
+    id: string;
     isVisible: boolean;
     setIsVisible: (isVisible: boolean) => void;
   } & EuiSearchBarProps['hint'];
@@ -84,6 +85,8 @@ export class EuiSearchBox extends Component<EuiSearchBoxProps> {
             'aria-live': undefined,
             'aria-modal': false,
             role: undefined,
+            tabIndex: -1,
+            id: hint.id,
           }}
           {...hint.popoverProps}
         >