Skip to content

fix(react v7): Add missing HighContrast override to SplitButton #16635

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

Merged
theerebuss merged 2 commits into from
Jan 27, 2021
Merged

fix(react v7): Add missing HighContrast override to SplitButton #16635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1ae454
fix(react v7): Add missing HighContrast override to SplitButton
Jan 26, 2021
47f55bf
Change files
Jan 27, 2021
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
8 changes: 8 additions & 0 deletions change/@fluentui-react-examples-2021-01-26-16-12-53-16339.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "patch",
"comment": "Fix chevron colour in high contrast for the Command Bar Split Disabled example",
"packageName": "@fluentui/react-examples",
"email": "andredias@microsoft.com",
"dependentChangeType": "patch",
"date": "2021-01-26T15:12:52.979Z"
}
8 changes: 8 additions & 0 deletions change/office-ui-fabric-react-2021-01-26-16-12-53-16339.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "patch",
"comment": "Fix high contrast override for SplitButton",
"packageName": "office-ui-fabric-react",
"email": "andredias@microsoft.com",
"dependentChangeType": "patch",
"date": "2021-01-26T15:12:12.493Z"
}
5 changes: 5 additions & 0 deletions packages/office-ui-fabric-react/src/components/Button/SplitButton/SplitButton.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@ export const getStyles = memoizeFunction(
marginTop: 0,
marginRight: 0,
marginBottom: 0,
[HighContrastSelector]: {
Copy link
Contributor Author

@theerebuss theerebuss Jan 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Used generic HighContrast selector as the problem was also present in High Contrast White mode.

'.ms-Button-menuIcon': {
color: 'WindowText',
},
},
},
splitButtonDivider: {
...splitButtonDividerBaseStyles,
Expand Down
3 changes: 3 additions & 0 deletions ...act-examples/src/office-ui-fabric-react/__snapshots__/Button.CustomSplit.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,9 @@ exports[`Component Examples renders Button.CustomSplit.Example.tsx correctly 1`]
vertical-align: top;
width: 28px;
}
@media screen and (-ms-high-contrast: active){& .ms-Button-menuIcon {
color: WindowText;
}
data-is-focusable={false}
onClick={[Function]}
onKeyDown={[Function]}
Expand Down
17 changes: 13 additions & 4 deletions ...ges/react-examples/src/office-ui-fabric-react/__snapshots__/Button.Split.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,9 @@ exports[`Component Examples renders Button.Split.Example.tsx correctly 1`] = `
@media screen and (-ms-high-contrast: active){&:hover {
color: Highlight;
}
@media screen and (-ms-high-contrast: active){& .ms-Button-menuIcon {
color: WindowText;
}
data-is-focusable={false}
onClick={[Function]}
onKeyDown={[Function]}
Expand Down Expand Up @@ -644,6 +647,9 @@ exports[`Component Examples renders Button.Split.Example.tsx correctly 1`] = `
@media screen and (-ms-high-contrast: active){&:hover {
color: Highlight;
}
@media screen and (-ms-high-contrast: active){& .ms-Button-menuIcon {
color: WindowText;
}
data-is-focusable={false}
onClick={[Function]}
onKeyDown={[Function]}
Expand Down Expand Up @@ -986,6 +992,9 @@ exports[`Component Examples renders Button.Split.Example.tsx correctly 1`] = `
@media screen and (-ms-high-contrast: active){&:hover {
color: Highlight;
}
@media screen and (-ms-high-contrast: active){& .ms-Button-menuIcon {
color: WindowText;
}
data-is-focusable={false}
onClick={[Function]}
onKeyDown={[Function]}
Expand Down Expand Up @@ -1325,17 +1334,17 @@ exports[`Component Examples renders Button.Split.Example.tsx correctly 1`] = `
@media screen and (-ms-high-contrast: active){&:hover {
color: Highlight;
}
@media screen and (-ms-high-contrast: active){& .ms-Button--primary {
@media screen and (-ms-high-contrast: active){& {
background-color: Window;
border-color: GrayText;
border: 1px solid GrayText;
color: GrayText;
}
@media screen and (-ms-high-contrast: active){& .ms-Button-menuIcon {
color: GrayText;
}
@media screen and (-ms-high-contrast: active){& {
@media screen and (-ms-high-contrast: active){& .ms-Button--primary {
background-color: Window;
border: 1px solid GrayText;
border-color: GrayText;
color: GrayText;
}
data-is-focusable={false}
Expand Down
19 changes: 11 additions & 8 deletions ...amples/src/office-ui-fabric-react/__snapshots__/CommandBar.SplitDisabled.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,9 @@ exports[`Component Examples renders CommandBar.SplitDisabled.Example.tsx correct
vertical-align: top;
width: 32px;
}
@media screen and (-ms-high-contrast: active){& .ms-Button-menuIcon {
color: WindowText;
}
&:hover {
background-color: #f3f2f1;
color: #201f1e;
Expand Down Expand Up @@ -779,6 +782,14 @@ exports[`Component Examples renders CommandBar.SplitDisabled.Example.tsx correct
vertical-align: top;
width: 32px;
}
@media screen and (-ms-high-contrast: active){& {
background-color: Window;
border: none;
color: GrayText;
}
@media screen and (-ms-high-contrast: active){& .ms-Button-menuIcon {
color: GrayText;
}
&:hover {
background-color: #f3f2f1;
color: #201f1e;
Expand All @@ -801,14 +812,6 @@ exports[`Component Examples renders CommandBar.SplitDisabled.Example.tsx correct
border-color: GrayText;
color: GrayText;
}
@media screen and (-ms-high-contrast: active){& .ms-Button-menuIcon {
color: GrayText;
}
@media screen and (-ms-high-contrast: active){& {
background-color: Window;
border: none;
color: GrayText;
}
@media screen and (forced-colors: active){& {
forced-color-adjust: none;
}
Expand Down
3 changes: 3 additions & 0 deletions ...act-examples/src/office-ui-fabric-react/__snapshots__/FocusZone.Tabbable.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,9 @@ exports[`Component Examples renders FocusZone.Tabbable.Example.tsx correctly 1`]
@media screen and (-ms-high-contrast: active){&:hover {
color: Highlight;
}
@media screen and (-ms-high-contrast: active){& .ms-Button-menuIcon {
color: WindowText;
}
data-is-focusable={false}
onClick={[Function]}
onKeyDown={[Function]}
Expand Down
3 changes: 3 additions & 0 deletions ...s/react-examples/src/office-ui-fabric-react/__snapshots__/Keytips.Button.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,9 @@ exports[`Component Examples renders Keytips.Button.Example.tsx correctly 1`] = `
@media screen and (-ms-high-contrast: active){&:hover {
color: Highlight;
}
@media screen and (-ms-high-contrast: active){& .ms-Button-menuIcon {
color: WindowText;
}
data-is-focusable={false}
data-ktp-execute-target="ktp-2-b"
onClick={[Function]}
Expand Down
3 changes: 3 additions & 0 deletions packages/react-examples/src/react-focus/__snapshots__/FocusZone.Tabbable.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,9 @@ exports[`Component Examples renders FocusZone.Tabbable.Example.tsx correctly 1`]
@media screen and (-ms-high-contrast: active){&:hover {
color: Highlight;
}
@media screen and (-ms-high-contrast: active){& .ms-Button-menuIcon {
color: WindowText;
}
data-is-focusable={false}
onClick={[Function]}
onKeyDown={[Function]}
Expand Down