From d958b14b8d08d5ed35d1d37b33ae7cfeb4e70727 Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Thu, 30 May 2019 10:50:41 -0400
Subject: [PATCH] Revert "render only new toolbox xmls"
---
src/containers/blocks.jsx | 39 +++++++++------------------------------
1 file changed, 9 insertions(+), 30 deletions(-)
diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index 0b95ebc89..d79c7e9c7 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -30,10 +30,6 @@ import {
SOUNDS_TAB_INDEX
} from '../reducers/editor-tab';
-const UNINITIALIZED_TOOLBOX_XML = `<xml style="display: none">
- <category name="%{BKY_CATEGORY_MOTION}" id="motion" colour="#4C97FF" secondaryColour="#3373CC"></category>
-</xml>`;
-
const addFunctionListener = (object, property, callback) => {
const oldFn = object[property];
object[property] = function () {
@@ -87,19 +83,16 @@ class Blocks extends React.Component {
};
this.onTargetsUpdate = debounce(this.onTargetsUpdate, 100);
this.toolboxUpdateQueue = [];
- this.initializedWorkspace = false;
}
componentDidMount () {
this.ScratchBlocks.FieldColourSlider.activateEyedropper_ = this.props.onActivateColorPicker;
this.ScratchBlocks.Procedures.externalProcedureDefCallback = this.props.onActivateCustomProcedures;
this.ScratchBlocks.ScratchMsgs.setLocale(this.props.locale);
- const toolboxXML = UNINITIALIZED_TOOLBOX_XML;
-
const workspaceConfig = defaultsDeep({},
Blocks.defaultOptions,
this.props.options,
- {rtl: this.props.isRtl, toolbox: toolboxXML}
+ {rtl: this.props.isRtl, toolbox: this.props.toolboxXML}
);
this.workspace = this.ScratchBlocks.inject(this.blocks, workspaceConfig);
@@ -121,7 +114,7 @@ class Blocks extends React.Component {
// Store the xml of the toolbox that is actually rendered.
// This is used in componentDidUpdate instead of prevProps, because
// the xml can change while e.g. on the costumes tab.
- this._renderedToolboxXML = toolboxXML;
+ this._renderedToolboxXML = this.props.toolboxXML;
// we actually never want the workspace to enable "refresh toolbox" - this basically re-renders the
// entire toolbox every time we reset the workspace. We call updateToolbox as a part of
@@ -195,19 +188,13 @@ class Blocks extends React.Component {
componentWillUnmount () {
this.detachVM();
this.workspace.dispose();
- if (this.toolboxUpdateTimeout) this.toolboxUpdateTimeout.cancel();
+ clearTimeout(this.toolboxUpdateTimeout);
}
requestToolboxUpdate () {
- if (this.toolboxUpdateTimeout) this.toolboxUpdateTimeout.cancel();
- let running = true;
- this.toolboxUpdateTimeout = Promise.resolve().then(() => {
- if (running) {
- this.updateToolbox();
- }
- });
- this.toolboxUpdateTimeout.cancel = () => {
- running = false;
- };
+ clearTimeout(this.toolboxUpdateTimeout);
+ this.toolboxUpdateTimeout = setTimeout(() => {
+ this.updateToolbox();
+ }, 0);
}
setLocale () {
this.ScratchBlocks.ScratchMsgs.setLocale(this.props.locale);
@@ -227,15 +214,8 @@ class Blocks extends React.Component {
const categoryId = this.workspace.toolbox_.getSelectedCategoryId();
const offset = this.workspace.toolbox_.getCategoryScrollOffset();
-
- let toolboxXML = this.props.toolboxXML;
- if (!this.initializedWorkspace) {
- toolboxXML = UNINITIALIZED_TOOLBOX_XML;
- }
- if (this._renderedToolboxXML !== toolboxXML) {
- this.workspace.updateToolbox(toolboxXML);
- this._renderedToolboxXML = toolboxXML;
- }
+ this.workspace.updateToolbox(this.props.toolboxXML);
+ this._renderedToolboxXML = this.props.toolboxXML;
// In order to catch any changes that mutate the toolbox during "normal runtime"
// (variable changes/etc), re-enable toolbox refresh.
@@ -371,7 +351,6 @@ class Blocks extends React.Component {
// When we change sprites, update the toolbox to have the new sprite's blocks
const toolboxXML = this.getToolboxXML();
if (toolboxXML) {
- this.initializedWorkspace = true;
this.props.updateToolboxState(toolboxXML);
}
--
GitLab