fix: #17339 scrolling behaviour in table with footer and frozen rows (#…

…17340) Co-authored-by: Christian Tu <christian.tu@pv.at>
primefaces · Jan 15, 2025 · ce09dbe · ce09dbe
1 parent 4c0246e
commit ce09dbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/primeng/src/table/style/tablestyle.ts b/packages/primeng/src/table/style/tablestyle.ts
@@ -26,7 +26,7 @@ const theme = ({ dt }) => `
     z-index: 2;
 }
 /* For PrimeNG */
-.p-datatable-scrollable-table > .p-datatable-frozen-tbody:last-child {
+.p-datatable-scrollable-table > .p-datatable-frozen-tbody + .p-datatable-frozen-tbody {
     z-index: 1;
 }
 
@@ -367,12 +367,16 @@ const theme = ({ dt }) => `
     outline-offset: ${dt('datatable.row.focus.ring.offset')};
 }
 
+.p-datatable-tbody:has(+ .p-datatable-tfoot) > tr:last-child > td {
+    border-width: 0;
+}
+
 .p-datatable-tfoot > tr > td {
     text-align: start;
     padding: ${dt('datatable.footer.cell.padding')};
     border-color: ${dt('datatable.footer.cell.border.color')};
     border-style: solid;
-    border-width: 0 0 1px 0;
+    border-width: 1px 0 1px 0;
     color: ${dt('datatable.footer.cell.color')};
     background: ${dt('datatable.footer.cell.background')};
 }

diff --git a/packages/primeng/src/table/table.ts b/packages/primeng/src/table/table.ts
@@ -273,7 +273,7 @@ export class TableService {
                             [style]="'height: calc(' + scrollerOptions.spacerStyle.height + ' - ' + scrollerOptions.rows.length * scrollerOptions.itemSize + 'px);'"
                             [ngClass]="cx('virtualScrollerSpacer')"
                         ></tbody>
-                        <tfoot role="rowgroup" *ngIf="footerGroupedTemplate || footerTemplate || _footerTemplate || _footerGroupedTemplate" #tfoot [ngClass]="cx('footer')">
+                        <tfoot role="rowgroup" *ngIf="footerGroupedTemplate || footerTemplate || _footerTemplate || _footerGroupedTemplate" #tfoot [ngClass]="cx('footer')" [ngStyle]="sx('tfoot')">
                             <ng-container
                                 *ngTemplateOutlet="
                                     footerGroupedTemplate || footerTemplate || _footerTemplate || _footerGroupedTemplate;