From 2f3ade1a17b3701b68ea7d698eb3d0702621cf38 Mon Sep 17 00:00:00 2001 From: abhishek-01k Date: Wed, 29 May 2024 16:15:31 +0530 Subject: [PATCH] fix: scrollbar in member list in group info was not visible Fixed the scrollbar issue in the member list in group info in uiweb #1298 --- .../components/chat/ChatProfile/PendingMembers.tsx | 12 ++++-------- .../components/chat/ChatViewList/ChatViewList.tsx | 8 +++++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/uiweb/src/lib/components/chat/ChatProfile/PendingMembers.tsx b/packages/uiweb/src/lib/components/chat/ChatProfile/PendingMembers.tsx index 4c055c718..de4d4185a 100644 --- a/packages/uiweb/src/lib/components/chat/ChatProfile/PendingMembers.tsx +++ b/packages/uiweb/src/lib/components/chat/ChatProfile/PendingMembers.tsx @@ -105,8 +105,6 @@ export const PendingMembers = ({ {acceptedMembers.map((item, index) => ( @@ -313,8 +309,8 @@ export const AcceptedMembers = ({ isAdmin(item) && accountStatus?.role === GROUP_ROLES.ADMIN.toLowerCase() ? [removeAdminDropdown, removeMemberDropdown] : accountStatus?.role === GROUP_ROLES.ADMIN.toLowerCase() - ? [addAdminDropdown, removeMemberDropdown] - : [] + ? [addAdminDropdown, removeMemberDropdown] + : [] } selectedMemberAddress={selectedMemberAddress} setSelectedMemberAddress={setSelectedMemberAddress} @@ -375,7 +371,7 @@ const PendingSection = styled.div` box-sizing: border-box; `; -const ArrowImage = styled(Image)` +const ArrowImage = styled(Image) ` margin-left: auto; transform: ${(props) => (props?.setPosition ? 'rotate(0)' : 'rotate(180deg)')}; `; @@ -390,7 +386,7 @@ const Badge = styled.div` font-weight: 700; `; -const ProfileSection = styled(Section)<{ theme: IChatTheme }>` +const ProfileSection = styled(Section) <{ theme: IChatTheme }>` height: fit-content; &::-webkit-scrollbar-thumb { background: transparent; diff --git a/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx b/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx index f51098d0b..29fd43d7c 100644 --- a/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx +++ b/packages/uiweb/src/lib/components/chat/ChatViewList/ChatViewList.tsx @@ -293,7 +293,9 @@ export const ChatViewList: React.FC = (options: IChatViewLis return () => clearTimeout(timer); } - return () => {}; + return () => { + //Empty return + }; }, [chatAcceptStream, participantJoinStream]); // Change listtype to 'UINITIALIZED' and hidden to true when participantRemoveStream or participantLeaveStream is received @@ -571,7 +573,7 @@ export const ChatViewList: React.FC = (options: IChatViewLis }; //styles -const ChatViewListCard = styled(Section)` +const ChatViewListCard = styled(Section) ` &::-webkit-scrollbar-thumb { background: ${(props) => props.theme.scrollbarColor}; border-radius: 10px; @@ -584,6 +586,6 @@ const ChatViewListCard = styled(Section)` overscroll-behavior: contain; `; -const ChatViewListCardInner = styled(Section)` +const ChatViewListCardInner = styled(Section) ` filter: ${(props) => (props.blur ? 'blur(6px)' : 'none')}; `;