Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: (CXSPA-9018) - Fix extra reading issue when tab-panel is focused in 'Delivery method' #19920

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
+10 −11
Draft

fix: (CXSPA-9018) - Fix extra reading issue when tab-panel is focused in 'Delivery method' #19920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f34db90
fix extra reading issue when tab-panel is focused in 'Delivery method'
petarmarkov9449 Jan 23, 2025
b2b2558
update test
petarmarkov9449 Jan 23, 2025
25f557c
fix aria issue with JAWS
petarmarkov9449 Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions ...bs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
1 change: 0 additions & 1 deletion projects/storefrontlib/cms-components/content/tab/panel/tab-panel.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
"
Expand Down
6 changes: 2 additions & 4 deletions projects/storefrontlib/cms-components/content/tab/panel/tab-panel.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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', () => {
Expand All @@ -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', () => {
Expand Down