Skip to content
Snippets Groups Projects
Commit 6ce56124 authored by Paul Kaplan's avatar Paul Kaplan
Browse files

Do not render invisible components

parent 3e210b5d
No related branches found
No related tags found
No related merge requests found
...@@ -79,10 +79,10 @@ const GUIComponent = props => { ...@@ -79,10 +79,10 @@ const GUIComponent = props => {
</Box> </Box>
</TabPanel> </TabPanel>
<TabPanel className={tabClassNames.tabPanel}> <TabPanel className={tabClassNames.tabPanel}>
<CostumeTab vm={vm} /> {tabIndex === 1 ? <CostumeTab vm={vm} /> : null}
</TabPanel> </TabPanel>
<TabPanel className={tabClassNames.tabPanel}> <TabPanel className={tabClassNames.tabPanel}>
<SoundTab vm={vm} /> {tabIndex === 2 ? <SoundTab vm={vm} /> : null}
</TabPanel> </TabPanel>
</Tabs> </Tabs>
</Box> </Box>
......
...@@ -3,7 +3,6 @@ import React from 'react'; ...@@ -3,7 +3,6 @@ import React from 'react';
import VM from 'scratch-vm'; import VM from 'scratch-vm';
import Box from '../box/box.jsx';
import BackdropLibrary from '../../containers/backdrop-library.jsx'; import BackdropLibrary from '../../containers/backdrop-library.jsx';
import CostumeLibrary from '../../containers/costume-library.jsx'; import CostumeLibrary from '../../containers/costume-library.jsx';
import SoundLibrary from '../../containers/sound-library.jsx'; import SoundLibrary from '../../containers/sound-library.jsx';
...@@ -43,7 +42,7 @@ const TargetPane = ({ ...@@ -43,7 +42,7 @@ const TargetPane = ({
vm, vm,
...componentProps ...componentProps
}) => ( }) => (
<Box <div
className={styles.targetPane} className={styles.targetPane}
{...componentProps} {...componentProps}
> >
...@@ -61,7 +60,7 @@ const TargetPane = ({ ...@@ -61,7 +60,7 @@ const TargetPane = ({
onNewSpriteClick={onNewSpriteClick} onNewSpriteClick={onNewSpriteClick}
onSelectSprite={onSelectSprite} onSelectSprite={onSelectSprite}
/> />
<Box className={styles.stageSelectorWrapper}> <div className={styles.stageSelectorWrapper}>
{stage.id && <StageSelector {stage.id && <StageSelector
assetId={ assetId={
stage.costume && stage.costume &&
...@@ -72,30 +71,35 @@ const TargetPane = ({ ...@@ -72,30 +71,35 @@ const TargetPane = ({
selected={stage.id === editingTarget} selected={stage.id === editingTarget}
onSelect={onSelectSprite} onSelect={onSelectSprite}
/>} />}
<Box> <div>
<SpriteLibrary {spriteLibraryVisible ? (
visible={spriteLibraryVisible} <SpriteLibrary
vm={vm} vm={vm}
onRequestClose={onRequestCloseSpriteLibrary} onRequestClose={onRequestCloseSpriteLibrary}
/> />
<CostumeLibrary ) : null}
visible={costumeLibraryVisible} {costumeLibraryVisible ? (
vm={vm} <CostumeLibrary
onRequestClose={onRequestCloseCostumeLibrary} vm={vm}
/> onRequestClose={onRequestCloseCostumeLibrary}
<SoundLibrary />
visible={soundLibraryVisible} ) : null}
vm={vm} {soundLibraryVisible ? (
onRequestClose={onRequestCloseSoundLibrary} <SoundLibrary
/> vm={vm}
<BackdropLibrary onRequestClose={onRequestCloseSoundLibrary}
visible={backdropLibraryVisible} />
vm={vm} ) : null}
onRequestClose={onRequestCloseBackdropLibrary} {backdropLibraryVisible ? (
/> <BackdropLibrary
</Box> vm={vm}
</Box> onRequestClose={onRequestCloseBackdropLibrary}
</Box> />
) : null}
</div>
</div>
</div>
); );
const spriteShape = PropTypes.shape({ const spriteShape = PropTypes.shape({
......
...@@ -27,9 +27,9 @@ class BackdropLibrary extends React.Component { ...@@ -27,9 +27,9 @@ class BackdropLibrary extends React.Component {
render () { render () {
return ( return (
<LibraryComponent <LibraryComponent
visible
data={backdropLibraryContent} data={backdropLibraryContent}
title="Backdrop Library" title="Backdrop Library"
visible={this.props.visible}
onItemSelected={this.handleItemSelect} onItemSelected={this.handleItemSelect}
onRequestClose={this.props.onRequestClose} onRequestClose={this.props.onRequestClose}
/> />
...@@ -39,7 +39,6 @@ class BackdropLibrary extends React.Component { ...@@ -39,7 +39,6 @@ class BackdropLibrary extends React.Component {
BackdropLibrary.propTypes = { BackdropLibrary.propTypes = {
onRequestClose: PropTypes.func, onRequestClose: PropTypes.func,
visible: PropTypes.bool,
vm: PropTypes.instanceOf(VM).isRequired vm: PropTypes.instanceOf(VM).isRequired
}; };
......
...@@ -27,9 +27,9 @@ class CostumeLibrary extends React.PureComponent { ...@@ -27,9 +27,9 @@ class CostumeLibrary extends React.PureComponent {
render () { render () {
return ( return (
<LibraryComponent <LibraryComponent
visible
data={costumeLibraryContent} data={costumeLibraryContent}
title="Costume Library" title="Costume Library"
visible={this.props.visible}
onItemSelected={this.handleItemSelected} onItemSelected={this.handleItemSelected}
onRequestClose={this.props.onRequestClose} onRequestClose={this.props.onRequestClose}
/> />
...@@ -39,7 +39,6 @@ class CostumeLibrary extends React.PureComponent { ...@@ -39,7 +39,6 @@ class CostumeLibrary extends React.PureComponent {
CostumeLibrary.propTypes = { CostumeLibrary.propTypes = {
onRequestClose: PropTypes.func, onRequestClose: PropTypes.func,
visible: PropTypes.bool,
vm: PropTypes.instanceOf(VM).isRequired vm: PropTypes.instanceOf(VM).isRequired
}; };
......
...@@ -74,9 +74,9 @@ class SoundLibrary extends React.PureComponent { ...@@ -74,9 +74,9 @@ class SoundLibrary extends React.PureComponent {
return ( return (
<LibraryComponent <LibraryComponent
visible
data={soundLibraryThumbnailData} data={soundLibraryThumbnailData}
title="Sound Library" title="Sound Library"
visible={this.props.visible}
onItemMouseEnter={this.handleItemMouseEnter} onItemMouseEnter={this.handleItemMouseEnter}
onItemMouseLeave={this.handleItemMouseLeave} onItemMouseLeave={this.handleItemMouseLeave}
onItemSelected={this.handleItemSelected} onItemSelected={this.handleItemSelected}
...@@ -88,7 +88,6 @@ class SoundLibrary extends React.PureComponent { ...@@ -88,7 +88,6 @@ class SoundLibrary extends React.PureComponent {
SoundLibrary.propTypes = { SoundLibrary.propTypes = {
onRequestClose: PropTypes.func, onRequestClose: PropTypes.func,
visible: PropTypes.bool,
vm: PropTypes.instanceOf(VM).isRequired vm: PropTypes.instanceOf(VM).isRequired
}; };
......
...@@ -64,9 +64,9 @@ class SpriteLibrary extends React.PureComponent { ...@@ -64,9 +64,9 @@ class SpriteLibrary extends React.PureComponent {
render () { render () {
return ( return (
<LibraryComponent <LibraryComponent
visible
data={this.state.sprites} data={this.state.sprites}
title="Sprite Library" title="Sprite Library"
visible={this.props.visible}
onItemMouseEnter={this.handleMouseEnter} onItemMouseEnter={this.handleMouseEnter}
onItemMouseLeave={this.handleMouseLeave} onItemMouseLeave={this.handleMouseLeave}
onItemSelected={this.handleItemSelect} onItemSelected={this.handleItemSelect}
...@@ -78,7 +78,6 @@ class SpriteLibrary extends React.PureComponent { ...@@ -78,7 +78,6 @@ class SpriteLibrary extends React.PureComponent {
SpriteLibrary.propTypes = { SpriteLibrary.propTypes = {
onRequestClose: PropTypes.func, onRequestClose: PropTypes.func,
visible: PropTypes.bool,
vm: PropTypes.instanceOf(VM).isRequired vm: PropTypes.instanceOf(VM).isRequired
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment