Minor refactoring to move repeated code into utility class

2 files changed, 11 insertions, 5 deletions

diff --git a/src/components/ui/input/index.tsx b/src/components/ui/input/index.tsx
index 225517ba8..7e3179baf 100644
--- a/src/components/ui/input/index.tsx
+++ b/src/components/ui/input/index.tsx
@@ -16,6 +16,7 @@ import {
   injectIntl,
 } from 'react-intl';
 import withStyles, { type WithStylesProps } from 'react-jss';
+import { isEnterKeyPress } from '../../../jsUtils';
 // biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
 import Error from '../error';
 import Icon from '../icon';
@@ -96,7 +97,7 @@ class Input extends Component<IProps, IState> {
   }
 
   onInputKeyPress(e: KeyboardEvent<HTMLInputElement>): void {
-    if (e.key === 'Enter') {
+    if (isEnterKeyPress(e.key)) {
       const { onEnterKey = noop } = this.props;
       onEnterKey();
     }
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx
index 397fd97ed..c19c12417 100644
--- a/src/components/ui/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -13,6 +13,11 @@ import {
   createRef,
 } from 'react';
 import withStyles, { type WithStylesProps } from 'react-jss';
+import {
+  isArrowDownKeyPress,
+  isArrowUpKeyPress,
+  isEnterKeyPress,
+} from '../../../jsUtils';
 import type { Theme } from '../../../themes';
 // biome-ignore lint/suspicious/noShadowRestrictedNames: <explanation>
 import Error from '../error';
@@ -288,23 +293,23 @@ class SelectComponent extends Component<IProps, IState> {
 
     if (!open) return;
 
-    if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
+    if (isArrowUpKeyPress(e.key) || isArrowDownKeyPress(e.key)) {
       e.preventDefault();
     }
 
     if (this.componentRef?.current) {
-      if (e.key === 'ArrowUp' && selected > 0) {
+      if (isArrowUpKeyPress(e.key) && selected > 0) {
         this.setState((state: IState) => ({
           selected: state.selected - 1,
         }));
       } else if (
-        e.key === 'ArrowDown' &&
+        isArrowDownKeyPress(e.key) &&
         selected < Object.keys(options!).length - 1
       ) {
         this.setState((state: IState) => ({
           selected: state.selected + 1,
         }));
-      } else if (e.key === 'Enter') {
+      } else if (isEnterKeyPress(e.key)) {
         this.select(Object.keys(options!)[selected]);
       }