fix(SharePopover): restore focus on close

gravity-ui · Sep 12, 2024 · bbbd8c2 · bbbd8c2
1 parent 092657c
commit bbbd8c2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/components/SharePopover/SharePopover.tsx b/src/components/SharePopover/SharePopover.tsx
@@ -108,6 +108,7 @@ export const SharePopover = (props: SharePopoverProps) => {
         buttonAriaLabel,
     } = props;
     const [isOpen, setIsOpen] = React.useState(false);
+    const buttonRef = React.useRef<HTMLButtonElement>(null);
     const tooltipId = useUniqId();
 
     const content = React.useMemo(
@@ -174,6 +175,7 @@ export const SharePopover = (props: SharePopoverProps) => {
             onOpenChange={setIsOpen}
             focusTrap={!shouldOpenByHover}
             autoFocus={!shouldOpenByHover}
+            restoreFocusRef={shouldOpenByHover ? undefined : buttonRef}
         >
             {({onClick: onClickInner}) => (
                 <button
@@ -183,6 +185,7 @@ export const SharePopover = (props: SharePopoverProps) => {
                     aria-describedby={tooltipId}
                     aria-label={buttonAriaLabel}
                     onClick={onClickInner}
+                    ref={buttonRef}
                 >
                     <div className={b('icon-container')}>
                         <Icon