Replaced deprecated keyCode functionality and docs with KeyboardEvent.code & KeyboardEvent.key also updates the keyIsDown function to accept alphanumerics as parameters

src/core/constants.js

@@ -879,92 +879,104 @@ export const MITER = 'miter';
  * @final
  */
 export const AUTO = 'auto';
-
+// INPUT
 /**
- * @typedef {18} ALT
+ * @typedef {'AltLeft' | 'AltRight'} ALT
  * @property {ALT} ALT
  * @final
  */
-// INPUT
-export const ALT = 18;
+export const ALT = 'AltLeft';
+
 /**
- * @typedef {8} BACKSPACE
+ * @typedef {'Backspace'} BACKSPACE
  * @property {BACKSPACE} BACKSPACE
  * @final
  */
-export const BACKSPACE = 8;
+export const BACKSPACE = 'Backspace';
+
 /**
- * @typedef {17} CONTROL
+ * @typedef {'ControlLeft' | 'ControlRight'} CONTROL
  * @property {CONTROL} CONTROL
  * @final
  */
-export const CONTROL = 17;
+export const CONTROL = 'ControlLeft';
+
 /**
- * @typedef {46} DELETE
+ * @typedef {'Delete'} DELETE
  * @property {DELETE} DELETE
  * @final
  */
-export const DELETE = 46;
+export const DELETE = 'Delete';
+
 /**
- * @typedef {40} DOWN_ARROW
+ * @typedef {'ArrowDown'} DOWN_ARROW
  * @property {DOWN_ARROW} DOWN_ARROW
  * @final
  */
-export const DOWN_ARROW = 40;
+export const DOWN_ARROW = 'ArrowDown';
+
 /**
- * @typedef {13} ENTER
+ * @typedef {'Enter'} ENTER
  * @property {ENTER} ENTER
  * @final
  */
-export const ENTER = 13;
+export const ENTER = 'Enter';
+
 /**
- * @typedef {27} ESCAPE
+ * @typedef {'Escape'} ESCAPE
  * @property {ESCAPE} ESCAPE
  * @final
  */
-export const ESCAPE = 27;
+export const ESCAPE = 'Escape';
+
 /**
- * @typedef {37} LEFT_ARROW
+ * @typedef {'ArrowLeft'} LEFT_ARROW
  * @property {LEFT_ARROW} LEFT_ARROW
  * @final
  */
-export const LEFT_ARROW = 37;
+export const LEFT_ARROW = 'ArrowLeft';
+
 /**
- * @typedef {18} OPTION
+ * @typedef {'AltLeft' | 'AltRight'} OPTION
  * @property {OPTION} OPTION
  * @final
  */
-export const OPTION = 18;
+export const OPTION = 'AltLeft';
+
 /**
- * @typedef {13} RETURN
+ * @typedef {'Enter'} RETURN
  * @property {RETURN} RETURN
  * @final
  */
-export const RETURN = 13;
+export const RETURN = 'Enter';
+
 /**
- * @typedef {39} RIGHT_ARROW
+ * @typedef {'ArrowRight'} RIGHT_ARROW
  * @property {RIGHT_ARROW} RIGHT_ARROW
  * @final
  */
-export const RIGHT_ARROW = 39;
+export const RIGHT_ARROW = 'ArrowRight';
+
 /**
- * @typedef {16} SHIFT
+ * @typedef {'ShiftLeft' | 'ShiftRight'} SHIFT
  * @property {SHIFT} SHIFT
  * @final
  */
-export const SHIFT = 16;
+export const SHIFT = 'ShiftLeft';
+
 /**
- * @typedef {9} TAB
+ * @typedef {'Tab'} TAB
  * @property {TAB} TAB
  * @final
  */
-export const TAB = 9;
+export const TAB = 'Tab';
+
 /**
- * @typedef {38} UP_ARROW
+ * @typedef {'ArrowUp'} UP_ARROW
  * @property {UP_ARROW} UP_ARROW
  * @final
  */
-export const UP_ARROW = 38;
+export const UP_ARROW = 'ArrowUp';
 
 // RENDERING
 /**

src/core/main.js

@@ -418,6 +418,7 @@ class p5 {
 
     this._styles = [];
     this._downKeys = {}; //Holds the key codes of currently pressed keys
+    this._downKeyCodes = {};
   }
 }
 

src/events/keyboard.js

@@ -97,6 +97,7 @@ function keyboard(p5, fn){
    */
   fn.isKeyPressed = false;
   fn.keyIsPressed = false; // khan
+  fn.code = null;
 
   /**
    * A `String` system variable that contains the value of the last key typed.
@@ -440,15 +441,16 @@ function keyboard(p5, fn){
    * </div>
    */
   fn._onkeydown = function(e) {
-    if (this._downKeys[e.which]) {
-      // prevent multiple firings
+    if (this._downKeys[e.code]) {
       return;
     }
     this.isKeyPressed = true;
     this.keyIsPressed = true;
     this.keyCode = e.which;
-    this._downKeys[e.which] = true;
-    this.key = e.key || String.fromCharCode(e.which) || e.which;
+    this.key = e.key;
+    this.code = e.code;
+    this._downKeyCodes[e.code] = true;
+    this._downKeys[e.key] = true;
     const context = this._isGlobal ? window : this;
     if (typeof context.keyPressed === 'function' && !e.charCode) {
       const executeDefault = context.keyPressed(e);
@@ -614,18 +616,20 @@ function keyboard(p5, fn){
    * </div>
    */
   fn._onkeyup = function(e) {
-    this._downKeys[e.which] = false;
+    delete this._downKeyCodes[e.code];
+    delete this._downKeys[e.key];
 
-    if (!this._areDownKeys()) {
+    if (Object.keys(this._downKeys).length === 0) {
       this.isKeyPressed = false;
       this.keyIsPressed = false;
+      this.key = '';
+      this.code = null;
+    } else {
+      // If other keys are still pressed, update code to the last pressed key
+      const lastPressedKey = Object.keys(this._downKeys).pop();
+      this.code = lastPressedKey;
     }
 
-    this._lastKeyCodeTyped = null;
-
-    this.key = e.key || String.fromCharCode(e.which) || e.which;
-    this.keyCode = e.which;
-
     const context = this._isGlobal ? window : this;
     if (typeof context.keyReleased === 'function') {
       const executeDefault = context.keyReleased(e);
@@ -810,7 +814,7 @@ function keyboard(p5, fn){
    * <a href="https://keycode.info" target="_blank">keycode.info</a>.
    *
    * @method keyIsDown
-   * @param {Number}          code key to check.
+   * @param {Number || String}          code key to check.
    * @return {Boolean}        whether the key is down or not.
    *
    * @example
@@ -902,11 +906,27 @@ function keyboard(p5, fn){
    * </code>
    * </div>
    */
-  fn.keyIsDown = function(code) {
-    // p5._validateParameters('keyIsDown', arguments);
-    return this._downKeys[code] || false;
-  };
-
+  function isCode(input) {
+    if (typeof input !== 'string') {
+      return false;
+    }
+
+    // If it's a single digit, it should be treated as a code (with "Digit" prefix)
+    if (input.length === 1 && /[0-9]/.test(input)) {
+      return true;
+    }
+
+    // If it's longer than 1 character, it's a code
+    return input.length > 1;
+  }
+  fn.keyIsDown = function(input) {
+    if (isCode(input)) {
+      const key = input.length === 1 ? `Digit${input}` : input;
+      return this._downKeyCodes[key] || this._downKeys[key];
+    } else {
+      return this._downKeys[input] || this._downKeyCodes[input];
+    }
+  }
   /**
    * The _areDownKeys function returns a boolean true if any keys pressed
    * and a false if no keys are currently pressed.