mirror of
https://github.com/cheveguerra/whaticket-community.git
synced 2026-04-20 20:59:16 +00:00
improvement: better space between msgs
This commit is contained in:
@@ -130,6 +130,7 @@ const useStyles = makeStyles(theme => ({
|
|||||||
position: "relative",
|
position: "relative",
|
||||||
|
|
||||||
backgroundColor: "#ffffff",
|
backgroundColor: "#ffffff",
|
||||||
|
color: "#303030",
|
||||||
alignSelf: "flex-start",
|
alignSelf: "flex-start",
|
||||||
borderTopLeftRadius: 0,
|
borderTopLeftRadius: 0,
|
||||||
borderTopRightRadius: 8,
|
borderTopRightRadius: 8,
|
||||||
@@ -152,6 +153,7 @@ const useStyles = makeStyles(theme => ({
|
|||||||
position: "relative",
|
position: "relative",
|
||||||
|
|
||||||
backgroundColor: "#dcf8c6",
|
backgroundColor: "#dcf8c6",
|
||||||
|
color: "#303030",
|
||||||
alignSelf: "flex-end",
|
alignSelf: "flex-end",
|
||||||
borderTopLeftRadius: 8,
|
borderTopLeftRadius: 8,
|
||||||
borderTopRightRadius: 8,
|
borderTopRightRadius: 8,
|
||||||
@@ -453,7 +455,7 @@ const MessagesList = () => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (index + 1 === messagesList.length) {
|
if (index === messagesList.length - 1) {
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={`ref-${message.createdAt}`}
|
key={`ref-${message.createdAt}`}
|
||||||
@@ -464,6 +466,19 @@ const MessagesList = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const renderMessageDivider = (message, index) => {
|
||||||
|
if (index < messagesList.length && index > 0) {
|
||||||
|
let messageUser = messagesList[index].fromMe;
|
||||||
|
let previousMessageUser = messagesList[index - 1].fromMe;
|
||||||
|
|
||||||
|
if (messageUser !== previousMessageUser) {
|
||||||
|
return (
|
||||||
|
<span style={{ marginTop: 16 }} key={`divider-${message.id}`}></span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const renderMessages = () => {
|
const renderMessages = () => {
|
||||||
if (messagesList.length > 0) {
|
if (messagesList.length > 0) {
|
||||||
const viewMessagesList = messagesList.map((message, index) => {
|
const viewMessagesList = messagesList.map((message, index) => {
|
||||||
@@ -471,6 +486,7 @@ const MessagesList = () => {
|
|||||||
return (
|
return (
|
||||||
<LinkifyWithTargetBlank key={message.id}>
|
<LinkifyWithTargetBlank key={message.id}>
|
||||||
{renderDailyTimestamps(message, index)}
|
{renderDailyTimestamps(message, index)}
|
||||||
|
{renderMessageDivider(message, index)}
|
||||||
<div className={classes.messageLeft}>
|
<div className={classes.messageLeft}>
|
||||||
{message.mediaUrl && checkMessaageMedia(message)}
|
{message.mediaUrl && checkMessaageMedia(message)}
|
||||||
<div className={classes.textContentItem}>
|
<div className={classes.textContentItem}>
|
||||||
@@ -486,6 +502,7 @@ const MessagesList = () => {
|
|||||||
return (
|
return (
|
||||||
<LinkifyWithTargetBlank key={message.id}>
|
<LinkifyWithTargetBlank key={message.id}>
|
||||||
{renderDailyTimestamps(message, index)}
|
{renderDailyTimestamps(message, index)}
|
||||||
|
{renderMessageDivider(message, index)}
|
||||||
<div className={classes.messageRight}>
|
<div className={classes.messageRight}>
|
||||||
{message.mediaUrl && checkMessaageMedia(message)}
|
{message.mediaUrl && checkMessaageMedia(message)}
|
||||||
<div className={classes.textContentItem}>
|
<div className={classes.textContentItem}>
|
||||||
|
|||||||
Reference in New Issue
Block a user