Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
95 changes: 55 additions & 40 deletions src/components/Reactions/MessageReactionsDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,48 +118,63 @@ export function MessageReactionsDetail({
data-testid='all-reacting-users'
>
{areReactionsLoading && (
<div className='str-chat__message-reactions-detail__loading-overlay'>
<LoadingIndicator />
</div>
<>
<div className='str-chat__message-reactions-detail__skeleton-item'>
<div className='str-chat__message-reactions-detail__skeleton-avatar' />
<div className='str-chat__message-reactions-detail__skeleton-line' />
</div>
<div className='str-chat__message-reactions-detail__skeleton-item'>
<div className='str-chat__message-reactions-detail__skeleton-avatar' />
<div className='str-chat__message-reactions-detail__skeleton-line' />
</div>
<div className='str-chat__message-reactions-detail__skeleton-item'>
<div className='str-chat__message-reactions-detail__skeleton-avatar' />
<div className='str-chat__message-reactions-detail__skeleton-line' />
</div>
</>
)}
{reactionDetailsWithLegacyFallback.map(({ user }) => {
const belongsToCurrentUser = client.user?.id === user?.id;
return (
<div
className='str-chat__message-reactions-detail__user-list-item'
key={user?.id}
>
<Avatar
className='str-chat__avatar--with-border'
data-testid='avatar'
imageUrl={user?.image as string | undefined}
size='sm'
userName={user?.name || user?.id}
/>
<div className='str-chat__message-reactions-detail__user-list-item-info'>
<span
className='str-chat__message-reactions-detail__user-list-item-username'
data-testid='reaction-user-username'
{!areReactionsLoading && (
<>
{reactionDetailsWithLegacyFallback.map(({ user }) => {
const belongsToCurrentUser = client.user?.id === user?.id;
return (
<div
className='str-chat__message-reactions-detail__user-list-item'
key={user?.id}
>
{belongsToCurrentUser ? t('You') : user?.name || user?.id}
</span>
{belongsToCurrentUser && selectedReactionType && (
<button
className='str-chat__message-reactions-detail__user-list-item-button'
data-testid='remove-reaction-button'
onClick={(e) => {
contextHandleReaction(selectedReactionType, e).then(() => {
refetch();
});
}}
>
{t('Tap to remove')}
</button>
)}
</div>
</div>
);
})}
<Avatar
className='str-chat__avatar--with-border'
data-testid='avatar'
imageUrl={user?.image as string | undefined}
size='md'
userName={user?.name || user?.id}
/>
<div className='str-chat__message-reactions-detail__user-list-item-info'>
<span
className='str-chat__message-reactions-detail__user-list-item-username'
data-testid='reaction-user-username'
>
{belongsToCurrentUser ? t('You') : user?.name || user?.id}
</span>
{belongsToCurrentUser && selectedReactionType && (
<button
className='str-chat__message-reactions-detail__user-list-item-button'
data-testid='remove-reaction-button'
onClick={(e) => {
contextHandleReaction(selectedReactionType, e).then(() => {
refetch();
});
}}
>
{t('Tap to remove')}
</button>
)}
</div>
</div>
);
})}
</>
)}
</div>
</div>
);
Expand Down
92 changes: 54 additions & 38 deletions src/components/Reactions/styling/MessageReactionsDetail.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use '../../../styling/utils' as utils;
@use './common' as common;
@use '../../Channel/styling/Channel' as channel-utils;

.str-chat {
.str-chat__dialog-contents:has(.str-chat__message-reactions-detail):focus-visible {
Expand All @@ -10,9 +11,20 @@
.str-chat__message-reactions-detail {
border-radius: var(--radius-lg);
background: var(--background-elevation-elevation-2);
max-width: 280px;
min-width: min(90vw, 280px);
max-height: 200px;
max-width: 256px;
min-width: min(90vw, 256px);

&::after {
content: '';
position: absolute;
width: 100%;
bottom: 0;
left: 0;
height: var(--size-12);
border-bottom-right-radius: inherit;
border-bottom-left-radius: inherit;
background: linear-gradient(to bottom, rgba(0, 0, 0, 0) 5%, rgba(0, 0, 0, 0.1) 130%);
}

font-family: var(--typography-font-family-sans);

Expand All @@ -25,42 +37,30 @@

display: flex;
flex-direction: column;
gap: var(--spacing-xxs);
gap: var(--spacing-xxxs);

.str-chat__message-reactions-detail__total-count {
display: flex;
align-items: center;
justify-content: flex-start;
padding-inline: var(--spacing-md);
padding-block: 6px;

color: var(--text-tertiary, #687385);
min-height: var(--size-32);
max-height: var(--size-32);

color: var(--text-tertiary);
font-size: var(--typography-font-size-sm);
font-weight: var(--typography-font-weight-medium);
line-height: var(--typography-line-height-normal);
}

.str-chat__message-reactions-detail__reaction-type-list-container {
display: flex;
overflow-x: auto;
width: 100%;

scrollbar-color: red orange;
scrollbar-width: none;
}

.str-chat__message-reactions-detail__reaction-type-list {
list-style: none;
margin: 0;
padding-inline: var(--spacing-md);
padding-inline: var(--spacing-xs);
padding-block: var(--spacing-xs);
display: flex;
align-items: center;
gap: var(--spacing-xxs);

display: flex;
gap: var(--spacing-xxs);
flex-wrap: wrap;
gap: var(--spacing-xs) var(--spacing-xxs);

.str-chat__message-reactions-detail__reaction-type-list-item {
display: flex;
Expand Down Expand Up @@ -90,29 +90,47 @@

.str-chat__message-reactions-detail__user-list {
@include utils.scrollable-y;
scrollbar-width: thin;
scrollbar-width: none;
position: relative;
padding-block-end: var(--spacing-xxs);
max-height: 100px;

&:has(
.str-chat__message-reactions-detail__user-list-item
.str-chat__message-reactions-detail__user-list-item-button:nth-child(-n + 3)
) {
max-height: 106px;
}

.str-chat__message-reactions-detail__loading-overlay {
position: absolute;
inset: 0;
.str-chat__message-reactions-detail__skeleton-item {
padding-block: var(--spacing-xxs);
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
backdrop-filter: blur(1px);
border-bottom-left-radius: var(--radius-lg);
border-bottom-right-radius: var(--radius-lg);
z-index: 1;
gap: var(--spacing-xs);
padding-inline: calc(var(--spacing-sm) + var(--spacing-xxs));

.str-chat__message-reactions-detail__skeleton-avatar {
width: var(--size-32);
height: var(--size-32);
border-radius: var(--radius-max);
@include channel-utils.channel-loading-shimmer;
flex-shrink: 0;
}

.str-chat__message-reactions-detail__skeleton-line {
flex-grow: 1;
height: var(--size-20);
border-radius: var(--radius-sm);
@include channel-utils.channel-loading-faded-bar;
}
}

.str-chat__message-reactions-detail__user-list-item {
padding-block: var(--spacing-xs);
padding-block: var(--spacing-xxs);
display: flex;
align-items: center;
gap: var(--spacing-xs);
padding-inline: var(--spacing-md);
padding-inline: calc(var(--spacing-sm) + var(--spacing-xxs));

.str-chat__message-reactions-detail__user-list-item-info {
display: flex;
Expand All @@ -129,9 +147,7 @@
.str-chat__message-reactions-detail__user-list-item-button {
@include utils.unset-button;
color: var(--text-tertiary);
font-size: var(--typography-font-size-xs);
font-weight: var(--typography-font-weight-regular);
line-height: var(--typography-line-height-tight);
font: var(--str-chat__metadata-default-text);
cursor: pointer;
}
}
Expand Down
Loading