From 1a124c2eabe9b31f45177368ce0976bb05e05670 Mon Sep 17 00:00:00 2001 From: Justin Date: Tue, 27 Sep 2022 10:50:01 -0400 Subject: [PATCH] Fix fade when scrolling on ChatList --- .../chats/components/chat-list-item.tsx | 1 + .../features/chats/components/chat-list.tsx | 33 +++++++++---------- .../chats/components/chat-pane/chat-pane.tsx | 1 - 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/app/soapbox/features/chats/components/chat-list-item.tsx b/app/soapbox/features/chats/components/chat-list-item.tsx index 531b504c0..b091187b2 100644 --- a/app/soapbox/features/chats/components/chat-list-item.tsx +++ b/app/soapbox/features/chats/components/chat-list-item.tsx @@ -110,6 +110,7 @@ const ChatListItem: React.FC = ({ chat, chatSilence, onC
+ {/* TODO: fix nested buttons here */} void, useWindowScroll?: boolean, - fade?: boolean, searchValue?: string } -const ChatList: React.FC = ({ onClickChat, useWindowScroll = false, searchValue, fade }) => { +const ChatList: React.FC = ({ onClickChat, useWindowScroll = false, searchValue }) => { const dispatch = useAppDispatch(); const chatListRef = useRef(null); @@ -76,22 +75,20 @@ const ChatList: React.FC = ({ onClickChat, useWindowScroll = false, s )} - {fade && ( - <> -
-
- - )} + <> +
+
+
); }; diff --git a/app/soapbox/features/chats/components/chat-pane/chat-pane.tsx b/app/soapbox/features/chats/components/chat-pane/chat-pane.tsx index dd4b2fc01..d89bee60a 100644 --- a/app/soapbox/features/chats/components/chat-pane/chat-pane.tsx +++ b/app/soapbox/features/chats/components/chat-pane/chat-pane.tsx @@ -59,7 +59,6 @@ const ChatPane = () => { ) : (