fix: right panel settings media should not have a scroll bar

combined containers for messageInfoOverlay
pull/3020/head
William Grant 1 year ago
parent a64ccca0dc
commit 78da584c02

@ -1,9 +1,9 @@
import React, { useCallback, useState } from 'react';
import classNames from 'classnames'; import classNames from 'classnames';
import React, { useCallback, useState } from 'react';
import { MediaItemType } from '../../lightbox/LightboxGallery';
import { AttachmentSection } from './AttachmentSection'; import { AttachmentSection } from './AttachmentSection';
import { EmptyState } from './EmptyState'; import { EmptyState } from './EmptyState';
import { MediaItemType } from '../../lightbox/LightboxGallery';
type Props = { type Props = {
documents: Array<MediaItemType>; documents: Array<MediaItemType>;

@ -42,11 +42,11 @@ import { AttachmentTypeWithPath } from '../../../../types/Attachment';
import { getAbsoluteAttachmentPath } from '../../../../types/MessageAttachment'; import { getAbsoluteAttachmentPath } from '../../../../types/MessageAttachment';
import { Avatar, AvatarSize } from '../../../avatar/Avatar'; import { Avatar, AvatarSize } from '../../../avatar/Avatar';
import { Flex } from '../../../basic/Flex'; import { Flex } from '../../../basic/Flex';
import { SpacerMD } from '../../../basic/Text'; import { SpacerLG, SpacerMD, SpacerXL } from '../../../basic/Text';
import { PanelButtonGroup, PanelIconButton } from '../../../buttons'; import { PanelButtonGroup, PanelIconButton } from '../../../buttons';
import { MediaItemType } from '../../../lightbox/LightboxGallery'; import { MediaItemType } from '../../../lightbox/LightboxGallery';
import { MediaGallery } from '../../media-gallery/MediaGallery'; import { MediaGallery } from '../../media-gallery/MediaGallery';
import { Header } from './components'; import { Header, StyledScrollContainer } from './components';
async function getMediaGalleryProps( async function getMediaGalleryProps(
conversationId: string conversationId: string
@ -278,7 +278,8 @@ export const OverlayRightPanelSettings = () => {
}; };
return ( return (
<> <StyledScrollContainer>
<Flex container={true} flexDirection={'column'} alignItems={'center'}>
<HeaderItem /> <HeaderItem />
<PanelButtonGroup style={{ margin: '0 var(--margins-lg)' }}> <PanelButtonGroup style={{ margin: '0 var(--margins-lg)' }}>
{showUpdateGroupNameButton && ( {showUpdateGroupNameButton && (
@ -349,6 +350,9 @@ export const OverlayRightPanelSettings = () => {
/> />
)} )}
</PanelButtonGroup> </PanelButtonGroup>
</> <SpacerLG />
<SpacerXL />
</Flex>
</StyledScrollContainer>
); );
}; };

@ -77,15 +77,13 @@ const MessageBody = ({
); );
}; };
const StyledMessageDetailContainer = styled.div` const StyledMessageInfoContainer = styled.div`
height: calc(100% - 48px); height: calc(100% - 48px);
width: 100%; width: 100%;
overflow-y: auto; max-width: 650px;
overflow: hidden auto;
z-index: 2; z-index: 2;
`;
const StyledMessageDetail = styled.div`
max-width: 650px;
margin-inline-start: auto; margin-inline-start: auto;
margin-inline-end: auto; margin-inline-end: auto;
padding: var(--margins-sm) var(--margins-2xl) var(--margins-lg); padding: var(--margins-sm) var(--margins-2xl) var(--margins-lg);
@ -254,8 +252,7 @@ export const OverlayMessageInfo = () => {
<Header hideBackButton={true} closeButtonOnClick={closePanel}> <Header hideBackButton={true} closeButtonOnClick={closePanel}>
<HeaderTitle>{window.i18n('messageInfo')}</HeaderTitle> <HeaderTitle>{window.i18n('messageInfo')}</HeaderTitle>
</Header> </Header>
<StyledMessageDetailContainer> <StyledMessageInfoContainer>
<StyledMessageDetail>
<MessageBody <MessageBody
messageId={messageId} messageId={messageId}
supportsAttachmentCarousel={supportsAttachmentCarousel} supportsAttachmentCarousel={supportsAttachmentCarousel}
@ -342,8 +339,7 @@ export const OverlayMessageInfo = () => {
)} )}
</PanelButtonGroup> </PanelButtonGroup>
<SpacerXL /> <SpacerXL />
</StyledMessageDetail> </StyledMessageInfoContainer>
</StyledMessageDetailContainer>
</Flex> </Flex>
</StyledScrollContainer> </StyledScrollContainer>
); );

Loading…
Cancel
Save