Skip to content

Commit 3402cb8

Browse files
authored
Merge pull request #1508 from AnnMarieW/1403-x-button-to-close-error-box
Add an 'x' button to close the error messages box #1403
2 parents cab1262 + beeee56 commit 3402cb8

File tree

6 files changed

+39
-5
lines changed

6 files changed

+39
-5
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ All notable changes to `dash` will be documented in this file.
33
This project adheres to [Semantic Versioning](https://semver.org/).
44

55
## [UNRELEASED]
6+
### Added
7+
- [#1508](https://github.com/plotly/dash/pull/1508) Fix [#1403](https://github.com/plotly/dash/issues/1403): Adds an x button
8+
to close the error messages box.
9+
610
### Changed
711
- [#1503](https://github.com/plotly/dash/pull/1506) Fix [#1466](https://github.com/plotly/dash/issues/1466): loosen `dash[testing]` requirements for easier integration in external projects. This PR also bumps many `dash[dev]` requirements.
812

dash-renderer/src/components/error/FrontEnd/FrontEndError.css

+16
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22
margin-top: 10px;
33
}
44

5+
.dash-fe-error__icon-x {
6+
position: absolute;
7+
right: 0;
8+
top: 0;
9+
color: #B9C2CE;
10+
font-size: 20px;
11+
cursor: pointer;
12+
margin-right: 10px
13+
}
14+
15+
.dash-fe-error__icon-x:hover
16+
{
17+
color:#a1a9b5;
18+
}
19+
20+
521
.dash-fe-errors {
622
min-width: 386px;
723
max-width: 650px;

dash-renderer/src/components/error/FrontEnd/FrontEndErrorContainer.react.js

+12-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ class FrontEndErrorContainer extends Component {
99
}
1010

1111
render() {
12-
const {errors, connected} = this.props;
12+
const {errors, connected, errorsOpened, clickHandler} = this.props;
1313
const errorsLength = errors.length;
14-
if (errorsLength === 0) {
14+
if (errorsLength === 0 || !errorsOpened) {
1515
return null;
1616
}
1717

@@ -34,6 +34,12 @@ class FrontEndErrorContainer extends Component {
3434
</strong>
3535
){connected ? null : '\u00a0 🚫 Server Unavailable'}
3636
</div>
37+
<div
38+
className='dash-fe-error__icon-x'
39+
onClick={() => clickHandler()}
40+
>
41+
×
42+
</div>
3743
</div>
3844
<div className='dash-error-card__list'>{errorElements}</div>
3945
</div>
@@ -42,9 +48,12 @@ class FrontEndErrorContainer extends Component {
4248
}
4349

4450
FrontEndErrorContainer.propTypes = {
51+
id: PropTypes.string,
4552
errors: PropTypes.array,
4653
connected: PropTypes.bool,
47-
inAlertsTray: PropTypes.any
54+
inAlertsTray: PropTypes.any,
55+
errorsOpened: PropTypes.any,
56+
clickHandler: PropTypes.func
4857
};
4958

5059
FrontEndErrorContainer.propTypes = {

dash-renderer/src/components/error/GlobalErrorOverlay.css

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
display: flex;
5454
justify-content: center;
5555
align-items: center;
56+
position: relative;
5657
}
5758
.dash-error-card__message {
5859
font-size: 14px;

dash-renderer/src/components/error/GlobalErrorOverlay.react.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default class GlobalErrorOverlay extends Component {
1111
}
1212

1313
render() {
14-
const {visible, error, errorsOpened} = this.props;
14+
const {visible, error, errorsOpened, clickHandler} = this.props;
1515

1616
let frontEndErrors;
1717
if (errorsOpened) {
@@ -21,6 +21,8 @@ export default class GlobalErrorOverlay extends Component {
2121
<FrontEndErrorContainer
2222
errors={errors}
2323
connected={error.backEndConnected}
24+
errorsOpened={errorsOpened}
25+
clickHandler={clickHandler}
2426
/>
2527
);
2628
}
@@ -41,5 +43,6 @@ GlobalErrorOverlay.propTypes = {
4143
children: PropTypes.object,
4244
visible: PropTypes.bool,
4345
error: PropTypes.object,
44-
errorsOpened: PropTypes.any
46+
errorsOpened: PropTypes.any,
47+
clickHandler: PropTypes.func
4548
};

dash-renderer/src/components/error/menu/DebugMenu.react.js

+1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ class DebugMenu extends Component {
147147
error={error}
148148
visible={errCount > 0}
149149
errorsOpened={errorsOpened}
150+
clickHandler={toggleErrors}
150151
>
151152
{this.props.children}
152153
</GlobalErrorOverlay>

0 commit comments

Comments
 (0)