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-9028) - Search dropdown first option visible focus #19741

Merged
merged 7 commits into from
Jan 8, 2025
Merged

fix: (CXSPA-9028) - Search dropdown first option visible focus #19741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
134e900
added visual focus exceptions
Pio-Bar Dec 6, 2024
25ecc92
added feature flags
Pio-Bar Dec 9, 2024
22fa783
Merge remote-tracking branch 'origin/develop' into feature/CXSPA-9028
Pio-Bar Dec 23, 2024
3733af5
Merge branch 'develop' into feature/CXSPA-9028
Pio-Bar Dec 23, 2024
5358ac9
lint fix
Pio-Bar Dec 23, 2024
7d8fcf1
Merge branch 'develop' into feature/CXSPA-9028
Pio-Bar Jan 8, 2025
09ce7ab
Merge branch 'develop' into feature/CXSPA-9028
Pio-Bar Jan 8, 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
9 changes: 9 additions & 0 deletions feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,15 @@ export class QuickOrderFormComponent implements OnInit, OnDestroy {

// Focus on first index moving to last
if (results.length) {
if (
this.featureConfigService.isEnabled(
'a11ySearchableDropdownFirstElementFocus'
)
) {
this.winRef.document
.querySelector('main')
?.classList.remove('mouse-focus');
}
if (focusedIndex >= results.length - 1) {
results[0].focus();
} else {
Expand Down
7 changes: 7 additions & 0 deletions projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,12 @@ export interface FeatureTogglesInterface {
*/
a11yAddPaddingToCarouselPanel?: boolean;

/**
* Search dropdowns will display the focus ring correctly when navigating to the options using the down arrow key.
* Affects: SearchBoxComponent, QuickOrderFormComponent
*/
a11ySearchableDropdownFirstElementFocus?: boolean;

/**
* Hides the 'Consent Management' button from the tab order when the cookies banner is visible.
* Ensures the button is re-enabled and part of the tab order once consent is given and the banner disappears.
Expand Down Expand Up @@ -1063,6 +1069,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
a11yQuickOrderSearchBoxRefocusOnClose: false,
a11yKeyboardFocusInSearchBox: false,
a11yAddPaddingToCarouselPanel: false,
a11ySearchableDropdownFirstElementFocus: false,
a11yHideConsentButtonWhenBannerVisible: false,
occCartNameAndDescriptionInHttpRequestBody: false,
cmsBottomHeaderSlotUsingFlexStyles: false,
Expand Down
1 change: 1 addition & 0 deletions projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ if (environment.cpq) {
a11yQuickOrderSearchBoxRefocusOnClose: true,
a11yKeyboardFocusInSearchBox: true,
a11yAddPaddingToCarouselPanel: true,
a11ySearchableDropdownFirstElementFocus: true,
a11yHideConsentButtonWhenBannerVisible: true,
cmsBottomHeaderSlotUsingFlexStyles: true,
useSiteThemeService: true,
Expand Down
9 changes: 9 additions & 0 deletions projects/storefrontlib/cms-components/navigation/search-box/search-box.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,15 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
];
// Focus on first index moving to last
if (results.length) {
if (
this.featureConfigService?.isEnabled(
'a11ySearchableDropdownFirstElementFocus'
)
) {
this.winRef.document
.querySelector('header')
?.classList.remove('mouse-focus');
}
if (focusedIndex >= results.length - 1) {
results[0].focus();
} else {
Expand Down
Loading