Skip to content

Commit f18b593

Browse files
PR fix
1 parent 6f7b000 commit f18b593

2 files changed

Lines changed: 25 additions & 25 deletions

File tree

packages/react/src/components/MessageBar/MessageBar.styles.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,24 @@ const iconColor: { [key: string]: keyof ISemanticColors } = {
5353
[MessageBarType.info]: 'infoIcon',
5454
};
5555

56+
const highContrastBorderColor: { [key: string]: string } = {
57+
[MessageBarType.error]: '#ff0000',
58+
[MessageBarType.blocked]: '#ff0000',
59+
[MessageBarType.success]: '#bad80a',
60+
[MessageBarType.warning]: '#fff100',
61+
[MessageBarType.severeWarning]: '#ff0000',
62+
[MessageBarType.info]: 'WindowText',
63+
};
64+
65+
const highContrastWhiteBorderColor: { [key: string]: string } = {
66+
[MessageBarType.error]: '#e81123',
67+
[MessageBarType.blocked]: '#e81123',
68+
[MessageBarType.success]: '#107c10',
69+
[MessageBarType.warning]: '#966400',
70+
[MessageBarType.severeWarning]: '#d83b01',
71+
[MessageBarType.info]: 'WindowText',
72+
};
73+
5674
export const getStyles = (props: IMessageBarStyleProps): IMessageBarStyles => {
5775
const {
5876
theme,
@@ -63,7 +81,7 @@ export const getStyles = (props: IMessageBarStyleProps): IMessageBarStyles => {
6381
expandSingleLine,
6482
messageBarType = MessageBarType.info,
6583
} = props;
66-
const { semanticColors, fonts, palette } = theme;
84+
const { semanticColors, fonts } = theme;
6785

6886
const SmallScreenSelector = getScreenSelector(0, ScreenWidthMaxSmall);
6987

@@ -108,24 +126,6 @@ export const getStyles = (props: IMessageBarStyleProps): IMessageBarStyles => {
108126
},
109127
];
110128

111-
const highContrastBorderColor: { [key: string]: string } = {
112-
[MessageBarType.error]: 'rgba(255, 0, 0)',
113-
[MessageBarType.blocked]: 'rgba(255, 0, 0)',
114-
[MessageBarType.success]: palette.greenLight,
115-
[MessageBarType.warning]: palette.yellowLight,
116-
[MessageBarType.severeWarning]: 'rgba(255, 0, 0)',
117-
[MessageBarType.info]: 'WindowText',
118-
};
119-
120-
const highContrastWhiteBorderColor: { [key: string]: string } = {
121-
[MessageBarType.error]: palette.red,
122-
[MessageBarType.blocked]: palette.red,
123-
[MessageBarType.success]: palette.green,
124-
[MessageBarType.warning]: 'rgba(150, 100, 0)',
125-
[MessageBarType.severeWarning]: palette.orange,
126-
[MessageBarType.info]: 'WindowText',
127-
};
128-
129129
return {
130130
root: [
131131
classNames.root,

packages/react/src/components/MessageBar/__snapshots__/MessageBar.test.tsx.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ exports[`MessageBar snapshots renders a error MessageBar correctly 1`] = `
160160
@media screen and (-ms-high-contrast: active), screen and (forced-colors: active){& {
161161
-ms-high-contrast-adjust: none;
162162
background: transparent;
163-
border: 1px solid rgba(255, 0, 0);
163+
border: 1px solid #ff0000;
164164
color: WindowText;
165165
forced-color-adjust: none;
166166
}
@@ -551,7 +551,7 @@ exports[`MessageBar snapshots renders a multiline error MessageBar correctly 1`]
551551
@media screen and (-ms-high-contrast: active), screen and (forced-colors: active){& {
552552
-ms-high-contrast-adjust: none;
553553
background: transparent;
554-
border: 1px solid rgba(255, 0, 0);
554+
border: 1px solid #ff0000;
555555
color: WindowText;
556556
forced-color-adjust: none;
557557
}
@@ -812,7 +812,7 @@ exports[`MessageBar snapshots renders a multiline severeWarning MessageBar corre
812812
@media screen and (-ms-high-contrast: active), screen and (forced-colors: active){& {
813813
-ms-high-contrast-adjust: none;
814814
background: transparent;
815-
border: 1px solid rgba(255, 0, 0);
815+
border: 1px solid #ff0000;
816816
color: WindowText;
817817
forced-color-adjust: none;
818818
}
@@ -1079,7 +1079,7 @@ exports[`MessageBar snapshots renders a multiline warning MessageBar correctly 1
10791079
forced-color-adjust: none;
10801080
}
10811081
@media screen and (-ms-high-contrast: black-on-white), screen and (forced-colors: active) and (prefers-color-scheme: light){& {
1082-
border: 1px solid rgba(150, 100, 0);
1082+
border: 1px solid #966400;
10831083
}
10841084
>
10851085
<div
@@ -1205,7 +1205,7 @@ exports[`MessageBar snapshots renders a severeWarning MessageBar correctly 1`] =
12051205
@media screen and (-ms-high-contrast: active), screen and (forced-colors: active){& {
12061206
-ms-high-contrast-adjust: none;
12071207
background: transparent;
1208-
border: 1px solid rgba(255, 0, 0);
1208+
border: 1px solid #ff0000;
12091209
color: WindowText;
12101210
forced-color-adjust: none;
12111211
}
@@ -1472,7 +1472,7 @@ exports[`MessageBar snapshots renders a warning MessageBar correctly 1`] = `
14721472
forced-color-adjust: none;
14731473
}
14741474
@media screen and (-ms-high-contrast: black-on-white), screen and (forced-colors: active) and (prefers-color-scheme: light){& {
1475-
border: 1px solid rgba(150, 100, 0);
1475+
border: 1px solid #966400;
14761476
}
14771477
>
14781478
<div

0 commit comments

Comments
 (0)