Skip to content

[pull] main from adobe:main #96

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
pull merged 1 commit into from
Aug 4, 2025
Merged

[pull] main from adobe:main #96

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
6 changes: 3 additions & 3 deletions packages/@react-aria/tooltip/src/useTooltipTrigger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ export function useTooltipTrigger(props: TooltipTriggerProps, state: TooltipTrig
'aria-describedby': state.isOpen ? tooltipId : undefined,
...mergeProps(focusableProps, hoverProps, {
onPointerDown: onPressStart,
onKeyDown: onPressStart,
tabIndex: undefined
})
onKeyDown: onPressStart
}),
tabIndex: undefined
},
tooltipProps: {
id: tooltipId
Expand Down
28 changes: 28 additions & 0 deletions packages/react-aria-components/test/Tooltip.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,4 +312,32 @@ describe('Tooltip', () => {
let tooltip = getByRole('tooltip');
expect(tooltip).toBeInTheDocument();
});

it('should not override child properties for excludeFromTabOrder', async () => {
let {getByRole} = render(
<TooltipTrigger>
<Button excludeFromTabOrder>
Check my tabindex
</Button>
<Tooltip>hello world</Tooltip>
</TooltipTrigger>
);

let button = getByRole('button');
expect(button).toHaveAttribute('tabindex', '-1');
});

it('should not override child properties', async () => {
let {getByRole} = render(
<TooltipTrigger>
<Button>
Check my tabindex
</Button>
<Tooltip>hello world</Tooltip>
</TooltipTrigger>
);

let button = getByRole('button');
expect(button).toHaveAttribute('tabindex', '0');
});
});
Loading