From 1322f92287d0e2ee1bbb979144edff5cc891ca5f Mon Sep 17 00:00:00 2001 From: Bill Date: Mon, 14 Mar 2022 06:41:50 -0400 Subject: [PATCH] Another group update --- src/components/groups/views/GroupInformationView.tsx | 8 ++++---- src/components/user-profile/views/GroupsContainerView.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/groups/views/GroupInformationView.tsx b/src/components/groups/views/GroupInformationView.tsx index d15a2779..51ffceb7 100644 --- a/src/components/groups/views/GroupInformationView.tsx +++ b/src/components/groups/views/GroupInformationView.tsx @@ -1,14 +1,14 @@ import { GroupInformationParser, GroupRemoveMemberComposer } from '@nitrots/nitro-renderer'; import { FC, useCallback } from 'react'; import { CreateLinkEvent, GetGroupManager, GetGroupMembers, GetSessionDataManager, LocalizeText, NotificationUtilities, SendMessageComposer, TryJoinGroup, TryVisitRoom } from '../../../api'; -import { Button, Column, Flex, Grid, LayoutBadgeImageView, Text } from '../../../common'; +import { Button, Column, Flex, Grid, GridProps, LayoutBadgeImageView, Text } from '../../../common'; import { CatalogPageName } from '../../catalog/common/CatalogPageName'; import { GroupMembershipType } from '../common/GroupMembershipType'; import { GroupType } from '../common/GroupType'; const STATES: string[] = [ 'regular', 'exclusive', 'private' ]; -interface GroupInformationViewProps +interface GroupInformationViewProps extends GridProps { groupInformation: GroupInformationParser; onJoin?: () => void; @@ -17,7 +17,7 @@ interface GroupInformationViewProps export const GroupInformationView: FC = props => { - const { groupInformation = null, onClose = null } = props; + const { groupInformation = null, onClose = null, overflow = 'hidden', ...rest } = props; const isRealOwner = (groupInformation && (groupInformation.ownerName === GetSessionDataManager().userName)); @@ -98,7 +98,7 @@ export const GroupInformationView: FC = props => if(!groupInformation) return null; return ( - + diff --git a/src/components/user-profile/views/GroupsContainerView.tsx b/src/components/user-profile/views/GroupsContainerView.tsx index 843842ea..845113e1 100644 --- a/src/components/user-profile/views/GroupsContainerView.tsx +++ b/src/components/user-profile/views/GroupsContainerView.tsx @@ -79,7 +79,7 @@ export const GroupsContainerView: FC = props => }) } - + { groupInformation && }