From d1172bfa9d9fc081cd8554f71f9cfdd8933474ad Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Tue, 27 Nov 2018 16:43:51 -0500
Subject: [PATCH] Hide entire frame unless vm has not started
---
src/components/stage/stage.jsx | 14 +++++++++-----
src/containers/stage.jsx | 4 +++-
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/components/stage/stage.jsx b/src/components/stage/stage.jsx
index 6d81443f8..f87a39b79 100644
--- a/src/components/stage/stage.jsx
+++ b/src/components/stage/stage.jsx
@@ -20,6 +20,7 @@ const StageComponent = props => {
dragRef,
isColorPicking,
isFullScreen,
+ isStarted,
colorInfo,
micIndicator,
question,
@@ -72,11 +73,13 @@ const StageComponent = props => {
stageWidth={stageDimensions.width}
/>
</Box>
- <Box className={styles.greenFlagOverlayWrapper}>
- <GreenFlagOverlay
- className={styles.greenFlagOverlay}
- />
- </Box>
+ {isStarted ? null : (
+ <Box className={styles.greenFlagOverlayWrapper}>
+ <GreenFlagOverlay
+ className={styles.greenFlagOverlay}
+ />
+ </Box>
+ )}
{isColorPicking && colorInfo ? (
<Box className={styles.colorPickerWrapper}>
<Loupe colorInfo={colorInfo} />
@@ -131,6 +134,7 @@ StageComponent.propTypes = {
dragRef: PropTypes.func,
isColorPicking: PropTypes.bool,
isFullScreen: PropTypes.bool.isRequired,
+ isStarted: PropTypes.bool,
micIndicator: PropTypes.bool,
onDeactivateColorPicker: PropTypes.func,
onDoubleClick: PropTypes.func,
diff --git a/src/containers/stage.jsx b/src/containers/stage.jsx
index 077006fcc..94d4f092f 100644
--- a/src/containers/stage.jsx
+++ b/src/containers/stage.jsx
@@ -82,7 +82,8 @@ class Stage extends React.Component {
this.state.colorInfo !== nextState.colorInfo ||
this.props.isFullScreen !== nextProps.isFullScreen ||
this.state.question !== nextState.question ||
- this.props.micIndicator !== nextProps.micIndicator;
+ this.props.micIndicator !== nextProps.micIndicator ||
+ this.props.isStarted !== nextProps.isStarted;
}
componentDidUpdate (prevProps) {
if (this.props.isColorPicking && !prevProps.isColorPicking) {
@@ -410,6 +411,7 @@ Stage.defaultProps = {
const mapStateToProps = state => ({
isColorPicking: state.scratchGui.colorPicker.active,
isFullScreen: state.scratchGui.mode.isFullScreen,
+ isStarted: state.scratchGui.vmStatus.started,
micIndicator: state.scratchGui.micIndicator,
// Do not use editor drag style in fullscreen or player mode.
useEditorDragStyle: !(state.scratchGui.mode.isFullScreen || state.scratchGui.mode.isPlayerOnly)
--
GitLab