Merge pull request #3 from tmickel/feature/toolbox-default

Use default toolbox from scratch-blocks
scratchfoundation · Oct 13, 2016 · 2677e22 · 2677e22
2 parents edd09fa + ea8dc56
commit 2677e22
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 715 deletions.
diff --git a/src/components/blocks.js b/src/components/blocks.js
@@ -3,12 +3,13 @@ const React = require('react');
 const ScratchBlocks = require('scratch-blocks');
 
 class Blocks extends React.Component {
-    componentDidUpdate (prevProps) {
-        if (!prevProps.options.toolbox && this.props.options.toolbox) {
-            let workspaceConfig = defaultsDeep({}, Blocks.defaultOptions, this.props.options);
-            this.workspace = ScratchBlocks.inject(this.refs.scratchBlocks, workspaceConfig);
-            this.props.onReceiveWorkspace(this.workspace);
-        }
+    componentDidMount () {
+        let workspaceConfig = defaultsDeep({}, Blocks.defaultOptions, this.props.options);
+        this.workspace = ScratchBlocks.inject(this.refs.scratchBlocks, workspaceConfig);
+        this.props.onReceiveWorkspace(this.workspace);
+    }
+    componentWillUnmount () {
+        this.workspace.dispose();
     }
     render () {
         return (

diff --git a/src/components/gui.js b/src/components/gui.js
@@ -6,7 +6,6 @@ const Renderer = require('scratch-render');
 const SpriteSelector = require('./sprite-selector');
 const Stage = require('./stage');
 const StopAll = require('./stop-all');
-const Toolbox = require('./toolbox');
 const VM = require('scratch-vm');
 const VMManager = require('../lib/vm-manager');
 
@@ -17,11 +16,6 @@ class GUI extends React.Component {
         this.onReceiveWorkspace = this.onReceiveWorkspace.bind(this);
         this.state = {};
     }
-    componentDidMount () {
-        this.setState({
-            toolbox: this.toolbox
-        });
-    }
     componentWillReceiveProps (nextProps) {
         if (this.props.projectData !== nextProps.projectData) {
             this.props.vm.loadProject(nextProps.projectData);
@@ -58,11 +52,9 @@ class GUI extends React.Component {
                 <StopAll vm={this.props.vm} />
                 <Stage stageRef={stage => this.stage = stage} />
                 <SpriteSelector vm={this.props.vm} />
-                <Toolbox toolboxRef={toolbox => this.toolbox = toolbox} />
                 <Blocks
                     options={{
-                        media: this.props.basePath + 'static/blocks-media/',
-                        toolbox: this.state.toolbox
+                        media: this.props.basePath + 'static/blocks-media/'
                     }}
                     vm={this.props.vm}
                     onReceiveWorkspace={this.onReceiveWorkspace}