Merge branch '20.0.x' of https://github.com/IgniteUI/igniteui-angular into mkirkova/feat-combo-toggle-button-20.x

Author: MonikaKirkova

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, 19.2.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
+    branches: [ master, '[0-9]+.[0-9]+.x' ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master, 19.2.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
+    branches: [ master, '[0-9]+.[0-9]+.x' ]
   schedule:
     - cron: '33 4 * * 4'
 

package-lock.json

@@ -119,7 +119,7 @@
     "hammerjs": "^2.0.8",
     "ig-typedoc-theme": "^6.0.0",
     "igniteui-dockmanager": "^1.16.1",
-    "igniteui-sassdoc-theme": "^2.0.0",
+    "igniteui-sassdoc-theme": "^2.0.1",
     "igniteui-webcomponents": "6.1.1",
     "jasmine": "^5.6.0",
     "jasmine-core": "^5.6.0",

package.json

@@ -20,7 +20,7 @@
     </ng-container>
     @if (displayValue) {
         <igx-suffix [attr.aria-label]="resourceStrings.igx_combo_clearItems_placeholder" class="igx-combo__clear-button"
-            (click)="handleClearItems($event)">
+            (click)="handleClearItems($event)" (keydown)="handleClearKeyDown($event)" [tabindex]="disabled ? -1 : 0" role="button">
             @if (clearIconTemplate) {
                 <ng-container *ngTemplateOutlet="clearIconTemplate"></ng-container>
             }

projects/igniteui-angular/src/lib/combo/combo.component.html

@@ -2290,6 +2290,21 @@ describe('igxCombo', () => {
                 expect(combo.toggle).toHaveBeenCalledTimes(2);
                 expect(combo.collapsed).toEqual(true);
             }));
+            it('should clear the selection on Enter of the focused clear icon', () => {
+                const selectedItem_1 = combo.dropdown.items[1];
+                combo.toggle();
+                fixture.detectChanges();
+                simulateComboItemClick(1);
+                expect(combo.selection[0]).toEqual(selectedItem_1.value);
+                expect(combo.value[0]).toEqual(selectedItem_1.value[combo.valueKey]);
+
+                const clearBtn = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
+                UIInteractions.triggerEventHandlerKeyDown('Enter', clearBtn);
+                fixture.detectChanges();
+                expect(input.nativeElement.value).toEqual('');
+                expect(combo.selection.length).toEqual(0);
+                expect(combo.value.length).toEqual(0);
+            });
             it('should not be able to select group header', () => {
                 spyOn(combo.selectionChanging, 'emit').and.callThrough();
                 combo.toggle();

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

@@ -265,10 +265,7 @@ export class IgxComboComponent extends IgxComboBaseDirective implements AfterVie
     /**
      * @hidden @internal
      */
-    public handleClearItems(event: Event): void {
-        if (this.disabled) {
-            return;
-        }
+    public clearInput(event: Event): void {
         this.deselectAllItems(true, event);
         if (this.collapsed) {
             this.getEditElement().focus();
@@ -278,6 +275,26 @@ export class IgxComboComponent extends IgxComboBaseDirective implements AfterVie
         event.stopPropagation();
     }
 
+    /**
+     * @hidden @internal
+     */
+    public handleClearItems(event: Event): void {
+        if (this.disabled) {
+            return;
+        }
+        this.clearInput(event);
+    }
+
+    /**
+     * @hidden @internal
+     */
+    public handleClearKeyDown(eventArgs: KeyboardEvent) {
+        if (eventArgs.key === 'Enter' || eventArgs.key === ' ') {
+            eventArgs.preventDefault();
+            this.clearInput(eventArgs);
+        }
+    }
+
     /**
      * Select defined items
      *

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

@@ -323,6 +323,10 @@
         %igx-combo__clear-button {
             color: var-get($theme, 'clear-button-foreground-focus');
             background: var-get($theme, 'clear-button-background-focus');
+
+            &:focus {
+                color: color($color: 'secondary');
+            }
         }
     }
 

projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss

@@ -27,7 +27,7 @@
 
     @if (hasSelectedItem) {
         <igx-suffix [attr.aria-label]="resourceStrings.igx_combo_clearItems_placeholder" class="igx-combo__clear-button"
-            (click)="handleClear($event)">
+            (click)="handleClear($event)" (keydown)="handleClearKeyDown($event)" [tabindex]="disabled ? -1 : 0" role="button">
             @if (clearIconTemplate) {
                 <ng-container *ngTemplateOutlet="clearIconTemplate"></ng-container>
             }

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

@@ -1252,6 +1252,19 @@ describe('IgxSimpleCombo', () => {
             expect(combo.collapsed).toEqual(true);
         }));
 
+        it('should clear the selection on Enter of the focused clear icon', () => {
+            combo.select(combo.data[2][combo.valueKey]);
+            fixture.detectChanges();
+            expect(combo.selection).toBeDefined()
+            expect(input.nativeElement.value).toEqual('Massachusetts');
+
+            const clearBtn = fixture.debugElement.query(By.css(`.${CSS_CLASS_CLEARBUTTON}`));
+            UIInteractions.triggerEventHandlerKeyDown('Enter', clearBtn);
+            fixture.detectChanges();
+            expect(input.nativeElement.value.length).toEqual(0);
+            expect(combo.selection).not.toBeDefined();
+        });
+
         it('should not filter the data when disableFiltering is true', () => {
             combo.disableFiltering = true;
             fixture.detectChanges();

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

@@ -424,15 +424,11 @@ export class IgxSimpleComboComponent extends IgxComboBaseDirective implements Co
     }
 
     /** @hidden @internal */
-    public handleClear(event: Event): void {
-        if (this.disabled) {
-            return;
-        }
-
+    public clearInput(event: Event): void {
         const oldSelection = this.selection;
         this.clearSelection(true);
 
-        if(!this.collapsed){
+        if (!this.collapsed) {
             this.focusSearchInput(true);
         }
         event.stopPropagation();
@@ -446,6 +442,23 @@ export class IgxSimpleComboComponent extends IgxComboBaseDirective implements Co
         this.comboInput.focus();
     }
 
+    /** @hidden @internal */
+    public handleClear(event: Event): void {
+        if (this.disabled) {
+            return;
+        }
+
+        this.clearInput(event);
+    }
+
+    /** @hidden @internal */
+    public handleClearKeyDown(event: KeyboardEvent): void {
+        if (event.key === 'Enter' || event.key === ' ') {
+            event.preventDefault();
+            this.clearInput(event);
+        }
+    }
+
     /** @hidden @internal */
     public handleOpened(): void {
         this.triggerCheck();