From 9415e0da19cf055270acbfa9964aa09899bb15b0 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Wed, 2 Feb 2022 22:48:40 +0100 Subject: [PATCH] Global Search: Allow adding to folders from chat results --- src/components/left/search/LeftSearchResultChat.tsx | 8 ++++++-- src/hooks/useChatContextActions.ts | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/components/left/search/LeftSearchResultChat.tsx b/src/components/left/search/LeftSearchResultChat.tsx index 4389e563f..cb2cec826 100644 --- a/src/components/left/search/LeftSearchResultChat.tsx +++ b/src/components/left/search/LeftSearchResultChat.tsx @@ -30,16 +30,18 @@ type StateProps = { user?: ApiUser; isPinned?: boolean; isMuted?: boolean; + canChangeFolder?: boolean; }; const LeftSearchResultChat: FC = ({ chatId, + withUsername, + onClick, chat, user, isPinned, isMuted, - withUsername, - onClick, + canChangeFolder, }) => { const [isDeleteModalOpen, openDeleteModal, closeDeleteModal] = useFlag(); const [isChatFolderModalOpen, openChatFolderModal, closeChatFolderModal] = useFlag(); @@ -49,6 +51,7 @@ const LeftSearchResultChat: FC = ({ user, isPinned, isMuted, + canChangeFolder, handleDelete: openDeleteModal, handleChatFolderChange: openChatFolderModal, }, true); @@ -104,6 +107,7 @@ export default memo(withGlobal( user, isPinned, isMuted, + canChangeFolder: Boolean(global.chatFolders.orderedIds?.length), }; }, )(LeftSearchResultChat)); diff --git a/src/hooks/useChatContextActions.ts b/src/hooks/useChatContextActions.ts index c5f2ec20a..fc247a038 100644 --- a/src/hooks/useChatContextActions.ts +++ b/src/hooks/useChatContextActions.ts @@ -12,21 +12,21 @@ import useLang from './useLang'; const useChatContextActions = ({ chat, user, - handleDelete, - handleChatFolderChange, folderId, isPinned, isMuted, canChangeFolder, + handleDelete, + handleChatFolderChange, }: { chat: ApiChat | undefined; user: ApiUser | undefined; - handleDelete: () => void; - handleChatFolderChange: () => void; folderId?: number; isPinned?: boolean; isMuted?: boolean; canChangeFolder?: boolean; + handleDelete: () => void; + handleChatFolderChange: () => void; }, isInSearch = false) => { const lang = useLang();