Merge branch 'main' into 17523-fix/toast-notifications-bottom-margin

carbon-design-system · Sep 26, 2024 · 3287460 · 3287460
2 parents 512dc17 + 52b7061
commit 3287460
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml
@@ -16,7 +16,7 @@ jobs:
           (github.event.comment.body == 'recheck' || github.event.comment.body
           == 'I have read the DCO document and I hereby sign the DCO.') ||
           github.event_name == 'pull_request_target'
-        uses: cla-assistant/github-action@f41946747f85d28e9a738f4f38dbcc74b69c7e0e # v2.5.1
+        uses: cla-assistant/github-action@b1522fa982419e79591a92e1267de463a281cdb7 # v2.6.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}

diff --git a/packages/react/src/components/Menu/Menu.tsx b/packages/react/src/components/Menu/Menu.tsx
@@ -237,7 +237,6 @@ const Menu = forwardRef<HTMLUListElement, MenuProps>(function Menu(
   }
 
   function focusItem(e?: React.KeyboardEvent<HTMLUListElement>) {
-    e?.preventDefault();
     const currentItem = focusableItems.findIndex((item) =>
       item.ref?.current?.contains(document.activeElement)
     );
@@ -266,6 +265,7 @@ const Menu = forwardRef<HTMLUListElement, MenuProps>(function Menu(
     if (indexToFocus !== currentItem) {
       const nodeToFocus = focusableItems[indexToFocus];
       nodeToFocus.ref?.current?.focus();
+      e?.preventDefault();
     }
   }