Don't scroll back to a popover anchor when the popover closes

elastic · Oct 1, 2020 · 57abce2 · 57abce2
1 parent 3c1ba1f
commit 57abce2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/components/popover/popover.tsx b/src/components/popover/popover.tsx
@@ -697,10 +697,14 @@ export class EuiPopover extends Component<Props, State> {
         `euiPopover__panelArrow--${this.state.arrowPosition}`
       );
 
+      const returnFocus = this.state.isOpenStable
+        ? { preventScroll: true }
+        : false;
+
       panel = (
         <EuiPortal insert={insert}>
           <EuiFocusTrap
-            returnFocus={this.state.isOpenStable} // Ignore temporary state of indecisive focus
+            returnFocus={returnFocus} // Ignore temporary state of indecisive focus
             clickOutsideDisables={true}
             initialFocus={initialFocus}
             onDeactivation={onTrapDeactivation}