Skip to content

chore(components): remove focus workaround as it no longer needed COMPASS-6345 #6973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2025
Merged

chore(components): remove focus workaround as it no longer needed COMPASS-6345 #6973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions packages/compass-components/src/components/actions/dropdown-menu-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ export function DropdownMenuButton<Action extends string>({
'data-testid': dataTestId,
hideOnNarrow = true,
}: DropdownMenuButtonProps<Action>) {
// this ref is used by the Menu component to calculate the height and position
// of the menu, and by us to give back the focus to the trigger when the menu
// is closed (https://jira.mongodb.org/browse/PD-1674).
// This ref is used by the Menu component to calculate the height and position
// of the menu.
const menuTriggerRef = useRef<HTMLButtonElement | null>(null);
const [isMenuOpen, setIsMenuOpen] = useState(false);

Expand All @@ -54,8 +53,6 @@ export function DropdownMenuButton<Action extends string>({
evt.stopPropagation();
if (evt.currentTarget.dataset.menuitem) {
setIsMenuOpen(false);
// Workaround for https://jira.mongodb.org/browse/PD-1674
menuTriggerRef.current?.focus();
}
const actionName = evt.currentTarget.dataset.action;
if (typeof actionName !== 'string') {
Expand Down
7 changes: 2 additions & 5 deletions packages/compass-components/src/components/actions/item-action-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@ export function ItemActionMenu<Action extends string>({
iconSize = ItemActionButtonSize.Default,
'data-testid': dataTestId,
}: ItemActionMenuProps<Action>) {
// this ref is used by the Menu component to calculate the height and position
// of the menu, and by us to give back the focus to the trigger when the menu
// is closed (https://jira.mongodb.org/browse/PD-1674).
// This ref is used by the Menu component to calculate the height and position
// of the menu.
const menuTriggerRef = useRef<HTMLButtonElement | null>(null);
const [isMenuOpen, setIsMenuOpen] = useState(false);

Expand All @@ -73,8 +72,6 @@ export function ItemActionMenu<Action extends string>({
evt.stopPropagation();
if (evt.currentTarget.dataset.menuitem) {
setIsMenuOpen(false);
// Workaround for https://jira.mongodb.org/browse/PD-1674
menuTriggerRef.current?.focus();
}
const actionName = evt.currentTarget.dataset.action;
if (typeof actionName !== 'string') {
Expand Down