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

Message: Do not allow to select and show context menu on unsent messages

Browse Source
This commit is contained in:
Alexander Zinchuk 2021-07-08 18:00:37 +03:00
parent db57700c68
commit aa3a02a4d5
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/middle/message/Message.tsx
View File

@ -263,6 +263,7 @@ const Message: FC<OwnProps & StateProps & DispatchProps> = ({
const { chatId, id: messageId, threadInfo } = message; const { chatId, id: messageId, threadInfo } = message;
const isLocal = isMessageLocal(message);
const isOwn = isOwnMessage(message); const isOwn = isOwnMessage(message);
const isScheduled = messageListType === 'scheduled' || message.isScheduled; const isScheduled = messageListType === 'scheduled' || message.isScheduled;
const hasReply = isReplyMessage(message) && !shouldHideReply; const hasReply = isReplyMessage(message) && !shouldHideReply;
@ -352,6 +353,10 @@ const Message: FC<OwnProps & StateProps & DispatchProps> = ({
}, [messageId, message.groupedId, toggleMessageSelection]); }, [messageId, message.groupedId, toggleMessageSelection]);
const handleMessageSelect = useCallback((e?: React.MouseEvent<HTMLDivElement, MouseEvent>) => { const handleMessageSelect = useCallback((e?: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
if (isLocal) {
return;
}
const params = isAlbum && album && album.messages const params = isAlbum && album && album.messages
? { ? {
messageId, messageId,
@ -360,7 +365,7 @@ const Message: FC<OwnProps & StateProps & DispatchProps> = ({
} }
: { messageId, withShift: e && e.shiftKey }; : { messageId, withShift: e && e.shiftKey };
toggleMessageSelection(params); toggleMessageSelection(params);
}, [toggleMessageSelection, messageId, isAlbum, album]); }, [isLocal, isAlbum, album, messageId, toggleMessageSelection]);
const handleContainerDoubleClick = useCallback(() => { const handleContainerDoubleClick = useCallback(() => {
setReplyingToId({ messageId }); setReplyingToId({ messageId });
@ -372,7 +377,10 @@ const Message: FC<OwnProps & StateProps & DispatchProps> = ({
const handleMouseDown = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => { const handleMouseDown = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
preventMessageInputBlur(e); preventMessageInputBlur(e);
handleBeforeContextMenu(e);
if (!isLocal) {
handleBeforeContextMenu(e);
}
}; };
const handleAvatarClick = useCallback(() => { const handleAvatarClick = useCallback(() => {
@ -581,7 +589,7 @@ const Message: FC<OwnProps & StateProps & DispatchProps> = ({
sticker={animatedEmoji} sticker={animatedEmoji}
observeIntersection={observeIntersectionForMedia} observeIntersection={observeIntersectionForMedia}
lastSyncTime={lastSyncTime} lastSyncTime={lastSyncTime}
forceLoadPreview={isMessageLocal(message)} forceLoadPreview={isLocal}
/> />
)} )}
{isAlbum && ( {isAlbum && (
@ -760,7 +768,7 @@ const Message: FC<OwnProps & StateProps & DispatchProps> = ({
onClick={isInSelectMode ? handleMessageSelect : IS_ANDROID ? handleClick : undefined} onClick={isInSelectMode ? handleMessageSelect : IS_ANDROID ? handleClick : undefined}
onDoubleClick={!isInSelectMode ? handleContainerDoubleClick : undefined} onDoubleClick={!isInSelectMode ? handleContainerDoubleClick : undefined}
onMouseDown={!isInSelectMode ? handleMouseDown : undefined} onMouseDown={!isInSelectMode ? handleMouseDown : undefined}
onContextMenu={!isInSelectMode ? handleContextMenu : undefined} onContextMenu={!isInSelectMode && !isLocal ? handleContextMenu : undefined}
onMouseEnter={isInDocumentGroup && !isLastInDocumentGroup ? handleDocumentGroupMouseEnter : undefined} onMouseEnter={isInDocumentGroup && !isLastInDocumentGroup ? handleDocumentGroupMouseEnter : undefined}
onMouseLeave={isInDocumentGroup && !isLastInDocumentGroup ? handleDocumentGroupMouseLeave : undefined} onMouseLeave={isInDocumentGroup && !isLastInDocumentGroup ? handleDocumentGroupMouseLeave : undefined}
> >
@ -771,12 +779,12 @@ const Message: FC<OwnProps & StateProps & DispatchProps> = ({
data-last-message-id={album ? album.messages[album.messages.length - 1].id : undefined} data-last-message-id={album ? album.messages[album.messages.length - 1].id : undefined}
data-has-unread-mention={message.hasUnreadMention} data-has-unread-mention={message.hasUnreadMention}
/> />
{!isInDocumentGroup && ( {!isLocal && !isInDocumentGroup && (
<div className="message-select-control"> <div className="message-select-control">
{isSelected && <i className="icon-select" />} {isSelected && <i className="icon-select" />}
</div> </div>
)} )}
{isLastInDocumentGroup && ( {!isLocal && isLastInDocumentGroup && (
<div <div
className={buildClassName('message-select-control group-select', isGroupSelected && 'is-selected')} className={buildClassName('message-select-control group-select', isGroupSelected && 'is-selected')}
onClick={handleGroupDocumentMessagesSelect} onClick={handleGroupDocumentMessagesSelect}