colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge signalapp/Signal-Desktop#6724

Browse Source
This commit is contained in:
trevor-signal
2023-12-22 16:06:29 -05:00
parent 844613272c 2ff0d87309
commit 23f39a0dc7
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ts/components/Lightbox.tsx
View File

@@ -26,6 +26,7 @@ import { isGIF } from '../types/Attachment';
import { useRestoreFocus } from '../hooks/useRestoreFocus'; import { useRestoreFocus } from '../hooks/useRestoreFocus';
import { usePrevious } from '../hooks/usePrevious'; import { usePrevious } from '../hooks/usePrevious';
import { arrow } from '../util/keyboard'; import { arrow } from '../util/keyboard';
import { isCmdOrCtrl } from '../hooks/useKeyboardShortcuts';
export type PropsType = { export type PropsType = {
children?: ReactNode; children?: ReactNode;
@@ -160,21 +161,24 @@ export function Lightbox({
setVideoTime(videoElement.currentTime); setVideoTime(videoElement.currentTime);
}, [setVideoTime, videoElement]); }, [setVideoTime, videoElement]);
const handleSave = ( const handleSave = useCallback(
event: React.MouseEvent<HTMLButtonElement, MouseEvent> (
) => { event: KeyboardEvent | React.MouseEvent<HTMLButtonElement, MouseEvent>
if (isViewOnce) { ) => {
return; if (isViewOnce) {
} return;
}
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
const mediaItem = media[selectedIndex]; const mediaItem = media[selectedIndex];
const { attachment, message, index } = mediaItem; const { attachment, message, index } = mediaItem;
saveAttachment(attachment, message.sent_at, index + 1); saveAttachment(attachment, message.sent_at, index + 1);
}; },
[isViewOnce, media, saveAttachment, selectedIndex]
);
const handleForward = ( const handleForward = (
event: React.MouseEvent<HTMLButtonElement, MouseEvent> event: React.MouseEvent<HTMLButtonElement, MouseEvent>
@@ -211,10 +215,16 @@ export function Lightbox({
onNext(event); onNext(event);
break; break;
case 's':
if (isCmdOrCtrl(event)) {
handleSave(event);
}
break;
default: default:
} }
}, },
[closeLightbox, onNext, onPrevious] [closeLightbox, onNext, onPrevious, handleSave]
); );
const onClose = (event: React.MouseEvent<HTMLElement>) => { const onClose = (event: React.MouseEvent<HTMLElement>) => {

2
ts/hooks/useKeyboardShortcuts.tsx
View File

@@ -14,7 +14,7 @@ import type { ContextMenuTriggerType } from '../components/conversation/MessageC
type KeyboardShortcutHandlerType = (ev: KeyboardEvent) => boolean; type KeyboardShortcutHandlerType = (ev: KeyboardEvent) => boolean;
function isCmdOrCtrl(ev: KeyboardEvent): boolean { export function isCmdOrCtrl(ev: KeyboardEvent): boolean {
const { ctrlKey, metaKey } = ev; const { ctrlKey, metaKey } = ev;
const commandKey = get(window, 'platform') === 'darwin' && metaKey; const commandKey = get(window, 'platform') === 'darwin' && metaKey;
const controlKey = get(window, 'platform') !== 'darwin' && ctrlKey; const controlKey = get(window, 'platform') !== 'darwin' && ctrlKey;