Skip to content

[pull] main from adobe:main #277

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
Jan 31, 2026
Merged

[pull] main from adobe:main #277

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
3 changes: 2 additions & 1 deletion packages/react-aria-components/src/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,14 +394,15 @@ export const TabPanels = /*#__PURE__*/ createHideableComponent(function TabPanel
prevSize.current = ref.current.getBoundingClientRect();
}

let DOMProps = filterDOMProps(props, {global: true});
let DOMProps = filterDOMProps(props, {labelable: true, global: true});
delete DOMProps.id;

return (
<dom.div
render={props.render}
{...DOMProps}
ref={ref}
style={props.style}
className={props.className || 'react-aria-TabPanels'}>
<Collection {...props} />
</dom.div>
Expand Down
36 changes: 36 additions & 0 deletions packages/react-aria-components/test/Tabs.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,42 @@ describe('Tabs', () => {
expect(tabs[2]).toHaveAttribute('aria-selected', 'true');
});

it('should support tabpanels with aria-labels', () => {
let {getByTestId} = render(
<Tabs>
<TabList aria-label="test">
<Tab id="a">A</Tab>
<Tab id="b">B</Tab>
</TabList>
<TabPanels aria-label="test" data-testid="tabpanels">
<TabPanel id="a">A</TabPanel>
<TabPanel id="b">B</TabPanel>
</TabPanels>
</Tabs>
);

let tabPanels = getByTestId('tabpanels');
expect(tabPanels).toHaveAttribute('aria-label', 'test');
});

it('should support tabpanels with custom styles', () => {
let {getByTestId} = render(
<Tabs>
<TabList aria-label="test">
<Tab id="a">A</Tab>
<Tab id="b">B</Tab>
</TabList>
<TabPanels style={{width: '100px'}} data-testid="tabpanels">
<TabPanel id="a">A</TabPanel>
<TabPanel id="b">B</TabPanel>
</TabPanels>
</Tabs>
);

let tabPanels = getByTestId('tabpanels');
expect(tabPanels).toHaveStyle({width: '100px'});
});

it('supports tooltips', async function () {
let {getByRole, getAllByRole} = render(
<Tabs>
Expand Down
Loading