bug: RovingFocus now respects alt-keys

navikt · Jul 4, 2024 · ce7004b · ce7004b
1 parent 420c5c3
commit ce7004b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/@navikt/core/react/src/tabs/parts/tablist/useTabList.ts b/@navikt/core/react/src/tabs/parts/tablist/useTabList.ts
@@ -48,9 +48,16 @@ export function useTabList() {
         End: lastTab,
       };
 
+      const shouldDoAction = !(
+        event.shiftKey ||
+        event.ctrlKey ||
+        event.altKey ||
+        event.metaKey
+      );
+
       const action = keyMap[event.key];
 
-      if (action) {
+      if (shouldDoAction && action) {
         event.preventDefault();
         action(event);
       } else if (event.key === "Tab") {

diff --git a/@navikt/core/react/src/toggle-group/parts/useToggleItem.ts b/@navikt/core/react/src/toggle-group/parts/useToggleItem.ts
@@ -77,9 +77,16 @@ export function useToggleItem<P extends UseToggleItemProps>(
         End: lastTab,
       };
 
+      const shouldDoAction = !(
+        event.shiftKey ||
+        event.ctrlKey ||
+        event.altKey ||
+        event.metaKey
+      );
+
       const action = keyMap[event.key];
 
-      if (action) {
+      if (shouldDoAction && action) {
         event.preventDefault();
         action(event);
       } else if (event.key === "Tab") {