rust/forkmessager
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 3 Releases Wiki Activity

Фикс чата

Browse Source
This commit is contained in:
Халимов Рустам
2026-03-20 01:40:02 +03:00
parent 473e9bcef6
commit f3e0941647
3 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client-web/src/modules/chats/presentation/components/ChatView.tsx
View File

@@ -200,9 +200,21 @@ export default function ChatView({ onStartCall, onStartGroupCall }: { onStartCal
container.scrollTop = targetEl.offsetTop - 60;
} else {
container.scrollTop = container.scrollHeight;
requestAnimationFrame(() => {
if (container) container.scrollTop = container.scrollHeight;
});
setTimeout(() => {
if (container) container.scrollTop = container.scrollHeight;
}, 100);
}
} else {
container.scrollTop = container.scrollHeight;
requestAnimationFrame(() => {
if (container) container.scrollTop = container.scrollHeight;
});
setTimeout(() => {
if (container) container.scrollTop = container.scrollHeight;
}, 100);
}
setScrollReady(true);
}

19
client-web/src/modules/chats/presentation/components/MessageBubble.tsx
View File

@@ -407,13 +407,18 @@ function MessageBubble({
</button>
)}
{(() => {
const hasReactions = Object.keys(reactionGroups).length > 0;
const needsFrame = !!message.content || !!message.forwardedFrom || !!message.replyTo || hasReactions;
return (
<div
id={`msg-${message.id}`}
onContextMenu={handleContextMenu}
onDoubleClick={handleReply}
title={t('reply') ? `${t('reply')} (Double Click)` : 'Double click to reply'}
className={`cursor-pointer max-w-full min-w-0 rounded-[1.25rem] overflow-hidden transition-all duration-300 ${
hasImage && !message.content && !message.forwardedFrom && !message.replyTo
hasImage && !needsFrame
? 'p-0 shadow-none border-none'
: isMine
? 'bubble-sent text-white shadow-sm px-3.5 py-2 hover:shadow-md hover:brightness-105 rounded-br-sm'
@@ -538,11 +543,11 @@ function MessageBubble({
return (
<div className={`
${(message.content || message.forwardedFrom) ? '-mx-4' : ''}
${(message.content || message.forwardedFrom) ? (message.forwardedFrom ? 'mt-2' : '-mt-2.5') : ''}
${(message.content || message.forwardedFrom) ? (message.content ? 'mb-2' : '-mb-2.5') : ''}
${isSingleGif && !(message.content || message.forwardedFrom) ? 'max-w-[260px] rounded-[1.25rem]' : ''}
${isSingleGif && (message.content || message.forwardedFrom) ? 'max-h-[260px] mx-auto' : ''}
${needsFrame ? '-mx-4' : ''}
${needsFrame ? (message.forwardedFrom ? 'mt-2' : '-mt-2.5') : ''}
${needsFrame ? (message.content ? 'mb-2' : '-mb-2.5') : ''}
${isSingleGif && !needsFrame ? 'max-w-[260px] rounded-[1.25rem]' : ''}
${isSingleGif && needsFrame ? 'max-h-[260px] mx-auto' : ''}
bg-black/20 overflow-hidden relative
`}>
<div className={`grid gap-[2px] ${galleryMedia.length >= 3
@@ -827,6 +832,8 @@ function MessageBubble({
</div>
)}
</div>
);
})()}
</div>
{isMine && (