Skip to content

Commit b1e0b92

Browse files
committed
chore(pivot): fix issue from merge changes
1 parent b93383d commit b1e0b92

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<span id='empty' igxDrop (dropped)="onDimDrop($event, filterArea, 2)"
1212
*ngIf="grid.filterDimensions.length === 0"
1313
class='igx-pivot__emptyChipArea'>{{grid.resourceStrings.igx_grid_pivot_empty_filter_drop_area}}</span>
14-
<ng-container *ngFor="let filter of grid.filterDimensions; let last = last;">
14+
<ng-container *ngFor="let filter of this.filterAreaDimensions; let last = last;">
1515
<span [style.visibility]='"hidden"' class="igx-grid__tr-pivot--chip_drop_indicator"
1616
[style.height.px]='getAreaHeight(filterArea)'></span>
1717
<igx-chip [id]="filter.memberName" [draggable]="true" [displayDensity]="grid.displayDensity"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent implem
129129
if (this.filterArea?.chipsList && this.filterArea.chipsList.length !== 0) {
130130
const styles = getComputedStyle(this.pivotFilterContainer.nativeElement);
131131
const containerPaddings = parseFloat(styles.paddingLeft) + parseFloat(styles.paddingRight);
132-
chipsWidth += containerPaddings + (this.filtersButton ? this.filtersButton.el.nativeElement.getBoundingClientRect().width : 0);
132+
chipsWidth += containerPaddings + (this.filtersButton && this.filterArea?.chipsList.length > 1 ? this.filtersButton.el.nativeElement.getBoundingClientRect().width : 0);
133133
this.filterArea.chipsList.forEach(chip => {
134134
const dim = this.grid.filterDimensions.find(x => x.memberName === chip.id);
135135
if (dim) {

0 commit comments

Comments
 (0)