Skip to content

Стабілізував перемикання між особистими діалогами #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yaro-PY merged 1 commit into from
May 11, 2026
Merged

Стабілізував перемикання між особистими діалогами #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 41 additions & 39 deletions apps/frontend/src/pages/MessagesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,11 @@ export default function MessagesPage() {
className={`messages-dialog-item${
dialog.id === selectedDialogId ? ' active' : ''
}`}
onClick={() => setSelectedDialogId(dialog.id)}
onClick={() => {
if (dialog.id !== selectedDialogId) {
setSelectedDialogId(dialog.id);
}
}}
>
<span className="messages-dialog-avatar" aria-hidden>
{initialsFromName(dialog.otherUser.fullName)}
Expand Down Expand Up @@ -1581,44 +1585,42 @@ export default function MessagesPage() {
</div>
</header>

{dialogMessagesLoading ? (
<QuietLoadingInline label={t('messagesPage.dialogs.loadingMessages')} compact />
) : (
<div className="messages-thread-feed">
{dialogMessages.length === 0 ? (
<div className="state-callout subtle">
<strong>{t('messagesPage.dialogs.title')}</strong>
<p>{t('messagesPage.dialogs.noMessages')}</p>
</div>
) : (
dialogMessages.map((item) => (
<article
key={item.id}
className={`messages-thread-item${
item.senderId === me?.id ? ' mine' : ''
}`}
>
<p>{item.body}</p>
<div className="messages-thread-meta">
<span>{formatDateTime(item.createdAt, language)}</span>
{item.senderId === me?.id ? (
<button
type="button"
className="messages-thread-delete"
onClick={() => openDeleteMessageConfirmation(item)}
disabled={pendingMessageDeleteId === item.id}
>
{pendingMessageDeleteId === item.id
? t('messagesPage.dialogs.deleting')
: t('messagesPage.dialogs.deleteMessage')}
</button>
) : null}
</div>
</article>
))
)}
</div>
)}
<div className={`messages-thread-feed${dialogMessagesLoading ? ' is-loading' : ''}`}>
{dialogMessagesLoading ? (
<QuietLoadingInline label={t('messagesPage.dialogs.loadingMessages')} compact />
) : dialogMessages.length === 0 ? (
<div className="state-callout subtle">
<strong>{t('messagesPage.dialogs.title')}</strong>
<p>{t('messagesPage.dialogs.noMessages')}</p>
</div>
) : (
dialogMessages.map((item) => (
<article
key={item.id}
className={`messages-thread-item${
item.senderId === me?.id ? ' mine' : ''
}`}
>
<p>{item.body}</p>
<div className="messages-thread-meta">
<span>{formatDateTime(item.createdAt, language)}</span>
{item.senderId === me?.id ? (
<button
type="button"
className="messages-thread-delete"
onClick={() => openDeleteMessageConfirmation(item)}
disabled={pendingMessageDeleteId === item.id}
>
{pendingMessageDeleteId === item.id
? t('messagesPage.dialogs.deleting')
: t('messagesPage.dialogs.deleteMessage')}
</button>
) : null}
</div>
</article>
))
)}
</div>

<form className="panel-form messages-thread-form" onSubmit={handleSendMessage}>
<label className="field messages-composer-field">
Expand Down
5 changes: 5 additions & 0 deletions apps/frontend/src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7706,6 +7706,11 @@ a {
gap: 10px;
}

.messages-thread-feed.is-loading {
align-content: center;
justify-items: center;
}

.messages-thread-feed > p {
margin: 2px;
color: #5d6472;
Expand Down
Loading