@patternfly/patternfly 6.0.0-alpha.100 → 6.0.0-alpha.101

package/components/Table/table-scrollable.css

@@ -1,6 +1,6 @@
 :where(:root),
 :where(.pf-v6-c-table) {
-  --pf-v6-c-table__sticky-cell--MinWidth--base: 12.5rem;
+  --pf-v6-c-table__sticky-cell--MinWidth--base: 8.75rem;
   --pf-v6-c-table__sticky-cell--MinWidth: var(--pf-v6-c-table__sticky-cell--MinWidth--base);
   --pf-v6-c-table__sticky-cell--ZIndex: var(--pf-t--global--Zindex--xs);
   --pf-v6-c-table__sticky-cell--Right: auto;
@@ -14,36 +14,33 @@
   --pf-v6-c-table__sticky-cell--m-left--Left: 0;
   --pf-v6-c-table--m-sticky-header__sticky-cell--ZIndex: calc(var(--pf-v6-c-table__sticky-cell--ZIndex) + 1);
 }
-:where(:root) .pf-v6-c-table__sticky-cell,
-:where(.pf-v6-c-table) .pf-v6-c-table__sticky-cell {
-  --pf-v6-c-table--cell--Overflow: visible;
-  --pf-v6-c-table--m-sticky-header--cell--ZIndex: var(--pf-v6-c-table--m-sticky-header__sticky-cell--ZIndex);
+
+.pf-v6-c-table .pf-v6-c-table__sticky-cell {
   position: sticky;
   inset-inline-start: var(--pf-v6-c-table__sticky-cell--Left);
   inset-inline-end: var(--pf-v6-c-table__sticky-cell--Right);
   z-index: var(--pf-v6-c-table__sticky-cell--ZIndex);
   min-width: var(--pf-v6-c-table__sticky-cell--MinWidth);
+}
+
+.pf-v6-c-table__sticky-cell {
+  --pf-v6-c-table--cell--Overflow: visible;
+  --pf-v6-c-table--m-sticky-header--cell--ZIndex: var(--pf-v6-c-table--m-sticky-header__sticky-cell--ZIndex);
   background-color: var(--pf-v6-c-table__sticky-cell--BackgroundColor);
   background-clip: padding-box;
 }
-:where(:root) .pf-v6-c-table__sticky-cell.pf-m-border-right::before,
-:where(.pf-v6-c-table) .pf-v6-c-table__sticky-cell.pf-m-border-right::before {
+.pf-v6-c-table__sticky-cell.pf-m-border-right::before {
   --pf-v6-c-table--cell--m-border-right--before--BorderRightWidth: var(--pf-v6-c-table__sticky-cell--m-border-right--before--BorderRightWidth);
   --pf-v6-c-table--cell--m-border-right--before--BorderRightColor: var(--pf-v6-c-table__sticky-cell--m-border-right--before--BorderRightColor);
 }
-:where(:root) .pf-v6-c-table__sticky-cell.pf-m-border-left::before,
-:where(.pf-v6-c-table) .pf-v6-c-table__sticky-cell.pf-m-border-left::before {
+.pf-v6-c-table__sticky-cell.pf-m-border-left::before {
   --pf-v6-c-table--cell--m-border-left--before--BorderLeftWidth: var(--pf-v6-c-table__sticky-cell--m-border-left--before--BorderLeftWidth);
   --pf-v6-c-table--cell--m-border-left--before--BorderLeftColor: var(--pf-v6-c-table__sticky-cell--m-border-left--before--BorderLeftColor);
 }
-:where(:root) .pf-v6-c-table__sticky-cell.pf-m-right, :where(:root) .pf-v6-c-table__sticky-cell.pf-m-inline-end,
-:where(.pf-v6-c-table) .pf-v6-c-table__sticky-cell.pf-m-right,
-:where(.pf-v6-c-table) .pf-v6-c-table__sticky-cell.pf-m-inline-end {
+.pf-v6-c-table__sticky-cell.pf-m-right, .pf-v6-c-table__sticky-cell.pf-m-inline-end {
   --pf-v6-c-table__sticky-cell--Right: var(--pf-v6-c-table__sticky-cell--m-right--Right);
 }
-:where(:root) .pf-v6-c-table__sticky-cell.pf-m-left, :where(:root) .pf-v6-c-table__sticky-cell.pf-m-inline-start,
-:where(.pf-v6-c-table) .pf-v6-c-table__sticky-cell.pf-m-left,
-:where(.pf-v6-c-table) .pf-v6-c-table__sticky-cell.pf-m-inline-start {
+.pf-v6-c-table__sticky-cell.pf-m-left, .pf-v6-c-table__sticky-cell.pf-m-inline-start {
   --pf-v6-c-table__sticky-cell--Left: var(--pf-v6-c-table__sticky-cell--m-left--Left);
 }
 

package/components/Table/table-scrollable.scss

@@ -1,7 +1,7 @@
 // * Table scrollable
 :where(:root),
 :where(.#{$table}) {
-  --#{$table}__sticky-cell--MinWidth--base: #{pf-size-prem(200px)};
+  --#{$table}__sticky-cell--MinWidth--base: #{pf-size-prem(140px)};
   --#{$table}__sticky-cell--MinWidth: var(--#{$table}__sticky-cell--MinWidth--base);
   --#{$table}__sticky-cell--ZIndex: var(--pf-t--global--Zindex--xs);
   --#{$table}__sticky-cell--Right: auto;
@@ -14,44 +14,47 @@
   --#{$table}__sticky-cell--m-right--Right: 0;
   --#{$table}__sticky-cell--m-left--Left: 0;
   --#{$table}--m-sticky-header__sticky-cell--ZIndex: calc(var(--#{$table}__sticky-cell--ZIndex) + 1);
+}
+
 
-  // * Table sticky cell
-  .#{$table}__sticky-cell {
-    --#{$table}--cell--Overflow: visible;
-    --#{$table}--m-sticky-header--cell--ZIndex: var(--#{$table}--m-sticky-header__sticky-cell--ZIndex);
+// - Table sticky cell
+.#{$table} .#{$table}__sticky-cell {
+  position: sticky;
+  inset-inline-start: var(--#{$table}__sticky-cell--Left);
+  inset-inline-end: var(--#{$table}__sticky-cell--Right);
+  z-index: var(--#{$table}__sticky-cell--ZIndex);
+  min-width: var(--#{$table}__sticky-cell--MinWidth);
+}
 
-    position: sticky;
-    inset-inline-start: var(--#{$table}__sticky-cell--Left);
-    inset-inline-end: var(--#{$table}__sticky-cell--Right);
-    z-index: var(--#{$table}__sticky-cell--ZIndex);
-    min-width: var(--#{$table}__sticky-cell--MinWidth);
-    background-color: var(--#{$table}__sticky-cell--BackgroundColor);
-    background-clip: padding-box;
+.#{$table}__sticky-cell {
+  --#{$table}--cell--Overflow: visible;
+  --#{$table}--m-sticky-header--cell--ZIndex: var(--#{$table}--m-sticky-header__sticky-cell--ZIndex);
 
-    &.pf-m-border-right::before {
-      --#{$table}--cell--m-border-right--before--BorderRightWidth: var(--#{$table}__sticky-cell--m-border-right--before--BorderRightWidth);
-      --#{$table}--cell--m-border-right--before--BorderRightColor: var(--#{$table}__sticky-cell--m-border-right--before--BorderRightColor);
-    }
+  background-color: var(--#{$table}__sticky-cell--BackgroundColor);
+  background-clip: padding-box;
 
-    &.pf-m-border-left::before {
-      --#{$table}--cell--m-border-left--before--BorderLeftWidth: var(--#{$table}__sticky-cell--m-border-left--before--BorderLeftWidth);
-      --#{$table}--cell--m-border-left--before--BorderLeftColor: var(--#{$table}__sticky-cell--m-border-left--before--BorderLeftColor);
-    }
+  &.pf-m-border-right::before {
+    --#{$table}--cell--m-border-right--before--BorderRightWidth: var(--#{$table}__sticky-cell--m-border-right--before--BorderRightWidth);
+    --#{$table}--cell--m-border-right--before--BorderRightColor: var(--#{$table}__sticky-cell--m-border-right--before--BorderRightColor);
+  }
 
-    &.pf-m-right,
-    &.pf-m-inline-end {
-      --#{$table}__sticky-cell--Right: var(--#{$table}__sticky-cell--m-right--Right);
-    }
+  &.pf-m-border-left::before {
+    --#{$table}--cell--m-border-left--before--BorderLeftWidth: var(--#{$table}__sticky-cell--m-border-left--before--BorderLeftWidth);
+    --#{$table}--cell--m-border-left--before--BorderLeftColor: var(--#{$table}__sticky-cell--m-border-left--before--BorderLeftColor);
+  }
 
-    &.pf-m-left,
-    &.pf-m-inline-start {
-      --#{$table}__sticky-cell--Left: var(--#{$table}__sticky-cell--m-left--Left);
-    }
+  &.pf-m-right,
+  &.pf-m-inline-end {
+    --#{$table}__sticky-cell--Right: var(--#{$table}__sticky-cell--m-right--Right);
+  }
 
+  &.pf-m-left,
+  &.pf-m-inline-start {
+    --#{$table}__sticky-cell--Left: var(--#{$table}__sticky-cell--m-left--Left);
   }
 }
 
-// * Scroll outer wrapper
+// - Scroll outer wrapper
 .#{$scroll-outer-wrapper} {
   --#{$scroll-outer-wrapper}--MinHeight: #{pf-size-prem(400px)};
   --#{$scroll-outer-wrapper}--MaxHeight: 100%;
@@ -64,7 +67,7 @@
   overflow: hidden;
 }
 
-// * Scroll inner wrapper
+// - Scroll inner wrapper
 .#{$scroll-inner-wrapper} {
   display: flex;
   flex-direction: column;

package/components/Table/table-tree-view.css

@@ -6,7 +6,6 @@
   --pf-v6-c-table__tree-view-main--PaddingLeft: var(--pf-v6-c-table__tree-view-main--indent--base);
   --pf-v6-c-table__tree-view-main--MarginLeft: calc(var(--pf-v6-c-table--cell--PaddingLeft) * -1);
   --pf-v6-c-table__tree-view-main--c-table__check--PaddingRight: var(--pf-t--global--spacer--sm);
-  --pf-v6-c-table__tree-view-main--c-table__check--PaddingLeft: var(--pf-t--global--spacer--sm);
   --pf-v6-c-table__tree-view-main--c-table__check--MarginRight: var(--pf-t--global--spacer--sm);
   --pf-v6-c-table__tree-view-icon--MinWidth: var(--pf-t--global--spacer--md);
   --pf-v6-c-table__tree-view-icon--MarginRight: var(--pf-t--global--spacer--sm);
@@ -87,7 +86,6 @@
   margin-inline-end: var(--pf-v6-c-table__tree-view-main--c-table__check--MarginRight);
 }
 .pf-v6-c-table__tree-view-main > .pf-v6-c-table__check label {
-  padding-inline-start: var(--pf-v6-c-table__tree-view-main--c-table__check--PaddingLeft);
   padding-inline-end: var(--pf-v6-c-table__tree-view-main--c-table__check--PaddingRight);
   margin-block-start: 0;
   margin-block-end: 0;

package/components/Table/table-tree-view.scss

@@ -1,4 +1,4 @@
-$pf-v5-c-tree-view--MaxDepth: 10;
+$pf-v6-c-tree-view--MaxDepth: 10;
 
 // * Table tree view
 :where(:root),
@@ -9,28 +9,27 @@ $pf-v5-c-tree-view--MaxDepth: 10;
   // * Table tree view main button
   --#{$table}__tree-view-main--c-button--MarginRight: var(--pf-t--global--spacer--sm);
 
-  // - Table tree view main
+  // * Table tree view main
   --#{$table}__tree-view-main--PaddingLeft: var(--#{$table}__tree-view-main--indent--base);
   --#{$table}__tree-view-main--MarginLeft: calc(var(--#{$table}--cell--PaddingLeft) * -1);
 
-  // - Table tree view check
+  // * Table tree view check
   --#{$table}__tree-view-main--c-table__check--PaddingRight: var(--pf-t--global--spacer--sm);
-  --#{$table}__tree-view-main--c-table__check--PaddingLeft: var(--pf-t--global--spacer--sm);
   --#{$table}__tree-view-main--c-table__check--MarginRight: var(--pf-t--global--spacer--sm);
 
-  // - Table tree view icon
+  // * Table tree view icon
   --#{$table}__tree-view-icon--MinWidth: var(--pf-t--global--spacer--md);
   --#{$table}__tree-view-icon--MarginRight: var(--pf-t--global--spacer--sm);
 
-  // - Table tree view toggle
+  // * Table tree view toggle
   --#{$table}--m-tree-view__toggle--Position: absolute;
   --#{$table}--m-tree-view__toggle--Left: var(--#{$table}__tree-view-main--PaddingLeft);
   --#{$table}--m-tree-view__toggle--TranslateX: -100%;
 
-  // - Table tree view toggle toggle icon
+  // * Table tree view toggle toggle icon
   --#{$table}--m-tree-view__toggle__toggle-icon--MinWidth: var(--pf-t--global--spacer--md);
 
-  // - Table tree view no inset tree view main
+  // * Table tree view no inset tree view main
   --#{$table}--m-no-inset__tree-view-main--PaddingLeft: 0;
   --#{$table}--m-no-inset__tree-view-main--MarginLeft: 0;
 }
@@ -51,7 +50,7 @@ $pf-v5-c-tree-view--MaxDepth: 10;
     --#{$table}__tree-view-main--MarginLeft: var(--#{$table}--m-no-inset__tree-view-main--MarginLeft);
   }
 
-  @for $i from 2 through $pf-v5-c-tree-view--MaxDepth {
+  @for $i from 2 through $pf-v6-c-tree-view--MaxDepth {
     tr:where(.#{$table}__tr)[aria-level="#{$i}"] {
       --#{$table}__tree-view-main--PaddingLeft: calc(var(--#{$table}__tree-view-main--nested-indent--base) * #{$i - 1} + var(--#{$table}__tree-view-main--indent--base));
     }
@@ -95,7 +94,6 @@ $pf-v5-c-tree-view--MaxDepth: 10;
   }
 
   > .#{$table}__check label {
-    padding-inline-start: var(--#{$table}__tree-view-main--c-table__check--PaddingLeft);
     padding-inline-end: var(--#{$table}__tree-view-main--c-table__check--PaddingRight);
     margin-block-start: 0;
     margin-block-end: 0;
@@ -313,7 +311,7 @@ $pf-v5-c-tree-view--MaxDepth: 10;
     margin-block-end: var(--#{$table}__tree-view-details-toggle--MarginBottom);
   }
 
-  @for $i from 2 through $pf-v5-c-tree-view--MaxDepth {
+  @for $i from 2 through $pf-v6-c-tree-view--MaxDepth {
     tr:where(.#{$table}__tr)[aria-level="#{$i}"] {
       --#{$table}--m-tree-view-grid__tbody--cell--PaddingLeft: calc(var(--#{$table}__tree-view-main--nested-indent--base) * #{$i - 1} + var(--#{$table}__tree-view-main--indent--base)); // indent, plus indent level, plus
     }

package/components/Table/table.css

@@ -60,18 +60,21 @@
   --pf-v6-c-table__caption--PaddingLeft: var(--pf-t--global--spacer--lg);
   --pf-v6-c-table__thead--cell--FontSize: var(--pf-t--global--font--size--body--sm);
   --pf-v6-c-table__thead--cell--FontWeight: var(--pf-t--global--font--weight--body--bold);
+  --pf-v6-c-table__thead__toggle--PaddingBottom: var(--pf-t--global--spacer--xs);
   --pf-v6-c-table__tbody--cell--PaddingTop: var(--pf-v6-c-table--cell--Padding--base);
   --pf-v6-c-table__tbody--cell--PaddingBottom: 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__tr--BorderBottomWidth: var(--pf-t--global--border--width--divider--default);
+  --pf-v6-c-table__tr--BorderBottomColor: var(--pf-t--global--border--color--default);
   --pf-v6-c-table--cell--Padding--base: var(--pf-t--global--spacer--md);
-  --pf-v6-c-table--cell--FontSize: var(--pf-t--global--font--size--body--default);
-  --pf-v6-c-table--cell--FontWeight: var(--pf-t--global--font--weight--body);
-  --pf-v6-c-table--cell--LineHeight: var(--pf-t--global--font--line-height--body);
-  --pf-v6-c-table--cell--Color: var(--pf-t--global--text--color--regular);
   --pf-v6-c-table--cell--PaddingTop: var(--pf-v6-c-table--cell--Padding--base);
   --pf-v6-c-table--cell--PaddingRight: var(--pf-v6-c-table--cell--Padding--base);
   --pf-v6-c-table--cell--PaddingBottom: var(--pf-v6-c-table--cell--Padding--base);
   --pf-v6-c-table--cell--PaddingLeft: var(--pf-v6-c-table--cell--Padding--base);
+  --pf-v6-c-table--cell--FontSize: var(--pf-t--global--font--size--body--default);
+  --pf-v6-c-table--cell--FontWeight: var(--pf-t--global--font--weight--body);
+  --pf-v6-c-table--cell--LineHeight: var(--pf-t--global--font--line-height--body);
+  --pf-v6-c-table--cell--Color: var(--pf-t--global--text--color--regular);
   --pf-v6-c-table--cell--first-last-child--PaddingInline: var(--pf-t--global--spacer--sm);
   --pf-v6-c-table__tr--m-first-cell-offset-reset--cell--PaddingLeft: var(--pf-v6-c-table--cell--Padding--base);
   --pf-v6-c-table--cell--MinWidth: 0;
@@ -88,6 +91,7 @@
   --pf-v6-c-table--cell--m-help--MinWidth: 11ch;
   --pf-v6-c-table--m-truncate--cell--MaxWidth: 1px;
   --pf-v6-c-table--m-truncate--cell--MinWidth: calc(5ch + var(--pf-v6-c-table--cell--PaddingRight) + var(--pf-v6-c-table--cell--PaddingLeft));
+  --pf-v6-c-table--m-truncate__text--MinWidth: 5ch;
   --pf-v6-c-table--cell--hidden-visible--Display: table-cell;
   --pf-v6-c-table__toggle--PaddingTop: var(--pf-t--global--spacer--sm);
   --pf-v6-c-table__toggle--PaddingBottom: var(--pf-t--global--spacer--sm);
@@ -106,7 +110,6 @@
   --pf-v6-c-table__button--BorderRadius: var(--pf-t--global--border--radius--small);
   --pf-v6-c-table__button--hover--Color: var(--pf-t--global--text--color--regular);
   --pf-v6-c-table__button--hover--BackgroundColor: var(--pf-t--global--background--color--action--plain--hover);
-  --pf-v6-c-table__button--OutlineOffset: calc(var(--pf-t--global--border--width--strong) * -1);
   --pf-v6-c-table--m-compact__toggle--PaddingTop: 0;
   --pf-v6-c-table--m-compact__toggle--PaddingBottom: 0;
   --pf-v6-c-table__check--PaddingLeft: var(--pf-t--global--spacer--sm);
@@ -114,6 +117,7 @@
   --pf-v6-c-table__favorite--c-button--FontSize: var(--pf-t--global--font--size--body--default);
   --pf-v6-c-table--cell--m-favorite--Color: var(--pf-t--global--text--color--subtle);
   --pf-v6-c-table__favorite--m-favorited--c-button--Color: var(--pf-t--global--color--favorite--clicked);
+  --pf-v6-c-table__favorite--m-favorited--c-button--hover--Color: var(--pf-t--global--color--favorite--clicked);
   --pf-v6-c-table__sort--m-favorite__button__text--Color: var(--pf-t--global--text--color--subtle);
   --pf-v6-c-table__sort--m-favorite__button--hover__text--Color: var(--pf-t--global--text--color--regular);
   --pf-v6-c-table__draggable--c-button--MarginTop: calc(var(--pf-v6-c-button--PaddingTop) * -1);
@@ -133,7 +137,11 @@
   --pf-v6-c-table__expandable-row-content--PaddingBottom: var(--pf-t--global--spacer--md);
   --pf-v6-c-table__expandable-row-content--PaddingLeft: var(--pf-t--global--spacer--md);
   --pf-v6-c-table__expandable-row-content--PaddingRight: var(--pf-t--global--spacer--md);
+  --pf-v6-c-table__expandable-row-content--BorderRadius: var(--pf-t--global--border--radius--small);
   --pf-v6-c-table__expandable-row-content--Transition: var(--pf-v6-global--Transition);
+  --pf-v6-c-table__control-row--BackgroundColor: var(--pf-t--global--background--color--primary--default);
+  --pf-v6-c-table__control-row--BorderBottomWidth: var(--pf-t--global--border--width--divider--default);
+  --pf-v6-c-table__control-row__tbody--BorderBottomColor: var(--pf-t--global--border--color--default);
   --pf-v6-c-table__icon-inline--MarginRight: var(--pf-t--global--spacer--sm);
   --pf-v6-c-table__sort--MinWidth: calc(6ch + var(--pf-v6-c-table--cell--PaddingRight) + var(--pf-v6-c-table--cell--PaddingLeft) + var(--pf-v6-c-table__sort-indicator--MarginLeft));
   --pf-v6-c-table__sort__button--PaddingTop: var(--pf-t--global--spacer--sm);
@@ -160,10 +168,16 @@
   --pf-v6-c-table__column-help--c-button--PaddingRight: var(--pf-t--global--spacer--sm);
   --pf-v6-c-table__column-help--c-button--PaddingLeft: var(--pf-t--global--spacer--sm);
   --pf-v6-c-table__compound-expansion-toggle__button--Color: var(--pf-t--global--icon--color--brand--default);
+  --pf-v6-c-table__compound-expansion-toggle__button--BackgroundColor: var(--pf-t--global--background--color--action--plain--default);
   --pf-v6-c-table__compound-expansion-toggle__button--hover--Color: var(--pf-t--global--icon--color--brand--hover);
+  --pf-v6-c-table__compound-expansion-toggle__button--hover--BackgroundColor: var(--pf-t--global--background--color--action--plain--hover);
+  --pf-v6-c-table__compound-expansion-toggle__button--expanded--BackgroundColor: var(--pf-t--global--background--color--action--plain--clicked);
   --pf-v6-c-table__compound-expansion-toggle__button--after--BorderColor: var(--pf-t--global--border--color--clicked);
   --pf-v6-c-table__compound-expansion-toggle__button--after--BorderTopWidth: 0;
+  --pf-v6-c-table__compound-expansion-toggle__button--hover--BorderColor: var(--pf-t--global--border--color--hover);
+  --pf-v6-c-table__compound-expansion-toggle__button--hover--after--BorderTopWidth: var(--pf-t--global--border--width--strong);
   --pf-v6-c-table__compound-expansion-toggle--m-expanded__button--after--BorderTopWidth: var(--pf-t--global--border--width--strong);
+  --pf-v6-c-table--compound-expansion--m-expanded--BackgroundColor: var(--pf-t--global--background--color--primary--clicked);
   --pf-v6-c-table--m-compact__th--PaddingTop: calc(var(--pf-t--global--spacer--sm) + var(--pf-t--global--spacer--xs));
   --pf-v6-c-table--m-compact__th--PaddingBottom: var(--pf-t--global--spacer--sm);
   --pf-v6-c-table--m-compact--cell--PaddingTop: var(--pf-t--global--spacer--sm);
@@ -172,26 +186,34 @@
   --pf-v6-c-table--m-compact--cell--PaddingLeft: var(--pf-t--global--spacer--sm);
   --pf-v6-c-table--m-compact__action--PaddingTop: var(--pf-t--global--spacer--xs);
   --pf-v6-c-table--m-compact__action--PaddingBottom: var(--pf-t--global--spacer--xs);
+  --pf-v6-c-table--m-expandable__tbody--BorderBottomWidth: var(--pf-t--global--border--width--divider--default);
+  --pf-v6-c-table--m-expandable__tbody--BorderBottomColor: var(--pf-t--global--border--color--default);
   --pf-v6-c-table__expandable-row--m-expanded--BorderBottomColor: var(--pf-t--global--border--color--default);
   --pf-v6-c-table__tr--m-clickable--BackgroundColor: transparent;
   --pf-v6-c-table__tr--m-clickable--OutlineOffset: calc(-1 * var(--pf-t--global--spacer--xs));
   --pf-v6-c-table__tr--m-clickable--hover--BackgroundColor: var(--pf-t--global--background--color--primary--hover);
-  --pf-v6-c-table__tr--m-selected--BackgroundColor: var(--pf-t--global--background--color--primary--hover);
+  --pf-v6-c-table__tr--m-clickable--m-expanded--BackgroundColor: var(--pf-t--global--background--color--primary--clicked);
+  --pf-v6-c-table__tr--m-selected--BackgroundColor: var(--pf-t--global--background--color--primary--clicked);
   --pf-v6-c-table__tr--m-selected--OutlineOffset: calc(-1 * var(--pf-t--global--spacer--xs));
   --pf-v6-c-table__tbody--m-clickable--BackgroundColor: transparent;
   --pf-v6-c-table__tbody--m-clickable--OutlineOffset: calc(-1 * var(--pf-t--global--spacer--xs));
-  --pf-v6-c-table__tbody--m-clickable--hover--BackgroundColor: var(--pf-t--global--background--color--primary--default);
+  --pf-v6-c-table__tbody--m-clickable--hover--BackgroundColor: var(--pf-t--global--background--color--primary--hover);
+  --pf-v6-c-table__tbody--m-clickable--m-expanded--BackgroundColor: var(--pf-t--global--background--color--primary--clicked);
   --pf-v6-c-table__tbody--m-clickable--m-expanded--BorderColor: var(--pf-t--global--border--color--clicked);
-  --pf-v6-c-table__tbody--m-selected--BackgroundColor: var(--pf-t--global--background--color--primary--default);
+  --pf-v6-c-table__tbody--m-selected--BackgroundColor: var(--pf-t--global--background--color--primary--clicked);
   --pf-v6-c-table__tbody--m-selected--OutlineOffset: calc(-1 * var(--pf-t--global--spacer--xs));
   --pf-v6-c-table__thead--m-nested-column-header--button--OutlineOffset: -0.1875rem;
   --pf-v6-c-table__thead--m-nested-column-header__tr--PaddingTop: var(--pf-t--global--spacer--xs);
-  --pf-v6-c-table__thead--m-nested-column-header__tr--PaddingBottom: var(--pf-t--global--spacer--xs);
+  --pf-v6-c-table__thead--m-nested-column-header__tr--PaddingBottom: var(--pf-t--global--spacer--md);
   --pf-v6-c-table__subhead--PaddingLeft: var(--pf-t--global--spacer--sm);
   --pf-v6-c-table__subhead--PaddingRight: var(--pf-t--global--spacer--sm);
   --pf-v6-c-table__subhead--Color: var(--pf-t--global--text--color--subtle);
-  --pf-v6-c-table--m-striped__tr--BackgroundColor: var(--pf-t--global--background--color--primary--default);
+  --pf-v6-c-table__nested-column-header__button--PaddingLeft: calc(var(--pf-v6-c-table__button--PaddingLeft) - var(--pf-t--global--spacer--sm));
+  --pf-v6-c-table__nested-column-header__button--PaddingRight: calc(var(--pf-v6-c-table__button--PaddingRight) - var(--pf-t--global--spacer--xs));
+  --pf-v6-c-table--m-striped__tr--BackgroundColor: var(--pf-t--global--background--color--secondary--default);
   --pf-v6-c-table--m-sticky-header--cell--ZIndex: var(--pf-t--global--Zindex--xs);
+  --pf-v6-c-table--m-sticky-header--ZIndex: calc(var(--pf-t--global--Zindex--xs) + 1);
+  --pf-v6-c-table--m-sticky-header--border--ZIndex: calc(var(--pf-t--global--Zindex--xs) + 2);
 }
 
 .pf-v6-c-table {
@@ -201,39 +223,36 @@
 .pf-v6-c-table.pf-m-fixed {
   table-layout: fixed;
 }
-.pf-v6-c-table.pf-m-sticky-header {
-  position: relative;
-}
-.pf-v6-c-table.pf-m-sticky-header thead:where(.pf-v6-c-table__thead) tr:where(.pf-v6-c-table__tr) > :where(th, td) {
-  z-index: var(--pf-v6-c-table--m-sticky-header--cell--ZIndex);
-}
-.pf-v6-c-table.pf-m-sticky-header > thead:where(.pf-v6-c-table__thead):not(.pf-m-nested-column-header) > tr:where(.pf-v6-c-table__tr) > :where(th, td) {
+.pf-v6-c-table.pf-m-sticky-header > .pf-v6-c-table__thead,
+.pf-v6-c-table .pf-v6-c-table__thead.pf-m-nested-column-header {
   position: sticky;
   inset-block-start: 0;
+  z-index: var(--pf-v6-c-table--m-sticky-header--ZIndex);
   background: var(--pf-v6-c-table--BackgroundColor);
 }
-.pf-v6-c-table.pf-m-sticky-header > thead:where(.pf-v6-c-table__thead):not(.pf-m-nested-column-header) > tr:where(.pf-v6-c-table__tr) > :where(th, td)::after {
+.pf-v6-c-table.pf-m-sticky-header > .pf-v6-c-table__thead::before,
+.pf-v6-c-table .pf-v6-c-table__thead.pf-m-nested-column-header::before {
   position: absolute;
+  inset-block-start: 0;
   inset-block-end: 0;
   inset-inline-start: 0;
   inset-inline-end: 0;
+  z-index: var(--pf-v6-c-table--m-sticky-header--border--ZIndex);
+  pointer-events: none;
   content: "";
   border-block-end: var(--pf-v6-c-table--border-width--base) solid var(--pf-v6-c-table--BorderColor);
 }
+.pf-v6-c-table.pf-m-sticky-header {
+  position: relative;
+}
+.pf-v6-c-table.pf-m-sticky-header thead:where(.pf-v6-c-table__thead) tr:where(.pf-v6-c-table__tr) > :where(th, td) {
+  z-index: var(--pf-v6-c-table--m-sticky-header--cell--ZIndex);
+}
 .pf-v6-c-table.pf-m-sticky-header > .pf-m-nested-column-header {
   position: sticky;
   inset-block-start: 0;
-  z-index: var(--pf-t--global--Zindex--xs);
   background: var(--pf-v6-c-table--BackgroundColor);
 }
-.pf-v6-c-table.pf-m-sticky-header > .pf-m-nested-column-header > .pf-m-border-row {
-  height: var(--pf-v6-c-table--border-width--base);
-  background-color: var(--pf-v6-c-table--BorderColor);
-}
-.pf-v6-c-table.pf-m-sticky-header > .pf-m-nested-column-header tr:where(.pf-v6-c-table__tr):not(:nth-last-child(2)) th:where(.pf-v6-c-table__th):not([rowspan]),
-.pf-v6-c-table.pf-m-sticky-header > .pf-m-nested-column-header tr:where(.pf-v6-c-table__tr):not(:nth-last-child(2)) td:where(.pf-v6-c-table__td):not([rowspan]) {
-  --pf-v6-c-table--cell--PaddingBottom: var(--pf-v6-c-table__thead--m-nested-column-header__tr--PaddingBottom);
-}
 .pf-v6-c-table:not(.pf-m-sticky-header) > .pf-m-nested-column-header tr:where(.pf-v6-c-table__tr):not(:last-child) {
   border-block-end: 0;
 }
@@ -241,7 +260,7 @@
 .pf-v6-c-table:not(.pf-m-sticky-header) > .pf-m-nested-column-header tr:where(.pf-v6-c-table__tr):not(:last-child) td:where(.pf-v6-c-table__td):not([rowspan]) {
   --pf-v6-c-table--cell--PaddingBottom: var(--pf-v6-c-table__thead--m-nested-column-header__tr--PaddingBottom);
 }
-.pf-v6-c-table.pf-m-striped:not(.pf-m-expandable) > tbody:where(.pf-v6-c-table__tbody) > tr:where(.pf-v6-c-table__tr):nth-child(odd), .pf-v6-c-table.pf-m-striped.pf-m-expandable > tbody:where(.pf-v6-c-table__tbody):nth-of-type(odd) > tr:where(.pf-v6-c-table__tr):not(.pf-v6-c-table__expandable-row),
+.pf-v6-c-table.pf-m-striped:not(.pf-m-expandable) > tbody:where(.pf-v6-c-table__tbody) > tr:where(.pf-v6-c-table__tr):nth-child(odd), .pf-v6-c-table.pf-m-striped.pf-m-expandable > tbody:where(.pf-v6-c-table__tbody):nth-of-type(odd) > tr:where(.pf-v6-c-table__tr),
 .pf-v6-c-table > .pf-m-striped > tr:nth-child(odd),
 .pf-v6-c-table > .pf-m-striped-even > tr:nth-child(even),
 .pf-v6-c-table tr:where(.pf-v6-c-table__tr).pf-m-striped {
@@ -280,7 +299,7 @@
 .pf-v6-c-table tr:where(.pf-v6-c-table__tr) > :where(th, td).pf-m-center {
   text-align: center;
 }
-.pf-v6-c-table tr:where(.pf-v6-c-table__tr) > :where(th, td):empty {
+.pf-v6-c-table tr:where(.pf-v6-c-table__tr) > :where(th, td):is(:empty, .pf-v6-c-table__cell-empty) {
   width: auto;
   min-width: 0;
   padding: 0;
@@ -327,14 +346,9 @@
   --pf-v6-c-table--cell--PaddingTop: var(--pf-v6-c-table__thead--m-nested-column-header__tr--PaddingTop);
 }
 .pf-v6-c-table thead:where(.pf-v6-c-table__thead) .pf-v6-c-table__subhead {
-  --pf-v6-c-table--cell--PaddingLeft: var(--pf-v6-c-table__subhead--PaddingLeft);
-  --pf-v6-c-table--cell--PaddingRight: var(--pf-v6-c-table__subhead--PaddingRight);
   --pf-v6-c-table__sort__button__text--Color: var(--pf-v6-c-table__subhead--Color);
   color: var(--pf-v6-c-table__subhead--Color);
 }
-.pf-v6-c-table thead:where(.pf-v6-c-table__thead) .pf-v6-c-table__subhead .pf-v6-c-table__button {
-  margin-inline-start: 0;
-}
 .pf-v6-c-table tbody:where(.pf-v6-c-table__tbody) {
   --pf-v6-c-table--cell--PaddingTop: var(--pf-v6-c-table__tbody--cell--PaddingTop);
   --pf-v6-c-table--cell--PaddingBottom: var(--pf-v6-c-table__tbody--cell--PaddingBottom);
@@ -383,6 +397,12 @@
   --pf-v6-c-table--cell--WordBreak: break-word;
   --pf-v6-c-table--cell--WhiteSpace: normal;
 }
+.pf-v6-c-table.pf-m-no-border-rows > tbody:where(.pf-v6-c-table__tbody) {
+  --pf-v6-c-table__tr--BorderBottomWidth: 0;
+  --pf-v6-c-table__tbody--BorderBottomWidth: 0;
+  --pf-v6-c-table--m-expandable__tbody--BorderBottomWidth: 0;
+  --pf-v6-c-table__control-row--BorderBottomWidth: 0;
+}
 .pf-v6-c-table.pf-m-no-border-rows > tbody:where(.pf-v6-c-table__tbody) > tr:where(.pf-v6-c-table__tr) {
   border-block-end: 0;
 }
@@ -401,35 +421,38 @@
   --pf-v6-c-table__tr--m-clickable--BackgroundColor: var(--pf-v6-c-table__tr--m-clickable--hover--BackgroundColor);
 }
 .pf-v6-c-table tr:where(.pf-v6-c-table__tr).pf-m-selected {
-  --pf-v6-c-table__expandable-row--after--BorderLeftWidth: var(--pf-v6-c-table__tr--m-selected--after--BorderLeftWidth);
-  --pf-v6-c-table__expandable-row--after--BorderColor: var(--pf-v6-c-table__tr--m-selected--after--BorderLeftColor);
   position: relative;
   background-color: var(--pf-v6-c-table__tr--m-selected--BackgroundColor);
   outline-offset: var(--pf-v6-c-table__tr--m-selected--OutlineOffset);
 }
-.pf-v6-c-table tr:where(.pf-v6-c-table__tr).pf-m-first-cell-offset-reset {
-  --pf-v6-c-table--cell--first-last-child--PaddingLeft: var(--pf-v6-c-table__tr--m-first-cell-offset-reset--cell--PaddingLeft);
+.pf-v6-c-table tr:where(.pf-v6-c-table__tr).pf-m-first-cell-offset-reset > :first-child {
+  padding-inline-start: var(--pf-v6-c-table__tr--m-first-cell-offset-reset--cell--PaddingLeft);
 }
 .pf-v6-c-table tbody:where(.pf-v6-c-table__tbody).pf-m-clickable {
   cursor: pointer;
   background-color: var(--pf-v6-c-table__tbody--m-clickable--BackgroundColor);
   outline-offset: var(--pf-v6-c-table__tbody--m-clickable--OutlineOffset);
 }
-.pf-v6-c-table tbody:where(.pf-v6-c-table__tbody).pf-m-clickable.pf-m-expanded:not(.pf-m-selected) {
-  --pf-v6-c-table__expandable-row--after--BorderColor: var(--pf-v6-c-table__tbody--m-clickable--m-expanded--BorderColor);
-}
 .pf-v6-c-table tbody:where(.pf-v6-c-table__tbody).pf-m-clickable:is(:hover, :focus) {
   --pf-v6-c-table__tbody--m-clickable--BackgroundColor: var(--pf-v6-c-table__tbody--m-clickable--hover--BackgroundColor);
 }
+.pf-v6-c-table tbody:where(.pf-v6-c-table__tbody).pf-m-clickable.pf-m-expanded {
+  --pf-v6-c-table__tbody--m-clickable--BackgroundColor: var(--pf-v6-c-table__tbody--m-clickable--m-expanded--BackgroundColor);
+}
 .pf-v6-c-table tbody:where(.pf-v6-c-table__tbody).pf-m-selected {
-  --pf-v6-c-table__expandable-row--after--BorderLeftWidth: var(--pf-v6-c-table__tbody--m-selected--after--BorderLeftWidth);
-  --pf-v6-c-table__expandable-row--after--BorderColor: var(--pf-v6-c-table__tbody--m-selected--after--BorderLeftColor);
   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.pf-m-drag-over {
   overflow-anchor: none;
 }
+.pf-v6-c-table .pf-v6-c-table {
+  background-color: transparent;
+}
+.pf-v6-c-table .pf-v6-c-table,
+.pf-v6-c-table .pf-v6-c-table :is(.pf-v6-c-table__tbody, .pf-v6-c-table__tr:last-child) {
+  border-block-end: 0;
+}
 
 .pf-v6-c-table__text {
   --pf-v6-c-table--cell--MaxWidth: 100%;
@@ -446,6 +469,7 @@
 }
 .pf-v6-c-table__text.pf-m-truncate {
   --pf-v6-c-table--cell--MinWidth: 100%;
+  --pf-v6-c-table--text--MinWidth: var(--pf-v6-c-table--m-truncate__text--MinWidth);
 }
 .pf-v6-c-table__text.pf-m-truncate > :where(th, td) {
   overflow: var(--pf-v6-c-table--cell--Overflow);
@@ -453,10 +477,6 @@
   white-space: var(--pf-v6-c-table--cell--WhiteSpace);
 }
 
-.pf-v6-c-table__tr.pf-m-border-row {
-  border-block-end: var(--pf-v6-c-table--border-width--base) solid var(--pf-v6-c-table--BorderColor);
-}
-
 .pf-v6-c-table__button {
   width: auto;
   padding-block-start: var(--pf-v6-c-table__button--PaddingTop);
@@ -474,6 +494,7 @@
   background-color: var(--pf-v6-c-table__button--BackgroundColor);
   border: 0;
   border-radius: var(--pf-v6-c-table__button--BorderRadius);
+  outline-offset: var(--pf-v6-c-table__button--OutlineOffset);
 }
 .pf-v6-c-table .pf-v6-c-table .pf-v6-c-table__button {
   margin-block-end: 0;
@@ -583,9 +604,12 @@ thead .pf-v6-c-table__check .pf-v6-c-radio.pf-m-standalone {
 .pf-v6-c-table__favorite .pf-v6-c-button {
   --pf-v6-c-button--FontSize: var(--pf-v6-c-table__favorite--c-button--FontSize);
 }
-.pf-m-favorited.pf-v6-c-table__favorite .pf-v6-c-button {
+.pf-v6-c-table__favorite.pf-m-favorited .pf-v6-c-button {
   --pf-v6-c-button--m-plain--Color: var(--pf-v6-c-table__favorite--m-favorited--c-button--Color);
 }
+.pf-v6-c-table__favorite.pf-m-favorited .pf-v6-c-button:is(:hover, :focus) {
+  --pf-v6-c-button--m-plain--hover--Color: var(--pf-v6-c-table__favorite--m-favorited--c-button--Color);
+}
 
 .pf-v6-c-table__draggable .pf-v6-c-button {
   cursor: grab;
@@ -614,6 +638,7 @@ thead .pf-v6-c-table__check .pf-v6-c-radio.pf-m-standalone {
   --pf-v6-c-table__button--hover--Color: var(--pf-v6-c-table__compound-expansion-toggle__button--hover--Color);
   position: relative;
   padding: 0;
+  background-color: var(--pf-v6-c-table__compound-expansion-toggle__button--BackgroundColor);
 }
 .pf-v6-c-table__compound-expansion-toggle.pf-m-truncate {
   overflow: visible;
@@ -635,7 +660,12 @@ thead .pf-v6-c-table__check .pf-v6-c-radio.pf-m-standalone {
   border: 0;
   border-block-start: var(--pf-v6-c-table__compound-expansion-toggle__button--after--BorderTopWidth) solid var(--pf-v6-c-table__compound-expansion-toggle__button--after--BorderColor);
 }
-.pf-v6-c-table__compound-expansion-toggle:hover, .pf-v6-c-table__compound-expansion-toggle:focus-within, .pf-v6-c-table__compound-expansion-toggle.pf-m-expanded {
+.pf-v6-c-table__compound-expansion-toggle:hover, .pf-v6-c-table__compound-expansion-toggle:focus-within {
+  --pf-v6-c-table__compound-expansion-toggle__button--BackgroundColor: var(--pf-v6-c-table__compound-expansion-toggle__button--hover--BackgroundColor);
+  --pf-v6-c-table__compound-expansion-toggle__button--after--BorderTopWidth: var(--pf-v6-c-table__compound-expansion-toggle__button--hover--after--BorderTopWidth);
+}
+.pf-v6-c-table__compound-expansion-toggle.pf-m-expanded {
+  --pf-v6-c-table__compound-expansion-toggle__button--BackgroundColor: var(--pf-v6-c-table__compound-expansion-toggle__button--expanded--BackgroundColor);
   --pf-v6-c-table__compound-expansion-toggle__button--after--BorderTopWidth: var(--pf-v6-c-table__compound-expansion-toggle--m-expanded__button--after--BorderTopWidth);
 }
 .pf-v6-c-table__compound-expansion-toggle:focus-within {
@@ -671,10 +701,8 @@ thead .pf-v6-c-table__check .pf-v6-c-radio.pf-m-standalone {
 .pf-v6-c-table__sort.pf-m-help {
   --pf-v6-c-table__th--m-help--MinWidth: var(--pf-v6-c-table__sort--m-help--MinWidth);
 }
-.pf-v6-c-table__sort.pf-m-favorite {
-  --pf-v6-c-table__sort__button__text--Color: var(--pf-v6-c-table__sort--m-favorite__button__text--Color);
-  --pf-v6-c-table__sort__button--hover__text--Color: var(--pf-v6-c-table__sort--m-favorite__button--hover__text--Color);
-  --pf-v6-c-table__sort--m-selected__button__text--Color: currentcolor;
+.pf-v6-c-table__sort.pf-m-favorite .pf-v6-c-table__text {
+  font-size: var(--pf-v6-c-table__favorite--c-button--FontSize);
 }
 
 .pf-v6-c-table__sort-indicator {
@@ -703,7 +731,7 @@ thead .pf-v6-c-table__check .pf-v6-c-radio.pf-m-standalone {
   padding-block-start: 0;
   padding-inline-end: 0;
   padding-block-end: 0;
-  padding-inline-start: var(--pf-v6-c-table__expandable-row--after--border-width--base);
+  padding-inline-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-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 {
@@ -712,6 +740,10 @@ thead .pf-v6-c-table__check .pf-v6-c-radio.pf-m-standalone {
 .pf-v6-c-table__expandable-row .pf-v6-c-table__expandable-row-content {
   padding-block-start: var(--pf-v6-c-table__expandable-row-content--PaddingTop);
   padding-block-end: var(--pf-v6-c-table__expandable-row-content--PaddingBottom);
+  padding-inline-start: var(--pf-v6-c-table__expandable-row-content--PaddingLeft);
+  padding-inline-end: var(--pf-v6-c-table__expandable-row-content--PaddingRight);
+  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-m-expanded {
   border-block-end-color: var(--pf-v6-c-table__expandable-row--m-expanded--BorderBottomColor);
@@ -751,13 +783,44 @@ thead .pf-v6-c-table__check .pf-v6-c-radio.pf-m-standalone {
 }
 
 .pf-v6-c-table__thead {
+  --pf-v6-c-table__tr--BorderBottomWidth: 0;
+  --pf-v6-c-table__toggle--PaddingBottom: var(--pf-v6-c-table__thead__toggle--PaddingBottom);
   vertical-align: bottom;
 }
+.pf-v6-c-table__thead.pf-m-nested-column-header .pf-v6-c-table__button {
+  --pf-v6-c-table__button--PaddingLeft: var(--pf-v6-c-table__nested-column-header__button--PaddingLeft);
+  --pf-v6-c-table__button--PaddingRight: var(--pf-v6-c-table__nested-column-header__button--PaddingRight);
+  margin-inline-end: calc(var(--pf-v6-c-table__button--PaddingLeft) * -1);
+}
 
 .pf-v6-c-table__tbody {
   vertical-align: top;
 }
-.pf-v6-c-table__tbody .pf-v6-c-table__tr {
+.pf-v6-c-table__tbody .pf-v6-c-table__control-row ~ .pf-v6-c-table__expandable-row.pf-m-expanded {
+  background-color: var(--pf-v6-c-table--compound-expansion--m-expanded--BackgroundColor);
+}
+
+.pf-v6-c-table.pf-m-expandable .pf-v6-c-table__tr.pf-m-expanded {
+  border-block-end: 0;
+}
+.pf-v6-c-table.pf-m-expandable .pf-v6-c-table__tbody {
+  border-block-end: var(--pf-v6-c-table__tr--BorderBottomWidth) solid var(--pf-v6-c-table__tr--BorderBottomColor);
+}
+.pf-v6-c-table.pf-m-expandable .pf-v6-c-table__tbody.pf-m-expanded {
+  border-block-end: var(--pf-v6-c-table__tr--BorderBottomWidth) solid var(--pf-v6-c-table__tr--BorderBottomColor);
+}
+.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--BorderBottomWidth) solid var(--pf-v6-c-table__control-row__tbody--BorderBottomColor);
+}
+
+.pf-v6-c-table__tr {
+  border-block-end: var(--pf-v6-c-table__tr--BorderBottomWidth) solid var(--pf-v6-c-table__tr--BorderBottomColor);
+}
+.pf-v6-c-table__thead .pf-v6-c-table__tr {
+  border-block-end: 0;
+}
+.pf-v6-c-table__tr.pf-m-border-row {
   border-block-end: var(--pf-v6-c-table--border-width--base) solid var(--pf-v6-c-table--BorderColor);
 }