mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

macOS shortcuts: Only listen for command key, not control key

Browse source
This commit is contained in:
Scott Nonnenberg 2019-12-17 10:52:36 -08:00 • committed by Ken Powers
parent d86e8ef7ec
commit 2c7baad68d
10 changed files with 59 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ts/components/SearchResults.tsx
View file

@ -5,7 +5,7 @@ import {
CellMeasurerCache,
List,
} from 'react-virtualized';
import { debounce, isNumber } from 'lodash';
import { debounce, get, isNumber } from 'lodash';
import { Intl } from './Intl';
import { Emojify } from './conversation/Emojify';
@ -136,7 +136,9 @@ export class SearchResults extends React.Component<PropsType, StateType> {
public handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
const { items } = this.props;
const commandOrCtrl = event.metaKey || event.ctrlKey;
const commandKey = get(window, 'platform') === 'darwin' && event.metaKey;
const controlKey = get(window, 'platform') !== 'darwin' && event.ctrlKey;
const commandOrCtrl = commandKey || controlKey;
if (!items || items.length < 1) {
return;