From 45274d9dff49b49b2b6b2acfe890821b74667fbc Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Fri, 5 Jan 2024 09:18:30 +0000
Subject: [PATCH] Merge pull request #16380 from overleaf/mj-select-keyboard

[web] Allow keyboard interactions with custom select component

GitOrigin-RevId: 81adea8e456bd6ce2483dfa17a352c24c36e5768
---
 .../frontend/js/shared/components/select.tsx  | 21 +++++++++++++++++--
 .../components/shared/select.spec.tsx         |  9 ++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/services/web/frontend/js/shared/components/select.tsx b/services/web/frontend/js/shared/components/select.tsx
index eb7c453099..271896a34e 100644
--- a/services/web/frontend/js/shared/components/select.tsx
+++ b/services/web/frontend/js/shared/components/select.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable jsx-a11y/label-has-for */
 /* eslint-disable jsx-a11y/label-has-associated-control */
-import { useRef, useEffect } from 'react'
+import { useRef, useEffect, KeyboardEventHandler, useCallback } from 'react'
 import classNames from 'classnames'
 import { useSelect } from 'downshift'
 import Icon from './icon'
@@ -59,6 +59,7 @@ export const Select = <T,>({
     getMenuProps,
     getItemProps,
     highlightedIndex,
+    openMenu,
   } = useSelect({
     items: items ?? [],
     itemToString,
@@ -91,6 +92,17 @@ export const Select = <T,>({
     }
   }, [name, itemToString, selectedItem, defaultItem])
 
+  const onKeyDown: KeyboardEventHandler<HTMLButtonElement> = useCallback(
+    event => {
+      if (event.key === 'Enter' && !isOpen) {
+        event.preventDefault()
+        ;(event.nativeEvent as any).preventDownshiftDefault = true
+        openMenu()
+      }
+    },
+    [isOpen, openMenu]
+  )
+
   let value: string | undefined
   if (selectedItem || defaultItem) {
     value = itemToString(selectedItem || defaultItem)
@@ -113,7 +125,12 @@ export const Select = <T,>({
         ) : null}
         <div
           className={classNames({ disabled }, 'select-trigger')}
-          {...getToggleButtonProps({ disabled })}
+          // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
+          tabIndex={0}
+          {...getToggleButtonProps({
+            disabled,
+            onKeyDown,
+          })}
         >
           <div>{value}</div>
           <div>
diff --git a/services/web/test/frontend/components/shared/select.spec.tsx b/services/web/test/frontend/components/shared/select.spec.tsx
index 15fa53590d..7231a1bd11 100644
--- a/services/web/test/frontend/components/shared/select.spec.tsx
+++ b/services/web/test/frontend/components/shared/select.spec.tsx
@@ -266,4 +266,13 @@ describe('<Select />', function () {
       })
     })
   })
+
+  describe('keyboard navigation', function () {
+    it('can select an item using the keyboard', function () {
+      render({ defaultText: 'Choose an item' })
+      cy.findByText('Choose an item').type('{Enter}{downArrow}{Enter}')
+      cy.findByText('Demo item 1').should('exist')
+      cy.findByText('Demo item 2').should('not.exist')
+    })
+  })
 })