From 1e822ea234e05e30f0b456f022ef6f0be7cba14d Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Wed, 27 Nov 2024 20:33:20 +0400 Subject: [PATCH] Edit Message: Refactoring (#5172) --- src/components/common/Composer.tsx | 6 +++--- src/components/middle/composer/AttachMenu.tsx | 8 ++++---- src/global/helpers/messageMedia.ts | 8 +++----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/components/common/Composer.tsx b/src/components/common/Composer.tsx index dcca9a3d0..b282e3bf4 100644 --- a/src/components/common/Composer.tsx +++ b/src/components/common/Composer.tsx @@ -48,10 +48,10 @@ import { } from '../../config'; import { requestMeasure, requestNextMutation } from '../../lib/fasterdom/fasterdom'; import { + canEditMedia, getAllowedAttachmentOptions, getReactionKey, getStoryKey, - hasReplaceableMedia, isChatAdmin, isChatChannel, isChatSuperGroup, @@ -433,7 +433,7 @@ const Composer: FC = ({ const [isInputHasFocus, markInputHasFocus, unmarkInputHasFocus] = useFlag(); const [isAttachMenuOpen, onAttachMenuOpen, onAttachMenuClose] = useFlag(); - const canMediaBeReplaced = editingMessage && hasReplaceableMedia(editingMessage); + const canMediaBeReplaced = editingMessage && canEditMedia(editingMessage); const { emojiSet, members: groupChatMembers, botCommands: chatBotCommands } = chatFullInfo || {}; const chatEmojiSetId = emojiSet?.id; @@ -1890,7 +1890,7 @@ const Composer: FC = ({ chatId={chatId} threadId={threadId} editingMessage={editingMessage} - hasReplaceableMedia={canMediaBeReplaced} + canEditMedia={canMediaBeReplaced} isButtonVisible={!activeVoiceRecording} canAttachMedia={canAttachMedia} canAttachPolls={canAttachPolls} diff --git a/src/components/middle/composer/AttachMenu.tsx b/src/components/middle/composer/AttachMenu.tsx index b7b8fdaec..86f9c006d 100644 --- a/src/components/middle/composer/AttachMenu.tsx +++ b/src/components/middle/composer/AttachMenu.tsx @@ -57,7 +57,7 @@ export type OwnProps = { onPollCreate: NoneToVoidFunction; onMenuOpen: NoneToVoidFunction; onMenuClose: NoneToVoidFunction; - hasReplaceableMedia?: boolean; + canEditMedia?: boolean; editingMessage?: ApiMessage; }; @@ -80,7 +80,7 @@ const AttachMenu: FC = ({ onMenuOpen, onMenuClose, onPollCreate, - hasReplaceableMedia, + canEditMedia, editingMessage, }) => { const [isAttachMenuOpen, openAttachMenu, closeAttachMenu] = useFlag(); @@ -171,7 +171,7 @@ const AttachMenu: FC = ({ return (
{ - editingMessage && hasReplaceableMedia ? ( + editingMessage && canEditMedia ? ( = ({ {lang('Poll')} )} - {!editingMessage && !hasReplaceableMedia && !isScheduled && bots?.map((bot) => ( + {!editingMessage && !canEditMedia && !isScheduled && bots?.map((bot) => (