Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add keyboard shortcuts to modals #2977

Merged
merged 10 commits into from
Mar 28, 2024
Merged

Add keyboard shortcuts to modals #2977

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2274667
feat: make delete and backspace keys work the same as delete button
ianmacd May 5, 2022
9b79080
fix: enable use of escape on modals
KeeJef Mar 21, 2024
93211b1
fix: add checks to deal with non server deletable messages
Bilb Mar 25, 2024
40a1bb4
feat: add focustrap for dialog and focus-within for buttons
Bilb Mar 26, 2024
3214786
fix: wrap radiobutton in buttons to focus is visible
Bilb Mar 26, 2024
ce1dfd2
fix: tab navigation in modals
Bilb Mar 26, 2024
dca7469
fix: add focus trap to the selectionoverlay too
Bilb Mar 27, 2024
f7d574c
Merge remote-tracking branch 'oxen/unstable' into delete-and-backspace
Bilb Mar 27, 2024
a52ed64
fix: no need to handle Delete key in convo now
Bilb Mar 27, 2024
d267e7c
fix: minor ui fixes
Bilb Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ts/components/conversation/SessionConversation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ import { isAudio } from '../../types/MIME';
import { HTMLDirection } from '../../util/i18n';
import { NoticeBanner } from '../NoticeBanner';
import { SessionSpinner } from '../basic/SessionSpinner';
import { deleteMessagesByIdForEveryone } from '../../interactions/conversations/unsendingInteractions';
import { RightPanel, StyledRightPanelContainer } from './right-panel/RightPanel';

const DEFAULT_JPEG_QUALITY = 0.85;

interface State {
isDraggingFile: boolean;
}
Expand Down Expand Up @@ -353,6 +353,15 @@ export class SessionConversation extends React.Component<Props, State> {
window.inboxStore?.dispatch(resetSelectedMessageIds());
}
break;
case 'Backspace':
case 'Delete':
if (selectionMode) {
void deleteMessagesByIdForEveryone(
Bilb marked this conversation as resolved.
Show resolved Hide resolved
this.props.selectedMessages,
this.props.selectedConversationKey
);
}
break;
default:
}
}
Expand Down
9 changes: 9 additions & 0 deletions ts/components/dialog/SessionConfirm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { shell } from 'electron';
import React, { Dispatch, useEffect, useState } from 'react';
import { useDispatch } from 'react-redux';
import styled from 'styled-components';
import useKey from 'react-use/lib/useKey';
import { useLastMessage } from '../../hooks/useParamSelector';
import { MessageInteraction } from '../../interactions';
import {
Expand Down Expand Up @@ -119,6 +120,14 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
}
};

useKey('Enter', () => {
void onClickOkHandler();
});

useKey('Escape', () => {
onClickCancelHandler();
});

useEffect(() => {
if (isLoading) {
if (conversationId && lastMessage?.interactionType) {
Expand Down
Loading