Merge pull request #1029 from nwanduka/patch-11

Fixed keyboard accessibility issue on workbench page
camicroscope · Aug 20, 2024 · c876db4 · c876db4
2 parents 7c488a1 + 06de7ff
commit c876db4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/apps/dev-workbench/workbench.css b/apps/dev-workbench/workbench.css
@@ -67,9 +67,8 @@
     margin-left: 0 !important;
   }
 }
-.navbar .nav-item .dropdown .options-button {
-  background-color: #000;
-  color: #fff;
+.navbar .nav-item .options-button {
+  color: #000;
   border: none;
 }
 

diff --git a/apps/dev-workbench/workbench.js b/apps/dev-workbench/workbench.js
@@ -4,16 +4,25 @@ $(document).ready(function() {
   $('#stepper').show(400);
 });
 
-$('#goBack').click(function() {
-  window.history.back();
-});
-
-// Keydown event for the back button
-$('#goBack').keydown(function(e) {
-    if (e.keyCode === 13) {
-      window.history.back();
+// Unified function for going back
+  function goBack(e) {
+    // Prevent default action for keyboard events
+    if (e && e.preventDefault) {
+      e.preventDefault();
+    }
+    window.history.back();
   }
-});
+
+// Click event for the back button
+  $('#goBack').on('click', goBack);
+
+  // Keydown event for the back button
+  $('#goBack').on('keydown', function(e) {
+    // Check for both Enter (13) and Space (32) key codes
+    if (e.keyCode === 13 || e.keyCode === 32) {
+      goBack(e);
+    }
+  });
 
 // initialize Step 1
 function dataSelect() {