Skip to content

Commit 2da71c1

Browse files
authored
Merge branch 'master' into apetrov/fix-themes-shadow-elevation
2 parents 552625a + 742beaa commit 2da71c1

File tree

6 files changed

+27
-7
lines changed

6 files changed

+27
-7
lines changed

ROADMAP.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22

33
# Current Milestone
44

5-
## Milestone 40, version 20.1 (Due by Nov, 2025)
5+
## Milestone 40, version 21 (Due by Nov, 2025)
66
1. Support for Angular 21
77
2. AI Chat UI component [#16094](https://github.com/IgniteUI/igniteui-angular/issues/16094)
8+
3. PDF Export feature on Angular Data Grid, Tree Grid, Hierarchical Grid and Pivot Grid [#5696](https://github.com/IgniteUI/igniteui-angular/issues/5696)
9+
4. Multiple entry points library refactoring for code splitting support [#16325](https://github.com/IgniteUI/igniteui-angular/issues/16325)
10+
5. Grids filtering performance improvements
811

912
## Going down the road
1013

11-
1. Grids performance
14+
1. Transition the library to signals
15+
2. Zoneless support
1216

1317
# Previous Milestone
1418

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
415415
this.validation.updateAll(this._data);
416416
}
417417

418-
if (this.autoGenerate && this._data.length > 0 && this.shouldRecreateColumns(oldData, this._data)) {
418+
if (this.autoGenerate && this._data.length > 0 && this.shouldRecreateColumns(oldData, this._data) && this.gridAPI.grid) {
419419
this.setupColumns();
420420
}
421421

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
868868
if (!this._init) {
869869
this.validation.updateAll(this._data);
870870
}
871-
if (this.autoGenerate && this._data.length > 0 && this.shouldRecreateColumns(oldData, this._data)) {
871+
if (this.autoGenerate && this._data.length > 0 && this.shouldRecreateColumns(oldData, this._data) && this.gridAPI.grid) {
872872
this.setupColumns();
873873
this.reflow();
874874
}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,22 @@ describe('IgxPivotGrid #pivotGrid', () => {
807807
expect(pivotGrid.nativeElement.clientWidth - expectedSize).toBeLessThan(50, "should take sum of columns as width.");
808808
});
809809

810+
it('should render cell values for dimension columns containing dots - issue #16445', () => {
811+
let data = fixture.componentInstance.data;
812+
data = data.map(item => {
813+
return {
814+
...item,
815+
Country: `${item['Country']}.Test`
816+
};
817+
});
818+
819+
fixture.componentInstance.data = [...data];
820+
fixture.detectChanges();
821+
822+
const cell = fixture.componentInstance.pivotGrid.gridAPI.get_cell_by_index(0, 'Bulgaria.Test-UnitsSold');
823+
expect(cell.value).not.toBeUndefined();
824+
});
825+
810826
describe('IgxPivotGrid Features #pivotGrid', () => {
811827
it('should show excel style filtering via dimension chip.', async () => {
812828
const pivotGrid = fixture.componentInstance.pivotGrid;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[rowData]="data" [columnData]='getColumnData(col)'
1515
[style.min-width]="col.resolvedWidth" [style.max-width]="col.resolvedWidth"
1616
[style.flex-basis]="col.resolvedWidth" [width]="col.getCellWidth()" [visibleColumnIndex]="col.visibleIndex"
17-
[value]="pivotAggregationData[col.field] | dataMapper:col.field:grid.pipeTrigger:pivotAggregationData[col.field]:col.hasNestedPath"
17+
[value]="pivotAggregationData[col.field]"
1818
[cellTemplate]="col.bodyTemplate" [lastSearchInfo]="grid.lastSearchInfo"
1919
[cellSelectionMode]="grid.cellSelection" [displayPinnedChip]="shouldDisplayPinnedChip(col)"
2020
(pointerdown)="grid.navigation.focusOutRowHeader($event)">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { IgxGridSelectionService } from '../selection/selection.service';
1313
import { IPivotGridColumn, IPivotGridRecord } from './pivot-grid.interface';
1414
import { PivotUtil } from './pivot-util';
1515
import { IgxPivotGridCellStyleClassesPipe } from './pivot-grid.pipes';
16-
import { IgxGridNotGroupedPipe, IgxGridCellStylesPipe, IgxGridDataMapperPipe, IgxGridTransactionStatePipe } from '../common/pipes';
16+
import { IgxGridNotGroupedPipe, IgxGridCellStylesPipe, IgxGridTransactionStatePipe } from '../common/pipes';
1717
import { IgxCheckboxComponent } from '../../checkbox/checkbox.component';
1818
import { NgClass, NgStyle } from '@angular/common';
1919
import { IgxGridCellComponent } from '../cell.component';
@@ -24,7 +24,7 @@ import { IgxGridForOfDirective } from '../../directives/for-of/for_of.directive'
2424
selector: 'igx-pivot-row',
2525
templateUrl: './pivot-row.component.html',
2626
providers: [{ provide: IgxRowDirective, useExisting: forwardRef(() => IgxPivotRowComponent) }],
27-
imports: [IgxGridForOfDirective, IgxGridCellComponent, NgClass, NgStyle, IgxCheckboxComponent, IgxGridNotGroupedPipe, IgxGridCellStylesPipe, IgxGridDataMapperPipe, IgxGridTransactionStatePipe, IgxPivotGridCellStyleClassesPipe]
27+
imports: [IgxGridForOfDirective, IgxGridCellComponent, NgClass, NgStyle, IgxCheckboxComponent, IgxGridNotGroupedPipe, IgxGridCellStylesPipe, IgxGridTransactionStatePipe, IgxPivotGridCellStyleClassesPipe]
2828
})
2929
export class IgxPivotRowComponent extends IgxRowDirective {
3030
/**

0 commit comments

Comments
 (0)