SONAR-16337 Handle shortcuts and inputs when keydown

2 files changed, 8 insertions, 0 deletions

diff --git a/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx b/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx
index b4197c05a62..4ee53ee75b2 100644
--- a/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx
+++ b/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx
@@ -79,12 +79,16 @@ it('should correctly bind key events for component navigation', () => {
   keydown({ code: KeyboardCodes.DownArrow });
   expect(onHighlight).toBeCalledWith(COMPONENTS[0]);
 
+  keydown({ code: KeyboardCodes.RightArrow, metaKey: true });
+  expect(onSelect).not.toBeCalled();
   keydown({ code: KeyboardCodes.RightArrow });
   expect(onSelect).toBeCalledWith(COMPONENTS[0]);
 
   keydown({ code: KeyboardCodes.Enter });
   expect(onSelect).toBeCalledWith(COMPONENTS[0]);
 
+  keydown({ code: KeyboardCodes.LeftArrow, metaKey: true });
+  expect(onGoToParent).not.toBeCalled();
   keydown({ code: KeyboardCodes.LeftArrow });
   expect(onGoToParent).toBeCalled();
 });
diff --git a/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx b/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx
index b92a470199e..4232c27bc57 100644
--- a/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx
+++ b/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx
@@ -20,6 +20,7 @@
 import * as React from 'react';
 import PageActions from '../../components/ui/PageActions';
 import { getComponentMeasureUniqueKey } from '../../helpers/component';
+import { isInput, isShortcut } from '../../helpers/keyboardEventHelpers';
 import { KeyboardCodes } from '../../helpers/keycodes';
 import { ComponentMeasure } from '../../types/types';
 import { getWrappedDisplayName } from './utils';
@@ -50,6 +51,9 @@ export default function withKeyboardNavigation<P>(
     }
 
     handleKeyDown = (event: KeyboardEvent) => {
+      if (isInput(event) || isShortcut(event)) {
+        return true;
+      }
       if (event.code === KeyboardCodes.UpArrow) {
         event.preventDefault();
         return this.skipIfFile(this.handleHighlightPrevious);