@patternfly/patternfly 6.3.0-prerelease.38 → 6.3.0-prerelease.39

package/components/Table/table.css

@@ -14,8 +14,6 @@
   --pf-v6-c-table__tbody--cell--PaddingBlockStart: var(--pf-v6-c-table--cell--Padding--base);
   --pf-v6-c-table__tbody--cell--PaddingBlockEnd: var(--pf-v6-c-table--cell--Padding--base);
   --pf-v6-c-table__tbody--cell--FontSize: var(--pf-t--global--font--size--body--default);
-  --pf-v6-c-table__tbody--BorderBlockEndWidth: var(--pf-t--global--border--width--divider--default);
-  --pf-v6-c-table__tbody--BorderBlockEndColor: var(--pf-t--global--border--color--default);
   --pf-v6-c-table__tr--BorderBlockEndWidth: var(--pf-t--global--border--width--divider--default);
   --pf-v6-c-table__tr--BorderBlockEndColor: var(--pf-t--global--border--color--default);
   --pf-v6-c-table--cell--Padding--base: var(--pf-t--global--spacer--md);
@@ -208,7 +206,7 @@
   --pf-v6-c-table__sticky-column--BackgroundColor: var(--pf-v6-c-table--m-striped__tr--BackgroundColor);
   background: var(--pf-v6-c-table--m-striped__tr--BackgroundColor);
 }
-.pf-v6-c-table tr:where(.pf-v6-c-table__tr):not(.pf-v6-c-table__expandable-row:where(:nth-child(n+2))).pf-m-ghost-row {
+.pf-v6-c-table tr:where(.pf-v6-c-table__tr):not(.pf-v6-c-table__expandable-row).pf-m-ghost-row {
   background-color: var(--pf-v6-c-table__tr--m-ghost-row--BackgroundColor);
   opacity: var(--pf-v6-c-table__tr--m-ghost-row--Opacity);
 }
@@ -408,7 +406,7 @@
   background-color: var(--pf-v6-c-table__tbody--m-selected--BackgroundColor);
   outline-offset: var(--pf-v6-c-table__tbody--m-selected--OutlineOffset);
 }
-.pf-v6-c-table tbody:where(.pf-v6-c-table__tbody).pf-m-selected .pf-v6-c-table__tr.pf-m-expanded:not(.pf-v6-c-table__expandable-row:where(:nth-child(n+2))) {
+.pf-v6-c-table tbody:where(.pf-v6-c-table__tbody).pf-m-selected .pf-v6-c-table__tr.pf-m-expanded:not(.pf-v6-c-table__expandable-row) {
   border: none;
 }
 .pf-v6-c-table.pf-m-drag-over {
@@ -424,7 +422,10 @@
 .pf-v6-c-table .pf-v6-c-button .pf-v6-c-table__sort-indicator {
   --pf-v6-c-table__sort-indicator--MarginInlineStart: 0;
 }
-.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row:where(:nth-child(n+2)) {
+.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody.pf-m-expanded > .pf-v6-c-table__control-row {
+  border-block-end: 0;
+}
+.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row {
   display: var(--pf-v6-c-table__expandable-row--Display, revert);
   visibility: hidden;
   opacity: var(--pf-v6-c-table__expandable-row--Opacity);
@@ -434,33 +435,36 @@
   transition-property: opacity, translate, visibility, background-color;
   translate: 0 var(--pf-v6-c-table__expandable-row--TranslateY);
 }
-.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row:where(:nth-child(n+2))[hidden] {
+.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row[hidden] {
   display: var(--pf-v6-c-table__expandable-row--Display, revert);
 }
-.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row:where(:nth-child(n+2)).pf-m-expanded {
+.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row.pf-m-expanded {
   visibility: visible;
   opacity: var(--pf-v6-c-table__tbody--m-expanded__expandable-row--Opacity);
   transition-delay: 0s;
   transition-duration: var(--pf-v6-c-table__expandable-row--TransitionDuration--expand--fade), var(--pf-v6-c-table__expandable-row--TransitionDuration--expand--slide), 0s, 0s;
   translate: 0 var(--pf-v6-c-table__tbody--m-expanded__expandable-row--TranslateY);
 }
-.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row:where(:nth-child(n+2)).pf-m-expanded > :is(.pf-v6-c-table__td, .pf-v6-c-table__th) > .pf-v6-c-table__expandable-row-content {
+.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row.pf-m-expanded > :is(.pf-v6-c-table__td, .pf-v6-c-table__th) > .pf-v6-c-table__expandable-row-content {
   max-height: 99999px;
 }
-.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row:where(:nth-child(n+2)):not(.pf-m-expanded) > :is(.pf-v6-c-table__td, .pf-v6-c-table__th) {
-  --pf-v6-c-table--cell--responsive--label: none;
-}
-.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row:where(:nth-child(n+2)):not(.pf-m-expanded) > :is(.pf-v6-c-table__td, .pf-v6-c-table__th),
-.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row:where(:nth-child(n+2)):not(.pf-m-expanded) > :is(.pf-v6-c-table__td, .pf-v6-c-table__th) > .pf-v6-c-table__expandable-row-content {
+.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row:not(.pf-m-expanded) > :is(.pf-v6-c-table__td, .pf-v6-c-table__th),
+.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row:not(.pf-m-expanded) > :is(.pf-v6-c-table__td, .pf-v6-c-table__th) > .pf-v6-c-table__expandable-row-content {
   padding: 0;
   overflow: hidden;
   transition-delay: var(--pf-v6-c-table__expandable-row--TransitionDuration--collapse--fade);
   transition-property: padding, max-height, overflow;
 }
-.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row:where(:nth-child(n+2)):not(.pf-m-expanded) > :is(.pf-v6-c-table__td, .pf-v6-c-table__th) > .pf-v6-c-table__expandable-row-content {
+.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__expandable-row:not(.pf-m-expanded) > :is(.pf-v6-c-table__td, .pf-v6-c-table__th) > .pf-v6-c-table__expandable-row-content {
   max-height: 0;
 }
-.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__control-row.pf-m-no-animate-expand ~ .pf-v6-c-table__expandable-row:where(:nth-child(n+2)) {
+.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__control-row ~ .pf-v6-c-table__expandable-row.pf-m-expanded > :is(.pf-v6-c-table__th, .pf-v6-c-table__td):not(.pf-m-no-padding) {
+  padding-block-start: var(--pf-v6-c-table--cell--PaddingBlockStart);
+}
+.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__tr:has(~ .pf-v6-c-table__expandable-row) {
+  border-block-end: 0;
+}
+.pf-v6-c-table.pf-m-animate-expand > .pf-v6-c-table__tbody > .pf-v6-c-table__control-row.pf-m-no-animate-expand ~ .pf-v6-c-table__expandable-row {
   --pf-v6-c-table__expandable-row--TransitionDuration--collapse--fade: 0s;
   --pf-v6-c-table__expandable-row--TransitionDuration--collapse--slide: 0s;
   --pf-v6-c-table__expandable-row--TransitionDuration--expand--fade: 0s;
@@ -767,7 +771,46 @@ thead .pf-v6-c-table__check .pf-v6-c-radio.pf-m-standalone {
   pointer-events: none;
 }
 
-.pf-v6-c-table__tr:has(~ .pf-v6-c-table__expandable-row.pf-m-expanded) {
+.pf-v6-c-table__expandable-row {
+  position: relative;
+  border-block-end: 0 solid transparent;
+}
+:not(.pf-v6-c-table__control-row) ~ .pf-v6-c-table__expandable-row > .pf-v6-c-table__th,
+:not(.pf-v6-c-table__control-row) ~ .pf-v6-c-table__expandable-row > .pf-v6-c-table__td {
+  padding-block-start: 0;
+}
+
+.pf-v6-c-table__expandable-row td:where(.pf-v6-c-table__td).pf-m-no-padding,
+.pf-v6-c-table__expandable-row th:where(.pf-v6-c-table__th).pf-m-no-padding {
+  padding-block-start: 0;
+  padding-block-end: 0;
+  padding-inline-start: 0;
+  padding-inline-end: 0;
+}
+.pf-v6-c-table__expandable-row td:where(.pf-v6-c-table__td).pf-m-no-padding .pf-v6-c-table__expandable-row-content,
+.pf-v6-c-table__expandable-row th:where(.pf-v6-c-table__th).pf-m-no-padding .pf-v6-c-table__expandable-row-content {
+  padding: 0;
+  border-radius: 0;
+}
+.pf-v6-c-table__expandable-row .pf-v6-c-table__expandable-row-content {
+  padding-block-start: var(--pf-v6-c-table__expandable-row-content--PaddingBlockStart);
+  padding-block-end: var(--pf-v6-c-table__expandable-row-content--PaddingBlockEnd);
+  padding-inline-start: var(--pf-v6-c-table__expandable-row-content--PaddingInlineStart);
+  padding-inline-end: var(--pf-v6-c-table__expandable-row-content--PaddingInlineEnd);
+  background-color: var(--pf-v6-c-table__expandable-row-content--BackgroundColor);
+  border-radius: var(--pf-v6-c-table__expandable-row-content--BorderRadius);
+}
+.pf-v6-c-table__expandable-row .pf-v6-c-table__expandable-row-content.pf-m-no-background {
+  background-color: transparent;
+}
+.pf-v6-c-table__expandable-row.pf-m-expanded {
+  border-block-end-color: var(--pf-v6-c-table__expandable-row--m-expanded--BorderBlockEndColor);
+  border-block-end-width: var(--pf-v6-c-table--border-width--base);
+}
+.pf-v6-c-table__expandable-row:not(.pf-m-expanded) {
+  display: none;
+}
+.pf-v6-c-table__expandable-row tr:last-child {
   border-block-end: 0;
 }
 
@@ -775,7 +818,7 @@ thead .pf-v6-c-table__check .pf-v6-c-radio.pf-m-standalone {
   --pf-v6-c-table--cell--PaddingBlockStart: var(--pf-v6-c-table--m-compact--cell--PaddingBlockStart);
   --pf-v6-c-table--cell--PaddingBlockEnd: var(--pf-v6-c-table--m-compact--cell--PaddingBlockEnd);
 }
-.pf-v6-c-table.pf-m-compact tr:where(.pf-v6-c-table__tr):not(.pf-v6-c-table__expandable-row:where(:nth-child(n+2))) {
+.pf-v6-c-table.pf-m-compact tr:where(.pf-v6-c-table__tr):not(.pf-v6-c-table__expandable-row) {
   --pf-v6-c-table--cell--PaddingBlockStart: var(--pf-v6-c-table--m-compact--cell--PaddingBlockStart);
   --pf-v6-c-table--cell--PaddingBlockEnd: var(--pf-v6-c-table--m-compact--cell--PaddingBlockEnd);
 }
@@ -819,15 +862,20 @@ thead .pf-v6-c-table__check .pf-v6-c-radio.pf-m-standalone {
   background-color: var(--pf-v6-c-table--compound-expansion--m-expanded--BackgroundColor);
 }
 
-.pf-v6-c-table__tr.pf-m-expanded:has(~ .pf-v6-c-table__expandable-row) {
+.pf-v6-c-table.pf-m-expandable .pf-v6-c-table__tr.pf-m-expanded {
   border-block-end: 0;
 }
-
-.pf-v6-c-table__tbody.pf-m-expanded, .pf-v6-c-table__tbody:has(> .pf-v6-c-table__expandable-row.pf-m-expanded) {
-  border-block-end: var(--pf-v6-c-table__tbody--BorderBlockEndWidth) solid var(--pf-v6-c-table__tbody--BorderBlockEndColor);
+.pf-v6-c-table.pf-m-expandable .pf-v6-c-table__tbody {
+  border-block-end: var(--pf-v6-c-table__tr--BorderBlockEndWidth) solid var(--pf-v6-c-table__tr--BorderBlockEndColor);
+}
+.pf-v6-c-table.pf-m-expandable .pf-v6-c-table__tbody.pf-m-expanded {
+  border-block-end: var(--pf-v6-c-table__tr--BorderBlockEndWidth) solid var(--pf-v6-c-table__tr--BorderBlockEndColor);
 }
-.pf-v6-c-table__tbody.pf-m-expanded .pf-v6-c-table__control-row {
+.pf-v6-c-table.pf-m-expandable .pf-v6-c-table__tbody.pf-m-expanded .pf-v6-c-table__control-row {
   background-color: var(--pf-v6-c-table__control-row--BackgroundColor);
+  border-block-end: var(--pf-v6-c-table__control-row--BorderBlockEndWidth) solid var(--pf-v6-c-table__control-row__tbody--BorderBlockEndColor);
+}
+.pf-v6-c-table.pf-m-expandable .pf-v6-c-table__tbody.pf-m-expanded .pf-v6-c-table__control-row.pf-m-expanded {
   border-block-end: 0;
 }
 
@@ -841,52 +889,6 @@ thead .pf-v6-c-table__check .pf-v6-c-radio.pf-m-standalone {
   border-block-end: var(--pf-v6-c-table--border-width--base) solid var(--pf-v6-c-table--BorderColor);
 }
 
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)) {
-  position: relative;
-  border-block-end: 0 solid transparent;
-}
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)) > .pf-v6-c-table__th,
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)) > .pf-v6-c-table__td {
-  padding-block-start: 0;
-}
-.pf-v6-c-table__control-row ~ .pf-v6-c-table__expandable-row:where(:nth-child(n+2)) > .pf-v6-c-table__th,
-.pf-v6-c-table__control-row ~ .pf-v6-c-table__expandable-row:where(:nth-child(n+2)) > .pf-v6-c-table__td {
-  padding-block-start: var(--pf-v6-c-table--cell--PaddingBlockStart);
-}
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)) .pf-v6-c-table__td.pf-m-no-padding,
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)) .pf-v6-c-table__th.pf-m-no-padding {
-  padding-block-start: 0;
-  padding-block-end: 0;
-  padding-inline-start: 0;
-  padding-inline-end: 0;
-}
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)) .pf-v6-c-table__td.pf-m-no-padding .pf-v6-c-table__expandable-row-content,
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)) .pf-v6-c-table__th.pf-m-no-padding .pf-v6-c-table__expandable-row-content {
-  padding: 0;
-  border-radius: 0;
-}
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)) .pf-v6-c-table__expandable-row-content {
-  padding-block-start: var(--pf-v6-c-table__expandable-row-content--PaddingBlockStart);
-  padding-block-end: var(--pf-v6-c-table__expandable-row-content--PaddingBlockEnd);
-  padding-inline-start: var(--pf-v6-c-table__expandable-row-content--PaddingInlineStart);
-  padding-inline-end: var(--pf-v6-c-table__expandable-row-content--PaddingInlineEnd);
-  background-color: var(--pf-v6-c-table__expandable-row-content--BackgroundColor);
-  border-radius: var(--pf-v6-c-table__expandable-row-content--BorderRadius);
-}
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)) .pf-v6-c-table__expandable-row-content.pf-m-no-background {
-  background-color: transparent;
-}
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)).pf-m-expanded {
-  border-block-end-color: var(--pf-v6-c-table__expandable-row--m-expanded--BorderBlockEndColor);
-  border-block-end-width: var(--pf-v6-c-table--border-width--base);
-}
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)):not(.pf-m-expanded) {
-  display: none;
-}
-.pf-v6-c-table__expandable-row:where(:nth-child(n+2)) tr:last-child {
-  border-block-end: 0;
-}
-
 .pf-v6-c-table__icon-inline {
   display: flex;
   align-items: center;

package/components/Table/table.scss

@@ -27,8 +27,6 @@
   --#{$table}__tbody--cell--PaddingBlockStart: var(--#{$table}--cell--Padding--base);
   --#{$table}__tbody--cell--PaddingBlockEnd: var(--#{$table}--cell--Padding--base);
   --#{$table}__tbody--cell--FontSize: var(--pf-t--global--font--size--body--default); // set this explicitly for input heights to calc properly
-  --#{$table}__tbody--BorderBlockEndWidth: var(--pf-t--global--border--width--divider--default);
-  --#{$table}__tbody--BorderBlockEndColor: var(--pf-t--global--border--color--default);
 
   // * Table tr
   --#{$table}__tr--BorderBlockEndWidth: var(--pf-t--global--border--width--divider--default);
@@ -333,7 +331,7 @@
 
   // Standard table row (non-expandable)
   // exclude expandable rows
-  tr:where(.#{$table}__tr):not(.#{$table}__expandable-row:where(:nth-child(n+2))) {
+  tr:where(.#{$table}__tr):not(.#{$table}__expandable-row) {
     // stylelint-disable-next-line
     &.pf-m-ghost-row {
       background-color: var(--#{$table}__tr--m-ghost-row--BackgroundColor);
@@ -571,7 +569,7 @@
       background-color: var(--#{$table}__tbody--m-selected--BackgroundColor);
       outline-offset: var(--#{$table}__tbody--m-selected--OutlineOffset);
 
-      .#{$table}__tr.pf-m-expanded:not(.#{$table}__expandable-row:where(:nth-child(n+2))) {
+      .#{$table}__tr.pf-m-expanded:not(.#{$table}__expandable-row) {
         border: none;
       }
     }
@@ -598,7 +596,13 @@
   // stylelint-disable max-nesting-depth, selector-max-class
   &.pf-m-animate-expand {
     > .#{$table}__tbody {
-      > .#{$table}__expandable-row:where(:nth-child(n+2)) {
+      &.pf-m-expanded {
+        > .#{$table}__control-row {
+          border-block-end: 0;
+        }
+      }
+
+      > .#{$table}__expandable-row {
         display: var(--#{$table}__expandable-row--Display, revert);
         visibility: hidden;
         opacity: var(--#{$table}__expandable-row--Opacity);
@@ -628,8 +632,6 @@
 
         &:not(.pf-m-expanded) {
           > :is(.#{$table}__td, .#{$table}__th) {
-            --#{$table}--cell--responsive--label: none;
-
             &,
             > .#{$table}__expandable-row-content {
               padding: 0;
@@ -645,7 +647,18 @@
         }
       }
 
-      > .#{$table}__control-row.pf-m-no-animate-expand ~ .#{$table}__expandable-row:where(:nth-child(n+2)) {
+      // Add padding back to compound expandable
+      > .#{$table}__control-row ~ .#{$table}__expandable-row.pf-m-expanded {
+        > :is(.#{$table}__th, .#{$table}__td):not(.pf-m-no-padding) {
+          padding-block-start: var(--#{$table}--cell--PaddingBlockStart);
+        }
+      }
+
+      > .#{$table}__tr:has(~ .#{$table}__expandable-row) {
+        border-block-end: 0;
+      }
+
+      > .#{$table}__control-row.pf-m-no-animate-expand ~ .#{$table}__expandable-row {
         --#{$table}__expandable-row--TransitionDuration--collapse--fade: 0s;
         --#{$table}__expandable-row--TransitionDuration--collapse--slide: 0s;
         --#{$table}__expandable-row--TransitionDuration--expand--fade: 0s;
@@ -653,7 +666,7 @@
       }
     }
   }
-  // stylelint-enable max-nesting-depth, selector-max-class
+  // stylelint-enable
 }
 
 // - Table truncate - Table wrap - Table nowrap - Table fit content - Table wrap - Table break word
@@ -1041,8 +1054,61 @@
   pointer-events: none;
 }
 
-.#{$table}__tr:has(~ .#{$table}__expandable-row.pf-m-expanded) {
-  border-block-end: 0;
+// - Table expandable row
+.#{$table}__expandable-row {
+  position: relative;
+  border-block-end: 0 solid transparent;
+
+  @at-root :not(.#{$table}__control-row) ~ .#{$table}__expandable-row {
+    > .#{$table}__th,
+    > .#{$table}__td {
+      padding-block-start: 0;
+    }
+  }
+
+  td:where(.#{$table}__td),
+  th:where(.#{$table}__th) {
+    &.pf-m-no-padding {
+      padding-block-start: 0;
+      padding-block-end: 0;
+      padding-inline-start: 0;
+      padding-inline-end: 0;
+
+      .#{$table}__expandable-row-content {
+        padding: 0;
+        border-radius: 0;
+      }
+    }
+  }
+
+  // - Table expandable row content
+  .#{$table}__expandable-row-content {
+    padding-block-start: var(--#{$table}__expandable-row-content--PaddingBlockStart);
+    padding-block-end: var(--#{$table}__expandable-row-content--PaddingBlockEnd);
+    padding-inline-start: var(--#{$table}__expandable-row-content--PaddingInlineStart);
+    padding-inline-end: var(--#{$table}__expandable-row-content--PaddingInlineEnd);
+    background-color: var(--#{$table}__expandable-row-content--BackgroundColor);
+    border-radius: var(--#{$table}__expandable-row-content--BorderRadius);
+
+    &.pf-m-no-background {
+      background-color: transparent;
+    }
+  }
+
+  // - Table expandable row content expanded
+  &.pf-m-expanded {
+    border-block-end-color: var(--#{$table}__expandable-row--m-expanded--BorderBlockEndColor);
+    border-block-end-width: var(--#{$table}--border-width--base);
+  }
+
+  &:not(.pf-m-expanded) {
+    display: none;
+  }
+
+  // - Table expandable row tr last-child
+  tr:last-child {
+    border-block-end: 0;
+  }
 }
 
 // - Table compact
@@ -1052,7 +1118,7 @@
 
   // - Table compact table tr
   tr:where(.#{$table}__tr) {
-    &:not(.#{$table}__expandable-row:where(:nth-child(n+2))) {
+    &:not(.#{$table}__expandable-row) {
       --#{$table}--cell--PaddingBlockStart: var(--#{$table}--m-compact--cell--PaddingBlockStart);
       --#{$table}--cell--PaddingBlockEnd: var(--#{$table}--m-compact--cell--PaddingBlockEnd);
     }
@@ -1116,21 +1182,31 @@
   }
 }
 
-.#{$table}__tr.pf-m-expanded:has(~ .#{$table}__expandable-row) {
-  border-block-end: 0;
-}
+// Table table tbody expandable
+.#{$table}.pf-m-expandable {
+  .#{$table}__tr.pf-m-expanded {
+    border-block-end: 0;
+  }
 
-.#{$table}__tbody {
-  &.pf-m-expanded,
-  &:has(> .#{$table}__expandable-row.pf-m-expanded) {
-    border-block-end: var(--#{$table}__tbody--BorderBlockEndWidth) solid var(--#{$table}__tbody--BorderBlockEndColor);
+  // - Table tbody
+  .#{$table}__tbody {
+    border-block-end: var(--#{$table}__tr--BorderBlockEndWidth) solid var(--#{$table}__tr--BorderBlockEndColor);
   }
 
-  &.pf-m-expanded {
+  // - Table tbody - Table tr
+  .#{$table}__tbody.pf-m-expanded {
+    border-block-end: var(--#{$table}__tr--BorderBlockEndWidth) solid var(--#{$table}__tr--BorderBlockEndColor);
+
     // - Table tbody table control row
     .#{$table}__control-row {
       background-color: var(--#{$table}__control-row--BackgroundColor);
-      border-block-end: 0;
+      border-block-end: var(--#{$table}__control-row--BorderBlockEndWidth) solid var(--#{$table}__control-row__tbody--BorderBlockEndColor);
+
+      // stylelint-disable max-nesting-depth, selector-max-class
+      &.pf-m-expanded {
+        border-block-end: 0; // TODO this is a dupe of the block above, consolidate in a breaking change
+      }
+      // stylelint-enable
     }
   }
 }
@@ -1148,71 +1224,6 @@
   }
 }
 
-// - Table expandable row
-// n+2 selects all children except the first because __expandable-row can go on the first row in an expandable tbody when it shouldn't. TODO - remove __expandable-body from first/control tr in breaking change.
-.#{$table}__expandable-row:where(:nth-child(n+2)) {
-  position: relative;
-  border-block-end: 0 solid transparent;
-
-  // Remove top padding from regular expandable
-  > .#{$table}__th,
-  > .#{$table}__td {
-    padding-block-start: 0;
-  }
-
-  // Add padding back to compound expandable
-  .#{$table}__control-row ~ & {
-    > .#{$table}__th,
-    > .#{$table}__td {
-      padding-block-start: var(--#{$table}--cell--PaddingBlockStart);
-    }
-  }
-
-  .#{$table}__td,
-  .#{$table}__th {
-    &.pf-m-no-padding {
-      padding-block-start: 0;
-      padding-block-end: 0;
-      padding-inline-start: 0;
-      padding-inline-end: 0;
-
-      .#{$table}__expandable-row-content {
-        padding: 0;
-        border-radius: 0;
-      }
-    }
-  }
-
-  // - Table expandable row content
-  .#{$table}__expandable-row-content {
-    padding-block-start: var(--#{$table}__expandable-row-content--PaddingBlockStart);
-    padding-block-end: var(--#{$table}__expandable-row-content--PaddingBlockEnd);
-    padding-inline-start: var(--#{$table}__expandable-row-content--PaddingInlineStart);
-    padding-inline-end: var(--#{$table}__expandable-row-content--PaddingInlineEnd);
-    background-color: var(--#{$table}__expandable-row-content--BackgroundColor);
-    border-radius: var(--#{$table}__expandable-row-content--BorderRadius);
-
-    &.pf-m-no-background {
-      background-color: transparent;
-    }
-  }
-
-  // - Table expandable row content expanded
-  &.pf-m-expanded {
-    border-block-end-color: var(--#{$table}__expandable-row--m-expanded--BorderBlockEndColor);
-    border-block-end-width: var(--#{$table}--border-width--base);
-  }
-
-  &:not(.pf-m-expanded) {
-    display: none;
-  }
-
-  // - Table expandable row tr last-child
-  tr:last-child {
-    border-block-end: 0;
-  }
-}
-
 // - Table icon inline
 .#{$table}__icon-inline {
   display: flex;