bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pl-fe: count quotes with reblogs, try to fix account lists in modals

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2024-09-02 21:31:41 +02:00
parent cffcbc8d2b
commit e3d15ba6d8
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/pl-fe/src/components/status-action-bar.tsx
View file

@ -625,6 +625,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
const replyCount = status.replies_count;
const reblogCount = status.reblogs_count;
const quoteCount = status.quotes_count;
const favouriteCount = status.favourites_count;
const emojiReactCount = status.emoji_reactions ? reduceEmoji(
@ -683,7 +684,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)}
active={status.reblogged}
onClick={handleReblogClick}
count={reblogCount}
count={reblogCount + quoteCount}
text={withLabels ? intl.formatMessage(messages.reblog) : undefined}
theme={statusActionButtonTheme}
/>

2
packages/pl-fe/src/features/ui/components/modals/familiar-followers-modal.tsx
View file

@ -36,7 +36,7 @@ const FamiliarFollowersModal: React.FC<BaseModalProps & FamiliarFollowersModalPr
scrollKey='familiar_followers'
emptyMessage={emptyMessage}
itemClassName='pb-3'
style={{ height: '80vh' }}
style={{ height: 'calc(80vh - 88px)' }}
useWindowScroll={false}
>
{familiarFollowerIds.map(id =>

2
packages/pl-fe/src/features/ui/components/modals/favourites-modal.tsx
View file

@ -50,7 +50,7 @@ const FavouritesModal: React.FC<BaseModalProps & FavouritesModalProps> = ({ onCl
emptyMessage={emptyMessage}
listClassName='max-w-full'
itemClassName='pb-3'
style={{ height: '80vh' }}
style={{ height: 'calc(80vh - 88px)' }}
useWindowScroll={false}
onLoadMore={handleLoadMore}
hasMore={!!next}

3
packages/pl-fe/src/features/ui/components/modals/reactions-modal.tsx
View file

@ -103,7 +103,8 @@ const ReactionsModal: React.FC<BaseModalProps & ReactionsModalProps> = ({ onClos
})}
listClassName='max-w-full'
itemClassName='pb-3'
style={{ height: '80vh' }}
style={{ height: 'calc(80vh - 88px)' }}
useWindowScroll={false}
>
{accounts.map((account) =>
<AccountContainer key={`${account.id}-${account.reaction}`} id={account.id} emoji={account.reaction} emojiUrl={account.reactionUrl} />,

2
packages/pl-fe/src/features/ui/components/modals/reblogs-modal.tsx
View file

@ -52,7 +52,7 @@ const ReblogsModal: React.FC<BaseModalProps & ReblogsModalProps> = ({ onClose, s
emptyMessage={emptyMessage}
listClassName='max-w-full'
itemClassName='pb-3'
style={{ height: '80vh' }}
style={{ height: 'calc(80vh - 88px)' }}
useWindowScroll={false}
onLoadMore={handleLoadMore}
hasMore={!!next}