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

8
ts/components/stickers/StickerButton.tsx
View file

@ -1,6 +1,6 @@
import * as React from 'react';
import classNames from 'classnames';
import { noop } from 'lodash';
import { get, noop } from 'lodash';
import { Manager, Popper, Reference } from 'react-popper';
import { createPortal } from 'react-dom';
import { StickerPicker } from './StickerPicker';
@ -152,7 +152,9 @@ export const StickerButton = React.memo(
() => {
const handleKeydown = (event: KeyboardEvent) => {
const { ctrlKey, key, metaKey, shiftKey } = event;
const ctrlOrCommand = metaKey || ctrlKey;
const commandKey = get(window, 'platform') === 'darwin' && metaKey;
const controlKey = get(window, 'platform') !== 'darwin' && ctrlKey;
const commandOrCtrl = commandKey || controlKey;
// We don't want to open up if the conversation has any panels open
const panels = document.querySelectorAll('.conversation .panel');
@ -160,7 +162,7 @@ export const StickerButton = React.memo(
return;
}
if (ctrlOrCommand && shiftKey && (key === 's' || key === 'S')) {
if (commandOrCtrl && shiftKey && (key === 's' || key === 'S')) {
event.stopPropagation();
event.preventDefault();