Skip to content

Commit c082e76

Browse files
committed
chore(*): fix error and fix lint
1 parent d31b73f commit c082e76

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@
252252
igx-list {
253253
flex-grow: 1;
254254
overflow: hidden;
255-
margin-left: -#{rem(16px)};
256-
margin-right: -#{rem(16px)};
255+
margin-left: -#{rem(16px)};
256+
margin-right: -#{rem(16px)};
257257
border: 0;
258258
border-top: 1px dashed igx-color($palette, 'grays', 300);
259259
border-bottom: 1px dashed igx-color($palette, 'grays', 300);
@@ -292,8 +292,8 @@
292292
}
293293

294294
igx-list {
295-
margin-left: -#{rem(8px)};
296-
margin-right: -#{rem(8px)};
295+
margin-left: -#{rem(8px)};
296+
margin-right: -#{rem(8px)};
297297
}
298298
}
299299

@@ -338,8 +338,8 @@
338338
}
339339

340340
igx-list {
341-
margin-left: -#{rem(4px)};
342-
margin-right: -#{rem(4px)};
341+
margin-left: -#{rem(4px)};
342+
margin-right: -#{rem(4px)};
343343
}
344344
}
345345

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent {
370370

371371
public onDimDrop(event, area, dimension: PivotDimensionType) {
372372
const dragId = event.dragChip?.id || event.dragData?.chip.id;
373+
const isFromFiltering = this.grid.filterDimensions.find(x => x.memberName === dragId);
373374
const currentDim = this.getDimensionsByType(dimension);
374375
const chipsArray = area.chipsList.toArray();
375376
const chip = chipsArray.find(x => x.id === dragId);
@@ -421,6 +422,9 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent {
421422
// if columns have changed need to regenerate columns.
422423
this.grid.setupColumns();
423424
}
425+
if (isFromFiltering) {
426+
this.grid.reflow();
427+
}
424428
this.grid.pipeTrigger++;
425429
this.grid.dimensionsChange.emit({ dimensions: currentDim, dimensionCollectionType: dimension });
426430
// clean states

0 commit comments

Comments
 (0)