feat: move padding globally to the messages list

we dont want individual padding on each message type
pull/2971/head
William Grant 2 years ago
parent 851cd2bd59
commit 9cd85a47af

@ -28,6 +28,7 @@ const LastSeenBarContainer = styled.div<{ darkMode?: boolean }>`
padding-bottom: 35px; padding-bottom: 35px;
max-width: 300px; max-width: 300px;
align-self: center; align-self: center;
margin: 0 auto;
padding-top: 28px; padding-top: 28px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;

@ -2,6 +2,7 @@ import React, { useLayoutEffect, useState } from 'react';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import useKey from 'react-use/lib/useKey'; import useKey from 'react-use/lib/useKey';
import styled from 'styled-components';
import { import {
PropsForDataExtractionNotification, PropsForDataExtractionNotification,
PropsForMessageRequestResponse, PropsForMessageRequestResponse,
@ -33,6 +34,10 @@ function isNotTextboxEvent(e: KeyboardEvent) {
return (e?.target as any)?.type === undefined; return (e?.target as any)?.type === undefined;
} }
const StyledMessagesList = styled.div`
padding: 0 var(--margins-lg) 0;
`;
let previousRenderedConvo: string | undefined; let previousRenderedConvo: string | undefined;
export const SessionMessagesList = (props: { export const SessionMessagesList = (props: {
@ -96,7 +101,7 @@ export const SessionMessagesList = (props: {
} }
return ( return (
<> <StyledMessagesList>
{messagesProps.map(messageProps => { {messagesProps.map(messageProps => {
const messageId = messageProps.message.props.messageId; const messageId = messageProps.message.props.messageId;
const unreadIndicator = messageProps.showUnreadIndicator ? ( const unreadIndicator = messageProps.showUnreadIndicator ? (
@ -161,6 +166,6 @@ export const SessionMessagesList = (props: {
return [<Message messageId={messageId} key={messageId} />, ...componentToMerge]; return [<Message messageId={messageId} key={messageId} />, ...componentToMerge];
})} })}
</> </StyledMessagesList>
); );
}; };

@ -1,6 +1,5 @@
import React from 'react'; import React from 'react';
import styled from 'styled-components';
import { PropsForExpirationTimer } from '../../state/ducks/conversations'; import { PropsForExpirationTimer } from '../../state/ducks/conversations';
import { assertUnreachable } from '../../types/sqlSharedTypes'; import { assertUnreachable } from '../../types/sqlSharedTypes';
@ -10,10 +9,6 @@ import { SpacerSM, Text } from '../basic/Text';
import { Flex } from '../basic/Flex'; import { Flex } from '../basic/Flex';
import { isLegacyDisappearingModeEnabled } from '../../util/expiringMessages'; import { isLegacyDisappearingModeEnabled } from '../../util/expiringMessages';
const StyledTimerNotificationContainer = styled.div`
padding: 0 var(--margins-lg) 0;
`;
export const TimerNotification = (props: PropsForExpirationTimer) => { export const TimerNotification = (props: PropsForExpirationTimer) => {
const { messageId, pubkey, profileName, expirationMode, timespan, type, disabled } = props; const { messageId, pubkey, profileName, expirationMode, timespan, type, disabled } = props;
@ -51,7 +46,6 @@ export const TimerNotification = (props: PropsForExpirationTimer) => {
} }
return ( return (
<StyledTimerNotificationContainer>
<ExpirableReadableMessage <ExpirableReadableMessage
messageId={messageId} messageId={messageId}
isCentered={true} isCentered={true}
@ -74,6 +68,5 @@ export const TimerNotification = (props: PropsForExpirationTimer) => {
<Text text={textToRender} /> <Text text={textToRender} />
</Flex> </Flex>
</ExpirableReadableMessage> </ExpirableReadableMessage>
</StyledTimerNotificationContainer>
); );
}; };

@ -1,5 +1,4 @@
import React from 'react'; import React from 'react';
import styled from 'styled-components';
import { PropsForDataExtractionNotification } from '../../../../models/messageType'; import { PropsForDataExtractionNotification } from '../../../../models/messageType';
import { SignalService } from '../../../../protobuf'; import { SignalService } from '../../../../protobuf';
import { Flex } from '../../../basic/Flex'; import { Flex } from '../../../basic/Flex';
@ -7,10 +6,6 @@ import { SpacerSM, Text } from '../../../basic/Text';
import { SessionIcon } from '../../../icon'; import { SessionIcon } from '../../../icon';
import { ExpirableReadableMessage } from './ExpirableReadableMessage'; import { ExpirableReadableMessage } from './ExpirableReadableMessage';
const StyledDataExtractionNotificationContainer = styled.div`
padding: 0 var(--margins-lg) 0;
`;
export const DataExtractionNotification = (props: PropsForDataExtractionNotification) => { export const DataExtractionNotification = (props: PropsForDataExtractionNotification) => {
const { name, type, source, messageId } = props; const { name, type, source, messageId } = props;
@ -22,7 +17,6 @@ export const DataExtractionNotification = (props: PropsForDataExtractionNotifica
} }
return ( return (
<StyledDataExtractionNotificationContainer>
<ExpirableReadableMessage <ExpirableReadableMessage
messageId={messageId} messageId={messageId}
key={`readable-message-${messageId}`} key={`readable-message-${messageId}`}
@ -45,6 +39,5 @@ export const DataExtractionNotification = (props: PropsForDataExtractionNotifica
<Text text={contentText} ellipsisOverflow={true} /> <Text text={contentText} ellipsisOverflow={true} />
</Flex> </Flex>
</ExpirableReadableMessage> </ExpirableReadableMessage>
</StyledDataExtractionNotificationContainer>
); );
}; };

@ -46,7 +46,6 @@ const StyledReadableMessage = styled.div<{
align-items: center; align-items: center;
width: 100%; width: 100%;
letter-spacing: 0.03rem; letter-spacing: 0.03rem;
padding: 0 var(--margins-lg) 0;
&.message-highlighted { &.message-highlighted {
animation: ${highlightedMessageAnimation} 1s ease-in-out; animation: ${highlightedMessageAnimation} 1s ease-in-out;

@ -7,10 +7,6 @@ import { PropsForGroupInvitation } from '../../../../state/ducks/conversations';
import { SessionIconButton } from '../../../icon'; import { SessionIconButton } from '../../../icon';
import { ExpirableReadableMessage } from './ExpirableReadableMessage'; import { ExpirableReadableMessage } from './ExpirableReadableMessage';
const StyledGroupInvitationContainer = styled.div`
padding: 0 var(--margins-lg) 0;
`;
const StyledGroupInvitation = styled.div` const StyledGroupInvitation = styled.div`
background-color: var(--message-bubbles-received-background-color); background-color: var(--message-bubbles-received-background-color);
@ -80,7 +76,6 @@ export const GroupInvitation = (props: PropsForGroupInvitation) => {
const openGroupInvitation = window.i18n('openGroupInvitation'); const openGroupInvitation = window.i18n('openGroupInvitation');
return ( return (
<StyledGroupInvitationContainer>
<ExpirableReadableMessage <ExpirableReadableMessage
messageId={messageId} messageId={messageId}
key={`readable-message-${messageId}`} key={`readable-message-${messageId}`}
@ -110,6 +105,5 @@ export const GroupInvitation = (props: PropsForGroupInvitation) => {
</div> </div>
</StyledGroupInvitation> </StyledGroupInvitation>
</ExpirableReadableMessage> </ExpirableReadableMessage>
</StyledGroupInvitationContainer>
); );
}; };

@ -1,6 +1,5 @@
import React from 'react'; import React from 'react';
import styled from 'styled-components';
import { import {
PropsForGroupUpdate, PropsForGroupUpdate,
PropsForGroupUpdateType, PropsForGroupUpdateType,
@ -73,15 +72,10 @@ const ChangeItem = (change: PropsForGroupUpdateType): string => {
} }
}; };
const StyledGroupUpdateContainer = styled.div`
padding: 0 var(--margins-lg) 0;
`;
export const GroupUpdateMessage = (props: PropsForGroupUpdate) => { export const GroupUpdateMessage = (props: PropsForGroupUpdate) => {
const { change, messageId } = props; const { change, messageId } = props;
return ( return (
<StyledGroupUpdateContainer>
<ExpirableReadableMessage <ExpirableReadableMessage
messageId={messageId} messageId={messageId}
key={`readable-message-${messageId}`} key={`readable-message-${messageId}`}
@ -90,6 +84,5 @@ export const GroupUpdateMessage = (props: PropsForGroupUpdate) => {
> >
<NotificationBubble notificationText={ChangeItem(change)} iconType="users" /> <NotificationBubble notificationText={ChangeItem(change)} iconType="users" />
</ExpirableReadableMessage> </ExpirableReadableMessage>
</StyledGroupUpdateContainer>
); );
}; };

@ -1,5 +1,4 @@
import React from 'react'; import React from 'react';
import styled from 'styled-components';
import { PubKey } from '../../../../../session/types'; import { PubKey } from '../../../../../session/types';
import { import {
@ -39,10 +38,6 @@ const style: StyleType = {
}, },
}; };
const StyledCallNotificationContainer = styled.div`
padding: 0 var(--margins-lg) 0;
`;
export const CallNotification = (props: PropsForCallNotification) => { export const CallNotification = (props: PropsForCallNotification) => {
const { messageId, notificationType } = props; const { messageId, notificationType } = props;
const selectedConvoId = useSelectedConversationKey(); const selectedConvoId = useSelectedConversationKey();
@ -64,7 +59,6 @@ export const CallNotification = (props: PropsForCallNotification) => {
const iconColor = styleItem.iconColor; const iconColor = styleItem.iconColor;
return ( return (
<StyledCallNotificationContainer>
<ExpirableReadableMessage <ExpirableReadableMessage
messageId={messageId} messageId={messageId}
key={`readable-message-${messageId}`} key={`readable-message-${messageId}`}
@ -76,6 +70,5 @@ export const CallNotification = (props: PropsForCallNotification) => {
iconColor={iconColor} iconColor={iconColor}
/> />
</ExpirableReadableMessage> </ExpirableReadableMessage>
</StyledCallNotificationContainer>
); );
}; };

Loading…
Cancel
Save