Merge branch 'master' into ganastasov/fix-14276-master

Author: georgianastasov

CHANGELOG.md

@@ -7,12 +7,15 @@ All notable changes for each version of this project will be documented in this
 - `IgxPivotGrid`
     - Added horizontal layout for row dimensions. Can be configured through the `pivotUI` `rowLayout` property.
     - Added `horizontalSummary` property for each IPivotDimension, enabling summary row when using horizontal layout.
+    - Added `horizontalSummariesPosition` property to the `pivotUI`, configuring horizontal summaries position.
     - Keyboard navigation now can move in to row headers back and forth from any row dimension headers or column headers.
     - Added keyboard interactions for row dimension collapse using `Alt + Arrows` and row headers sorting using `Ctrl + Arrow Up/Down`.
 
 ### General
 - `ColumnType`, `IgxColumn`, `IgxColumnGroup`, `IgxColumnLayout`
     - The `children` query property has been deprecated and replaced by `childColumns` getter directly returning columns array.
+    - Several properties have been hidden from the public API, considered internal and not recommended for use. Those include:
+    `filterCell`, `headerCell`, `headerGroup`, `defaultMinWidth`, `gridRowSpan`, `gridColumnSpan` and `cells`.
 - `IgxPaginator`
     - The `isFirstPageDisabled` and `isLastPageDisabled` have been deprecated in favor of the identical `isFirstPage` and `isLastPage` getter.
 

projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts

@@ -802,7 +802,6 @@ export class IgxForOfDirective<T, U extends T[] = T[]> extends IgxForOfToken<T,U
             || containerSize && endTopOffset - containerSize > 5;
     }
 
-
     /**
      * @hidden
      * Function that recalculates and updates cache sizes.
@@ -831,13 +830,13 @@ export class IgxForOfDirective<T, U extends T[] = T[]> extends IgxForOfToken<T,U
                 const currDiff = newVal - oldVal;
                 diffs.push(currDiff);
                 totalDiff += currDiff;
-                this.sizesCache[index + 1] += totalDiff;
+                this.sizesCache[index + 1] = (this.sizesCache[index] || 0) + newVal;
             }
         }
         // update cache
         if (Math.abs(totalDiff) > 0) {
             for (let j = this.state.startIndex + this.state.chunkSize + 1; j < this.sizesCache.length; j++) {
-                this.sizesCache[j] += totalDiff;
+                this.sizesCache[j] = (this.sizesCache[j] || 0) + totalDiff;
             }
 
             // update scrBar heights/widths

projects/igniteui-angular/src/lib/grids/columns/column-group.component.ts

@@ -186,12 +186,7 @@ export class IgxColumnGroupComponent extends IgxColumnComponent implements After
      */
     public override set inlineEditorTemplate(template: TemplateRef<any>) { }
     /**
-     * Will return empty array. Use this.children.toArray()[index].cells to get the cells for a column that is part of the column group.
-     * ```typescript
-     * let columnCells = this.columnGroup.cells;
-     * ```
-     *
-     * @memberof IgxColumnGroupComponent
+     * @hidden @internal
      */
     public override get cells(): CellType[] {
         return [];

projects/igniteui-angular/src/lib/grids/columns/column.component.ts

@@ -1130,12 +1130,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
         this._groupingComparer = funcRef;
     }
     /**
-     * Gets the default minimum `width` of the column.
-     * ```typescript
-     * let defaultMinWidth =  this.column.defaultMinWidth;
-     * ```
-     *
-     * @memberof IgxColumnComponent
+     * @hidden @internal
      */
     public get defaultMinWidth(): string {
         if (!this.grid) {
@@ -1351,11 +1346,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
     }
 
     /**
-     * Gets the cells of the column.
-     * ```typescript
-     * let columnCells = this.column.cells;
-     * ```
-     *
+     * @hidden @internal
      */
     public get cells(): CellType[] {
         return this.grid.dataView
@@ -1455,7 +1446,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
      *
      * @memberof IgxColumnComponent
      */
-    public get columnLayoutChild() {
+    public get columnLayoutChild(): boolean {
         return this.parent && this.parent.columnLayout;
     }
 
@@ -1510,9 +1501,11 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
             null;
     }
 
+    /** @hidden @internal **/
     public get gridRowSpan(): number {
         return this.rowEnd && this.rowStart ? this.rowEnd - this.rowStart : 1;
     }
+    /** @hidden @internal **/
     public get gridColumnSpan(): number {
         return this.colEnd && this.colStart ? this.colEnd - this.colStart : 1;
     }
@@ -2296,47 +2289,31 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
      * ```typescript
      * let topLevelParent =  this.column.topLevelParent;
      * ```
-     *
-     * @memberof IgxColumnComponent
      */
-    public get topLevelParent() {
+    public get topLevelParent(): ColumnType | undefined {
         let parent = this.parent;
         while (parent && parent.parent) {
             parent = parent.parent;
         }
-        return parent;
+        return parent ?? undefined;
     }
 
     /**
-     * Returns a reference to the header of the column.
-     * ```typescript
-     * let column = this.grid.columnList.filter(c => c.field === 'ID')[0];
-     * let headerCell = column.headerCell;
-     * ```
-     *
-     * @memberof IgxColumnComponent
+     * @hidden @internal
      */
     public get headerCell(): IgxGridHeaderComponent {
         return this.grid.headerCellList.find((header) => header.column === this);
     }
 
     /**
-     * Returns a reference to the filter cell of the column.
-     * ```typescript
-     * let column = this.grid.columnList.filter(c => c.field === 'ID')[0];
-     * let filterell = column.filterell;
-     * ```
-     *
-     * @memberof IgxColumnComponent
+     * @hidden @internal
      */
     public get filterCell(): IgxGridFilteringCellComponent {
         return this.grid.filterCellList.find((filterCell) => filterCell.column === this);
     }
 
     /**
-     * Returns a reference to the header group of the column.
-     *
-     * @memberof IgxColumnComponent
+     * @hidden @internal
      */
     public get headerGroup(): IgxGridHeaderGroupComponent {
         return this.grid.headerGroupsList.find(group => group.column === this);

projects/igniteui-angular/src/lib/grids/common/grid.interface.ts

@@ -311,17 +311,9 @@ export interface ColumnType extends FieldType {
     get childColumns(): ColumnType[];
     /** @hidden @internal */
     allChildren: ColumnType[];
-    /**
-     * The header group component associated with this column.
-     * Could be of any type
-    */
-    // TYPE
+    /** @hidden @internal */
     headerGroup: any;
-    /**
-     * The header cell component associated with this column.
-     * Could be of any type
-     */
-    // TYPE
+    /** @hidden @internal */
     headerCell: any;
     validators: any[];
 
@@ -418,6 +410,7 @@ export interface ColumnType extends FieldType {
      * If the value is true, the result will not depend on the case (example: `E` will match `e`)
      */
     sortingIgnoreCase: boolean;
+    /** @hidden @internal */
     filterCell: any;
     filteringIgnoreCase: boolean;
     /**
@@ -447,7 +440,9 @@ export interface ColumnType extends FieldType {
     rowEnd: number;
     colStart: number;
     colEnd: number;
+    /** @hidden @internal */
     gridRowSpan: number;
+    /** @hidden @internal */
     gridColumnSpan: number;
     columnLayoutChild: boolean;
     width: string;

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

@@ -958,7 +958,7 @@ describe('IgxGrid - multi-column headers #grid', () => {
             expect(grid.columnList.filter(col => col.columnGroup).length).toEqual(7);
 
             // Get topLevelParent of column with no group
-            expect(grid.getColumnByName('ID').topLevelParent).toBeNull();
+            expect(grid.getColumnByName('ID').topLevelParent).toBeUndefined();
 
             // Get topLevelParent of column
             const addressGroupedColumn = getColGroup(grid, 'Address Information');
@@ -971,8 +971,8 @@ describe('IgxGrid - multi-column headers #grid', () => {
             expect(grid.getColumnByName('CompanyName').topLevelParent).toEqual(genInfGroupedColumn);
 
             // Get topLevelParent of top group
-            expect(genInfGroupedColumn.topLevelParent).toBeNull();
-            expect(addressGroupedColumn.topLevelParent).toBeNull();
+            expect(genInfGroupedColumn.topLevelParent).toBeUndefined();
+            expect(addressGroupedColumn.topLevelParent).toBeUndefined();
 
             // Get topLevelParent of group
             expect(getColGroup(grid, 'Person Details').topLevelParent).toEqual(genInfGroupedColumn);

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

@@ -16,7 +16,7 @@ import { configureTestSuite } from '../../test-utils/configure-suite';
 import { IgxGridComponent } from './grid.component';
 import { GridSelectionFunctions, GridFunctions } from '../../test-utils/grid-functions.spec';
 import { SortingDirection } from '../../data-operations/sorting-strategy';
-import { IgxColumnComponent } from '../public_api';
+import { ColumnType, IgxColumnComponent } from '../public_api';
 
 describe('IgxGrid - Column Moving #grid', () => {
     const CELL_CSS_CLASS = '.igx-grid__td';
@@ -1588,7 +1588,7 @@ describe('IgxGrid - Column Moving #grid', () => {
         }));
 
         it('MCH - should not move group column to last position', (async () => {
-            let column = grid.getColumnByName('Missing');
+            let column: ColumnType = grid.getColumnByName('Missing');
             column.move(3);
             await wait();
             fixture.detectChanges();
@@ -1610,8 +1610,7 @@ describe('IgxGrid - Column Moving #grid', () => {
         }));
 
         it('MCH - should be able to move group column to position lastIndex - group.children.length', (async () => {
-
-            let column = grid.getColumnByName('Missing');
+            let column: ColumnType = grid.getColumnByName('Missing');
             column.move(3);
             await wait();
             fixture.detectChanges();

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

@@ -590,13 +590,14 @@ describe('IgxGrid Master Detail #grid', () => {
             setupGridScrollDetection(fix, grid);
             const targetCellElement = grid.gridAPI.get_cell_by_index(0, 'ContactName');
             UIInteractions.simulateClickAndSelectEvent(targetCellElement);
+            await wait(DEBOUNCETIME);
             fix.detectChanges();
 
             UIInteractions.triggerEventHandlerKeyDown('End', gridContent, false, false, true);
-            await wait(DEBOUNCETIME);
             fix.detectChanges();
             await wait(DEBOUNCETIME);
             fix.detectChanges();
+            await wait(DEBOUNCETIME);
 
             const lastRow = grid.gridAPI.get_row_by_index(52);
             expect(lastRow).not.toBeUndefined();

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

@@ -14,6 +14,7 @@ import { IgxStringFilteringOperand } from '../../data-operations/filtering-condi
 import { GridFunctions } from '../../test-utils/grid-functions.spec';
 import { HierarchicalGridFunctions } from '../../test-utils/hierarchical-grid-functions.spec';
 import { IgxHierarchicalRowComponent } from './hierarchical-row.component';
+import { IgxHierarchicalGridDefaultComponent } from '../../test-utils/hierarchical-grid-components.spec';
 
 describe('IgxHierarchicalGrid Virtualization #hGrid', () => {
     let fixture;
@@ -22,7 +23,8 @@ describe('IgxHierarchicalGrid Virtualization #hGrid', () => {
         return TestBed.configureTestingModule({
             imports: [
                 NoopAnimationsModule,
-                IgxHierarchicalGridTestBaseComponent
+                IgxHierarchicalGridTestBaseComponent,
+                IgxHierarchicalGridDefaultComponent
             ]
         });
     }));
@@ -393,6 +395,43 @@ describe('IgxHierarchicalGrid Virtualization #hGrid', () => {
         expect(ri.gridScroll.emit).toHaveBeenCalled();
         expect(ri.dataPreLoad.emit).toHaveBeenCalled();
     });
+
+    it('should recalculate and update content correctly after filter is cleared, ensuring no empty areas post-filtering and scrolling', async () => {
+        // eslint-disable-next-line @typescript-eslint/no-shadow
+        const fixture = TestBed.createComponent(IgxHierarchicalGridDefaultComponent);
+        fixture.detectChanges();
+        // eslint-disable-next-line @typescript-eslint/no-shadow
+        const hierarchicalGrid = fixture.componentInstance.hierarchicalGrid;
+        fixture.detectChanges();
+        await wait(50);
+
+        hierarchicalGrid.filter('Artist', 'd', IgxStringFilteringOperand.instance().condition('contains'));
+        fixture.detectChanges();
+        await wait(50);
+
+        hierarchicalGrid.expandRow(6);
+        fixture.detectChanges();
+        await wait(50);
+
+        hierarchicalGrid.verticalScrollContainer.getScroll().scrollTop = 2000;
+        fixture.detectChanges();
+        await wait(50);
+
+        hierarchicalGrid.clearFilter();
+        fixture.detectChanges();
+        await wait(50);
+
+        hierarchicalGrid.verticalScrollContainer.getScroll().scrollTop = 2000;
+        fixture.detectChanges();
+        await wait(50);
+
+        const hierarchicalGridRect = hierarchicalGrid.tbody.nativeElement.getBoundingClientRect();
+        const lastRowRect = hierarchicalGrid.dataRowList.last.nativeElement.getBoundingClientRect();
+
+        const emptySpace = hierarchicalGridRect.bottom - lastRowRect.bottom;
+
+        expect(emptySpace).toBeLessThan(5);
+    });
 });
 
 describe('IgxHierarchicalGrid Virtualization Custom Scenarios #hGrid', () => {