Merge branch 'develop' into bugfix/CXSPA-1128

SAP · Oct 9, 2024 · 12dead4 · 12dead4
2 parents 0ee36ff + 0d6aa2b
commit 12dead4
Show file tree

Hide file tree

Showing 118 changed files with 1,421 additions and 585 deletions.
diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
   "keywords": [
     "spartacus",
@@ -21,10 +21,10 @@
   "peerDependencies": {
     "@angular/core": "^17.0.5",
     "@angular/ssr": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2"
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/user": "2211.29.0"
   },
   "optionalDependencies": {
     "@angular/platform-server": "^17.0.5",

diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "ASM feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,14 +32,14 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefinder": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefinder": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html
@@ -27,6 +27,7 @@
   </ng-container>
 
   <button
+    #addToCartDialogTriggerEl
     *ngIf="hasStock"
     [ngClass]="
       options?.displayAddToCart

diff --git a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.ts b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.ts
@@ -9,11 +9,13 @@ import {
   ChangeDetectorRef,
   Component,
   ComponentRef,
+  ElementRef,
   HostListener,
   Input,
   OnDestroy,
   OnInit,
   Optional,
+  ViewChild,
   inject,
 } from '@angular/core';
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
@@ -55,6 +57,11 @@ export class AddToCartComponent implements OnInit, OnDestroy {
    */
   @Input() product: Product;
 
+  /**
+   * Element responsible for opening the modal. The reference is used to refocus the modal after it closes.
+   */
+  @ViewChild('addToCartDialogTriggerEl') addToCartDialogTriggerEl: ElementRef;
+
   maxQuantity: number;
 
   hasStock: boolean = false;
@@ -77,9 +84,7 @@ export class AddToCartComponent implements OnInit, OnDestroy {
 
   iconTypes = ICON_TYPE;
 
-  @Optional() featureConfigService = inject(FeatureConfigService, {
-    optional: true,
-  });
+  private featureConfigService = inject(FeatureConfigService);
 
   /**
    * We disable the dialog launch on quantity input,
@@ -228,6 +233,9 @@ export class AddToCartComponent implements OnInit, OnDestroy {
     newEvent.quantity = quantity;
     newEvent.numberOfEntriesBeforeAdd = numberOfEntriesBeforeAdd;
     newEvent.pickupStoreName = storeName;
+    if (this.featureConfigService.isEnabled('a11yDialogTriggerRefocus')) {
+      newEvent.triggerElementRef = this.addToCartDialogTriggerEl;
+    }
     return newEvent;
   }
 

diff --git a/...ure-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog-event.listener.ts b/...ure-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog-event.listener.ts
@@ -56,7 +56,7 @@ export class AddedToCartDialogEventListener implements OnDestroy {
 
     const dialog = this.launchDialogService.openDialog(
       LAUNCH_CALLER.ADDED_TO_CART,
-      undefined,
+      event?.triggerElementRef,
       undefined,
       addToCartData
     );

diff --git a/feature-libs/cart/base/root/events/cart.events.ts b/feature-libs/cart/base/root/events/cart.events.ts
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { ElementRef } from '@angular/core';
 import { CxEvent } from '@spartacus/core';
 import { OrderEntry } from '../models/cart.model';
 
@@ -127,6 +128,11 @@ export class CartUiEventAddToCart extends CxEvent {
   quantity: number;
   numberOfEntriesBeforeAdd: number;
   pickupStoreName?: string;
+  /**
+   * Since the event can be used to open a dialog, we need to know which element triggered it.
+   * This way we can refocus on it after the dialog is closed.
+   */
+  triggerElementRef?: ElementRef;
 }
 
 /**

diff --git a/...export/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.ts b/...export/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.ts
@@ -54,6 +54,7 @@ export class ImportEntriesDialogComponent {
 
   constructor(protected launchDialogService: LaunchDialogService) {
     useFeatureStyles('a11yExpandedFocusIndicator');
+    useFeatureStyles('a11yVisibleFocusOverflows');
   }
 
   isNewCartForm(context: AddOrderEntriesContext) {

diff --git a/feature-libs/cart/import-export/styles/_import-entries-dialog.scss b/feature-libs/cart/import-export/styles/_import-entries-dialog.scss
@@ -21,6 +21,13 @@ cx-import-entries-dialog {
           font-weight: var(--cx-font-weight-semi);
           line-height: var(--cx-line-height, 1.2222222222);
         }
+
+        @include forFeature('a11yVisibleFocusOverflows') {
+          .cx-import-entries-close {
+            margin: 0;
+            padding: 0;
+          }
+        }
       }
 
       cx-import-entries-form,

diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cart",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "",
   "keywords": [
     "spartacus",
@@ -37,11 +37,11 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },

diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/checkout",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Checkout feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,13 +32,13 @@
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },

diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/customer-ticketing",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Customer-Ticketing library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,11 +30,11 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/estimated-delivery-date/package.json b/feature-libs/estimated-delivery-date/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/estimated-delivery-date",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Estimated Delivery Date library for Spartacus",
   "keywords": [
     "spartacus",
@@ -28,12 +28,12 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/order",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Order feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/pdf-invoices": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/pdf-invoices": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/organization",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Organization library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },

diff --git a/feature-libs/pdf-invoices/package.json b/feature-libs/pdf-invoices/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/pdf-invoices",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Invoices library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,10 +29,10 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/...onents/container/pdp-pickup-options-container/pdp-pickup-options-container.component.html b/...onents/container/pdp-pickup-options-container/pdp-pickup-options-container.component.html
@@ -3,6 +3,6 @@
     [selectedOption]="pickupOption$ | async"
     [displayPickupLocation]="displayPickupLocation$ | async"
     (pickupOptionChange)="onPickupOptionChange($event)"
-    (pickupLocationChange)="openDialog()"
+    (pickupLocationChange)="openDialog($event)"
   ></cx-pickup-options>
 </ng-container>