Skip to content

Commit 17f7b3d

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Fix pivot grid width calculations and remove some fixed px sizes.
1 parent 0ba76be commit 17f7b3d

3 files changed

Lines changed: 19 additions & 13 deletions

File tree

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,14 +1303,14 @@
13031303
overflow: hidden;
13041304
z-index: 1;
13051305
outline-style: none;
1306+
flex-grow: 1;
13061307
}
13071308

13081309
%grid-tbody-container {
13091310
position: relative;
1310-
display: grid;
1311+
display: flex;
13111312
grid-row: 4;
13121313
overflow: hidden;
1313-
grid-template-rows: 1fr;
13141314
}
13151315

13161316
%grid-tbody-message {
@@ -2086,7 +2086,7 @@
20862086

20872087
.sort-icon {
20882088
color: var-get($theme, 'header-selected-text-color');
2089-
2089+
20902090
::after {
20912091
background: var-get($theme, 'header-selected-background');
20922092
}
@@ -2114,15 +2114,15 @@
21142114
&%igx-grid-th--sorted {
21152115
.sort-icon {
21162116
color: var-get($theme, 'header-selected-text-color');
2117-
2117+
21182118
> igx-icon {
21192119
color: inherit;
21202120
}
21212121

21222122
&:focus,
21232123
&:hover {
21242124
color: var-get($theme, 'header-selected-text-color');
2125-
2125+
21262126
> igx-icon {
21272127
color: inherit;
21282128
}
@@ -2179,14 +2179,14 @@
21792179
.sort-icon {
21802180
opacity: 1;
21812181
color: var-get($theme, 'sorted-header-icon-color');
2182-
2182+
21832183
> igx-icon {
21842184
color: inherit;
21852185
}
21862186

21872187
&:hover {
21882188
color: var-get($theme, 'sortable-header-icon-hover-color');
2189-
2189+
21902190
> igx-icon {
21912191
color: inherit;
21922192
}

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2517,4 +2517,10 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
25172517
this.regroupTrigger++;
25182518
}
25192519
}
2520+
2521+
protected override getUnpinnedWidth(takeHidden = false) {
2522+
return this.isPercentWidth ?
2523+
this.calcWidth :
2524+
super.getUnpinnedWidth(takeHidden);
2525+
}
25202526
}

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<div>
2-
<div class="igx-grid-thead__wrapper igx-grid-thead__wrapper--pivot" role="row" [style.width.px]="width">
3-
<div class="igx-grid__tr" role="row" [style.width.px]="width">
1+
<div [style.width]="'100%'">
2+
<div class="igx-grid-thead__wrapper igx-grid-thead__wrapper--pivot" role="row" [style.width]="'100%'">
3+
<div class="igx-grid__tr" role="row" [style.width]="'100%'">
44
<div class='igx-grid__tr-pivot--filter-container'>
55
@if (grid.pivotUI.showConfiguration) {
66
<div #pivotFilterContainer
@@ -193,14 +193,14 @@
193193
</div>
194194
</div>
195195
</div>
196-
<div role="rowgroup" class="igx-grid-thead__wrapper" [style.width.px]="width"
196+
<div role="rowgroup" class="igx-grid-thead__wrapper" [style.width]="'100%'"
197197
[attr.aria-activedescendant]="activeDescendant" [class.igx-grid__tr--mrl]="hasMRL">
198198

199199
<!-- Column headers area -->
200-
<div class="igx-grid__tr" role="row" [style.width.px]="width">
200+
<div class="igx-grid__tr" role="row" [style.width]="'100%'">
201201
@if (!grid.pivotUI.showRowHeaders || grid.rowDimensions.length === 0) {
202202
<div #pivotContainer class="igx-grid__tr-pivot igx-grid__tr-pivot--row-area"
203-
[style.width.px]="grid.pivotRowWidths - 1" (igxDragLeave)="onAreaDragLeave($event, rowArea)" igxDrop
203+
[style.min-width.px]="grid.pivotRowWidths - 1" (igxDragLeave)="onAreaDragLeave($event, rowArea)" igxDrop
204204
(dropped)="onDimDrop($event, rowArea, 0)" (pointerdown)="$event.preventDefault()">
205205
<!-- Row area -->
206206
<igx-chips-area #rowArea droppable='true'>

0 commit comments

Comments
 (0)