From 37a732007fa96ae2738595291819238080b670bc Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Tue, 12 Aug 2025 08:22:34 -0400
Subject: [PATCH 1/5] fix(Tabs): updated logic for uncontrolled tabs animation

---
 packages/react-core/src/components/Tabs/Tabs.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/react-core/src/components/Tabs/Tabs.tsx b/packages/react-core/src/components/Tabs/Tabs.tsx
index 12a75bd62e7..d254170fe71 100644
--- a/packages/react-core/src/components/Tabs/Tabs.tsx
+++ b/packages/react-core/src/components/Tabs/Tabs.tsx
@@ -361,9 +361,9 @@ class Tabs extends Component<TabsProps, TabsState> {
       ...(shouldInitializeStyle && { isInitializingAccent: true })
     });
 
-    setTimeout(() => {
+    requestAnimationFrame(() => {
       this.setState({ isInitializingAccent: false });
-    }, 0);
+    });
   };
 
   handleResize = () => {
@@ -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) {

From b96c2f15e90440982574bf547e991083b008e222 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Wed, 13 Aug 2025 08:21:57 -0400
Subject: [PATCH 2/5] Attempted other solution

---
 packages/react-core/src/components/Tabs/Tabs.tsx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/react-core/src/components/Tabs/Tabs.tsx b/packages/react-core/src/components/Tabs/Tabs.tsx
index d254170fe71..55ee77a68e9 100644
--- a/packages/react-core/src/components/Tabs/Tabs.tsx
+++ b/packages/react-core/src/components/Tabs/Tabs.tsx
@@ -360,10 +360,6 @@ class Tabs extends Component<TabsProps, TabsState> {
       currentLinkAccentStart: `${startValue}px`,
       ...(shouldInitializeStyle && { isInitializingAccent: true })
     });
-
-    requestAnimationFrame(() => {
-      this.setState({ isInitializingAccent: false });
-    });
   };
 
   handleResize = () => {
@@ -442,6 +438,13 @@ class Tabs extends Component<TabsProps, TabsState> {
     if (prevState.uncontrolledIsExpandedLocal !== this.state.uncontrolledIsExpandedLocal) {
       this.setAccentStyles(true);
     }
+
+    if (
+      (parseInt(prevState.currentLinkAccentLength) === 0 && parseInt(this.state.currentLinkAccentLength) !== 0) ||
+      prevState.currentLinkAccentStart !== this.state.currentLinkAccentStart
+    ) {
+      this.setState({ isInitializingAccent: false });
+    }
   }
 
   static getDerivedStateFromProps(nextProps: TabsProps, prevState: TabsState) {

From 931986ea430bc79ff13459157036f9a4dc978240 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Wed, 13 Aug 2025 09:26:45 -0400
Subject: [PATCH 3/5] Updated tests

---
 .../components/Tabs/__tests__/Tabs.test.tsx   |  2 +-
 .../__snapshots__/Tabs.test.tsx.snap          | 48 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx b/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
index 661e6407752..e8f64019060 100644
--- a/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
@@ -21,7 +21,7 @@ test(`Renders with classes ${styles.tabs} and ${styles.modifiers.animateCurrent}
   expect(screen.getByRole('region')).toHaveClass(`${styles.tabs} ${styles.modifiers.animateCurrent}`);
 });
 
-test(`Renders with class ${styles.modifiers.initializingAccent} when component initially mounts`, () => {
+xtest(`Renders with class ${styles.modifiers.initializingAccent} when component initially mounts`, () => {
   render(
     <Tabs role="region">
       <Tab title="Test title" eventKey={0}>
diff --git a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
index 450209dfcc9..9511ec614d9 100644
--- a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
+++ b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
@@ -4,8 +4,8 @@ exports[`should render accessible tabs 1`] = `
 <DocumentFragment>
   <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"
+    class="pf-v6-c-tabs pf-m-animate-current"
+    data-ouia-component-id="OUIA-Generated-Tabs-11"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="accessibleTabs"
@@ -121,8 +121,8 @@ exports[`should render accessible tabs 1`] = `
 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"
+    class="pf-v6-c-tabs pf-m-animate-current pf-m-box"
+    data-ouia-component-id="OUIA-Generated-Tabs-10"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="boxTabs"
@@ -280,8 +280,8 @@ exports[`should render box tabs 1`] = `
 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"
+    class="pf-v6-c-tabs pf-m-animate-current pf-m-box pf-m-secondary"
+    data-ouia-component-id="OUIA-Generated-Tabs-17"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="boxSecondaryVariantTabs"
@@ -397,8 +397,8 @@ exports[`should render box tabs of secondary variant 1`] = `
 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"
+    class="pf-v6-c-tabs pf-m-animate-current pf-m-vertical pf-m-expandable"
+    data-ouia-component-id="OUIA-Generated-Tabs-8"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="verticalTabs"
@@ -604,8 +604,8 @@ exports[`should render expandable vertical tabs 1`] = `
 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"
+    class="pf-v6-c-tabs pf-m-animate-current pf-m-fill"
+    data-ouia-component-id="OUIA-Generated-Tabs-12"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="filledTabs"
@@ -721,8 +721,8 @@ exports[`should render filled tabs 1`] = `
 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"
+    class="pf-v6-c-tabs pf-m-animate-current"
+    data-ouia-component-id="OUIA-Generated-Tabs-3"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="simpleTabs"
@@ -880,8 +880,8 @@ exports[`should render simple tabs 1`] = `
 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"
+    class="pf-v6-c-tabs pf-m-animate-current"
+    data-ouia-component-id="OUIA-Generated-Tabs-13"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="primarieTabs"
@@ -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-14"
       data-ouia-component-type="PF6/Tabs"
       data-ouia-safe="true"
       id="subtabs"
@@ -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-15"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="eventKeyTabs"
@@ -1227,8 +1227,8 @@ exports[`should render tabs with eventKey Strings 1`] = `
 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"
+    class="pf-v6-c-tabs pf-m-animate-current pf-m-no-border-bottom"
+    data-ouia-component-id="OUIA-Generated-Tabs-18"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="noBottomBorderTabs"
@@ -1344,8 +1344,8 @@ exports[`should render tabs with no bottom border 1`] = `
 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"
+    class="pf-v6-c-tabs pf-m-animate-current"
+    data-ouia-component-id="OUIA-Generated-Tabs-16"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="separateTabs"
@@ -1471,8 +1471,8 @@ exports[`should render tabs with separate content 1`] = `
 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"
+    class="pf-v6-c-tabs pf-m-animate-current"
+    data-ouia-component-id="OUIA-Generated-Tabs-6"
     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;"
@@ -1629,8 +1629,8 @@ exports[`should render uncontrolled tabs 1`] = `
 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"
+    class="pf-v6-c-tabs pf-m-animate-current pf-m-vertical"
+    data-ouia-component-id="OUIA-Generated-Tabs-7"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="verticalTabs"

From fdadc96d93306329c05ac0e869327de0e2aa14b4 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Fri, 15 Aug 2025 13:35:30 -0400
Subject: [PATCH 4/5] Backed out delay fix attempt

---
 .../react-core/src/components/Tabs/Tabs.tsx   | 11 ++---
 .../components/Tabs/__tests__/Tabs.test.tsx   |  2 +-
 .../__snapshots__/Tabs.test.tsx.snap          | 48 +++++++++----------
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/packages/react-core/src/components/Tabs/Tabs.tsx b/packages/react-core/src/components/Tabs/Tabs.tsx
index 55ee77a68e9..7d2c8752eaf 100644
--- a/packages/react-core/src/components/Tabs/Tabs.tsx
+++ b/packages/react-core/src/components/Tabs/Tabs.tsx
@@ -360,6 +360,10 @@ class Tabs extends Component<TabsProps, TabsState> {
       currentLinkAccentStart: `${startValue}px`,
       ...(shouldInitializeStyle && { isInitializingAccent: true })
     });
+
+    setTimeout(() => {
+      this.setState({ isInitializingAccent: false });
+    }, 0);
   };
 
   handleResize = () => {
@@ -438,13 +442,6 @@ class Tabs extends Component<TabsProps, TabsState> {
     if (prevState.uncontrolledIsExpandedLocal !== this.state.uncontrolledIsExpandedLocal) {
       this.setAccentStyles(true);
     }
-
-    if (
-      (parseInt(prevState.currentLinkAccentLength) === 0 && parseInt(this.state.currentLinkAccentLength) !== 0) ||
-      prevState.currentLinkAccentStart !== this.state.currentLinkAccentStart
-    ) {
-      this.setState({ isInitializingAccent: false });
-    }
   }
 
   static getDerivedStateFromProps(nextProps: TabsProps, prevState: TabsState) {
diff --git a/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx b/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
index e8f64019060..661e6407752 100644
--- a/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
@@ -21,7 +21,7 @@ test(`Renders with classes ${styles.tabs} and ${styles.modifiers.animateCurrent}
   expect(screen.getByRole('region')).toHaveClass(`${styles.tabs} ${styles.modifiers.animateCurrent}`);
 });
 
-xtest(`Renders with class ${styles.modifiers.initializingAccent} when component initially mounts`, () => {
+test(`Renders with class ${styles.modifiers.initializingAccent} when component initially mounts`, () => {
   render(
     <Tabs role="region">
       <Tab title="Test title" eventKey={0}>
diff --git a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
index 9511ec614d9..450209dfcc9 100644
--- a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
+++ b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
@@ -4,8 +4,8 @@ exports[`should render accessible tabs 1`] = `
 <DocumentFragment>
   <nav
     aria-label="accessible Tabs example"
-    class="pf-v6-c-tabs pf-m-animate-current"
-    data-ouia-component-id="OUIA-Generated-Tabs-11"
+    class="pf-v6-c-tabs pf-m-animate-current pf-m-initializing-accent"
+    data-ouia-component-id="OUIA-Generated-Tabs-12"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="accessibleTabs"
@@ -121,8 +121,8 @@ exports[`should render accessible tabs 1`] = `
 exports[`should render box tabs 1`] = `
 <DocumentFragment>
   <div
-    class="pf-v6-c-tabs pf-m-animate-current pf-m-box"
-    data-ouia-component-id="OUIA-Generated-Tabs-10"
+    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-type="PF6/Tabs"
     data-ouia-safe="true"
     id="boxTabs"
@@ -280,8 +280,8 @@ exports[`should render box tabs 1`] = `
 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"
-    data-ouia-component-id="OUIA-Generated-Tabs-17"
+    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-type="PF6/Tabs"
     data-ouia-safe="true"
     id="boxSecondaryVariantTabs"
@@ -397,8 +397,8 @@ exports[`should render box tabs of secondary variant 1`] = `
 exports[`should render expandable vertical tabs 1`] = `
 <DocumentFragment>
   <div
-    class="pf-v6-c-tabs pf-m-animate-current pf-m-vertical pf-m-expandable"
-    data-ouia-component-id="OUIA-Generated-Tabs-8"
+    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-type="PF6/Tabs"
     data-ouia-safe="true"
     id="verticalTabs"
@@ -604,8 +604,8 @@ exports[`should render expandable vertical tabs 1`] = `
 exports[`should render filled tabs 1`] = `
 <DocumentFragment>
   <div
-    class="pf-v6-c-tabs pf-m-animate-current pf-m-fill"
-    data-ouia-component-id="OUIA-Generated-Tabs-12"
+    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-type="PF6/Tabs"
     data-ouia-safe="true"
     id="filledTabs"
@@ -721,8 +721,8 @@ exports[`should render filled tabs 1`] = `
 exports[`should render simple tabs 1`] = `
 <DocumentFragment>
   <div
-    class="pf-v6-c-tabs pf-m-animate-current"
-    data-ouia-component-id="OUIA-Generated-Tabs-3"
+    class="pf-v6-c-tabs pf-m-animate-current pf-m-initializing-accent"
+    data-ouia-component-id="OUIA-Generated-Tabs-4"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="simpleTabs"
@@ -880,8 +880,8 @@ exports[`should render simple tabs 1`] = `
 exports[`should render subtabs 1`] = `
 <DocumentFragment>
   <div
-    class="pf-v6-c-tabs pf-m-animate-current"
-    data-ouia-component-id="OUIA-Generated-Tabs-13"
+    class="pf-v6-c-tabs pf-m-animate-current pf-m-initializing-accent"
+    data-ouia-component-id="OUIA-Generated-Tabs-14"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="primarieTabs"
@@ -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-14"
+      data-ouia-component-id="OUIA-Generated-Tabs-15"
       data-ouia-component-type="PF6/Tabs"
       data-ouia-safe="true"
       id="subtabs"
@@ -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-15"
+    data-ouia-component-id="OUIA-Generated-Tabs-16"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="eventKeyTabs"
@@ -1227,8 +1227,8 @@ exports[`should render tabs with eventKey Strings 1`] = `
 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"
-    data-ouia-component-id="OUIA-Generated-Tabs-18"
+    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-type="PF6/Tabs"
     data-ouia-safe="true"
     id="noBottomBorderTabs"
@@ -1344,8 +1344,8 @@ exports[`should render tabs with no bottom border 1`] = `
 exports[`should render tabs with separate content 1`] = `
 <DocumentFragment>
   <div
-    class="pf-v6-c-tabs pf-m-animate-current"
-    data-ouia-component-id="OUIA-Generated-Tabs-16"
+    class="pf-v6-c-tabs pf-m-animate-current pf-m-initializing-accent"
+    data-ouia-component-id="OUIA-Generated-Tabs-17"
     data-ouia-component-type="PF6/Tabs"
     data-ouia-safe="true"
     id="separateTabs"
@@ -1471,8 +1471,8 @@ exports[`should render tabs with separate content 1`] = `
 exports[`should render uncontrolled tabs 1`] = `
 <DocumentFragment>
   <div
-    class="pf-v6-c-tabs pf-m-animate-current"
-    data-ouia-component-id="OUIA-Generated-Tabs-6"
+    class="pf-v6-c-tabs pf-m-animate-current pf-m-initializing-accent"
+    data-ouia-component-id="OUIA-Generated-Tabs-7"
     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;"
@@ -1629,8 +1629,8 @@ exports[`should render uncontrolled tabs 1`] = `
 exports[`should render vertical tabs 1`] = `
 <DocumentFragment>
   <div
-    class="pf-v6-c-tabs pf-m-animate-current pf-m-vertical"
-    data-ouia-component-id="OUIA-Generated-Tabs-7"
+    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-type="PF6/Tabs"
     data-ouia-safe="true"
     id="verticalTabs"

From d4eadda3ff1bb01e5bbb72001e13676ad2af35e3 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <git.eric@thatblindgeye.dev>
Date: Fri, 15 Aug 2025 14:11:30 -0400
Subject: [PATCH 5/5] Added tests

---
 .../components/Tabs/__tests__/Tabs.test.tsx   | 48 +++++++++++++++++++
 .../__snapshots__/Tabs.test.tsx.snap          | 28 +++++------
 2 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx b/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
index 661e6407752..03fab0f6dbf 100644
--- a/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
@@ -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';
@@ -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">
diff --git a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
index 450209dfcc9..26915039523 100644
--- a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
+++ b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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;"
@@ -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"