pxt-arcade 2.0.34 → 2.0.36

package/built/editor.js

@@ -311,16 +311,20 @@ var pxt;
                 // same for SpriteKindLegacy
                 performOldEnumShimUpgrade("SpriteKindLegacy", "spritetype");
             }
-            // Added the "use system keyboard" options to the ask for number and ask for string blocks
-            if (pxt.semver.strcmp(pkgTargetVersion || "0.0.0", "2.0.18") < 0) {
+            // Added the "use on-screen keyboard" options to the ask for number and ask for string blocks
+            if (pxt.semver.strcmp(pkgTargetVersion || "0.0.0", "2.0.35") < 0) {
                 const allPromptBlocks = pxt.U.toArray(dom.querySelectorAll("block[type=gameaskforstring]"))
                     .concat(pxt.U.toArray(dom.querySelectorAll("shadow[type=gameaskforstring]")))
                     .concat(pxt.U.toArray(dom.querySelectorAll("block[type=gameaskfornumber]")))
                     .concat(pxt.U.toArray(dom.querySelectorAll("shadow[type=gameaskfornumber]")));
                 for (const block of allPromptBlocks) {
-                    if (!getChildNode(block, "value", "name", "useSystemKeyboard")) {
+                    if (getChildNode(block, "value", "name", "useOnScreenKeyboard")) {
+                        continue;
+                    }
+                    else {
+                        // preserve the old behavior by setting the value to true if not present
                         const value = document.createElement("value");
-                        value.setAttribute("name", "useSystemKeyboard");
+                        value.setAttribute("name", "useOnScreenKeyboard");
                         const shadow = document.createElement("shadow");
                         shadow.setAttribute("type", "logic_boolean");
                         const field = document.createElement("field");
@@ -330,6 +334,29 @@ var pxt;
                         value.appendChild(shadow);
                         block.appendChild(value);
                     }
+                    // since we are going to expand the block, we also need to make sure that
+                    // the other expandable parameter answerLength is present. the default values
+                    // and min/max were taken from the source in pxt-common-packages prior to this change
+                    const isStringBlock = block.getAttribute("type") === "gameaskforstring";
+                    if (!getChildNode(block, "value", "name", "answerLength")) {
+                        const value = document.createElement("value");
+                        value.setAttribute("name", "answerLength");
+                        const shadow = document.createElement("shadow");
+                        shadow.setAttribute("type", "math_number_minmax");
+                        const mutation = document.createElement("mutation");
+                        mutation.setAttribute("xmlns", "http://www.w3.org/1999/xhtml");
+                        mutation.setAttribute("min", "1");
+                        mutation.setAttribute("max", isStringBlock ? "24" : "10");
+                        mutation.setAttribute("label", "AnswerLength");
+                        mutation.setAttribute("prevision", "0");
+                        const field = document.createElement("field");
+                        field.setAttribute("name", "SLIDER");
+                        field.textContent = isStringBlock ? "12" : "6";
+                        shadow.appendChild(field);
+                        shadow.appendChild(mutation);
+                        value.appendChild(shadow);
+                        block.appendChild(value);
+                    }
                 }
             }
         }

package/built/sim-strings.json

@@ -1 +1 @@
-{}
+{"Type your response using your keyboard and hit ENTER":"Type your response using your keyboard and hit ENTER"}

package/built/sim.js

@@ -270,6 +270,7 @@ var pxsim;
      */
     pxsim.initCurrentRuntime = (msg) => {
         pxsim.runtime.board = new Board();
+        pxsim.Keyboard.cancelTextPrompt();
         pxsim.initGamepad();
         const theme = pxsim.theme.parseTheme(msg.theme);
         if (theme && !themeFromQueryParameter) {
@@ -653,6 +654,8 @@ var pxsim;
         }
         kill() {
             super.kill();
+            if (this.gameplayer)
+                this.gameplayer.dispose();
             pxsim.Keyboard.cancelTextPrompt();
         }
     }
@@ -775,6 +778,14 @@ var pxsim;
             if (input)
                 input.remove();
             pxsim.board().disableKeyEvents = true;
+            // clear all active button presses
+            pxsim.board().setButton(pxsim.Key.A, false);
+            pxsim.board().setButton(pxsim.Key.B, false);
+            pxsim.board().setButton(pxsim.Key.Up, false);
+            pxsim.board().setButton(pxsim.Key.Right, false);
+            pxsim.board().setButton(pxsim.Key.Down, false);
+            pxsim.board().setButton(pxsim.Key.Left, false);
+            pxsim.board().setButton(pxsim.Key.Menu, false);
             input = document.createElement("input");
             input.type = "text";
             input.maxLength = maxLength;
@@ -787,8 +798,8 @@ var pxsim;
             });
             input.addEventListener("keyup", e => {
                 if (e.key === "Enter" || e.key === "Escape") {
-                    pxsim.board().bus.queue(KeyboardEvent.Enter, 0);
                     cancelTextPrompt();
+                    pxsim.board().bus.queue(KeyboardEvent.Enter, 0);
                 }
                 else if (numberOnly) {
                     validateNumberInput();
@@ -828,6 +839,10 @@ var pxsim;
             return "";
         }
         Keyboard.getTextPromptString = getTextPromptString;
+        function getLocalizedInstructions() {
+            return pxsim.localization.lf("Type your response using your keyboard and hit ENTER");
+        }
+        Keyboard.getLocalizedInstructions = getLocalizedInstructions;
         function focusTextInput() {
             if (input)
                 input.focus();
@@ -1111,11 +1126,7 @@ var pxsim;
                 this.parent = undefined;
                 this.dragSurface = undefined;
                 this.cleanupInterval();
-                this.bindings.forEach(b => {
-                    const [el, ev, cb] = b;
-                    el.removeEventListener(ev, cb);
-                });
-                this.bindings = [];
+                this.unBindEvents();
             }
             pointIsWithinCircle(x, y, circle) {
                 const bounds = circle.getBoundingClientRect();
@@ -1155,6 +1166,7 @@ var pxsim;
             bindEvents(surface) {
                 if (!surface)
                     return;
+                this.unBindEvents();
                 if (visuals.hasPointerEvents()) {
                     this.bindPointerEvents(surface);
                 }
@@ -1175,9 +1187,9 @@ var pxsim;
                     inGesture = false;
                 });
                 this.bindEvent(surface, "pointerdown", (ev) => {
+                    pxsim.Keyboard.cancelSystemKeyboard();
                     this.updateButtonGesture(ev.clientX, ev.clientY);
                     inGesture = true;
-                    pxsim.Keyboard.cancelSystemKeyboard();
                 });
                 this.bindEvent(surface, "pointermove", (ev) => {
                     if (inGesture)
@@ -1256,6 +1268,13 @@ var pxsim;
                 ]);
                 element.addEventListener(event, callback);
             }
+            unBindEvents() {
+                this.bindings.forEach(b => {
+                    const [el, ev, cb] = b;
+                    el.removeEventListener(ev, cb);
+                });
+                this.bindings = [];
+            }
         }
         visuals.GameButtons = GameButtons;
     })(visuals = pxsim.visuals || (pxsim.visuals = {}));
@@ -1278,10 +1297,10 @@ var pxsim;
                     // TODO: localize; currently can't use lf in this repo
                     this.menu.setAttribute("aria-label", "Menu");
                     this.menu.onclick = () => {
+                        pxsim.Keyboard.cancelSystemKeyboard();
                         visuals.pressButton(pxsim.Key.Menu);
                         visuals.releaseButton(pxsim.Key.Menu);
                         pxsim.indicateFocus(true);
-                        pxsim.Keyboard.cancelSystemKeyboard();
                     };
                 }
                 if (this.reset) {
@@ -1474,9 +1493,9 @@ var pxsim;
                     inGesture = false;
                 });
                 this.bindEvent(surface, "pointerdown", (ev) => {
+                    pxsim.Keyboard.cancelSystemKeyboard();
                     this.updateJoystickDrag(ev.clientX, ev.clientY);
                     inGesture = true;
-                    pxsim.Keyboard.cancelSystemKeyboard();
                 });
                 this.bindEvent(surface, "pointermove", (ev) => {
                     if (inGesture)