From 4b6a6c011e275827d0e1252eb8acb65360c3ffdf Mon Sep 17 00:00:00 2001
From: Evelyn Eastmond <evhan55@gmail.com>
Date: Mon, 17 Sep 2018 14:07:02 -0400
Subject: [PATCH] Adding z-index-alert, and removing custom message for now.
---
src/components/alerts/alert.css | 2 +-
src/components/alerts/alerts.jsx | 10 ++--------
src/components/gui/gui.jsx | 6 +++++-
src/css/z-index.css | 1 +
src/lib/vm-listener-hoc.jsx | 4 ++--
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/components/alerts/alert.css b/src/components/alerts/alert.css
index 6c71353ab..9eb4f87d8 100644
--- a/src/components/alerts/alert.css
+++ b/src/components/alerts/alert.css
@@ -4,7 +4,7 @@
.alert-container {
position:absolute;
- z-index: $z-index-card;
+ z-index: $z-index-alert;
top: 53px;
left: 0;
right: 0;
diff --git a/src/components/alerts/alerts.jsx b/src/components/alerts/alerts.jsx
index 4b0ecea8b..cc193641d 100644
--- a/src/components/alerts/alerts.jsx
+++ b/src/components/alerts/alerts.jsx
@@ -13,16 +13,11 @@ const Alerts = props => (
<div className={styles.alert}>
{props.message}
</div>
- <div
- className={styles.button}
- onClick={props.onReconnect}
- >
- Reconnect
- </div>
<div
className={styles.removeButton}
onClick={props.onCloseAlert}
>
+ { /* eslint-disable react/jsx-no-literals */ }
x
</div>
</div>
@@ -31,8 +26,7 @@ const Alerts = props => (
Alerts.propTypes = {
message: PropTypes.string.isRequired,
- onCloseAlert: PropTypes.func.isRequired,
- onReconnect: PropTypes.func.isRequired
+ onCloseAlert: PropTypes.func.isRequired
};
export default Alerts;
diff --git a/src/components/gui/gui.jsx b/src/components/gui/gui.jsx
index 6d38a85fb..ec480e3e7 100644
--- a/src/components/gui/gui.jsx
+++ b/src/components/gui/gui.jsx
@@ -110,7 +110,11 @@ const GUIComponent = props => {
isRendererSupported={isRendererSupported}
stageSize={stageSize}
vm={vm}
- />
+ >
+ {alertsVisible ? (
+ <Alerts />
+ ) : null}
+ </StageWrapper>
) : (
<Box
className={styles.pageWrapper}
diff --git a/src/css/z-index.css b/src/css/z-index.css
index 26893f08f..9d4f750b2 100644
--- a/src/css/z-index.css
+++ b/src/css/z-index.css
@@ -14,6 +14,7 @@ $z-index-tooltip: 130; /* tooltips should go over add buttons if they overlap */
$z-index-card: 490;
$z-index-loader: 500;
$z-index-modal: 510;
+$z-index-alert: 550;
$z-index-drag-layer: 1000;
$z-index-monitor-dragging: 1010;
diff --git a/src/lib/vm-listener-hoc.jsx b/src/lib/vm-listener-hoc.jsx
index 97b6a637b..cf2307726 100644
--- a/src/lib/vm-listener-hoc.jsx
+++ b/src/lib/vm-listener-hoc.jsx
@@ -139,8 +139,8 @@ const vmListenerHOC = function (WrappedComponent) {
onProjectRunStop: () => dispatch(setRunningState(false)),
onTurboModeOn: () => dispatch(setTurboState(true)),
onTurboModeOff: () => dispatch(setTurboState(false)),
- onShowAlert: data => {
- dispatch(showAlert(data.message));
+ onShowAlert: () => {
+ dispatch(showAlert('Scratch has lost connection to peripheral.'));
}
});
return connect(
--
GitLab