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

Merge https://github.com/signalapp/Signal-Desktop/pull/5842

Browse source
This commit is contained in:
Fedor Indutnyy 2022-04-06 10:24:56 -07:00
commit 3c6d50f351
6 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ts/components/LeftPane.tsx
View file

@ -30,6 +30,7 @@ import { usePrevious } from '../hooks/usePrevious';
import { missingCaseError } from '../util/missingCaseError';
import type { WidthBreakpoint } from './_util';
import { getConversationListWidthBreakpoint } from './_util';
import * as KeyboardLayout from '../services/keyboardLayout';
import {
MIN_WIDTH,
SNAP_WIDTH,
@ -292,10 +293,11 @@ export const LeftPane: React.FC<PropsType> = ({
useEffect(() => {
const onKeyDown = (event: KeyboardEvent) => {
const { ctrlKey, shiftKey, altKey, metaKey, key } = event;
const { ctrlKey, shiftKey, altKey, metaKey } = event;
const commandOrCtrl = OS.isMacOS() ? metaKey : ctrlKey;
const key = KeyboardLayout.lookup(event);
if (event.key === 'Escape') {
if (key === 'Escape') {
const backAction = helper.getBackAction({
showInbox,
startComposing,