Merge branch 'master' into sivanova/fix-16508

Author: SisIvanova

projects/igniteui-angular-elements/src/analyzer/elements.config.ts

@@ -7,8 +7,8 @@ import {
 import { IgxTreeGridComponent } from "../../../igniteui-angular/grids/tree-grid";
 import { IgxPaginatorComponent } from "../../../igniteui-angular/paginator/src/paginator/paginator.component";
 import { IgxPaginatorToken } from "../../../igniteui-angular/paginator/src/paginator/token";
-import { IgxColumnComponent } from "../../../igniteui-angular/grids/core/src/columns/column.component";
 import { IgxColumnGroupComponent } from "../../../igniteui-angular/grids/core/src/columns/column-group.component";
+import { IgxColumnComponent } from "../../../igniteui-angular/grids/core/src/columns/column.component";
 import { IgxColumnLayoutComponent } from "../../../igniteui-angular/grids/core/src/columns/column-layout.component";
 import { IgxGridEditingActionsComponent } from "../../../igniteui-angular/grids/core/src/grid-actions/grid-editing-actions.component";
 import { IgxActionStripActionsToken } from "../../../igniteui-angular/core/src/grid-column-actions/token";

projects/igniteui-angular/core/src/data-operations/grid-types.ts

@@ -330,7 +330,7 @@ export interface ColumnType extends FieldType {
      * The immediate parent (right above) column of this column (if any).
      * If there is no parent, that means the current column is the root parent
      */
-    parent?: ColumnType;
+    parent: ColumnType | null;
     pipeArgs: IColumnPipeArgs;
     hasNestedPath: boolean;
     additionalTemplateContext: any;

projects/igniteui-angular/grids/core/src/api.service.ts

@@ -31,13 +31,13 @@ export class GridBaseAPIService<T extends GridType> implements GridServiceType {
     public cms = inject(IgxColumnMovingService)
 
     public grid: T;
-    protected destroyMap: Map<string, Subject<boolean>> = new Map<string, Subject<boolean>>();    
+    protected destroyMap: Map<string, Subject<boolean>> = new Map<string, Subject<boolean>>();
 
     public get_column_by_name(name: string): ColumnType {
         return this.grid.columns.find((col: ColumnType) => col.field === name);
     }
 
-    public get_summary_data() {
+    public get_summary_data(): any[] | null {
         const grid = this.grid;
         let data = grid.filteredData;
         if (data && grid.hasPinnedRecords) {

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

@@ -25,6 +25,7 @@ import { IColumnVisibilityChangingEventArgs, IPinColumnCancellableEventArgs, IPi
 import { IgxGridCell } from '../grid-public-cell';
 import { NG_VALIDATORS, Validator } from '@angular/forms';
 import { ColumnPinningPosition, ColumnType, DefaultSortingStrategy, ExpressionsTreeUtil, FilteringExpressionsTree, GridColumnDataType, IColumnEditorOptions, IColumnPipeArgs, IgxBooleanFilteringOperand, IgxDateFilteringOperand, IgxDateTimeFilteringOperand, IgxFilteringOperand, IgxNumberFilteringOperand, IgxStringFilteringOperand, IgxSummaryResult, IgxTimeFilteringOperand, isConstructor, ISortingStrategy, MRLColumnSizeInfo, MRLResizeColumnInfo, PlatformUtil, ɵSize } from 'igniteui-angular/core';
+import type { IgxColumnLayoutComponent } from './column-layout.component';
 
 const DEFAULT_DATE_FORMAT = 'mediumDate';
 const DEFAULT_TIME_FORMAT = 'mediumTime';
@@ -1525,8 +1526,6 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
      * ```typescript
      * let visibleColumnIndex =  this.column.visibleIndex;
      * ```
-     *
-     * @memberof IgxColumnComponent
      */
     public get visibleIndex(): number {
         if (!isNaN(this._vIndex)) {
@@ -1543,7 +1542,8 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
             col = this.allChildren.filter(c => !c.columnGroup && !c.hidden)[0] as any;
         }
         if (this.columnLayoutChild) {
-            return this.parent.childrenVisibleIndexes.find(x => x.column === this).index;
+            // TODO: Refactor/redo/remove this
+            return (this.parent as IgxColumnLayoutComponent).childrenVisibleIndexes.find(x => x.column === this).index;
         }
 
         if (!this.pinned) {
@@ -1668,7 +1668,8 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
         this._visibleWhenCollapsed = value;
         this.visibleWhenCollapsedChange.emit(this._visibleWhenCollapsed);
         if (this.parent) {
-            this.parent?.setExpandCollapseState?.();
+            // TODO: Refactor/redo/remove this
+            (this.parent as IgxColumnLayoutComponent)?.setExpandCollapseState?.();
         }
     }
 
@@ -1801,10 +1802,8 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
      * ```typescript
      * this.column.parent = higherLevelColumn;
      * ```
-     *
-     * @memberof IgxColumnComponent
      */
-    public parent = null;
+    public parent: ColumnType | null = null;
 
     /* blazorSuppress */
     /**
@@ -2199,7 +2198,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
             return [{ target: this, spanUsed: 1 }];
         }
 
-        const columnSized = this.getInitialChildColumnSizes(this.parent.children);
+        const columnSized = this.getInitialChildColumnSizes(this.parent.children as QueryList<IgxColumnComponent>);
         const targets: MRLResizeColumnInfo[] = [];
         const colEnd = this.colEnd ? this.colEnd : this.colStart + 1;
 

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

@@ -27,7 +27,7 @@ export const IGX_GRID_SERVICE_BASE = /*@__PURE__*/new InjectionToken<GridService
 
 export interface IGridDataBindable extends GridTypeBase {
     data: any[] | null;
-    get filteredData(): any[];
+    get filteredData(): any[] | null;
 }
 
 /* marshalByValue */
@@ -385,7 +385,7 @@ export interface GridServiceType {
     get_row_expansion_state(id: any): boolean;
     /** Represents a method declaration for setting a new expansion state. It can be triggered by an event */
     set_row_expansion_state(id: any, expanded: boolean, event?: Event): void;
-    get_summary_data(): any[];
+    get_summary_data(): any[] | null;
 
     prepare_sorting_expression(stateCollections: Array<Array<any>>, expression: ISortingExpression): void;
     /**
@@ -417,7 +417,7 @@ export interface GridServiceType {
     clear_groupby?(field: string | any): void;
     getParentRowId?(child: GridType): any;
     getChildGrids?(inDepth?: boolean): GridType[];
-    getChildGrid?(path: IPathSegment[]): GridType;
+    getChildGrid?(path: IPathSegment[]): GridType | undefined;
 
     unsetChildRowIsland?(rowIsland: GridType): void;
     registerChildRowIsland?(rowIsland: GridType): void;
@@ -497,7 +497,7 @@ export interface GridType extends IGridDataBindable {
     /** @hidden @internal */
     tfoot: ElementRef<HTMLElement>;
     /** @hidden @internal */
-    paginator: IgxPaginatorComponent;
+    paginator?: IgxPaginatorComponent;
     /** @hidden @internal */
     paginatorList?: QueryList<IgxPaginatorComponent>;
     /** @hidden @internal */
@@ -634,7 +634,6 @@ export interface GridType extends IGridDataBindable {
     /** The height of each row in the grid. Setting a constant height can solve problems with not showing all elements when scrolling */
     rowHeight: number;
     multiRowLayoutRowSize: number;
-    maxLevelHeaderDepth: number;
     defaultRowHeight: number;
     /** The default font size, calculated for each element */
     _baseFontSize?: number;
@@ -691,7 +690,7 @@ export interface GridType extends IGridDataBindable {
     dataView: any[];
     _filteredUnpinnedData: any[];
     _filteredSortedUnpinnedData: any[];
-    filteredSortedData: any[];
+    filteredSortedData: any[] | null;
     dataWithAddedInTransactionRows: any[];
     /** Represents the transaction service for the grid. */
     readonly transactions: TransactionService<Transaction, State>;

projects/igniteui-angular/grids/grid/src/grid-base.directive.ts

@@ -2729,11 +2729,11 @@ export abstract class IgxGridBaseDirective implements GridType,
     }
 
     /** @hidden @internal */
-    public get activeDescendant() {
+    public get activeDescendant(): string | undefined {
         const activeElem = this.navigation.activeNode;
 
         if (!activeElem || !Object.keys(activeElem).length || activeElem.row < 0) {
-            return null;
+            return;
         }
         return `${this.id}_${activeElem.row}_${activeElem.column}`;
     }
@@ -2770,18 +2770,6 @@ export abstract class IgxGridBaseDirective implements GridType,
         this.notifyChanges();
     }
 
-    /**
-     * @hidden @internal
-     */
-    public get maxLevelHeaderDepth() {
-        if (this._maxLevelHeaderDepth === null) {
-            this._maxLevelHeaderDepth = this.hasColumnLayouts ?
-                this._columns.reduce((acc, col) => Math.max(acc, col.rowStart), 0) :
-                this._columns.reduce((acc, col) => Math.max(acc, col.level), 0);
-        }
-        return this._maxLevelHeaderDepth;
-    }
-
     /**
      * Gets the number of hidden columns.
      *
@@ -3136,10 +3124,6 @@ export abstract class IgxGridBaseDirective implements GridType,
      * @hidden
      */
     protected _sortingExpressions: Array<ISortingExpression> = [];
-    /**
-     * @hidden
-     */
-    protected _maxLevelHeaderDepth = null;
     /**
      * @hidden
      */
@@ -3177,7 +3161,7 @@ export abstract class IgxGridBaseDirective implements GridType,
     protected _batchEditing = false;
     protected _sortingOptions: ISortingOptions = { mode: 'multiple' };
     protected _filterStrategy: IFilteringStrategy = new FilteringStrategy();
-    protected _autoGeneratedCols = [];
+    protected _autoGeneratedCols: ColumnType[] = [];
     protected _autoGeneratedColsRefs: ComponentRef<IgxColumnComponent>[] = [];
     protected _dataView = [];
     protected _lastSearchInfo: ISearchInfo = {
@@ -3353,7 +3337,7 @@ export abstract class IgxGridBaseDirective implements GridType,
      * const filteredSortedData = this.grid1.filteredSortedData;
      * ```
      */
-    public get filteredSortedData(): any[] {
+    public get filteredSortedData(): any[] | null {
         return this._filteredSortedData;
     }
 
@@ -4819,7 +4803,7 @@ export abstract class IgxGridBaseDirective implements GridType,
         }
 
         if (column.level) {
-            this._moveChildColumns(column.parent, column, target, pos);
+            this._moveChildColumns(column.parent as IgxColumnComponent, column, target, pos);
         }
 
         // let columnPinStateChanged;
@@ -6968,7 +6952,7 @@ export abstract class IgxGridBaseDirective implements GridType,
         if (this.autoGenerate && this._columns.length === 0 && this._autoGeneratedCols.length > 0) {
             // In Ivy if there are nested conditional templates the content children are re-evaluated
             // hence autogenerated columns are cleared and need to be reset.
-            this.updateColumns(this._autoGeneratedCols);
+            this.updateColumns(this._autoGeneratedCols as IgxColumnComponent[]);
             return;
         }
         if (diff) {
@@ -7374,7 +7358,7 @@ export abstract class IgxGridBaseDirective implements GridType,
             const columnLayoutColumns = collection.filter((col) => col.columnLayout || col.columnLayoutChild);
             collection = columnLayoutColumns;
         }
-        this._maxLevelHeaderDepth = null;
+
         collection.forEach((column: IgxColumnComponent) => {
             column.defaultWidth = this.columnWidthSetByUser ? this._columnWidth : column.defaultWidth ? column.defaultWidth : '';
 

projects/igniteui-angular/grids/hierarchical-grid/src/hierarchical-grid-api.service.ts

@@ -25,7 +25,7 @@ export class IgxHierarchicalGridAPIService extends GridBaseAPIService<GridType>
         return this.childRowIslands.get(key);
     }
 
-    public getChildGrid(path: Array<IPathSegment>) {
+    public getChildGrid(path: Array<IPathSegment>): GridType | undefined {
         const currPath = path;
         let grid;
         const pathElem = currPath.shift();

projects/igniteui-angular/grids/hierarchical-grid/src/hierarchical-grid-base.directive.ts

@@ -79,16 +79,6 @@ export abstract class IgxHierarchicalGridBaseDirective extends IgxGridBaseDirect
         return 'hierarchical';
     }
 
-    /**
-     * @hidden
-     */
-    public override get maxLevelHeaderDepth() {
-        if (this._maxLevelHeaderDepth === null) {
-            this._maxLevelHeaderDepth = this.columns.reduce((acc, col) => Math.max(acc, col.level), 0);
-        }
-        return this._maxLevelHeaderDepth;
-    }
-
     /* blazorSuppress */
     /**
      * Gets the outlet used to attach the grid's overlays to.

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

@@ -676,8 +676,8 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
      * @hidden @internal
      */
     @Input()
-    public override get pagingMode() {
-        return;
+    public override get pagingMode(): GridPagingMode {
+        return 'local';
     }
 
     public override set pagingMode(_val: GridPagingMode) {
@@ -688,8 +688,8 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
      */
     @WatchChanges()
     @Input({ transform: booleanAttribute })
-    public override get hideRowSelectors() {
-        return;
+    public override get hideRowSelectors(): boolean {
+        return false;
     }
 
     public override set hideRowSelectors(_value: boolean) {
@@ -733,7 +733,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
      */
     @Input({ transform: booleanAttribute })
     public override get rowDraggable(): boolean {
-        return;
+        return false;
     }
 
 
@@ -789,7 +789,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
      */
     @Input()
     public override get perPage(): number {
-        return;
+        return 0;
     }
 
     public override set perPage(_val: number) {
@@ -894,7 +894,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
     }
 
     /**
-     * @hidden @interal
+     * @hidden @internal
      */
     @Input()
     public override get summaryCalculationMode() {
@@ -905,7 +905,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
     }
 
     /**
-     * @hidden @interal
+     * @hidden @internal
      */
     @Input({ transform: booleanAttribute })
     public override get showSummaryOnCollapse() {
@@ -918,23 +918,23 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
     /**
      * @hidden @internal
      */
-    public override get hiddenColumnsCount() {
-        return null;
+    public override get hiddenColumnsCount(): number {
+        return 0;
     }
 
     /**
      * @hidden @internal
      */
-    public override get pinnedColumnsCount() {
-        return null;
+    public override get pinnedColumnsCount(): number {
+        return 0;
     }
 
     /**
      * @hidden @internal
      */
     @Input({ transform: booleanAttribute })
     public override get batchEditing(): boolean {
-        return;
+        return false;
     }
 
     public override set batchEditing(_val: boolean) {
@@ -1276,7 +1276,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
      * @hidden @internal
      */
     public override isRecordPinnedByIndex(_rowIndex: number) {
-        return null;
+        return false;
     }
 
     /**
@@ -1991,9 +1991,9 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
     }
 
     /** @hidden @internal */
-    public override get activeDescendant() {
+    public override get activeDescendant(): string | undefined {
         if (this.navigation.isRowHeaderActive || this.navigation.isRowDimensionHeaderActive) {
-            return null;
+            return;
         }
         return super.activeDescendant;
     }
@@ -2015,7 +2015,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         return activeHeader ? `${this.id}_${activeHeader.title}` : null;
     }
 
-    protected resolveToggle(groupColumn: IgxColumnComponent, state: boolean) {
+    protected resolveToggle(groupColumn: ColumnType, state: boolean) {
         if (!groupColumn) return;
         groupColumn.hidden = state;
         this.columnGroupStates.set(groupColumn.field, state);

projects/igniteui-angular/grids/tree-grid/src/tree-grid-api.service.ts

@@ -28,7 +28,7 @@ export class IgxTreeGridAPIService extends GridBaseAPIService<GridType> {
         return data;
     }
 
-    public override get_summary_data() {
+    public override get_summary_data(): any[] | null {
         const grid = this.grid;
         const data = grid.processedRootRecords?.filter(row => row.isFilteredOutParent === undefined || row.isFilteredOutParent === false)
             .map(rec => rec.data);