Skip to content
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.

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

fix: scrollbar in member list in group info was not visible #1325

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
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
4,814 changes: 1,699 additions & 3,115 deletions packages/restapi/yarn.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -105,8 +105,6 @@ export const PendingMembers = ({
<ProfileSection
flexDirection="column"
flex="1"
maxHeight="10rem"
overflow="hidden auto"
justifyContent="start"
borderRadius="12px"
theme={theme}
@@ -301,8 +299,6 @@ export const AcceptedMembers = ({
flexDirection="column"
zIndex="2"
justifyContent="start"
overflow="hidden auto"
maxHeight="15rem"
theme={theme}
>
{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)<ShadowedProps>`
const ArrowImage = styled(Image) <ShadowedProps>`
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;
Original file line number Diff line number Diff line change
@@ -293,7 +293,9 @@ export const ChatViewList: React.FC<IChatViewListProps> = (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<IChatViewListProps> = (options: IChatViewLis
};

//styles
const ChatViewListCard = styled(Section)<IThemeProps>`
const ChatViewListCard = styled(Section) <IThemeProps>`
&::-webkit-scrollbar-thumb {
background: ${(props) => props.theme.scrollbarColor};
border-radius: 10px;
@@ -584,6 +586,6 @@ const ChatViewListCard = styled(Section)<IThemeProps>`
overscroll-behavior: contain;
`;

const ChatViewListCardInner = styled(Section)<IThemeProps>`
const ChatViewListCardInner = styled(Section) <IThemeProps>`
filter: ${(props) => (props.blur ? 'blur(6px)' : 'none')};
`;
12,793 changes: 5,081 additions & 7,712 deletions packages/uiweb/yarn.lock

Large diffs are not rendered by default.

39,756 changes: 16,876 additions & 22,880 deletions yarn.lock

Large diffs are not rendered by default.