Merge branch 'develop' into revert-19321-chore/add-ver-desc-to-minor-…

…release-pipeline

feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.spec.ts

@@ -7,6 +7,7 @@ import {
   QuickOrderFacade,
 } from '@spartacus/cart/quick-order/root';
 import {
+  FeatureConfigService,
   FeaturesConfig,
   GlobalMessageService,
   GlobalMessageType,
@@ -64,6 +65,12 @@ class MockGlobalMessageService implements Partial<GlobalMessageService> {
   ): void {}
 }
 
+class MockFeatureConfigService {
+  isEnabled() {
+    return true;
+  }
+}
+
 @Component({
   selector: 'cx-icon',
   template: '',
@@ -101,6 +108,7 @@ describe('QuickOrderFormComponent', () => {
             features: { level: '5.1' },
           },
         },
+        { provide: FeatureConfigService, useClass: MockFeatureConfigService },
       ],
     }).compileComponents();
 
@@ -214,6 +222,20 @@ describe('QuickOrderFormComponent', () => {
       component.clear(ev as Event);
       expect(ev.preventDefault).toHaveBeenCalled();
     });
+
+    it('sets focus back to the input if results box was open', (done) => {
+      const inputSearch: HTMLElement = fixture.debugElement.query(
+        By.css('input')
+      ).nativeElement;
+
+      component.open();
+      expect(inputSearch).not.toBe(getFocusedElement());
+      component.clear();
+      requestAnimationFrame(() => {
+        expect(inputSearch).toBe(getFocusedElement());
+        done();
+      });
+    });
   });
 
   it('should not change focus on focusNextChild if results list is empty', () => {

feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.ts

@@ -9,14 +9,21 @@ import {
   ChangeDetectorRef,
   Component,
   ElementRef,
+  inject,
   Input,
   OnDestroy,
   OnInit,
   ViewChild,
 } from '@angular/core';
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import { QuickOrderFacade } from '@spartacus/cart/quick-order/root';
-import { Config, Product, WindowRef, useFeatureStyles } from '@spartacus/core';
+import {
+  Config,
+  FeatureConfigService,
+  Product,
+  useFeatureStyles,
+  WindowRef,
+} from '@spartacus/core';
 import { ICON_TYPE } from '@spartacus/storefront';
 import { Observable, Subscription } from 'rxjs';
 import {
@@ -45,6 +52,7 @@ export class QuickOrderFormComponent implements OnInit, OnDestroy {
 
   @ViewChild('quickOrderInput') quickOrderInput: ElementRef;
 
+  private featureConfigService = inject(FeatureConfigService);
   protected subscription = new Subscription();
   protected searchSubscription = new Subscription();
 
@@ -78,6 +86,15 @@ export class QuickOrderFormComponent implements OnInit, OnDestroy {
 
     if (this.isResultsBoxOpen()) {
       this.toggleBodyClass(SEARCH_BOX_ACTIVE_CLASS, false);
+      if (
+        this.featureConfigService.isEnabled(
+          'a11yQuickOrderSearchBoxRefocusOnClose'
+        )
+      ) {
+        requestAnimationFrame(() => {
+          this.quickOrderInput.nativeElement.focus();
+        });
+      }
     }
 
     const product = this.form.get('product')?.value;

projects/core/src/features-config/feature-toggles/config/feature-toggles.ts

@@ -777,6 +777,11 @@ export interface FeatureTogglesInterface {
    */
   a11yDifferentiateFocusedAndSelected?: boolean;
 
+  /**
+   * When enabled the input element in `QuickOrderFormComponent' will regain its focus after the dropdown is closed.
+   */
+  a11yQuickOrderSearchBoxRefocusOnClose?: boolean;
+
   /**
    * Adds a visible focus indicator for keyboard navigation in the `SearchBoxComponent` without affecting the visual state for mouse interactions.
    * Affects: SearchBoxComponent
@@ -1047,6 +1052,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11ySearchboxAssistiveMessage: false,
   updateConsentGivenInOnChanges: false,
   a11yDifferentiateFocusedAndSelected: false,
+  a11yQuickOrderSearchBoxRefocusOnClose: false,
   a11yKeyboardFocusInSearchBox: false,
   a11yAddPaddingToCarouselPanel: false,
   a11yHideConsentButtonWhenBannerVisible: false,

projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts

@@ -413,6 +413,7 @@ if (environment.cpq) {
         a11ySearchboxAssistiveMessage: true,
         updateConsentGivenInOnChanges: true,
         a11yDifferentiateFocusedAndSelected: true,
+        a11yQuickOrderSearchBoxRefocusOnClose: true,
         a11yKeyboardFocusInSearchBox: true,
         a11yAddPaddingToCarouselPanel: true,
         a11yHideConsentButtonWhenBannerVisible: true,