pxt-core 7.4.12 → 7.4.13

package/built/pxtblocks.js

@@ -3606,7 +3606,7 @@ var pxt;
 var pxt;
 (function (pxt) {
     var blocks;
-    (function (blocks) {
+    (function (blocks_4) {
         const typeDefaults = {
             "string": {
                 field: "TEXT",
@@ -3630,8 +3630,8 @@ var pxt;
             }
         };
         // Add numbers before input names to prevent clashes with the ones added by BlocklyLoader
-        blocks.optionalDummyInputPrefix = "0_optional_dummy";
-        blocks.optionalInputWithFieldPrefix = "0_optional_field";
+        blocks_4.optionalDummyInputPrefix = "0_optional_dummy";
+        blocks_4.optionalInputWithFieldPrefix = "0_optional_field";
         // Matches arrays
         function isArrayType(type) {
             const arrayTypeRegex = /^(?:Array<(.+)>)|(?:(.+)\[\])|(?:\[.+\])$/;
@@ -3652,7 +3652,7 @@ var pxt;
                 return undefined;
             }
         }
-        blocks.isArrayType = isArrayType;
+        blocks_4.isArrayType = isArrayType;
         // Matches tuples
         function isTupleType(type) {
             const tupleTypeRegex = /^\[(.+)\]$/;
@@ -3666,7 +3666,7 @@ var pxt;
                 return undefined;
             }
         }
-        blocks.isTupleType = isTupleType;
+        blocks_4.isTupleType = isTupleType;
         const primitiveTypeRegex = /^(string|number|boolean)$/;
         // list of built-in blocks, should be touched.
         let _builtinBlocks;
@@ -3678,8 +3678,8 @@ var pxt;
             }
             return _builtinBlocks;
         }
-        blocks.builtinBlocks = builtinBlocks;
-        blocks.buildinBlockStatements = {
+        blocks_4.builtinBlocks = builtinBlocks;
+        blocks_4.buildinBlockStatements = {
             "controls_if": true,
             "controls_for": true,
             "pxt_controls_for": true,
@@ -3698,7 +3698,7 @@ var pxt;
             let b = cachedBlocks[type];
             return b ? b.fn : undefined;
         }
-        blocks.blockSymbol = blockSymbol;
+        blocks_4.blockSymbol = blockSymbol;
         function createShadowValue(info, p, shadowId, defaultV) {
             defaultV = defaultV || p.defaultValue;
             shadowId = shadowId || p.shadowBlockId;
@@ -3823,7 +3823,7 @@ var pxt;
             }
             return value;
         }
-        blocks.createShadowValue = createShadowValue;
+        blocks_4.createShadowValue = createShadowValue;
         function buildArrayShadow(shadow, blockType, fieldName, fieldValues) {
             const itemCount = fieldValues ? fieldValues.length : 2;
             const mut = document.createElement('mutation');
@@ -3852,7 +3852,7 @@ var pxt;
             headingLabel.setAttribute('web-class', 'blocklyFlyoutHeading');
             return headingLabel;
         }
-        blocks.createFlyoutHeadingLabel = createFlyoutHeadingLabel;
+        blocks_4.createFlyoutHeadingLabel = createFlyoutHeadingLabel;
         function createFlyoutGroupLabel(name, icon, labelLineWidth, helpCallback) {
             const groupLabel = createFlyoutLabel(name, undefined, icon);
             groupLabel.setAttribute('web-class', 'blocklyFlyoutGroup');
@@ -3865,7 +3865,7 @@ var pxt;
             }
             return groupLabel;
         }
-        blocks.createFlyoutGroupLabel = createFlyoutGroupLabel;
+        blocks_4.createFlyoutGroupLabel = createFlyoutGroupLabel;
         function createFlyoutLabel(name, color, icon, iconClass) {
             // Add the Heading label
             let headingLabel = Blockly.utils.xml.createElement('label');
@@ -3891,7 +3891,7 @@ var pxt;
             button.setAttribute('callbackKey', callbackKey);
             return button;
         }
-        blocks.createFlyoutButton = createFlyoutButton;
+        blocks_4.createFlyoutButton = createFlyoutButton;
         function createToolboxBlock(info, fn, comp) {
             //
             // toolbox update
@@ -3960,14 +3960,14 @@ var pxt;
             }
             return block;
         }
-        blocks.createToolboxBlock = createToolboxBlock;
+        blocks_4.createToolboxBlock = createToolboxBlock;
         function injectBlocks(blockInfo) {
             cachedBlockInfo = blockInfo;
             Blockly.pxtBlocklyUtils.whitelistDraggableBlockTypes(blockInfo.blocks.filter(fn => fn.attributes.duplicateShadowOnDrag).map(fn => fn.attributes.blockId));
             // inject Blockly with all block definitions
             return blockInfo.blocks
                 .map(fn => {
-                const comp = blocks.compileInfo(fn);
+                const comp = blocks_4.compileInfo(fn);
                 const block = createToolboxBlock(blockInfo, fn, comp);
                 if (fn.attributes.blockBuiltin) {
                     pxt.Util.assert(!!builtinBlocks()[fn.attributes.blockId]);
@@ -3981,7 +3981,7 @@ var pxt;
                 return fn;
             });
         }
-        blocks.injectBlocks = injectBlocks;
+        blocks_4.injectBlocks = injectBlocks;
         function injectBlockDefinition(info, fn, comp, blockXml) {
             let id = fn.attributes.blockId;
             if (builtinBlocks()[id]) {
@@ -4102,14 +4102,14 @@ var pxt;
             buildBlockFromDef(fn.attributes._def);
             let hasHandler = false;
             if (fn.attributes.mutate) {
-                blocks.addMutation(block, fn, fn.attributes.mutate);
+                blocks_4.addMutation(block, fn, fn.attributes.mutate);
             }
             else if (fn.attributes.defaultInstance) {
-                blocks.addMutation(block, fn, blocks.MutatorTypes.DefaultInstanceMutator);
+                blocks_4.addMutation(block, fn, blocks_4.MutatorTypes.DefaultInstanceMutator);
             }
             else if (fn.attributes._expandedDef && fn.attributes.expandableArgumentMode !== "disabled") {
                 const shouldToggle = fn.attributes.expandableArgumentMode === "toggle";
-                blocks.initExpandableBlock(info, block, fn.attributes._expandedDef, comp, shouldToggle, () => buildBlockFromDef(fn.attributes._expandedDef, true));
+                blocks_4.initExpandableBlock(info, block, fn.attributes._expandedDef, comp, shouldToggle, () => buildBlockFromDef(fn.attributes._expandedDef, true));
             }
             else if (comp.handlerArgs.length) {
                 /**
@@ -4119,7 +4119,7 @@ var pxt;
                  */
                 hasHandler = true;
                 if (fn.attributes.optionalVariableArgs) {
-                    blocks.initVariableArgsBlock(block, comp.handlerArgs);
+                    blocks_4.initVariableArgsBlock(block, comp.handlerArgs);
                 }
                 else if (fn.attributes.draggableParameters) {
                     comp.handlerArgs.filter(a => !a.inBlockDef).forEach(arg => {
@@ -4140,7 +4140,7 @@ var pxt;
                 }
             }
             // Add mutation to save and restore custom field settings
-            blocks.appendMutation(block, {
+            blocks_4.appendMutation(block, {
                 mutationToDom: (el) => {
                     block.inputList.forEach(input => {
                         input.fieldRow.forEach((fieldRow) => {
@@ -4318,7 +4318,7 @@ var pxt;
                                         blocksInfo: info
                                     };
                                     pxt.Util.jsonMergeFrom(options, fn.attributes.paramFieldEditorOptions && fn.attributes.paramFieldEditorOptions[actName] || {});
-                                    fields.push(namedField(blocks.createFieldEditor(customField, defl, options), defName));
+                                    fields.push(namedField(blocks_4.createFieldEditor(customField, defl, options), defName));
                                 }
                                 else
                                     fields.push(namedField(new Blockly.FieldDropdown(dd), defName));
@@ -4332,7 +4332,7 @@ var pxt;
                                     blocksInfo: info
                                 };
                                 pxt.Util.jsonMergeFrom(options, fn.attributes.paramFieldEditorOptions && fn.attributes.paramFieldEditorOptions[pr.actualName] || {});
-                                fields.push(namedField(blocks.createFieldEditor(customField, defl, options), pr.definitionName));
+                                fields.push(namedField(blocks_4.createFieldEditor(customField, defl, options), pr.definitionName));
                             }
                             else {
                                 inputName = defName;
@@ -4358,7 +4358,7 @@ var pxt;
                         input.setAlign(Blockly.ALIGN_LEFT);
                     }
                     else if (expanded) {
-                        const prefix = hasParameter ? blocks.optionalInputWithFieldPrefix : blocks.optionalDummyInputPrefix;
+                        const prefix = hasParameter ? blocks_4.optionalInputWithFieldPrefix : blocks_4.optionalDummyInputPrefix;
                         input = block.appendDummyInput(prefix + (anonIndex++));
                     }
                     else {
@@ -4397,13 +4397,13 @@ var pxt;
             var _a;
             return !!((_a = fn.parameters) === null || _a === void 0 ? void 0 : _a.some(pr => pxtc.parameterTypeIsArrowFunction(pr)));
         }
-        blocks.hasArrowFunction = hasArrowFunction;
+        blocks_4.hasArrowFunction = hasArrowFunction;
         function cleanBlocks() {
             pxt.debug('removing all custom blocks');
             for (const b in cachedBlocks)
                 removeBlock(cachedBlocks[b].fn);
         }
-        blocks.cleanBlocks = cleanBlocks;
+        blocks_4.cleanBlocks = cleanBlocks;
         /**
          * Used by pxtrunner to initialize blocks in the docs
          */
@@ -4411,7 +4411,7 @@ var pxt;
             init();
             injectBlocks(blockInfo);
         }
-        blocks.initializeAndInject = initializeAndInject;
+        blocks_4.initializeAndInject = initializeAndInject;
         /**
          * Used by main app to initialize blockly blocks.
          * Blocks are injected separately by called injectBlocks
@@ -4420,7 +4420,7 @@ var pxt;
             init();
             initJresIcons(blockInfo);
         }
-        blocks.initialize = initialize;
+        blocks_4.initialize = initialize;
         let blocklyInitialized = false;
         function init() {
             if (blocklyInitialized)
@@ -4430,7 +4430,7 @@ var pxt;
             goog.require('Blockly.Blocks');
             Blockly.FieldCheckbox.CHECK_CHAR = '■';
             Blockly.Constants.ADD_START_HATS = !!pxt.appTarget.appTheme.blockHats;
-            blocks.initFieldEditors();
+            blocks_4.initFieldEditors();
             initContextMenu();
             initOnStart();
             initMath();
@@ -4536,7 +4536,7 @@ var pxt;
             if (undeletable)
                 block.setDeletable(false);
             let tb = document.getElementById('blocklyToolboxDefinition');
-            let xml = tb ? blocks.getFirstChildWithAttr(tb, "block", "type", id) : undefined;
+            let xml = tb ? blocks_4.getFirstChildWithAttr(tb, "block", "type", id) : undefined;
             block.codeCard = {
                 header: name,
                 name: name,
@@ -4572,7 +4572,7 @@ var pxt;
                 setHelpResources(this, id, name, tooltip, url, colour, colourSecondary, colourTertiary);
             };
         }
-        blocks.installHelpResources = installHelpResources;
+        blocks_4.installHelpResources = installHelpResources;
         function initLists() {
             const msg = Blockly.Msg;
             // lists_create_with
@@ -4819,7 +4819,7 @@ var pxt;
                 }
             };
         }
-        blocks.onShowContextMenu = undefined;
+        blocks_4.onShowContextMenu = undefined;
         /**
          * The following patch to blockly is to add the Trash icon on top of the toolbox,
          * the trash icon should only show when a user drags a block that is already in the workspace.
@@ -5018,8 +5018,8 @@ var pxt;
                     options.push(screenshotOption);
                 }
                 // custom options...
-                if (blocks.onShowContextMenu)
-                    blocks.onShowContextMenu(this, options);
+                if (blocks_4.onShowContextMenu)
+                    blocks_4.onShowContextMenu(this, options);
             };
             // Get rid of bumping behavior
             Blockly.Constants.Logic.LOGIC_COMPARE_ONCHANGE_MIXIN.onchange = function () { };
@@ -5369,8 +5369,8 @@ var pxt;
             const mathModuloDef = pxt.blocks.getBlockDefinition(mathModuloId);
             msg.MATH_MODULO_TITLE = mathModuloDef.block["MATH_MODULO_TITLE"];
             installBuiltinHelpInfo(mathModuloId);
-            blocks.initMathOpBlock();
-            blocks.initMathRoundBlock();
+            blocks_4.initMathOpBlock();
+            blocks_4.initMathRoundBlock();
         }
         function initVariables() {
             // We only give types to "special" variables like enum members and we don't
@@ -5714,7 +5714,7 @@ var pxt;
             const functionReturnId = "function_return";
             Blockly.Blocks[functionReturnId] = {
                 init: function () {
-                    blocks.initReturnStatement(this);
+                    blocks_4.initReturnStatement(this);
                 },
                 onchange: function (event) {
                     const block = this;
@@ -6127,7 +6127,7 @@ var pxt;
             value.appendChild(shadow);
             return block;
         }
-        blocks.mkPredicateBlock = mkPredicateBlock;
+        blocks_4.mkPredicateBlock = mkPredicateBlock;
         function mkFieldBlock(type, fieldName, fieldValue, isShadow) {
             const fieldBlock = document.createElement(isShadow ? "shadow" : "block");
             fieldBlock.setAttribute("type", pxt.Util.htmlEscape(type));
@@ -6137,7 +6137,7 @@ var pxt;
             fieldBlock.appendChild(field);
             return fieldBlock;
         }
-        blocks.mkFieldBlock = mkFieldBlock;
+        blocks_4.mkFieldBlock = mkFieldBlock;
         function mkReturnStatementBlock() {
             const block = document.createElement("block");
             block.setAttribute("type", "function_return");
@@ -6148,7 +6148,7 @@ var pxt;
             value.appendChild(shadow);
             return block;
         }
-        blocks.mkReturnStatementBlock = mkReturnStatementBlock;
+        blocks_4.mkReturnStatementBlock = mkReturnStatementBlock;
         let jresIconCache = {};
         function iconToFieldImage(id) {
             let url = jresIconCache[id];
@@ -6207,7 +6207,7 @@ var pxt;
                 && sym.attributes.fixedInstance
                 && isSubtype(apis, sym.retType, qName));
         }
-        blocks.getFixedInstanceDropdownValues = getFixedInstanceDropdownValues;
+        blocks_4.getFixedInstanceDropdownValues = getFixedInstanceDropdownValues;
         function generateIcons(instanceSymbols) {
             const imgConv = new pxt.ImageConverter();
             instanceSymbols.forEach(v => {
@@ -6216,7 +6216,7 @@ var pxt;
                 }
             });
         }
-        blocks.generateIcons = generateIcons;
+        blocks_4.generateIcons = generateIcons;
         function getConstantDropdownValues(apis, qName) {
             return pxt.Util.values(apis.byQName).filter(sym => sym.attributes.blockIdentity === qName);
         }
@@ -6260,7 +6260,7 @@ var pxt;
                 varField.setValue(model.getId());
             }
         }
-        blocks.setVarFieldValue = setVarFieldValue;
+        blocks_4.setVarFieldValue = setVarFieldValue;
         function getBlockData(block) {
             if (!block.data) {
                 return {
@@ -6276,21 +6276,52 @@ var pxt;
             }
             return JSON.parse(block.data);
         }
-        blocks.getBlockData = getBlockData;
+        blocks_4.getBlockData = getBlockData;
         function setBlockData(block, data) {
             block.data = JSON.stringify(data);
         }
-        blocks.setBlockData = setBlockData;
+        blocks_4.setBlockData = setBlockData;
         function setBlockDataForField(block, field, data) {
             const blockData = getBlockData(block);
             blockData.fieldData[field] = data;
             setBlockData(block, blockData);
         }
-        blocks.setBlockDataForField = setBlockDataForField;
+        blocks_4.setBlockDataForField = setBlockDataForField;
         function getBlockDataForField(block, field) {
             return getBlockData(block).fieldData[field];
         }
-        blocks.getBlockDataForField = getBlockDataForField;
+        blocks_4.getBlockDataForField = getBlockDataForField;
+        class PxtWorkspaceSearch extends WorkspaceSearch {
+            createDom_() {
+                super.createDom_();
+                this.addEvent_(this.workspace_.getInjectionDiv(), "click", this, (e) => {
+                    if (!this.htmlDiv_.contains(e.target)) {
+                        this.close();
+                    }
+                });
+            }
+            highlightSearchGroup_(blocks) {
+                blocks.forEach((block) => {
+                    const blockPath = block.pathObject.svgPath;
+                    Blockly.utils.dom.addClass(blockPath, 'blockly-ws-search-highlight-pxt');
+                });
+            }
+            unhighlightSearchGroup_(blocks) {
+                blocks.forEach((block) => {
+                    const blockPath = block.pathObject.svgPath;
+                    Blockly.utils.dom.removeClass(blockPath, 'blockly-ws-search-highlight-pxt');
+                });
+            }
+            open() {
+                super.open();
+                Blockly.utils.dom.addClass(this.workspace_.getInjectionDiv(), 'blockly-ws-searching');
+            }
+            close() {
+                super.close();
+                Blockly.utils.dom.removeClass(this.workspace_.getInjectionDiv(), 'blockly-ws-searching');
+            }
+        }
+        blocks_4.PxtWorkspaceSearch = PxtWorkspaceSearch;
     })(blocks = pxt.blocks || (pxt.blocks = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -6786,7 +6817,7 @@ var pxt;
 var pxt;
 (function (pxt) {
     var blocks;
-    (function (blocks_4) {
+    (function (blocks_5) {
         let workspace;
         let blocklyDiv;
         let BlockLayout;
@@ -6796,7 +6827,7 @@ var pxt;
             // Shuffle deprecated
             BlockLayout[BlockLayout["Clean"] = 3] = "Clean";
             BlockLayout[BlockLayout["Flow"] = 4] = "Flow";
-        })(BlockLayout = blocks_4.BlockLayout || (blocks_4.BlockLayout = {}));
+        })(BlockLayout = blocks_5.BlockLayout || (blocks_5.BlockLayout = {}));
         function initRenderingWorkspace() {
             if (!workspace) {
                 blocklyDiv = document.createElement("div");
@@ -6820,7 +6851,7 @@ var pxt;
             pxt.blocks.clearWithoutEvents(workspace);
             return workspace;
         }
-        blocks_4.initRenderingWorkspace = initRenderingWorkspace;
+        blocks_5.initRenderingWorkspace = initRenderingWorkspace;
         function cleanRenderingWorkspace() {
             // We re-use the workspace across renders, catch any errors so we know to
             // create a new workspace if there was an error
@@ -6828,7 +6859,7 @@ var pxt;
                 workspace.dispose();
             workspace = undefined;
         }
-        blocks_4.cleanRenderingWorkspace = cleanRenderingWorkspace;
+        blocks_5.cleanRenderingWorkspace = cleanRenderingWorkspace;
         function renderWorkspace(options = { emPixels: 18, layout: BlockLayout.Align }) {
             const layout = options.splitSvg ? BlockLayout.Align : (options.layout || BlockLayout.Flow);
             switch (layout) {
@@ -6859,7 +6890,7 @@ var pxt;
                 ? pxt.blocks.layout.splitSvg(svg, workspace, options.emPixels)
                 : svg;
         }
-        blocks_4.renderWorkspace = renderWorkspace;
+        blocks_5.renderWorkspace = renderWorkspace;
         function render(blocksXml, options = { emPixels: 18, layout: BlockLayout.Align }) {
             initRenderingWorkspace();
             try {
@@ -6876,7 +6907,7 @@ var pxt;
                 cleanRenderingWorkspace();
             }
         }
-        blocks_4.render = render;
+        blocks_5.render = render;
         function blocksMetrics(ws) {
             const blocks = ws.getTopBlocks(false);
             if (!blocks.length)
@@ -6898,7 +6929,7 @@ var pxt;
                 height: m.b - m.t
             };
         }
-        blocks_4.blocksMetrics = blocksMetrics;
+        blocks_5.blocksMetrics = blocksMetrics;
     })(blocks = pxt.blocks || (pxt.blocks = {}));
 })(pxt || (pxt = {}));
 /// <reference path="../localtypings/blockly.d.ts" />
@@ -6906,7 +6937,7 @@ var pxt;
 var pxt;
 (function (pxt) {
     var blocks;
-    (function (blocks_5) {
+    (function (blocks_6) {
         function findRootBlocks(xmlDOM, type) {
             let blocks = [];
             for (const child in xmlDOM.children) {
@@ -6931,14 +6962,14 @@ var pxt;
             }
             return blocks;
         }
-        blocks_5.findRootBlocks = findRootBlocks;
+        blocks_6.findRootBlocks = findRootBlocks;
         function findRootBlock(xmlDOM, type) {
             let blks = findRootBlocks(xmlDOM, type);
             if (blks.length)
                 return blks[0];
             return null;
         }
-        blocks_5.findRootBlock = findRootBlock;
+        blocks_6.findRootBlock = findRootBlock;
     })(blocks = pxt.blocks || (pxt.blocks = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -10052,7 +10083,8 @@ var pxtblockly;
         }
         // The height of the preview on the block itself
         getPreviewHeight() {
-            return this.constants_.FIELD_BORDER_RECT_HEIGHT;
+            var _a;
+            return ((_a = this.getConstants()) === null || _a === void 0 ? void 0 : _a.FIELD_BORDER_RECT_HEIGHT) || 16;
         }
         getDropdownBackgroundColour() {
             if (this.sourceBlock_.parentBlock_) {
@@ -12297,7 +12329,8 @@ var pxtblockly;
             return this.pythonMode ? pxt.Util.lf("<python code>") : this.getValue();
         }
         applyColour() {
-            if (this.sourceBlock_ && this.constants_.FULL_BLOCK_FIELDS) {
+            var _a;
+            if (this.sourceBlock_ && ((_a = this.getConstants()) === null || _a === void 0 ? void 0 : _a.FULL_BLOCK_FIELDS)) {
                 if (this.borderRect_) {
                     this.borderRect_.setAttribute('stroke', this.sourceBlock_.style.colourTertiary);
                 }