pxt-arcade 2.0.17 → 2.0.20

package/built/editor.js

@@ -306,6 +306,27 @@ var pxt;
                     });
                 }
             }
+            // 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) {
+                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")) {
+                        const value = document.createElement("value");
+                        value.setAttribute("name", "useSystemKeyboard");
+                        const shadow = document.createElement("shadow");
+                        shadow.setAttribute("type", "logic_boolean");
+                        const field = document.createElement("field");
+                        field.setAttribute("name", "BOOL");
+                        field.textContent = "FALSE";
+                        shadow.appendChild(field);
+                        value.appendChild(shadow);
+                        block.appendChild(value);
+                    }
+                }
+            }
         }
         function swapFieldIfNotMatching(eventRoot, fieldAName, fieldBName, fieldAShouldStartWith) {
             const fieldA = eventRoot.querySelector(`field[name=${fieldAName}]`);

package/built/sim.js

@@ -145,6 +145,7 @@ var pxsim;
         }
         const old = ctrl.state[key] || false;
         if (old != pressed) {
+            pxsim.Keyboard.cancelSystemKeyboard();
             ctrl.state[key] = pressed;
             pxsim.board().setButton(key + (7 * (ctrl.player - 1)), pressed);
         }
@@ -155,6 +156,7 @@ var pxsim;
     let forcedUpdateLoop;
     let isFirstRunSafari = true;
     let themeFromQueryParameter = false;
+    pxsim.simButtonsHidden = false;
     window.addEventListener("DOMContentLoaded", () => {
         const searchParams = new URL(window.location.toString()).searchParams;
         const setThemeIfDefined = (themeType) => {
@@ -175,7 +177,8 @@ var pxsim;
             pxsim.theme.applySkin(skin);
         }
         registerPointerEvents(!!searchParams.get("pointer-events"));
-        if (!!searchParams.get("hideSimButtons"))
+        pxsim.simButtonsHidden = !!searchParams.get("hideSimButtons");
+        if (pxsim.simButtonsHidden)
             hideSimButtons();
         if (!!searchParams.get("noExtraPadding"))
             noExtraPadding();
@@ -417,6 +420,7 @@ var pxsim;
             super();
             this.startTime = Date.now();
             this.isPaused = false;
+            this.disableKeyEvents = false;
             this.lightState = {};
             this.screenState = new pxsim.ScreenState(null);
             this.audioState = new pxsim.AudioState();
@@ -506,6 +510,9 @@ var pxsim;
             return undefined;
         }
         setKey(which, isPressed, e) {
+            if (this.disableKeyEvents) {
+                return;
+            }
             if (!isMultiplayerSession() && e instanceof KeyboardEvent) {
                 pxsim.browserEvents.onKeyboardEvent(e, isPressed);
             }
@@ -644,6 +651,10 @@ var pxsim;
                 state = this.lightState[pinId] = new pxsim.CommonNeoPixelState();
             return state;
         }
+        kill() {
+            super.kill();
+            pxsim.Keyboard.cancelTextPrompt();
+        }
     }
     pxsim.Board = Board;
     function indicateFocus(hasFocus) {
@@ -653,6 +664,9 @@ var pxsim;
         const b = board();
         if (b) {
             b.gameplayer.indicateFocus(hasFocus);
+            if (hasFocus && b.disableKeyEvents) {
+                pxsim.Keyboard.focusTextInput();
+            }
         }
     }
     pxsim.indicateFocus = indicateFocus;
@@ -718,6 +732,126 @@ function isSafari() {
     })(ButtonMethods = pxsim.ButtonMethods || (pxsim.ButtonMethods = {}));
 })(pxsim || (pxsim = {}));
 var pxsim;
+(function (pxsim) {
+    var Keyboard;
+    (function (Keyboard) {
+        let KeyboardEvent;
+        (function (KeyboardEvent) {
+            KeyboardEvent[KeyboardEvent["Change"] = 7339] = "Change";
+            KeyboardEvent[KeyboardEvent["Enter"] = 7340] = "Enter";
+            KeyboardEvent[KeyboardEvent["Cancel"] = 7341] = "Cancel";
+        })(KeyboardEvent = Keyboard.KeyboardEvent || (Keyboard.KeyboardEvent = {}));
+        let input;
+        let onClick = (e) => {
+            if (input)
+                input.focus();
+            e.stopPropagation();
+            e.preventDefault();
+        };
+        function validateNumberInput() {
+            if (!input)
+                return;
+            let cleaned = "";
+            for (let i = 0; i < input.value.length; i++) {
+                const current = input.value.charAt(i);
+                if (current === "-") {
+                    if (cleaned.length !== 0) {
+                        continue;
+                    }
+                }
+                else if (current === ".") {
+                    if (cleaned.indexOf(".") !== -1) {
+                        continue;
+                    }
+                }
+                else if (!/[0-9]/.test(current)) {
+                    continue;
+                }
+                cleaned += current;
+            }
+            input.value = cleaned;
+        }
+        function promptForText(maxLength, numberOnly) {
+            if (input)
+                input.remove();
+            pxsim.board().disableKeyEvents = true;
+            input = document.createElement("input");
+            input.type = "text";
+            input.maxLength = maxLength;
+            document.body.appendChild(input);
+            input.addEventListener("change", e => {
+                if (numberOnly) {
+                    validateNumberInput();
+                }
+                pxsim.board().bus.queue(KeyboardEvent.Change, 0);
+            });
+            input.addEventListener("keyup", e => {
+                if (e.key === "Enter" || e.key === "Escape") {
+                    pxsim.board().bus.queue(KeyboardEvent.Enter, 0);
+                    cancelTextPrompt();
+                }
+                else if (numberOnly) {
+                    validateNumberInput();
+                }
+                pxsim.board().bus.queue(KeyboardEvent.Change, 0);
+            });
+            input.addEventListener("keydown", e => {
+                pxsim.board().bus.queue(KeyboardEvent.Change, 0);
+                if (numberOnly) {
+                    validateNumberInput();
+                }
+            });
+            document.addEventListener("pointerdown", onClick);
+            document.addEventListener("click", onClick);
+            input.style.opacity = "0";
+            input.focus();
+        }
+        Keyboard.promptForText = promptForText;
+        function cancelTextPrompt() {
+            if (input)
+                input.remove();
+            pxsim.board().disableKeyEvents = false;
+            document.removeEventListener("pointerdown", onClick);
+            document.removeEventListener("click", onClick);
+        }
+        Keyboard.cancelTextPrompt = cancelTextPrompt;
+        function cancelSystemKeyboard() {
+            if (input) {
+                cancelTextPrompt();
+                pxsim.board().bus.queue(KeyboardEvent.Cancel, 0);
+            }
+        }
+        Keyboard.cancelSystemKeyboard = cancelSystemKeyboard;
+        function getTextPromptString() {
+            if (input)
+                return input.value;
+            return "";
+        }
+        Keyboard.getTextPromptString = getTextPromptString;
+        function focusTextInput() {
+            if (input)
+                input.focus();
+        }
+        Keyboard.focusTextInput = focusTextInput;
+        function getTextPromptSelectionStart() {
+            if (input)
+                return input.selectionStart;
+            return 0;
+        }
+        Keyboard.getTextPromptSelectionStart = getTextPromptSelectionStart;
+        function getTextPromptSelectionEnd() {
+            if (input)
+                return input.selectionEnd;
+            return 0;
+        }
+        Keyboard.getTextPromptSelectionEnd = getTextPromptSelectionEnd;
+        function isSystemKeyboardSupported() {
+            return !pxsim.board().multiplayerState.origin && !pxsim.simButtonsHidden;
+        }
+        Keyboard.isSystemKeyboardSupported = isSystemKeyboardSupported;
+    })(Keyboard = pxsim.Keyboard || (pxsim.Keyboard = {}));
+})(pxsim || (pxsim = {}));
+var pxsim;
 (function (pxsim) {
     var theme;
     (function (theme_1) {
@@ -1043,6 +1177,7 @@ var pxsim;
                 this.bindEvent(surface, "pointerdown", (ev) => {
                     this.updateButtonGesture(ev.clientX, ev.clientY);
                     inGesture = true;
+                    pxsim.Keyboard.cancelSystemKeyboard();
                 });
                 this.bindEvent(surface, "pointermove", (ev) => {
                     if (inGesture)
@@ -1146,6 +1281,7 @@ var pxsim;
                         visuals.pressButton(pxsim.Key.Menu);
                         visuals.releaseButton(pxsim.Key.Menu);
                         pxsim.indicateFocus(true);
+                        pxsim.Keyboard.cancelSystemKeyboard();
                     };
                 }
                 if (this.reset) {
@@ -1340,6 +1476,7 @@ var pxsim;
                 this.bindEvent(surface, "pointerdown", (ev) => {
                     this.updateJoystickDrag(ev.clientX, ev.clientY);
                     inGesture = true;
+                    pxsim.Keyboard.cancelSystemKeyboard();
                 });
                 this.bindEvent(surface, "pointermove", (ev) => {
                     if (inGesture)