diff --git a/src/components/stage/stage.jsx b/src/components/stage/stage.jsx index 6d81443f893a9c0126d91f950f996c855b6f0b22..f87a39b791c1150d3d7d5d5380ecacdff5c432e0 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 077006fccc29be381fe66b0ae4b224437a9e98e9..94d4f092fc4ec64a0b1f838b49ed8e62636aaf05 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)