Oh hey metaKey is its own special thing

hashicorp · Jun 18, 2024 · 71ca80e · 71ca80e
1 parent 7f5f493
commit 71ca80e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.changelog/23365.txt b/.changelog/23365.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Dont show keyboard nav hints when taking a screenshot
+```
diff --git a/ui/app/services/keyboard.js b/ui/app/services/keyboard.js
@@ -348,11 +348,8 @@ export default class KeyboardService extends Service {
       const shifted = event.getModifierState('Shift');
       if (type === 'press') {
         if (key === 'Shift') {
-          // if cmd or ctrl are pressed, don't show hints — this is likely a user trying to take a screenshot.
-          if (
-            event.getModifierState('Meta') ||
-            event.getModifierState('Control')
-          ) {
+          // if cmd/windows key is pressed, don't show hints — this is likely a user trying to take a screenshot.
+          if (event.getModifierState('Meta')) {
             return;
           }
           this.displayHints = true;

diff --git a/ui/tests/acceptance/keyboard-test.js b/ui/tests/acceptance/keyboard-test.js
@@ -271,8 +271,10 @@ module('Acceptance | keyboard', function (hooks) {
         'Hints disappear when you release Shift'
       );
 
-      triggerEvent('.page-layout', 'keydown', { key: 'Meta' });
-      await triggerEvent('.page-layout', 'keydown', { key: 'Shift' });
+      await triggerEvent('.page-layout', 'keydown', {
+        key: 'Shift',
+        metaKey: true,
+      });
       assert.equal(
         document.querySelectorAll('[data-test-keyboard-hint]').length,
         0,