Merge branch '18.0.x' into bpachilova/comboIdChangeInTemplate-fix-14305-18.0.x

Author: ddaribo

projects/igniteui-angular/src/lib/core/styles/components/icon-button/_icon-button-theme.scss

@@ -1,4 +1,5 @@
 @use 'sass:map';
+@use 'sass:meta';
 @use 'sass:color';
 @use '../../base' as *;
 @use '../../themes/schemas' as *;

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

@@ -386,6 +386,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         this._superCompactMode = value;
     }
 
+    /** @hidden @internal */
     public override get gridSize() {
         if (this.superCompactMode) {
             return Size.Small;

projects/igniteui-angular/src/lib/services/exporter-common/base-export-service.ts

@@ -1275,7 +1275,7 @@ export abstract class IgxBaseExporter {
         return result;
     }
 
-    public addPivotRowHeaders(grid: any) {
+    private addPivotRowHeaders(grid: any) {
         if (grid?.pivotUI?.showRowHeaders) {
             const headersList = this._ownersMap.get(DEFAULT_OWNER);
             const enabledRows = grid.pivotConfiguration.rows.filter(r => r.enabled).map((r, index) => ({ name: r.displayName || r.memberName, level: index }));
@@ -1298,7 +1298,7 @@ export abstract class IgxBaseExporter {
         }
     }
 
-    public addPivotGridColumns(grid: any) {
+    private addPivotGridColumns(grid: any) {
         if (grid.nativeElement.tagName.toLowerCase() !== 'igx-pivot-grid') {
             return;
         }

projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.spec.ts

@@ -1688,6 +1688,52 @@ describe('IgxSimpleCombo', () => {
 
             expect(comboInput.nativeElement.value).toEqual('Connecticut');
         });
+
+        it('should properly filter dropdown when a key is pressed while the combo is focused but not opened, with no selected item', fakeAsync(() => {
+            expect(combo.collapsed).toEqual(true);
+
+            // filter with a specific character when there is no selected item
+            combo.handleInputChange('z');
+            tick();
+            fixture.detectChanges();
+
+            expect(combo.filteredData.length).toEqual(1);
+            expect(combo.filteredData[0].field).toEqual('Arizona');
+
+            combo.close();
+            tick();
+            fixture.detectChanges();
+
+            expect(combo.collapsed).toEqual(true);
+
+            // filter with ' '  when there is no selected item
+            combo.handleInputChange(' ');
+            tick();
+            fixture.detectChanges();
+
+            expect(combo.filteredData.length).toEqual(12);
+        }));
+
+        it('should properly filter dropdown when a key is pressed while the combo is focused but not opened, with a selected item', fakeAsync(() => {
+            // select an item
+            combo.select('Connecticut');
+            tick();
+            fixture.detectChanges();
+
+            expect(combo.selection.field).toEqual('Connecticut');
+
+            combo.close();
+            tick();
+            fixture.detectChanges();
+
+            // filter with a specific character when there is a selected item
+            combo.handleInputChange('z');
+            tick();
+            fixture.detectChanges();
+
+            expect(combo.filteredData.length).toEqual(1);
+            expect(combo.filteredData[0].field).toEqual('Arizona');
+        }));
     });
 
     describe('Display density', () => {

projects/igniteui-angular/src/lib/simple-combo/simple-combo.component.ts

@@ -239,7 +239,6 @@ export class IgxSimpleComboComponent extends IgxComboBaseDirective implements Co
                 this.filterValue = this.searchValue = this.comboInput.value;
                 return;
             }
-            this.filterValue = this.searchValue = '';
         });
         this.dropdown.opened.pipe(takeUntil(this.destroy$)).subscribe(() => {
             if (this.composing) {
@@ -279,12 +278,12 @@ export class IgxSimpleComboComponent extends IgxComboBaseDirective implements Co
 
     /** @hidden @internal */
     public override handleInputChange(event?: any): void {
-        if (event !== undefined) {
-            this.filterValue = this.searchValue = typeof event === 'string' ? event : event.target.value;
-        }
         if (this.collapsed && this.comboInput.focused) {
             this.open();
         }
+        if (event !== undefined) {
+            this.filterValue = this.searchValue = typeof event === 'string' ? event : event.target.value;
+        }
         if (!this.comboInput.value.trim() && super.selection.length) {
             // handle clearing of input by space
             this.clearSelection();