pxt-common-packages 12.3.5 → 12.3.9

package/built/common-sim.d.ts

@@ -341,15 +341,25 @@ declare namespace pxsim.browserEvents {
         ArrowRight = 39,
         PageDown = 34,
         End = 35,
-        Home = 36
+        Home = 36,
+        LeftShift = 1016,
+        RightShift = 1017,
+        LeftControl = 1018,
+        RightControl = 1019,
+        Backspace = 8,
+        Delete = 46
     }
     function onKeyboardEvent(event: KeyboardEvent, pressed: boolean): void;
-    function getValueForKey(event: KeyboardEvent): 0 | Key;
+    function getValueForKey(event: KeyboardEvent): 0 | Key.Zero | Key.One | Key.Two | Key.Three | Key.Four | Key.Five | Key.Six | Key.Seven | Key.Eight | Key.Nine | Key.BackTick | Key.Hyphen | Key.Equals | Key.Q | Key.W | Key.E | Key.R | Key.T | Key.Y | Key.U | Key.I | Key.O | Key.P | Key.OpenBracket | Key.CloseBracket | Key.BackSlash | Key.A | Key.S | Key.D | Key.F | Key.G | Key.H | Key.Space | Key.PageUp | Key.J | Key.K | Key.L | Key.SemiColon | Key.Apostrophe | Key.Z | Key.X | Key.C | Key.V | Key.B | Key.N | Key.M | Key.Comma | Key.Period | Key.ForwardSlash | Key.Shift | Key.Enter | Key.CapsLock | Key.Tab | Key.Control | Key.Meta | Key.Alt | Key.ArrowUp | Key.ArrowDown | Key.ArrowLeft | Key.ArrowRight | Key.PageDown | Key.End | Key.Home | Key.Backspace | Key.Delete;
 }
 declare namespace pxsim.browserEvents {
     interface BrowserEventsBoard extends CommonBoard {
         mouseState: MouseState;
     }
+    const INTERNAL_KEY_DOWN = 6870;
+    const INTERNAL_KEY_UP = 6871;
+    const INTERNAL_POINTER_DOWN = 6868;
+    const INTERNAL_POINTER_UP = 6869;
     type MouseEvent = "pointerdown" | "pointerup" | "pointermove" | "pointerleave" | "pointerenter" | "pointercancel" | "pointerover" | "pointerout";
     class MouseState {
         protected x: number;

package/built/common-sim.js

@@ -813,16 +813,42 @@ var pxsim;
             Key[Key["PageDown"] = 34] = "PageDown";
             Key[Key["End"] = 35] = "End";
             Key[Key["Home"] = 36] = "Home";
+            Key[Key["LeftShift"] = 1016] = "LeftShift";
+            Key[Key["RightShift"] = 1017] = "RightShift";
+            Key[Key["LeftControl"] = 1018] = "LeftControl";
+            Key[Key["RightControl"] = 1019] = "RightControl";
+            Key[Key["Backspace"] = 8] = "Backspace";
+            Key[Key["Delete"] = 46] = "Delete";
         })(Key = browserEvents.Key || (browserEvents.Key = {}));
         function onKeyboardEvent(event, pressed) {
+            const eventValue = getValueForKey(event);
+            fireEvent(eventValue, pressed);
+            if (eventValue === Key.Shift) {
+                if (event.location === event.DOM_KEY_LOCATION_LEFT) {
+                    fireEvent(Key.LeftShift, pressed);
+                }
+                else if (event.location === event.DOM_KEY_LOCATION_RIGHT) {
+                    fireEvent(Key.RightShift, pressed);
+                }
+            }
+            if (eventValue === Key.Control) {
+                if (event.location === event.DOM_KEY_LOCATION_LEFT) {
+                    fireEvent(Key.LeftControl, pressed);
+                }
+                else if (event.location === event.DOM_KEY_LOCATION_RIGHT) {
+                    fireEvent(Key.RightControl, pressed);
+                }
+            }
+        }
+        browserEvents.onKeyboardEvent = onKeyboardEvent;
+        function fireEvent(key, pressed) {
             if (pressed) {
-                pxsim.board().bus.queue(6866, getValueForKey(event));
+                pxsim.board().bus.queue(browserEvents.INTERNAL_KEY_DOWN, key);
             }
             else {
-                pxsim.board().bus.queue(6867, getValueForKey(event));
+                pxsim.board().bus.queue(browserEvents.INTERNAL_KEY_UP, key);
             }
         }
-        browserEvents.onKeyboardEvent = onKeyboardEvent;
         function getValueForKey(event) {
             switch (event.key) {
                 case "0":
@@ -998,6 +1024,10 @@ var pxsim;
                     return Key.End;
                 case "Home":
                     return Key.Home;
+                case "Delete":
+                    return Key.Delete;
+                case "Backspace":
+                    return Key.Backspace;
                 default:
                     return 0;
             }
@@ -1010,6 +1040,10 @@ var pxsim;
     var browserEvents;
     (function (browserEvents) {
         const THROTTLE_INTERVAL = 50;
+        browserEvents.INTERNAL_KEY_DOWN = 6870;
+        browserEvents.INTERNAL_KEY_UP = 6871;
+        browserEvents.INTERNAL_POINTER_DOWN = 6868;
+        browserEvents.INTERNAL_POINTER_UP = 6869;
         class MouseState {
             constructor() {
                 this.onMove = pxsim.U.throttle(() => {
@@ -1032,9 +1066,16 @@ var pxsim;
                     "pointerover",
                     "pointerout",
                 ];
+                let eventId = 6857 + events.indexOf(event.type);
+                if (event.type === "pointerdown") {
+                    eventId = browserEvents.INTERNAL_POINTER_DOWN;
+                }
+                else if (event.type === "pointerup") {
+                    eventId = browserEvents.INTERNAL_POINTER_UP;
+                }
                 // We add 1 to the button here because the left button is 0 and
                 // that's used as a wildcard in our event bus
-                pxsim.board().bus.queue(6857 + events.indexOf(event.type), (event.button || 0) + 1);
+                pxsim.board().bus.queue(eventId, (event.button || 0) + 1);
             }
             onWheelEvent(dx, dy, dz) {
                 this.dx = dx;