Skip to content

Commit 556e964

Browse files
chintankavathiatimowolf
authored andcommitted
fix(column-pinning): hide vertical divider if no horizontal scroll
also fix divider not showing on pinned header columns with horizontal scroll
1 parent ea5a410 commit 556e964

10 files changed

+34
-26
lines changed
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

projects/ngx-datatable/src/lib/components/body/body.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ import { DataTableSummaryRowComponent } from './summary/summary-row.component';
7878
[scrollbarH]="scrollbarH"
7979
[scrollHeight]="scrollHeight()"
8080
[scrollWidth]="columnGroupWidths?.total"
81+
[class.horizontal-overflow]="innerWidth < (columnGroupWidths?.total ?? 0)"
8182
(scroll)="onBodyScroll($event)"
8283
>
8384
@if (summaryRow && summaryPosition === 'top') {

projects/ngx-datatable/src/lib/components/header/header.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import { DataTableHeaderCellComponent } from './header-cell.component';
4646
role="row"
4747
orderable
4848
class="datatable-header-inner"
49+
[class.horizontal-overflow]="innerWidth < _columnGroupWidths.total"
4950
[style.width.px]="_columnGroupWidths.total"
5051
(reorder)="onColumnReordered($event)"
5152
(targetChanged)="onTargetChanged($event)"

projects/ngx-datatable/src/lib/themes/material.scss

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,20 @@ $datatble-ghost-cell-animation-duration: 10s;
201201
*/
202202
.datatable-header,
203203
.datatable-body {
204-
.datatable-row-left {
205-
background-color: $ngx-datatable-background;
206-
background-position: 100% 0;
207-
background-repeat: repeat-y;
208-
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAYAAAD5PA/NAAAAFklEQVQIHWPSkNeSBmJhTQVtbiDNCgASagIIuJX8OgAAAABJRU5ErkJggg==');
209-
}
204+
.horizontal-overflow {
205+
.datatable-row-left {
206+
background-color: $ngx-datatable-background;
207+
background-position: 100% 0;
208+
background-repeat: repeat-y;
209+
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAYAAAD5PA/NAAAAFklEQVQIHWPSkNeSBmJhTQVtbiDNCgASagIIuJX8OgAAAABJRU5ErkJggg==');
210+
}
210211

211-
.datatable-row-right {
212-
background-position: 0 0;
213-
background-color: $ngx-datatable-background;
214-
background-repeat: repeat-y;
215-
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAYAAAD5PA/NAAAAFklEQVQI12PQkNdi1VTQ5gbSwkAsDQARLAIGtOSFUAAAAABJRU5ErkJggg==');
212+
.datatable-row-right {
213+
background-position: 0 0;
214+
background-color: $ngx-datatable-background;
215+
background-repeat: repeat-y;
216+
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAYAAAD5PA/NAAAAFklEQVQI12PQkNdi1VTQ5gbSwkAsDQARLAIGtOSFUAAAAABJRU5ErkJggg==');
217+
}
216218
}
217219
}
218220

@@ -222,13 +224,17 @@ $datatble-ghost-cell-animation-duration: 10s;
222224
.datatable-header {
223225
border-block-end: 1px solid $datatable-header-border-bottom-color;
224226

227+
.datatable-row-left,
228+
.datatable-row-right {
229+
background-color: $datatable-header-cell-background;
230+
}
231+
225232
.datatable-header-cell {
226233
flex-shrink: 0;
227234
text-align: start;
228235
padding-block: 0.9rem;
229236
padding-inline: 1.2rem;
230237
font-weight: 400;
231-
background-color: $datatable-header-cell-background;
232238
color: $datatable-header-cell-color;
233239
vertical-align: bottom;
234240
font-size: 12px;

0 commit comments

Comments
 (0)