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

Disable emoji and sticker pickers if conversation has open panels

Browse source
This commit is contained in:
Scott Nonnenberg 2019-11-14 18:28:37 -08:00
parent 01bf53776b
commit 0512d08d61
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ts/components/emoji/EmojiButton.tsx
View file

@ -88,6 +88,12 @@ export const EmojiButton = React.memo(
const { ctrlKey, key, metaKey, shiftKey } = event; const { ctrlKey, key, metaKey, shiftKey } = event;
const ctrlOrCommand = metaKey || ctrlKey; const ctrlOrCommand = metaKey || ctrlKey;
// We don't want to open up if the conversation has any panels open
const panels = document.querySelectorAll('.conversation .panel');
if (panels && panels.length > 1) {
return;
}
if (ctrlOrCommand && shiftKey && (key === 'e' || key === 'E')) { if (ctrlOrCommand && shiftKey && (key === 'e' || key === 'E')) {
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();

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

@ -154,6 +154,12 @@ export const StickerButton = React.memo(
const { ctrlKey, key, metaKey, shiftKey } = event; const { ctrlKey, key, metaKey, shiftKey } = event;
const ctrlOrCommand = metaKey || ctrlKey; const ctrlOrCommand = metaKey || ctrlKey;
// We don't want to open up if the conversation has any panels open
const panels = document.querySelectorAll('.conversation .panel');
if (panels && panels.length > 1) {
return;
}
if (ctrlOrCommand && shiftKey && (key === 's' || key === 'S')) { if (ctrlOrCommand && shiftKey && (key === 's' || key === 'S')) {
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();