Collection of fixes for bugs found on livestream

pxtblocks/builtins/loops.ts

@@ -122,7 +122,8 @@ export function initLoops() {
                     {
                         "type": "field_variable",
                         "name": "VAR",
-                        "variable": controlsSimpleForDef.block["variable"]
+                        "variable": controlsSimpleForDef.block["variable"],
+                        "variableTypes": [""],
                         // Please note that most multilingual characters
                         // cannot be used as variable name at this point.
                         // Translate or decide the default variable name
@@ -328,7 +329,8 @@ export function initLoops() {
                         {
                             "type": "field_variable",
                             "name": "VAR",
-                            "variable": controlsForOfDef.block["variable"]
+                            "variable": controlsForOfDef.block["variable"],
+                            "variableTypes": [""],
                             // Please note that most multilingual characters
                             // cannot be used as variable name at this point.
                             // Translate or decide the default variable name

pxtblocks/builtins/variables.ts

@@ -1,14 +1,8 @@
 import * as Blockly from "blockly";
 import { createFlyoutGroupLabel, createFlyoutHeadingLabel, mkVariableFieldBlock } from "../toolbox";
 import { installBuiltinHelpInfo, setBuiltinHelpInfo } from "../help";
-import { provider } from "../constants";
 
 export function initVariables() {
-    // We only give types to "special" variables like enum members and we don't
-    // want those showing up in the variable dropdown so filter the variables
-    // that show up to only ones that have an empty type
-    (Blockly.FieldVariable.prototype as any).getVariableTypes_ = () => [""];
-
     let varname = lf("{id:var}item");
     Blockly.Variables.flyoutCategory = function (workspace: Blockly.WorkspaceSvg) {
         let xmlList: HTMLElement[] = [];
@@ -103,7 +97,31 @@ export function initVariables() {
     const variablesGetId = "variables_get";
     const variablesGetDef = pxt.blocks.getBlockDefinition(variablesGetId);
     msg.VARIABLES_GET_CREATE_SET = variablesGetDef.block["VARIABLES_GET_CREATE_SET"];
-    installBuiltinHelpInfo(variablesGetId);
+    Blockly.Blocks[variablesGetId] = {
+        init: function() {
+            this.jsonInit(
+                {
+                    "type": "variables_get",
+                    "message0": "%1",
+                    "args0": [
+                        {
+                            "type": "field_variable",
+                            "name": "VAR",
+                            "variable": "%{BKY_VARIABLES_DEFAULT_NAME}",
+                            "variableTypes": [""],
+                        },
+                    ],
+                    "output": null,
+                    "style": "variable_blocks",
+                    "helpUrl": "%{BKY_VARIABLES_GET_HELPURL}",
+                    "tooltip": "%{BKY_VARIABLES_GET_TOOLTIP}",
+                    "extensions": ["contextMenu_variableSetterGetter"],
+                }
+            );
+
+            setBuiltinHelpInfo(this, variablesGetId);
+        }
+    };
 
     const variablesReporterGetId = "variables_get_reporter";
     installBuiltinHelpInfo(variablesReporterGetId);
@@ -120,7 +138,36 @@ export function initVariables() {
     msg.VARIABLES_SET = variablesSetDef.block["VARIABLES_SET"];
     msg.VARIABLES_DEFAULT_NAME = varname;
     msg.VARIABLES_SET_CREATE_GET = lf("Create 'get %1'");
-    installBuiltinHelpInfo(variablesSetId);
+    Blockly.Blocks[variablesSetId] = {
+        init: function() {
+            this.jsonInit(
+                {
+                    "type": "variables_set",
+                    "message0": "%{BKY_VARIABLES_SET}",
+                    "args0": [
+                    {
+                        "type": "field_variable",
+                        "name": "VAR",
+                        "variable": "%{BKY_VARIABLES_DEFAULT_NAME}",
+                        "variableTypes": [""],
+                    },
+                    {
+                        "type": "input_value",
+                        "name": "VALUE",
+                    },
+                    ],
+                    "previousStatement": null,
+                    "nextStatement": null,
+                    "style": "variable_blocks",
+                    "tooltip": "%{BKY_VARIABLES_SET_TOOLTIP}",
+                    "helpUrl": "%{BKY_VARIABLES_SET_HELPURL}",
+                    "extensions": ["contextMenu_variableSetterGetter"],
+                }
+            );
+
+            setBuiltinHelpInfo(this, variablesSetId);
+        }
+    };
 
     // pxt variables_change
     const variablesChangeId = "variables_change";
@@ -133,7 +180,8 @@ export function initVariables() {
                     {
                         "type": "field_variable",
                         "name": "VAR",
-                        "variable": varname
+                        "variable": varname,
+                        "variableTypes": [""]
                     },
                     {
                         "type": "input_value",

pxtblocks/help.ts

@@ -58,7 +58,6 @@ export function installHelpResources(id: string, name: string, tooltip: any, url
 
     block.init = function () {
         old.call(this);
-        let block = this;
         setHelpResources(this, id, name, tooltip, url, colour, colourSecondary, colourTertiary);
     }
 }

pxtblocks/plugins/duplicateOnDrag/variablesGetReporter.ts

@@ -39,7 +39,8 @@ Blockly.defineBlocksWithJsonArray([
           {
             "type": "field_variable",
             "name": "VAR",
-            "variable": "%{BKY_VARIABLES_DEFAULT_NAME}"
+            "variable": "%{BKY_VARIABLES_DEFAULT_NAME}",
+            "variableTypes": [""],
           }
         ],
         "output": null,

pxtlib/spriteutils.ts

@@ -806,6 +806,8 @@ namespace pxt.sprite {
     }
 
     export function bitmapEquals(a: pxt.sprite.BitmapData, b: pxt.sprite.BitmapData) {
+        if (a === b) return true;
+        else if (!a && b || !b && a) return false;
         return pxt.sprite.Bitmap.fromData(a).equals(pxt.sprite.Bitmap.fromData(b));
     }
 

webapp/src/components/ImageEditor/ImageCanvas.tsx

@@ -204,7 +204,7 @@ export class ImageCanvasImpl extends React.Component<ImageCanvasProps, {}> imple
         if (document.activeElement instanceof HTMLElement && document.activeElement !== this.refs["canvas-bounds"]) {
             document.activeElement.blur();
         }
-        (this.refs["canvas-bounds"] as HTMLDivElement).focus();
+        this.focus();
 
         if (this.isColorSelect()) {
             this.selectCanvasColor(coord, isRightClick);
@@ -230,6 +230,7 @@ export class ImageCanvasImpl extends React.Component<ImageCanvasProps, {}> imple
 
     onDragStart(coord: ClientCoordinates, isRightClick?: boolean): void {
         this.hasInteracted = true
+        this.focus();
         if (this.touchesResize(coord.clientX, coord.clientY)) {
             this.isResizing = true;
         }
@@ -243,10 +244,12 @@ export class ImageCanvasImpl extends React.Component<ImageCanvasProps, {}> imple
         else {
             this.updateCursorLocation(coord);
             this.startEdit(!!isRightClick);
+            this.updateEdit(this.cursorLocation[0], this.cursorLocation[1]);
         }
     }
 
     onDragMove(coord: ClientCoordinates): void {
+        this.focus();
         if (this.isPanning() && this.lastPanX != undefined && this.lastPanY != undefined) {
             this.panX += this.lastPanX - coord.clientX;
             this.panY += this.lastPanY - coord.clientY;
@@ -1091,6 +1094,10 @@ export class ImageCanvasImpl extends React.Component<ImageCanvasProps, {}> imple
 
         this.props.dispatchImageEdit(this.editState.toImageState());
     }
+
+    protected focus() {
+        (this.refs["canvas-bounds"] as HTMLDivElement).focus();
+    }
 }
 
 function mapStateToProps({ store: { present }, editor }: ImageEditorStore, ownProps: any) {