Skip to content

fix(Tabs): updated logic for uncontrolled tabs animation #11958

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 5 commits into from
Aug 18, 2025
+66 −14
Merged

fix(Tabs): updated logic for uncontrolled tabs animation #11958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37a7320
fix(Tabs): updated logic for uncontrolled tabs animation
Aug 12, 2025
b96c2f1
Attempted other solution
Aug 13, 2025
931986e
Updated tests
Aug 13, 2025
fdadc96
Backed out delay fix attempt
Aug 15, 2025
d4eadda
Added tests
Aug 15, 2025
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
4 changes: 4 additions & 0 deletions packages/react-core/src/components/Tabs/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,10 @@ class Tabs extends Component<TabsProps, TabsState> {
} else if (prevState.enableScrollButtons && !enableScrollButtons) {
this.setState({ showScrollButtons: false });
}

if (prevState.uncontrolledIsExpandedLocal !== this.state.uncontrolledIsExpandedLocal) {
this.setAccentStyles(true);
}
}

static getDerivedStateFromProps(nextProps: TabsProps, prevState: TabsState) {
Expand Down
48 changes: 48 additions & 0 deletions packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { render, screen, act } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { Tabs } from '../Tabs';
import styles from '@patternfly/react-styles/css/components/Tabs/tabs';
import { Tab } from '../Tab';
Expand Down Expand Up @@ -50,6 +51,53 @@ test(`Does not render with class ${styles.modifiers.initializingAccent} when com
jest.useRealTimers();
});

test(`Renders with class ${styles.modifiers.initializingAccent} when uncontrolled expandable component initially mounts`, async () => {
const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });

render(
<Tabs
isVertical
expandable={{ default: 'expandable' }}
toggleText="Jump to section"
defaultIsExpanded={false}
role="region"
>
<Tab title="Test title" eventKey={0}>
Tab Content
</Tab>
</Tabs>
);

jest.useFakeTimers();
await user.click(screen.getByRole('button', { name: 'Jump to section' }));
act(() => {
jest.advanceTimersByTime(100);
});
expect(screen.getByRole('region')).toHaveClass(styles.modifiers.initializingAccent);
jest.useRealTimers();
});

test(`Does not render with class ${styles.modifiers.initializingAccent} when uncontrolled expandable component is finished mounting`, async () => {
const user = userEvent.setup();

render(
<Tabs
isVertical
expandable={{ default: 'expandable' }}
toggleText="Jump to section"
defaultIsExpanded={false}
role="region"
>
<Tab title="Test title" eventKey={0}>
Tab Content
</Tab>
</Tabs>
);

await user.click(screen.getByRole('button', { name: 'Jump to section' }));
expect(screen.getByRole('region')).not.toHaveClass(styles.modifiers.initializingAccent);
});

test('should render simple tabs', () => {
const { asFragment } = render(
<Tabs id="simpleTabs">
Expand Down
28 changes: 14 additions & 14 deletions packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`should render accessible tabs 1`] = `
<nav
aria-label="accessible Tabs example"
class="pf-v6-c-tabs pf-m-animate-current pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-12"
data-ouia-component-id="OUIA-Generated-Tabs-14"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="accessibleTabs"
Expand Down Expand Up @@ -122,7 +122,7 @@ exports[`should render box tabs 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-box pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-11"
data-ouia-component-id="OUIA-Generated-Tabs-13"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="boxTabs"
Expand Down Expand Up @@ -281,7 +281,7 @@ exports[`should render box tabs of secondary variant 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-box pf-m-secondary pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-18"
data-ouia-component-id="OUIA-Generated-Tabs-20"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="boxSecondaryVariantTabs"
Expand Down Expand Up @@ -398,7 +398,7 @@ exports[`should render expandable vertical tabs 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-vertical pf-m-expandable pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-9"
data-ouia-component-id="OUIA-Generated-Tabs-11"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="verticalTabs"
Expand All @@ -413,7 +413,7 @@ exports[`should render expandable vertical tabs 1`] = `
<button
aria-labelledby="generated-id-text generated-id-button"
class="pf-v6-c-button pf-m-plain"
data-ouia-component-id="OUIA-Generated-Button-plain-3"
data-ouia-component-id="OUIA-Generated-Button-plain-5"
data-ouia-component-type="PF6/Button"
data-ouia-safe="true"
id="generated-id-button"
Expand Down Expand Up @@ -605,7 +605,7 @@ exports[`should render filled tabs 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-fill pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-13"
data-ouia-component-id="OUIA-Generated-Tabs-15"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="filledTabs"
Expand Down Expand Up @@ -722,7 +722,7 @@ exports[`should render simple tabs 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-4"
data-ouia-component-id="OUIA-Generated-Tabs-6"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="simpleTabs"
Expand Down Expand Up @@ -881,7 +881,7 @@ exports[`should render subtabs 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-14"
data-ouia-component-id="OUIA-Generated-Tabs-16"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="primarieTabs"
Expand Down Expand Up @@ -967,7 +967,7 @@ exports[`should render subtabs 1`] = `
>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-subtab pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-15"
data-ouia-component-id="OUIA-Generated-Tabs-17"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="subtabs"
Expand Down Expand Up @@ -1110,7 +1110,7 @@ exports[`should render tabs with eventKey Strings 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-16"
data-ouia-component-id="OUIA-Generated-Tabs-18"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="eventKeyTabs"
Expand Down Expand Up @@ -1228,7 +1228,7 @@ exports[`should render tabs with no bottom border 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-no-border-bottom pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-19"
data-ouia-component-id="OUIA-Generated-Tabs-21"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="noBottomBorderTabs"
Expand Down Expand Up @@ -1345,7 +1345,7 @@ exports[`should render tabs with separate content 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-17"
data-ouia-component-id="OUIA-Generated-Tabs-19"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="separateTabs"
Expand Down Expand Up @@ -1472,7 +1472,7 @@ exports[`should render uncontrolled tabs 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-7"
data-ouia-component-id="OUIA-Generated-Tabs-9"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
style="--pf-v6-c-tabs--link-accent--length: 0px; --pf-v6-c-tabs--link-accent--start: 0px;"
Expand Down Expand Up @@ -1630,7 +1630,7 @@ exports[`should render vertical tabs 1`] = `
<DocumentFragment>
<div
class="pf-v6-c-tabs pf-m-animate-current pf-m-vertical pf-m-initializing-accent"
data-ouia-component-id="OUIA-Generated-Tabs-8"
data-ouia-component-id="OUIA-Generated-Tabs-10"
data-ouia-component-type="PF6/Tabs"
data-ouia-safe="true"
id="verticalTabs"
Expand Down
Loading