From 17d0cf7562861024a1f6329e1426f94f28f72fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Tue, 8 Oct 2024 13:20:14 +0200 Subject: [PATCH 1/2] pl-fe: ScrollableList: Fix height for lists displaying placeholders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- packages/pl-fe/src/components/scrollable-list.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pl-fe/src/components/scrollable-list.tsx b/packages/pl-fe/src/components/scrollable-list.tsx index 5026f0cca..6d08a52a0 100644 --- a/packages/pl-fe/src/components/scrollable-list.tsx +++ b/packages/pl-fe/src/components/scrollable-list.tsx @@ -175,7 +175,7 @@ const ScrollableList = React.forwardRef, IScrollableList>( id={'parentRef' in props ? id : undefined} className={listClassName} style={{ - height: !showLoading && data.length ? virtualizer.getTotalSize() : undefined, + height: (!showLoading || showPlaceholder) && data.length ? virtualizer.getTotalSize() : undefined, width: '100%', position: 'relative', }} From aaddf124bf90511bf828cb0ec926a94366d5fb41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Tue, 8 Oct 2024 13:20:55 +0200 Subject: [PATCH 2/2] pl-fe: Show visibility icon for actual status, not the reblog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- packages/pl-fe/src/components/status.tsx | 4 ++-- .../pl-fe/src/features/status/components/detailed-status.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/pl-fe/src/components/status.tsx b/packages/pl-fe/src/components/status.tsx index 65ed106b0..e8e064767 100644 --- a/packages/pl-fe/src/components/status.tsx +++ b/packages/pl-fe/src/components/status.tsx @@ -409,8 +409,8 @@ const Status: React.FC = (props) => { avatarSize={avatarSize} items={( <> - - + + )} /> diff --git a/packages/pl-fe/src/features/status/components/detailed-status.tsx b/packages/pl-fe/src/features/status/components/detailed-status.tsx index a7d158081..728b5db95 100644 --- a/packages/pl-fe/src/features/status/components/detailed-status.tsx +++ b/packages/pl-fe/src/features/status/components/detailed-status.tsx @@ -166,7 +166,7 @@ const DetailedStatus: React.FC = ({ - +