fix: Clean up use hook for select item

Workday · Sep 7, 2023 · 6b41512 · 6b41512
1 parent 2e7d661
commit 6b41512
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/react/select/lib/hooks/useSelectInput.ts b/modules/react/select/lib/hooks/useSelectInput.ts
@@ -98,6 +98,7 @@ export const useSelectInput = composeHooks(
 
         // Prevent the keys from being enter in the input
         event.preventDefault();
+        const keysToOpenSelect = ['Enter', 'Spacebar', 'ArrowUp', 'ArrowDown'];
 
         // Select should open if Enter, ArrowUp, ArrowDown and Spacebar is typed
         if (
@@ -115,7 +116,7 @@ export const useSelectInput = composeHooks(
 
         // If the dropdown is NOT visible and ArrowUp, ArrowDown, Enter and Spacebar is typed, when the dropdown opens
         // it should go to the current selected item in the dropdown.
-        if (event.key === 'Spacebar' || event.key === ' ') {
+        if (keysToOpenSelect.includes(event.key) || event.key === ' ') {
           if (model.state.visibility === 'hidden') {
             model.events.goTo({id: model.state.items[foundIndex].id});
 

diff --git a/modules/react/select/lib/hooks/useSelectItem.tsx b/modules/react/select/lib/hooks/useSelectItem.tsx
@@ -1,10 +1,9 @@
 import {createElemPropsHook} from '@workday/canvas-kit-react/common';
 import {useSelectModel} from './useSelectModel';
-
 /** Adds aria role `option` for the select item and `aria-disabled` if an item is disabled by `nonInteractiveIds` */
 
 export const useSelectItem = createElemPropsHook(useSelectModel)(
-  (_model, _, elemProps: {disabled: boolean | undefined} = {disabled: undefined}) => {
+  (_model, _, elemProps: {disabled?: boolean} = {}) => {
     return {
       role: 'option',
       'aria-disabled': elemProps?.disabled,