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-9041) Popover directive HCT contrast #19835

Merged
merged 7 commits into from
Jan 10, 2025
Merged

fix: (CXSPA-9041) Popover directive HCT contrast #19835

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
c8e3a2a
fix: (CXSPA-9041) Popover directive HCT contrast
StanislavSukhanov Jan 7, 2025
bf0df30
fix: (CXSPA-9041) Popover directive HCT contrast
StanislavSukhanov Jan 7, 2025
63faafd
Merge branch 'develop' into feature/CXSPA-9041-HCT-popover-styling
StanislavSukhanov Jan 8, 2025
d401f3e
Merge branch 'develop' into feature/CXSPA-9041-HCT-popover-styling
StanislavSukhanov Jan 8, 2025
db8a24b
fix: (CXSPA-9041) Popover directive HCT contrast
StanislavSukhanov Jan 9, 2025
2980d2d
Merge remote-tracking branch 'origin/feature/CXSPA-9041-HCT-popover-s…
StanislavSukhanov Jan 9, 2025
b7d9425
Merge branch 'develop' into feature/CXSPA-9041-HCT-popover-styling
StanislavSukhanov Jan 10, 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
6 changes: 6 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 @@ -211,6 +211,11 @@ export interface FeatureTogglesInterface {
*/
a11yPopoverFocus?: boolean;

/**
* Fix popover appearance when a High Contrast Theme is applied.
*/
a11yPopoverHighContrast?: boolean;

/**
* Adds Datepicker and Combobox label and corrects heading order for 'CheckoutScheduleReplenishmentOrderComponent'.
*/
Expand Down Expand Up @@ -984,6 +989,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
a11yPreventHorizontalScroll: false,
a11yReorderDialog: true,
a11yPopoverFocus: true,
a11yPopoverHighContrast: false,
a11yScheduleReplenishment: true,
a11yScrollToTop: true,
a11ySavedCartsZoom: true,
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 @@ -317,6 +317,7 @@ if (environment.cpq) {
a11yPreventHorizontalScroll: true,
a11yReorderDialog: true,
a11yPopoverFocus: true,
a11yPopoverHighContrast: true,
a11yScheduleReplenishment: true,
a11yScrollToTop: true,
a11ySavedCartsZoom: true,
Expand Down
10 changes: 9 additions & 1 deletion projects/storefrontlib/shared/components/popover/popover.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,16 @@ export class PopoverDirective implements OnInit {
this.cxPopoverOptions?.autoPositioning;

if (this.cxPopoverOptions?.appendToBody) {
const body = this.winRef.document.body;
const element = this.featureConfigService?.isEnabled(
'a11yPopoverHighContrast'
)
? // we need to select first child element if exists,
// otherwise HCT theming in popover will not be picked up.
(body.firstElementChild ?? body)
: body;
this.renderer.appendChild(
this.winRef.document.body,
element,
this.popoverContainer.location.nativeElement
);
}
Expand Down
10 changes: 10 additions & 0 deletions projects/storefrontstyles/scss/components/misc/popover/_popover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,14 @@
font-size: 1rem;
}
}

@include cx-highContrastTheme {
background-color: var(--cx-color-background);
box-shadow: none;
.popover-body > .cx-close-row {
.close {
color: var(--cx-color-text);
}
}
}
}
Loading