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.

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: addressed high contrast visual on web components #20418

Merged
merged 6 commits into from
Nov 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fixed high contrast visual for web components",
"packageName": "@fluentui/web-components",
"email": "khamu@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,26 @@ export const breadcrumbItemStyles: (
.start,
.end,
.separator {
background: ${SystemColors.ButtonFace};
color: ${SystemColors.ButtonText};
fill: currentcolor;
}
.separator {
fill: ${SystemColors.ButtonText};
}
:host([href]) {
forced-color-adjust: none;
background: ${SystemColors.ButtonFace};
color: ${SystemColors.LinkText};
}
:host([href]) .control:hover {
background: ${SystemColors.LinkText};
color: ${SystemColors.HighlightText};
fill: currentcolor;
}
:host([href]) .control:${focusVisible}::after {
box-shadow: 0 0 0 calc(${focusStrokeWidth} * 1px) ${SystemColors.LinkText} inset;
}
`,
),
);
66 changes: 62 additions & 4 deletions packages/web-components/src/button/button.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
forcedColorsStylesheetBehavior,
FoundationElementDefinition,
} from '@microsoft/fast-foundation';
import { SystemColors } from "@microsoft/fast-web-utilities";
import {
AccentButtonStyles,
baseButtonStyles,
Expand Down Expand Up @@ -35,10 +36,67 @@ export const buttonStyles: (
:host([disabled]) {
opacity: 1;
}
:host([disabled]) .control {
border-color: ${SystemColors.GrayText};
color: ${SystemColors.GrayText};
fill: currentcolor;
}
`,
),
appearanceBehavior('accent', AccentButtonStyles(context, definition, interactivitySelector, nonInteractivitySelector)),
appearanceBehavior('lightweight', LightweightButtonStyles(context, definition, interactivitySelector, nonInteractivitySelector)),
appearanceBehavior('outline', OutlineButtonStyles(context, definition, interactivitySelector, nonInteractivitySelector)),
appearanceBehavior('stealth', StealthButtonStyles(context, definition, interactivitySelector, nonInteractivitySelector)),
appearanceBehavior(
'accent',
css`
${AccentButtonStyles(context, definition, interactivitySelector, nonInteractivitySelector)},
`.withBehaviors(
forcedColorsStylesheetBehavior(
css`
:host([disabled]) .control {
background: ${SystemColors.ButtonFace};
}
`,
),
)
),
appearanceBehavior(
'lightweight',
css`
${LightweightButtonStyles(context, definition, interactivitySelector, nonInteractivitySelector)},
`.withBehaviors(
forcedColorsStylesheetBehavior(
css`
:host([disabled]) .control {
border-color: ${SystemColors.ButtonFace};
}
`,
),
)
),
appearanceBehavior(
'outline',
css`
${OutlineButtonStyles(context, definition, interactivitySelector, nonInteractivitySelector)}
`.withBehaviors(
forcedColorsStylesheetBehavior(
css`
:host([disabled]) .control {
border-color: ${SystemColors.GrayText};
}
`,
),
)
),
appearanceBehavior(
'stealth',
css`
${StealthButtonStyles(context, definition, interactivitySelector, nonInteractivitySelector)}
`.withBehaviors(
forcedColorsStylesheetBehavior(
css`
:host([disabled]) .control {
border-color: ${SystemColors.ButtonFace};
}
`,
),
)
)
);
3 changes: 1 addition & 2 deletions packages/web-components/src/card/card.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ export const cardStyles: (
forcedColorsStylesheetBehavior(
css`
:host {
forced-color-adjust: none;
background: ${SystemColors.Canvas};
box-shadow: 0 0 0 1px ${SystemColors.CanvasText};
color: ${SystemColors.CanvasText};
}
`,
),
Expand Down
43 changes: 17 additions & 26 deletions packages/web-components/src/checkbox/checkbox.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,64 +151,55 @@ export const checkboxStyles: (context: ElementDefinitionContext, definition: Che
forcedColorsStylesheetBehavior(
css`
.control {
forced-color-adjust: none;
border-color: ${SystemColors.FieldText};
background: ${SystemColors.Field};
}
:host(:not(.disabled)) .control:hover,
.control:active {
:host(:not(.disabled):hover) .control,
:host(:not(.disabled):active) .control {
border-color: ${SystemColors.Highlight};
background: ${SystemColors.Field};
}
slot[name='checked-indicator'] {
fill: ${SystemColors.FieldText};
}
slot[name='checked-indicator'],
slot[name='indeterminate-indicator'] {
fill: ${SystemColors.FieldText};
}
:host(:${focusVisible}) .control {
forced-color-adjust: none;
box-shadow: 0 0 0 1px ${SystemColors.Field}, 0 0 0 3px ${SystemColors.FieldText};
background: ${SystemColors.Field};
border-color: ${SystemColors.Highlight};
box-shadow: 0 0 0 2px ${SystemColors.Field}, 0 0 0 4px ${SystemColors.FieldText};
}
:host(.checked:${focusVisible}:not(.disabled)) .control {
box-shadow: 0 0 0 2px ${SystemColors.Field}, 0 0 0 4px ${SystemColors.FieldText};
}
:host(.checked) .control {
background: ${SystemColors.Highlight};
border-color: ${SystemColors.Highlight};
}
:host(.checked) .control:hover,
.control:active {
:host(.checked:not(.disabled):hover) .control,
:host(.checked:not(.disabled):active) .control {
background: ${SystemColors.HighlightText};
border-color: ${SystemColors.Highlight};
}
:host(.checked) slot[name='checked-indicator'] {
fill: ${SystemColors.HighlightText};
}
:host(.checked) .control:hover slot[name='checked-indicator'] {
fill: ${SystemColors.Highlight};
:host(.checked:${focusVisible}) .control {
box-shadow: 0 0 0 1px ${SystemColors.Field}, 0 0 0 3px ${SystemColors.FieldText};
}
:host(.checked) slot[name='checked-indicator'],
:host(.checked) slot[name='indeterminate-indicator'] {
fill: ${SystemColors.HighlightText};
}
:host(.checked) .control:hover slot[name='indeterminate-indicator'] {
:host(.checked:hover ) .control slot[name='checked-indicator'],
:host(.checked:hover ) .control slot[name='indeterminate-indicator'] {
fill: ${SystemColors.Highlight};
}
:host(.disabled) {
opacity: 1;
}
:host(.disabled) .control {
forced-color-adjust: none;
border-color: ${SystemColors.GrayText};
background: ${SystemColors.Field};
}
:host(.disabled) slot[name='indeterminate-indicator'],
:host(.checked.disabled) .control:hover slot[name='indeterminate-indicator'] {
forced-color-adjust: none;
fill: ${SystemColors.GrayText};
}
:host(.disabled) slot[name='checked-indicator'],
:host(.checked.disabled) .control:hover slot[name='checked-indicator'] {
forced-color-adjust: none;
:host(.checked.disabled:hover) .control slot[name='checked-indicator'],
:host(.disabled) slot[name='indeterminate-indicator'],
:host(.checked.disabled:hover) .control slot[name='indeterminate-indicator'] {
fill: ${SystemColors.GrayText};
}
`,
Expand Down
6 changes: 4 additions & 2 deletions packages/web-components/src/combobox/combobox.styles.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { css, ElementStyles } from '@microsoft/fast-element';
import { ComboboxOptions, disabledCursor, ElementDefinitionContext, focusVisible } from '@microsoft/fast-foundation';
import { ComboboxOptions, disabledCursor, ElementDefinitionContext, focusVisible, forcedColorsStylesheetBehavior } from '@microsoft/fast-foundation';
import { SystemColors } from "@microsoft/fast-web-utilities";
import { selectFilledStyles, selectStyles } from '../select/select.styles';
import { appearanceBehavior } from '../utilities/behaviors';
import { strokeWidth, typeRampBaseFontSize, typeRampBaseLineHeight } from '../design-tokens';
Expand Down Expand Up @@ -43,4 +44,5 @@ export const comboboxStyles: (context: ElementDefinitionContext, definition: Com
.selected-value:active {
outline: none;
}
`.withBehaviors(appearanceBehavior('filled', selectFilledStyles(context, definition)));
`.withBehaviors(
appearanceBehavior('filled', selectFilledStyles(context, definition)));
22 changes: 5 additions & 17 deletions packages/web-components/src/flipper/flipper.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,48 +76,36 @@ export const flipperStyles: (context: ElementDefinitionContext, definition: Flip
forcedColorsStylesheetBehavior(
css`
:host {
background: ${SystemColors.Canvas};
background: ${SystemColors.ButtonFace};
border-color: ${SystemColors.ButtonText};
}
:host .next,
:host .previous {
color: ${SystemColors.ButtonText};
fill: currentcolor;
}
:host {
background: ${SystemColors.Canvas};
border-color: ${SystemColors.ButtonText};
}
:host(:not(.disabled):hover) {
forced-color-adjust: none;
background: ${SystemColors.Highlight};
border-color: ${SystemColors.ButtonText};
opacity: 1;
}
:host(:not(.disabled):hover) .next,
:host(:not(.disabled):hover) .previous {
forced-color-adjust: none;
color: ${SystemColors.HighlightText};
fill: currentcolor;
}
:host(.disabled) {
opacity: 1;
}
:host(.disabled),
:host(.disabled:hover),
:host(.disabled) .next,
:host(.disabled) .previous,
:host(.disabled:hover) .next,
:host(.disabled:hover) .previous {
forced-color-adjust: none;
background: ${SystemColors.Canvas};
:host(.disabled) .previous {
border-color: ${SystemColors.GrayText};
color: ${SystemColors.GrayText};
fill: ${SystemColors.GrayText};
fill: currentcolor;
}
:host(:${focusVisible}) {
forced-color-adjust: none;
border-color: ${SystemColors.Highlight};
box-shadow: 0 0 0 2px ${SystemColors.Field}, 0 0 0 4px ${SystemColors.FieldText};
box-shadow: 0 0 0 2px ${SystemColors.ButtonFace}, 0 0 0 4px ${SystemColors.ButtonText};
}
`,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,21 @@ export const optionStyles: (
forcedColorsStylesheetBehavior(
css`
:host {
border-color: transparent;
background: ${SystemColors.ButtonFace};
border-color: ${SystemColors.ButtonFace};
color: ${SystemColors.ButtonText};
forced-color-adjust: none;
}

:host(:not([aria-selected='true']):hover),
:host([aria-selected='true']) {
:host(:not([disabled]):not([aria-selected="true"]):hover),
:host(:not([disabled])[aria-selected="true"]:hover),
:host([aria-selected="true"]) {
forced-color-adjust: none;
background: ${SystemColors.Highlight};
color: ${SystemColors.HighlightText};
}

:host(:not([disabled]):active)::before,
:host([aria-selected='true'])::before {
background: ${SystemColors.HighlightText};
}
:host([disabled]),
:host([disabled]:not([aria-selected='true']):hover) {
background: ${SystemColors.Canvas};
Expand Down
34 changes: 1 addition & 33 deletions packages/web-components/src/listbox/listbox.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@ import { css, ElementStyles } from '@microsoft/fast-element';
import {
display,
ElementDefinitionContext,
focusVisible,
forcedColorsStylesheetBehavior,
FoundationElementDefinition,
} from '@microsoft/fast-foundation';
import { SystemColors } from '@microsoft/fast-web-utilities';
import {
controlCornerRadius,
designUnit,
focusStrokeOuter,
focusStrokeWidth,
neutralStrokeRest,
strokeWidth,
} from '../design-tokens';
Expand All @@ -34,32 +30,4 @@ export const listboxStyles: (
border-color: ${focusStrokeOuter};
box-shadow: 0 0 0 1px ${focusStrokeOuter} inset;
}
`.withBehaviors(
forcedColorsStylesheetBehavior(
css`
:host(:${focusVisible}) ::slotted([aria-selected="true"][role="option"]) {
background: ${SystemColors.Highlight};
border-color: ${SystemColors.ButtonText};
box-shadow: 0 0 0 calc(${focusStrokeWidth} * 1px) inset ${SystemColors.HighlightText};
color: ${SystemColors.HighlightText};
fill: currentcolor;
}

:host(:${focusVisible}) ::slotted([aria-selected="true"][role="option"]) {
background: ${SystemColors.Highlight};
border-color: ${SystemColors.ButtonText};
box-shadow: 0 0 0 calc(${focusStrokeWidth} * 1px) inset ${SystemColors.HighlightText};
color: ${SystemColors.HighlightText};
fill: currentcolor;
}

::slotted([role='option']:not([aria-selected='true']):not([disabled]):hover) {
forced-color-adjust: none;
color: ${SystemColors.ButtonText};
background: ${SystemColors.ButtonFace};
border-color: ${SystemColors.Highlight};
box-shadow: none;
}
`,
),
);
`
Loading