Skip to content

fix: extended reactions button adjustments #3172

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

Open
arnautov-anton wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −22
Open

fix: extended reactions button adjustments #3172

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
35 changes: 21 additions & 14 deletions src/components/Reactions/ReactionSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ export const ReactionSelector: ReactionSelectorInterface = (props) => {
);
}, [reactionOptions]);

const hasExtendedReactions =
!Array.isArray(reactionOptions) &&
reactionOptions.extended &&
Object.keys(reactionOptions.extended).length > 0;

return (
<div
aria-label={t('aria/Reaction list')}
Expand Down Expand Up @@ -126,20 +131,22 @@ export const ReactionSelector: ReactionSelectorInterface = (props) => {
),
)}
</ul>
<Button
appearance='outline'
aria-label={t('aria/Open Reaction Selector')}
circular
className='str-chat__reaction-selector__add-button'
data-testid='reaction-selector-add-button'
onClick={() => {
setExtendedListOpen(true);
}}
size='sm'
variant='secondary'
>
<IconPlus />
</Button>
{hasExtendedReactions && (
<Button
appearance='outline'
aria-label={t('aria/Open Reaction Selector')}
circular
className='str-chat__reaction-selector__add-button'
data-testid='reaction-selector-add-button'
onClick={() => {
setExtendedListOpen(true);
}}
size='sm'
variant='secondary'
>
<IconPlus />
</Button>
)}
</>
) : (
<ReactionSelectorExtendedList
Expand Down
19 changes: 11 additions & 8 deletions src/components/Reactions/styling/ReactionSelector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@

.str-chat__reaction-selector {
display: flex;
padding-inline-start: var(--str-chat__spacing-xxs, 0);
padding-inline-end: var(--str-chat__spacing-xs, 0);
padding-block: var(--str-chat__spacing-xxs, 0);
padding-inline: var(--str-chat__spacing-xxs);
padding-block: var(--str-chat__spacing-xxs);
align-items: center;
gap: var(--str-chat__spacing-xs);

border-radius: var(--str-chat__radius-4xl, 32px);
background: var(--str-chat__background-core-elevation-2, #fff);
border-radius: var(--str-chat__radius-4xl);
background: var(--str-chat__background-core-elevation-2);

box-shadow: var(--str-chat__box-shadow-3);

Expand All @@ -35,12 +34,16 @@
}
}

&:has(.str-chat__reaction-selector__add-button) {
padding-inline-end: var(--str-chat__spacing-xs);
}

.str-chat__reaction-selector-list {
list-style: none;
margin: var(--str-chat__spacing-none, 0);
padding: var(--str-chat__spacing-none, 0);
margin: var(--str-chat__spacing-none);
padding: var(--str-chat__spacing-none);
display: flex;
gap: var(--str-chat__space-2, 2px);
gap: var(--str-chat__space-2);

.str-chat__reaction-selector-list__item {
display: flex;
Expand Down
Loading