From f34db904c9c4f534e1ca7bbb69f1bcec085bc231 Mon Sep 17 00:00:00 2001
From: Petar Markov <petarmarkov9449@gmail.com>
Date: Thu, 23 Jan 2025 11:05:23 +0100
Subject: [PATCH 1/5] fix extra reading issue when tab-panel is focused in
 'Delivery method'

---
 .../cms-components/content/tab/panel/tab-panel.component.html    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/projects/storefrontlib/cms-components/content/tab/panel/tab-panel.component.html b/projects/storefrontlib/cms-components/content/tab/panel/tab-panel.component.html
index 7c9f1026c48..1e17a8eeac8 100644
--- a/projects/storefrontlib/cms-components/content/tab/panel/tab-panel.component.html
+++ b/projects/storefrontlib/cms-components/content/tab/panel/tab-panel.component.html
@@ -1,7 +1,6 @@
 <div
   [attr.role]="mode === TAB_MODE.ACCORDIAN ? 'region' : 'tabpanel'"
   [tabindex]="tab.disableBorderFocus ? -1 : 0"
-  [attr.aria-labelledby]="tab.id ?? null"
   [attr.id]="
     tab.id !== null && tab.id !== undefined ? 'section-' + tab.id : null
   "

From b2b255857494b8c52d7affb357d4ac3deb66b884 Mon Sep 17 00:00:00 2001
From: Petar Markov <petarmarkov9449@gmail.com>
Date: Thu, 23 Jan 2025 12:00:12 +0100
Subject: [PATCH 2/5] update test

---
 .../content/tab/panel/tab-panel.component.spec.ts           | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/projects/storefrontlib/cms-components/content/tab/panel/tab-panel.component.spec.ts b/projects/storefrontlib/cms-components/content/tab/panel/tab-panel.component.spec.ts
index 2c7278a6c6b..36844478ba3 100644
--- a/projects/storefrontlib/cms-components/content/tab/panel/tab-panel.component.spec.ts
+++ b/projects/storefrontlib/cms-components/content/tab/panel/tab-panel.component.spec.ts
@@ -1,8 +1,8 @@
 import { Component, TemplateRef, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Tab, TAB_MODE } from '../tab.model';
-import { TabPanelComponent } from './tab-panel.component';
 import { KeyboardFocusTestingModule } from '@spartacus/storefront';
+import { TAB_MODE, Tab } from '../tab.model';
+import { TabPanelComponent } from './tab-panel.component';
 
 const mockTab: Tab | any = {
   id: 1,
@@ -46,7 +46,6 @@ describe('TabPanelComponent', () => {
     expect(tabPanel?.getAttribute('tabindex')).toEqual('0');
     expect(tabPanel?.getAttribute('role')).toEqual('tabpanel');
     expect(tabPanel?.getAttribute('class')).toEqual('active');
-    expect(tabPanel?.getAttribute('aria-labelledby')).toEqual('1');
   });
 
   it('should have correct attribues when is open in ACCORDIAN mode', () => {
@@ -58,7 +57,6 @@ describe('TabPanelComponent', () => {
     expect(tabPanel?.getAttribute('tabindex')).toEqual('0');
     expect(tabPanel?.getAttribute('role')).toEqual('region');
     expect(tabPanel?.getAttribute('class')).toEqual('active');
-    expect(tabPanel?.getAttribute('aria-labelledby')).toEqual('1');
   });
 
   it('should have correct attribues when disableBorderFocus is active', () => {

From 25f557c0fd7a9bd8f56bc5132c24830f754e4980 Mon Sep 17 00:00:00 2001
From: Petar Markov <petarmarkov9449@gmail.com>
Date: Tue, 28 Jan 2025 16:05:49 +0100
Subject: [PATCH 3/5] fix aria issue with JAWS

---
 .../pickup-options/pickup-options.component.html   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
index e872151a9c1..77abdeb461c 100644
--- a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
+++ b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
@@ -170,12 +170,14 @@
         {{ 'pickupOptions.legend' | cxTranslate }}
       </div>
 
-      <cx-tab
-        *ngIf="tabs"
-        [disabled]="disableControls"
-        [tabs]="tabs"
-        [config]="tabConfig"
-      ></cx-tab>
+      <div>
+        <cx-tab
+          *ngIf="tabs"
+          [disabled]="disableControls"
+          [tabs]="tabs"
+          [config]="tabConfig"
+        ></cx-tab>
+      </div>
     </div>
     <div aria-live="assertive" aria-atomic="true">
       <span *ngIf="validationError" tabindex="0" class="cx-invalid-message">

From 789836565b23b7ab4a80b1571c452399e1be9b25 Mon Sep 17 00:00:00 2001
From: Petar Markov <petarmarkov9449@gmail.com>
Date: Fri, 31 Jan 2025 09:21:52 +0100
Subject: [PATCH 4/5] add scope in the table

---
 .../cart-item-list/cart-item-list.component.html      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.html b/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.html
index 474edec909c..7b37265a65a 100644
--- a/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.html
+++ b/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.html
@@ -6,7 +6,7 @@
   </caption>
   <thead *ngIf="hasHeader">
     <tr role="row" class="cx-item-list-header">
-      <th role="columnheader" class="cx-item-list-desc">
+      <th role="columnheader" scope="col" class="cx-item-list-desc">
         {{ 'cartItems.item' | cxTranslate }}
       </th>
 
@@ -18,6 +18,7 @@
       <th
         *cxFeature="'a11yQTY2Quantity'"
         role="columnheader"
+        scope="col"
         class="cx-item-list-qty"
       >
         {{ 'cartItems.quantityFull' | cxTranslate }}
@@ -25,19 +26,20 @@
       <th
         *cxFeature="'!a11yQTY2Quantity'"
         role="columnheader"
+        scope="col"
         class="cx-item-list-qty"
       >
         {{ 'cartItems.quantity' | cxTranslate }}
       </th>
       <ng-container *ngIf="options.isSaveForLater; else totalHeader">
-        <th role="columnheader" class="cx-item-list-total">
+        <th role="columnheader" scope="col" class="cx-item-list-total">
           {{ 'saveForLaterItems.stock' | cxTranslate }}
         </th>
       </ng-container>
       <ng-container
         *ngIf="!readonly || options.isSaveForLater || options.displayAddToCart"
       >
-        <th role="columnheader" class="cx-item-list-actions">
+        <th role="columnheader" scope="col" class="cx-item-list-actions">
           {{ 'cartItems.actions' | cxTranslate }}
         </th>
       </ng-container>
@@ -58,6 +60,7 @@
           [readonly]="readonly"
           [promotionLocation]="promotionLocation"
           [options]="options"
+          [attr.aria-rowindex]="i + 1"
         ></tr>
       </ng-container>
     </ng-container>
@@ -65,7 +68,7 @@
 </table>
 
 <ng-template #totalHeader>
-  <th role="columnheader" class="cx-item-list-total">
+  <th role="columnheader" scope="col" class="cx-item-list-total">
     {{ 'cartItems.total' | cxTranslate }}
   </th>
 </ng-template>

From bb9ea8ad7055832fe24183632d2640925d2529c2 Mon Sep 17 00:00:00 2001
From: Petar Markov <petarmarkov9449@gmail.com>
Date: Mon, 3 Feb 2025 11:52:03 +0100
Subject: [PATCH 5/5] remove unncessary div

---
 .../pickup-options/pickup-options.component.html   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
index 77abdeb461c..e872151a9c1 100644
--- a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
+++ b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
@@ -170,14 +170,12 @@
         {{ 'pickupOptions.legend' | cxTranslate }}
       </div>
 
-      <div>
-        <cx-tab
-          *ngIf="tabs"
-          [disabled]="disableControls"
-          [tabs]="tabs"
-          [config]="tabConfig"
-        ></cx-tab>
-      </div>
+      <cx-tab
+        *ngIf="tabs"
+        [disabled]="disableControls"
+        [tabs]="tabs"
+        [config]="tabConfig"
+      ></cx-tab>
     </div>
     <div aria-live="assertive" aria-atomic="true">
       <span *ngIf="validationError" tabindex="0" class="cx-invalid-message">