Skip to content

Commit 2d9cd7e

Browse files
committed
useKeyDownHandler: update to use isMac() and cherrypick
1 parent c1543fa commit 2d9cd7e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"tsx": "never"
3030
}
3131
],
32+
"import/prefer-default-export": "off",
3233
"react/jsx-filename-extension": [1, { "extensions": [".jsx", ".tsx"] }],
3334
"comma-dangle": 0, // not sure why airbnb turned this on. gross!
3435
"default-param-last": 0,

client/common/useKeyDownHandlers.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { mapKeys } from 'lodash';
2-
import PropTypes from 'prop-types';
32
import { useCallback, useEffect, useRef } from 'react';
3+
import { isMac } from '../utils/device';
44

55
/**
66
* Function to call upon keydown
@@ -36,8 +36,7 @@ export default function useKeyDownHandlers(keyHandlers: KeydownHandlerMap) {
3636
(e: KeyboardEvent) => {
3737
if (!e.key) return;
3838

39-
const isMac = navigator.userAgent.toLowerCase().indexOf('mac') !== -1;
40-
const isCtrl = isMac ? e.metaKey : e.ctrlKey;
39+
const isCtrl = isMac() ? e.metaKey : e.ctrlKey;
4140

4241
if (e.shiftKey && isCtrl) {
4342
handlers.current[

0 commit comments

Comments
 (0)