Hold Shift to delete without confirmation: fixes #537

enricoros · May 13, 2024 · 002df7b · 002df7b
1 parent 564cf0f
commit 002df7b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/apps/chat/components/ChatDrawer.tsx b/src/apps/chat/components/ChatDrawer.tsx
@@ -310,7 +310,7 @@ function ChatDrawer(props: {
  bottomBarBasis={filteredChatsBarBasis}
  onConversationActivate={handleConversationActivate}
  onConversationBranch={onConversationBranch}
- onConversationDelete={handleConversationDeleteNoConfirmation}
+ onConversationDeleteNoConfirmation={handleConversationDeleteNoConfirmation}
  onConversationExport={onConversationsExportDialog}
  onConversationFolderChange={handleConversationFolderChange}
  />

diff --git a/src/apps/chat/components/ChatDrawerItem.tsx b/src/apps/chat/components/ChatDrawerItem.tsx
@@ -42,7 +42,7 @@ export const ChatDrawerItemMemo = React.memo(ChatDrawerItem, (prev, next) =>
  prev.bottomBarBasis === next.bottomBarBasis &&
  prev.onConversationActivate === next.onConversationActivate &&
  prev.onConversationBranch === next.onConversationBranch &&
- prev.onConversationDelete === next.onConversationDelete &&
+ prev.onConversationDeleteNoConfirmation === next.onConversationDeleteNoConfirmation &&
  prev.onConversationExport === next.onConversationExport &&
  prev.onConversationFolderChange === next.onConversationFolderChange,
 );
@@ -76,7 +76,7 @@ function ChatDrawerItem(props: {
  bottomBarBasis: number,
  onConversationActivate: (conversationId: DConversationId, closeMenu: boolean) => void,
  onConversationBranch: (conversationId: DConversationId, messageId: string | null) => void,
- onConversationDelete: (conversationId: DConversationId) => void,
+ onConversationDeleteNoConfirmation: (conversationId: DConversationId) => void,
  onConversationExport: (conversationId: DConversationId, exportAll: boolean) => void,
  onConversationFolderChange: (folderChangeRequest: FolderChangeRequest) => void,
 }) {
@@ -155,17 +155,26 @@ function ChatDrawerItem(props: {
 
  // Delete
 
- const handleDeleteButtonShow = React.useCallback(() => setDeleteArmed(true), []);
+ const { onConversationDeleteNoConfirmation } = props;
+ const handleDeleteButtonShow = React.useCallback((event: React.MouseEvent) => {
+ // special case: if 'Shift' is pressed, delete immediately
+ if (event.shiftKey) {
+ event.stopPropagation();
+ onConversationDeleteNoConfirmation(conversationId);
+ return;
+ }
+ setDeleteArmed(true);
+ }, [conversationId, onConversationDeleteNoConfirmation]);
 
  const handleDeleteButtonHide = React.useCallback(() => setDeleteArmed(false), []);
 
  const handleConversationDelete = React.useCallback((event: React.MouseEvent) => {
  if (deleteArmed) {
  setDeleteArmed(false);
  event.stopPropagation();
- props.onConversationDelete(conversationId);
+ onConversationDeleteNoConfirmation(conversationId);
  }
- }, [conversationId, deleteArmed, props]);
+ }, [conversationId, deleteArmed, onConversationDeleteNoConfirmation]);
 
 
  const textSymbol = SystemPurposes[systemPurposeId]?.symbol || '❓';