pxt-microbit 5.0.1 → 5.0.4

package/built/sim.d.ts

@@ -747,6 +747,7 @@ declare namespace pxsim.visuals {
         private attachPinsIOEvents;
         private attachPinsTouchEvents;
         private attachABEvents;
+        attachButtonEvents(stateButton: Button, buttonOuter: SVGElement, elButton: SVGElement): void;
         private attachAPlusBEvents;
     }
 }

package/built/sim.js

@@ -2608,6 +2608,9 @@ var pxsim;
         .sim-button {
             pointer-events: none;
         }
+        .sim-head .sim-button {
+            pointer-events: unset;
+        }
         .sim-board, .sim-display, sim-button {
             fill: #111;
         }
@@ -2903,10 +2906,12 @@ path.sim-board {
                 pxsim.svg.fill(this.buttonsOuter[2], theme.virtualButtonOuter);
                 pxsim.svg.fill(this.buttons[2], theme.virtualButtonUp);
                 pxsim.svg.fills(this.logos, theme.accent);
-                if (this.domHardwareVersion > 1)
+                if (this.domHardwareVersion > 1) {
                     pxsim.svg.fills(this.heads.slice(1), "gold");
-                else
+                }
+                else {
                     pxsim.svg.fills(this.heads.slice(1), theme.accent);
+                }
                 if (this.shakeButton)
                     pxsim.svg.fill(this.shakeButton, theme.virtualButtonUp);
                 this.pinGradients.forEach(lg => pxsim.svg.setGradientColors(lg, theme.pin, theme.pinActive));
@@ -3480,7 +3485,7 @@ path.sim-board {
                 // head
                 this.head = pxsim.svg.child(this.g, "g", { class: "sim-head" });
                 pxsim.svg.child(this.head, "circle", { cx: 258, cy: 75, r: 100, fill: "transparent" });
-                this.headParts = pxsim.svg.child(this.head, "g", { class: "sim-button-outer sim-button-group" });
+                this.headParts = pxsim.svg.child(this.head, "g", {});
                 this.heads = [];
                 // background
                 this.heads.push(pxsim.svg.path(this.headParts, "sim-button", "M 269.9 50.2 L 269.9 50.2 l -39.5 0 v 0 c -14.1 0.1 -24.6 10.7 -24.6 24.8 c 0 13.9 10.4 24.4 24.3 24.7 v 0 h 39.6 c 14.2 0 24.8 -10.6 24.8 -24.7 C 294.5 61 284 50.3 269.9 50.2 M 269.7 89.2"));
@@ -3587,6 +3592,8 @@ path.sim-board {
                 const headTitle = pxsim.localization.lf("logo touch (micro:bit v2 needed)");
                 pxsim.accessibility.makeFocusable(this.headParts);
                 pxsim.accessibility.setAria(this.headParts, "button", headTitle);
+                this.headParts.setAttribute("class", "sim-button-outer sim-button-group");
+                this.attachButtonEvents(this.board.logoTouch, this.headParts, this.headParts);
                 // microphone led
                 const microphoneTitle = pxsim.localization.lf("microphone (micro:bit v2 needed)");
                 const microg = pxsim.svg.child(this.g, "g", { title: microphoneTitle });
@@ -3785,38 +3792,41 @@ path.sim-board {
             }
             attachABEvents() {
                 const bpState = this.board.buttonPairState;
-                const stateButtons = [bpState.aBtn, bpState.bBtn, this.board.logoTouch];
-                const elButtonOuters = this.buttonsOuter.slice(0, 2).concat(this.headParts);
-                const elButtons = this.buttons.slice(0, 2).concat(this.headParts);
+                const stateButtons = [bpState.aBtn, bpState.bBtn];
+                const elButtonOuters = this.buttonsOuter.slice(0, 2);
+                const elButtons = this.buttons.slice(0, 2);
                 elButtonOuters.forEach((btn, index) => {
-                    let pressedTime;
-                    pxsim.pointerEvents.down.forEach(evid => btn.addEventListener(evid, ev => {
-                        console.log(`down ${stateButtons[index].id}`);
-                        stateButtons[index].pressed = true;
-                        pxsim.svg.fill(elButtons[index], this.props.theme.buttonDown);
-                        this.board.bus.queue(stateButtons[index].id, 1 /* MICROBIT_BUTTON_EVT_DOWN */);
-                        pressedTime = pxsim.runtime.runningTime();
-                    }));
-                    btn.addEventListener(pxsim.pointerEvents.leave, ev => {
-                        stateButtons[index].pressed = false;
-                        pxsim.svg.fill(elButtons[index], this.props.theme.buttonUp);
-                    });
-                    btn.addEventListener(pxsim.pointerEvents.up, ev => {
-                        stateButtons[index].pressed = false;
-                        pxsim.svg.fill(elButtons[index], this.props.theme.buttonUp);
-                        this.board.bus.queue(stateButtons[index].id, 2 /* MICROBIT_BUTTON_EVT_UP */);
-                        const currentTime = pxsim.runtime.runningTime();
-                        if (currentTime - pressedTime > 1000 /* DEVICE_BUTTON_LONG_CLICK_TIME */)
-                            this.board.bus.queue(stateButtons[index].id, 4 /* MICROBIT_BUTTON_EVT_LONG_CLICK */);
-                        else
-                            this.board.bus.queue(stateButtons[index].id, 3 /* MICROBIT_BUTTON_EVT_CLICK */);
-                        pressedTime = undefined;
-                    });
-                    pxsim.accessibility.enableKeyboardInteraction(btn, undefined, () => {
-                        this.board.bus.queue(stateButtons[index].id, 1 /* MICROBIT_BUTTON_EVT_DOWN */);
-                        this.board.bus.queue(stateButtons[index].id, 2 /* MICROBIT_BUTTON_EVT_UP */);
-                        this.board.bus.queue(stateButtons[index].id, 3 /* MICROBIT_BUTTON_EVT_CLICK */);
-                    });
+                    this.attachButtonEvents(stateButtons[index], btn, elButtons[index]);
+                });
+            }
+            attachButtonEvents(stateButton, buttonOuter, elButton) {
+                let pressedTime;
+                pxsim.pointerEvents.down.forEach(evid => buttonOuter.addEventListener(evid, ev => {
+                    // console.log(`down ${stateButton.id}`)
+                    stateButton.pressed = true;
+                    pxsim.svg.fill(elButton, this.props.theme.buttonDown);
+                    this.board.bus.queue(stateButton.id, 1 /* MICROBIT_BUTTON_EVT_DOWN */);
+                    pressedTime = pxsim.runtime.runningTime();
+                }));
+                buttonOuter.addEventListener(pxsim.pointerEvents.leave, ev => {
+                    stateButton.pressed = false;
+                    pxsim.svg.fill(elButton, this.props.theme.buttonUp);
+                });
+                buttonOuter.addEventListener(pxsim.pointerEvents.up, ev => {
+                    stateButton.pressed = false;
+                    pxsim.svg.fill(elButton, this.props.theme.buttonUp);
+                    this.board.bus.queue(stateButton.id, 2 /* MICROBIT_BUTTON_EVT_UP */);
+                    const currentTime = pxsim.runtime.runningTime();
+                    if (currentTime - pressedTime > 1000 /* DEVICE_BUTTON_LONG_CLICK_TIME */)
+                        this.board.bus.queue(stateButton.id, 4 /* MICROBIT_BUTTON_EVT_LONG_CLICK */);
+                    else
+                        this.board.bus.queue(stateButton.id, 3 /* MICROBIT_BUTTON_EVT_CLICK */);
+                    pressedTime = undefined;
+                });
+                pxsim.accessibility.enableKeyboardInteraction(buttonOuter, undefined, () => {
+                    this.board.bus.queue(stateButton.id, 1 /* MICROBIT_BUTTON_EVT_DOWN */);
+                    this.board.bus.queue(stateButton.id, 2 /* MICROBIT_BUTTON_EVT_UP */);
+                    this.board.bus.queue(stateButton.id, 3 /* MICROBIT_BUTTON_EVT_CLICK */);
                 });
             }
             attachAPlusBEvents() {