Merge branch 'master' into dpetev/combo-valid-state

Author: kdinev

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

@@ -2357,7 +2357,10 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
      */
     @Input()
     public set sortingOptions(value: ISortingOptions) {
-        this.clearSort();
+        if (!this._init) {
+            // clear sort only if option is changed runtime. No need to clear on initial load.
+            this.clearSort();
+        }
         this._sortingOptions = Object.assign(this._sortingOptions, value);
     }
 

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

@@ -4,7 +4,7 @@ import { DefaultSortingStrategy, SortingDirection } from '../../data-operations/
 import { configureTestSuite } from '../../test-utils/configure-suite';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { GridFunctions } from '../../test-utils/grid-functions.spec';
-import { GridDeclaredColumnsComponent, SortByParityComponent, GridWithPrimaryKeyComponent, SortByAnotherColumnComponent } from '../../test-utils/grid-samples.spec';
+import { GridDeclaredColumnsComponent, SortByParityComponent, GridWithPrimaryKeyComponent, SortByAnotherColumnComponent, SortOnInitComponent } from '../../test-utils/grid-samples.spec';
 import { UIInteractions } from '../../test-utils/ui-interactions.spec';
 import { SampleTestData } from '../../test-utils/sample-test-data.spec';
 import { CellType } from '../common/grid.interface';
@@ -703,5 +703,12 @@ describe('IgxGrid - Grid Sorting #grid', () => {
             expect(GridFunctions.getColumnSortingIndex(headerLastName)).toBeNull();
             expect(grid.sortingExpressions.length).toBe(1);
         }));
+
+        it('should not clear sortingExpressions when setting sortingOptions on init. ', fakeAsync(() => {
+            fixture = TestBed.createComponent(SortOnInitComponent);
+            fixture.detectChanges();
+            grid = fixture.componentInstance.grid;
+            expect(grid.sortingExpressions.length).toBe(1);
+        }));
     });
 });

projects/igniteui-angular/src/lib/test-utils/grid-samples.spec.ts

@@ -14,7 +14,7 @@ import { IgxColumnComponent } from '../grids/columns/column.component';
 import { IgxFilteringOperand, IgxNumberFilteringOperand } from '../data-operations/filtering-condition';
 import { IFilteringExpressionsTree, FilteringExpressionsTree } from '../data-operations/filtering-expressions-tree';
 import { FilteringStrategy, IgxFilterItem } from '../data-operations/filtering-strategy';
-import { IgxExcelStyleHeaderIconDirective, IgxSortAscendingHeaderIconDirective, IgxSortDescendingHeaderIconDirective, IgxSortHeaderIconDirective } from '../grids/public_api';
+import { ISortingOptions, IgxExcelStyleHeaderIconDirective, IgxSortAscendingHeaderIconDirective, IgxSortDescendingHeaderIconDirective, IgxSortHeaderIconDirective } from '../grids/public_api';
 import { IgxRowAddTextDirective, IgxRowEditActionsDirective, IgxRowEditTabStopDirective, IgxRowEditTemplateDirective, IgxRowEditTextDirective } from '../grids/grid.rowEdit.directive';
 import { IgxExcelStyleColumnOperationsTemplateDirective, IgxExcelStyleFilterOperationsTemplateDirective, IgxGridExcelStyleFilteringComponent } from '../grids/filtering/excel-style/excel-style-filtering.component';
 import { FilteringLogic } from '../data-operations/filtering-expression.interface';
@@ -2144,6 +2144,24 @@ export class SortByAnotherColumnComponent extends GridDeclaredColumnsComponent i
     }
 }
 
+@Component({
+    template: GridTemplateStrings.declareGrid(
+        '[sortingOptions]="sortingOptions"',
+        '',
+        ColumnDefinitions.idFirstLastNameSortable,
+        '',
+        '',
+        ''),
+    standalone: true,
+    imports: [IgxGridComponent, IgxColumnComponent]
+})
+export class SortOnInitComponent extends GridDeclaredColumnsComponent implements OnInit {
+   public sortingOptions: ISortingOptions = { mode: 'single' };
+   public ngOnInit(): void {
+        this.grid.sortingExpressions = [{ fieldName: 'Name', dir: SortingDirection.Asc }];
+    }
+}
+
 @Component({
     template: `
     <igx-grid #grid [data]="data" [height]="'500px'" [width]="'500px'">