Keys.isKeyboardClick

it's like a method on a java enum!
palantir · Nov 30, 2018 · 5b1bcf3 · 5b1bcf3
1 parent 9026515
commit 5b1bcf3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/packages/core/src/common/keys.ts b/packages/core/src/common/keys.ts
@@ -15,3 +15,8 @@ export const ARROW_UP = 38;
 export const ARROW_RIGHT = 39;
 export const ARROW_DOWN = 40;
 export const DELETE = 46;
+
+/** Returns whether the key code is `enter` or `space`, the two keys that can click a button. */
+export function isKeyboardClick(keyCode: number) {
+    return keyCode === ENTER || keyCode === SPACE;
+}
diff --git a/packages/core/src/components/button/abstractButton.tsx b/packages/core/src/components/button/abstractButton.tsx
@@ -125,7 +125,7 @@ export abstract class AbstractButton<H extends React.HTMLAttributes<any>> extend
     // argument because it is not a supertype of candidate
     // 'KeyboardEvent<HTMLElement>'."
     protected handleKeyDown = (e: React.KeyboardEvent<any>) => {
-        if (isKeyboardClick(e.which)) {
+        if (Keys.isKeyboardClick(e.which)) {
             e.preventDefault();
             if (e.which !== this.currentKeyDown) {
                 this.setState({ isActive: true });
@@ -136,7 +136,7 @@ export abstract class AbstractButton<H extends React.HTMLAttributes<any>> extend
     };
 
     protected handleKeyUp = (e: React.KeyboardEvent<any>) => {
-        if (isKeyboardClick(e.which)) {
+        if (Keys.isKeyboardClick(e.which)) {
             this.setState({ isActive: false });
             this.buttonRef.click();
         }
@@ -159,7 +159,3 @@ export abstract class AbstractButton<H extends React.HTMLAttributes<any>> extend
         ];
     }
 }
-
-function isKeyboardClick(keyCode: number) {
-    return keyCode === Keys.ENTER || keyCode === Keys.SPACE;
-}
diff --git a/packages/core/src/components/forms/numericInput.tsx b/packages/core/src/components/forms/numericInput.tsx
@@ -432,7 +432,7 @@ export class NumericInput extends AbstractPureComponent<HTMLInputProps & INumeri
         // respond explicitly on key *up*, because onKeyDown triggers multiple
         // times and doesn't always receive modifier-key flags, leading to an
         // unintuitive/out-of-control incrementing experience.
-        if (e.keyCode === Keys.SPACE || e.keyCode === Keys.ENTER) {
+        if (Keys.isKeyboardClick(e.keyCode)) {
             // prevent the page from scrolling (this is the default browser
             // behavior for shift + space or alt + space).
             e.preventDefault();

diff --git a/packages/core/src/components/tabs/tabs.tsx b/packages/core/src/components/tabs/tabs.tsx
@@ -236,7 +236,7 @@ export class Tabs extends AbstractPureComponent<ITabsProps, ITabsState> {
 
     private handleKeyPress = (e: React.KeyboardEvent<HTMLDivElement>) => {
         const targetTabElement = (e.target as HTMLElement).closest(TAB_SELECTOR) as HTMLElement;
-        if (targetTabElement != null && isEventKeyCode(e, Keys.SPACE, Keys.ENTER)) {
+        if (targetTabElement != null && Keys.isKeyboardClick(e.keyCode)) {
             e.preventDefault();
             targetTabElement.click();
         }