Skip to content

Commit bef9bed

Browse files
authored
fix: warning message bar text overflow/overlap (#6416)
#### Details Fixes #6406. ##### Motivation Bug fix. ##### Context min-height on the message bar component is behaving weirdly: setting the minimum to 32px should not yield the behavior we are seeing but it does. Hence, I wrote that for the overwrite. While "unset" also works here, I used fit-content because it also works and is more appropriate for the desired behavior. But ... 32px being the **min**-height should have also been appropriate for the desired behavior. 🤷 Before: ![image](https://user-images.githubusercontent.com/32555133/217665106-25a54e6a-d27b-4a24-89ff-66b6cb8e7c72.png) After: ![image](https://user-images.githubusercontent.com/32555133/217665169-344f878c-a9b4-4347-84d1-3a5cb855ab2b.png) #### Pull request checklist <!-- If a checklist item is not applicable to this change, write "n/a" in the checkbox --> - [ ] Addresses an existing issue: #0000 - [x] Ran `yarn fastpass` - [x] Added/updated relevant unit test(s) (and ran `yarn test`) - [x] Verified code coverage for the changes made. Check coverage report at: `<rootDir>/test-results/unit/coverage` - [x] PR title *AND* final merge commit title both start with a semantic tag (`fix:`, `chore:`, `feat(feature-name):`, `refactor:`). See `CONTRIBUTING.md`. - [x] (UI changes only) Added screenshots/GIFs to description above - [ ] (UI changes only) Verified usability with NVDA/JAWS
1 parent a42de2f commit bef9bed

File tree

7 files changed

+30
-4
lines changed

7 files changed

+30
-4
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
.message-bar-height-override {
5+
// min-height is set to 32px in MessageBar which behaves oddly and causes #6406.
6+
min-height: fit-content;
7+
}

src/DetailsView/components/injection-failed-warning.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import {
77
InjectingState,
88
VisualizationStoreData,
99
} from 'common/types/store-data/visualization-store-data';
10+
11+
import commonStyles from 'DetailsView/components/common-message-bar-styles.scss';
1012
import * as React from 'react';
1113

1214
export const InjectionFailedWarningContainerAutomationId = 'injection-failed-warning-container';
@@ -22,7 +24,11 @@ export const InjectionFailedWarning = NamedFC<InjectionFailedWarningProps>(
2224
return null;
2325
} else {
2426
return (
25-
<MessageBar key="injection-failed" messageBarType={MessageBarType.warning}>
27+
<MessageBar
28+
className={commonStyles.messageBarHeightOverride}
29+
key="injection-failed"
30+
messageBarType={MessageBarType.warning}
31+
>
2632
<div data-automation-id={InjectionFailedWarningContainerAutomationId}>
2733
{DisplayableStrings.injectionFailed}
2834
</div>

src/DetailsView/components/scan-incomplete-warning.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import { MessageBar, MessageBarType } from '@fluentui/react';
44
import { ScanIncompleteWarningId } from 'common/types/store-data/scan-incomplete-warnings';
55
import { VisualizationType } from 'common/types/visualization-type';
6+
import commonStyles from 'DetailsView/components/common-message-bar-styles.scss';
67
import {
78
ScanIncompleteWarningMessageBarDeps,
89
WarningConfiguration,
@@ -32,7 +33,11 @@ export class ScanIncompleteWarning extends React.PureComponent<ScanIncompleteWar
3233
}
3334

3435
const message = (
35-
<MessageBar key={warningId} messageBarType={MessageBarType.warning}>
36+
<MessageBar
37+
className={commonStyles.messageBarHeightOverride}
38+
key={warningId}
39+
messageBarType={MessageBarType.warning}
40+
>
3641
{render(this.props)}
3742
</MessageBar>
3843
);

src/DetailsView/components/target-page-hidden-bar.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Licensed under the MIT License.
33
import { MessageBar, MessageBarType } from '@fluentui/react';
44
import { NamedFC } from 'common/react/named-fc';
5+
6+
import commonStyles from 'DetailsView/components/common-message-bar-styles.scss';
57
import * as React from 'react';
68

79
export type TargetPageHiddenBarProps = {
@@ -16,7 +18,10 @@ export const TargetPageHiddenBar = NamedFC<TargetPageHiddenBarProps>(
1618
}
1719

1820
return (
19-
<MessageBar messageBarType={MessageBarType.warning}>
21+
<MessageBar
22+
className={commonStyles.messageBarHeightOverride}
23+
messageBarType={MessageBarType.warning}
24+
>
2025
The Target page is in a hidden state. For better performance, use the Target page
2126
link above to make the page visible.
2227
</MessageBar>

src/tests/unit/tests/DetailsView/components/__snapshots__/injection-failed-warning.test.tsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
exports[`InjectionFailedWarning render with injection failed 1`] = `
44
<StyledMessageBar
5+
className="messageBarHeightOverride"
56
messageBarType={5}
67
>
78
<div

src/tests/unit/tests/DetailsView/components/__snapshots__/scan-incomplete-warning.test.tsx.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ exports[`ScanIncompleteWarning notRendered: where no warnings were provided 1`]
55
exports[`ScanIncompleteWarning rendered: where warnings were provided 1`] = `
66
<React.Fragment>
77
<StyledMessageBar
8+
className="messageBarHeightOverride"
89
messageBarType={5}
910
/>
1011
</React.Fragment>
@@ -13,6 +14,7 @@ exports[`ScanIncompleteWarning rendered: where warnings were provided 1`] = `
1314
exports[`ScanIncompleteWarning rendered: where warnings were provided, with one warning not supported 1`] = `
1415
<React.Fragment>
1516
<StyledMessageBar
17+
className="messageBarHeightOverride"
1618
messageBarType={5}
1719
/>
1820
</React.Fragment>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`TargetPageHiddenBar renders per snapshot to indicate that the target page is hidden 1`] = `
4-
"<StyledMessageBar messageBarType={5}>
4+
"<StyledMessageBar className="messageBarHeightOverride" messageBarType={5}>
55
The Target page is in a hidden state. For better performance, use the Target page link above to make the page visible.
66
</StyledMessageBar>"
77
`;

0 commit comments

Comments
 (0)