From 653dfb08d0fed5e5bc1cc11833b450b69e2ebbd8 Mon Sep 17 00:00:00 2001 From: Cole Bemis Date: Wed, 14 Jun 2023 23:39:44 -0700 Subject: [PATCH 1/2] Ignore cmd/alt+arrow key events --- src/TreeView/TreeView.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/TreeView/TreeView.tsx b/src/TreeView/TreeView.tsx index 0819c335c56..c9e7f1005d3 100644 --- a/src/TreeView/TreeView.tsx +++ b/src/TreeView/TreeView.tsx @@ -397,11 +397,15 @@ const Item = React.forwardRef( } break case 'ArrowRight': + // Ignore if modifier keys are pressed + if (event.altKey || event.metaKey) return event.preventDefault() event.stopPropagation() setIsExpandedWithCache(true) break case 'ArrowLeft': + // Ignore if modifier keys are pressed + if (event.altKey || event.metaKey) return event.preventDefault() event.stopPropagation() setIsExpandedWithCache(false) From bdcc3fa6e28aa88acc19a6981932876a5029f10e Mon Sep 17 00:00:00 2001 From: Cole Bemis Date: Wed, 14 Jun 2023 23:42:56 -0700 Subject: [PATCH 2/2] Create polite-kings-rhyme.md --- .changeset/polite-kings-rhyme.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/polite-kings-rhyme.md diff --git a/.changeset/polite-kings-rhyme.md b/.changeset/polite-kings-rhyme.md new file mode 100644 index 00000000000..24f914d214d --- /dev/null +++ b/.changeset/polite-kings-rhyme.md @@ -0,0 +1,5 @@ +--- +"@primer/react": patch +--- + +TreeView: Ignore arrow key events when combined with cmd or alt keys to avoid interfering with native browser shortcuts.