ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Edit Message: Refactoring (#5172)

Browse Source
This commit is contained in:
Alexander Zinchuk 2024-11-27 20:33:20 +04:00
parent e62e78f968
commit 1e822ea234
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/common/Composer.tsx
View File

@ -48,10 +48,10 @@ import {
} from '../../config'; } from '../../config';
import { requestMeasure, requestNextMutation } from '../../lib/fasterdom/fasterdom'; import { requestMeasure, requestNextMutation } from '../../lib/fasterdom/fasterdom';
import { import {
canEditMedia,
getAllowedAttachmentOptions, getAllowedAttachmentOptions,
getReactionKey, getReactionKey,
getStoryKey, getStoryKey,
hasReplaceableMedia,
isChatAdmin, isChatAdmin,
isChatChannel, isChatChannel,
isChatSuperGroup, isChatSuperGroup,
@ -433,7 +433,7 @@ const Composer: FC<OwnProps & StateProps> = ({
const [isInputHasFocus, markInputHasFocus, unmarkInputHasFocus] = useFlag(); const [isInputHasFocus, markInputHasFocus, unmarkInputHasFocus] = useFlag();
const [isAttachMenuOpen, onAttachMenuOpen, onAttachMenuClose] = useFlag(); const [isAttachMenuOpen, onAttachMenuOpen, onAttachMenuClose] = useFlag();
const canMediaBeReplaced = editingMessage && hasReplaceableMedia(editingMessage); const canMediaBeReplaced = editingMessage && canEditMedia(editingMessage);
const { emojiSet, members: groupChatMembers, botCommands: chatBotCommands } = chatFullInfo || {}; const { emojiSet, members: groupChatMembers, botCommands: chatBotCommands } = chatFullInfo || {};
const chatEmojiSetId = emojiSet?.id; const chatEmojiSetId = emojiSet?.id;
@ -1890,7 +1890,7 @@ const Composer: FC<OwnProps & StateProps> = ({
chatId={chatId} chatId={chatId}
threadId={threadId} threadId={threadId}
editingMessage={editingMessage} editingMessage={editingMessage}
hasReplaceableMedia={canMediaBeReplaced} canEditMedia={canMediaBeReplaced}
isButtonVisible={!activeVoiceRecording} isButtonVisible={!activeVoiceRecording}
canAttachMedia={canAttachMedia} canAttachMedia={canAttachMedia}
canAttachPolls={canAttachPolls} canAttachPolls={canAttachPolls}

8
src/components/middle/composer/AttachMenu.tsx
View File

@ -57,7 +57,7 @@ export type OwnProps = {
onPollCreate: NoneToVoidFunction; onPollCreate: NoneToVoidFunction;
onMenuOpen: NoneToVoidFunction; onMenuOpen: NoneToVoidFunction;
onMenuClose: NoneToVoidFunction; onMenuClose: NoneToVoidFunction;
hasReplaceableMedia?: boolean; canEditMedia?: boolean;
editingMessage?: ApiMessage; editingMessage?: ApiMessage;
}; };
@ -80,7 +80,7 @@ const AttachMenu: FC<OwnProps> = ({
onMenuOpen, onMenuOpen,
onMenuClose, onMenuClose,
onPollCreate, onPollCreate,
hasReplaceableMedia, canEditMedia,
editingMessage, editingMessage,
}) => { }) => {
const [isAttachMenuOpen, openAttachMenu, closeAttachMenu] = useFlag(); const [isAttachMenuOpen, openAttachMenu, closeAttachMenu] = useFlag();
@ -171,7 +171,7 @@ const AttachMenu: FC<OwnProps> = ({
return ( return (
<div className="AttachMenu"> <div className="AttachMenu">
{ {
editingMessage && hasReplaceableMedia ? ( editingMessage && canEditMedia ? (
<ResponsiveHoverButton <ResponsiveHoverButton
id="replace-menu-button" id="replace-menu-button"
className={isAttachMenuOpen ? 'AttachMenu--button activated' : 'AttachMenu--button'} className={isAttachMenuOpen ? 'AttachMenu--button activated' : 'AttachMenu--button'}
@ -246,7 +246,7 @@ const AttachMenu: FC<OwnProps> = ({
<MenuItem icon="poll" onClick={onPollCreate}>{lang('Poll')}</MenuItem> <MenuItem icon="poll" onClick={onPollCreate}>{lang('Poll')}</MenuItem>
)} )}
{!editingMessage && !hasReplaceableMedia && !isScheduled && bots?.map((bot) => ( {!editingMessage && !canEditMedia && !isScheduled && bots?.map((bot) => (
<AttachBotItem <AttachBotItem
bot={bot} bot={bot}
chatId={chatId} chatId={chatId}

8
src/global/helpers/messageMedia.ts
View File

@ -57,14 +57,12 @@ export function hasMessageMedia(message: MediaContainer) {
)); ));
} }
export function hasReplaceableMedia(message: MediaContainer) { export function canEditMedia(message: MediaContainer) {
const { const {
text, photo, video, audio, document, photo, video, altVideos, audio, document, text, webPage, ...otherMedia
} = message.content; } = message.content;
if (getMessageVoice(message)) return false; return !video?.isRound && !Object.keys(otherMedia).length;
return Boolean(text || photo || (video && !video.isGif) || audio || document);
} }
export function getMessagePhoto(message: MediaContainer) { export function getMessagePhoto(message: MediaContainer) {