Merge branch 'main' into all-contributors/add-lab-mediaArts

Author: ksen0

.all-contributorsrc

@@ -6233,7 +6233,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/7389189?v=4",
       "profile": "https://github.com/AaratiAkkapeddi",
       "contributions": [
-        "code"
+        "code",
+        "ideas"
       ]
     },
     {
@@ -6693,6 +6694,15 @@
         "test"
       ]
     },
+    {
+      "login": "ChloeYanYan",
+      "name": "Chloe Yan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/181019103?v=4",
+      "profile": "https://github.com/ChloeYanYan",
+      "contributions": [
+        "doc"
+      ]
+    },
     {
       "login": "webermayank",
       "name": "Mayank Verma",
@@ -6710,6 +6720,70 @@
       "contributions": [
         "ideas"
       ]
+    },
+    {
+      "login": "roxi09",
+      "name": "roxi09",
+      "avatar_url": "https://avatars.githubusercontent.com/u/175943104?v=4",
+      "profile": "https://github.com/Roxi09",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "jlliu",
+      "name": "Jackie Liu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8304517?v=4",
+      "profile": "https://github.com/jlliu",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "re7l",
+      "name": "Carrie Wang",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19353655?v=4",
+      "profile": "https://github.com/re7l",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "himanshuukholiya",
+      "name": "Himanshu Kholiya",
+      "avatar_url": "https://avatars.githubusercontent.com/u/128818464?v=4",
+      "profile": "https://github.com/himanshuukholiya",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mclark414",
+      "name": "mclark414",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26391144?v=4",
+      "profile": "https://github.com/mclark414",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "mxramsey",
+      "name": "Mx. Ramsey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/161327383?v=4",
+      "profile": "https://github.com/mxramsey",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "franolichdesign",
+      "name": "Franolich Design",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74784668?v=4",
+      "profile": "https://github.com/franolichdesign",
+      "contributions": [
+        "bug",
+        "code"
+      ]
     }
   ],
   "repoType": "github",

README.md

@@ -1044,7 +1044,7 @@ We recognize all types of contributions. This project follows the [all-contribut
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/c-dacanay"><img src="https://avatars.githubusercontent.com/u/54914834?v=4?s=120" width="120px;" alt="c-dacanay"/><br /><sub><b>c-dacanay</b></sub></a><br /><a href="#design-c-dacanay" title="Design">🎨</a> <a href="#eventOrganizing-c-dacanay" title="Event Organizing">📋</a> <a href="#example-c-dacanay" title="Examples">💡</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/mathewpan2"><img src="https://avatars.githubusercontent.com/u/112679001?v=4?s=120" width="120px;" alt="mathewpan2"/><br /><sub><b>mathewpan2</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=mathewpan2" title="Code">💻</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/cog25"><img src="https://avatars.githubusercontent.com/u/74242561?v=4?s=120" width="120px;" alt="cog25"/><br /><sub><b>cog25</b></sub></a><br /><a href="#translation-cog25" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="16.66%"><a href="https://github.com/AaratiAkkapeddi"><img src="https://avatars.githubusercontent.com/u/7389189?v=4?s=120" width="120px;" alt="Aarati Akkapeddi "/><br /><sub><b>Aarati Akkapeddi </b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=AaratiAkkapeddi" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/AaratiAkkapeddi"><img src="https://avatars.githubusercontent.com/u/7389189?v=4?s=120" width="120px;" alt="Aarati Akkapeddi "/><br /><sub><b>Aarati Akkapeddi </b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=AaratiAkkapeddi" title="Code">💻</a> <a href="#ideas-AaratiAkkapeddi" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="16.66%"><a href="https://mayaarguelles.com/"><img src="https://avatars.githubusercontent.com/u/29130029?v=4?s=120" width="120px;" alt="Maya Arguelles"/><br /><sub><b>Maya Arguelles</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=mayaarguelles" title="Code">💻</a></td>
@@ -1111,7 +1111,17 @@ We recognize all types of contributions. This project follows the [all-contribut
       <td align="center" valign="top" width="16.66%"><a href="https://bojidar-bg.dev/"><img src="https://avatars.githubusercontent.com/u/5276727?v=4?s=120" width="120px;" alt="Bojidar Marinov"/><br /><sub><b>Bojidar Marinov</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=bojidar-bg" title="Code">💻</a> <a href="https://github.com/processing/p5.js/commits?author=bojidar-bg" title="Tests">⚠️</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/ChloeYanYan"><img src="https://avatars.githubusercontent.com/u/181019103?v=4?s=120" width="120px;" alt="Chloe Yan"/><br /><sub><b>Chloe Yan</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=ChloeYanYan" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/webermayank"><img src="https://avatars.githubusercontent.com/u/111176033?v=4?s=120" width="120px;" alt="Mayank Verma"/><br /><sub><b>Mayank Verma</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=webermayank" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/jlliu"><img src="https://avatars.githubusercontent.com/u/8304517?v=4?s=120" width="120px;" alt="Jackie Liu"/><br /><sub><b>Jackie Liu</b></sub></a><br /><a href="#ideas-jlliu" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/re7l"><img src="https://avatars.githubusercontent.com/u/19353655?v=4?s=120" width="120px;" alt="Carrie Wang"/><br /><sub><b>Carrie Wang</b></sub></a><br /><a href="#ideas-re7l" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/himanshuukholiya"><img src="https://avatars.githubusercontent.com/u/128818464?v=4?s=120" width="120px;" alt="Himanshu Kholiya"/><br /><sub><b>Himanshu Kholiya</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=himanshuukholiya" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/mclark414"><img src="https://avatars.githubusercontent.com/u/26391144?v=4?s=120" width="120px;" alt="mclark414"/><br /><sub><b>mclark414</b></sub></a><br /><a href="#ideas-mclark414" title="Ideas, Planning, & Feedback">🤔</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/mxramsey"><img src="https://avatars.githubusercontent.com/u/161327383?v=4?s=120" width="120px;" alt="Mx. Ramsey"/><br /><sub><b>Mx. Ramsey</b></sub></a><br /><a href="#ideas-mxramsey" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/franolichdesign"><img src="https://avatars.githubusercontent.com/u/74784668?v=4?s=120" width="120px;" alt="Franolich Design"/><br /><sub><b>Franolich Design</b></sub></a><br /><a href="https://github.com/processing/p5.js/issues?q=author%3Afranolichdesign" title="Bug reports">🐛</a> <a href="https://github.com/processing/p5.js/commits?author=franolichdesign" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/Roxi09"><img src="https://avatars.githubusercontent.com/u/175943104?v=4?s=120" width="120px;" alt="roxi09"/><br /><sub><b>roxi09</b></sub></a><br /><a href="#ideas-roxi09" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/lab-mediaArts"><img src="https://avatars.githubusercontent.com/u/179049131?v=4?s=120" width="120px;" alt="Lauren Berrios"/><br /><sub><b>Lauren Berrios</b></sub></a><br /><a href="#ideas-lab-mediaArts" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
   </tbody>

src/accessibility/outputs.js

@@ -579,8 +579,13 @@ p5.prototype._getPos = function (x, y) {
 function _canvasLocator(args, canvasWidth, canvasHeight) {
   const noRows = 10;
   const noCols = 10;
-  let locX = Math.floor(args[0] / canvasWidth * noRows);
-  let locY = Math.floor(args[1] / canvasHeight * noCols);
+  let x = args[0];
+  let y = args[1];
+  if (x < 0 || x >= canvasWidth || y < 0 || y >= canvasHeight) {
+    return null;
+  }
+  let locX = Math.floor(x / canvasWidth * noRows);
+  let locY = Math.floor(y / canvasHeight * noCols);
   if (locX === noRows) {
     locX = locX - 1;
   }