fix date display with deleted messages
This commit is contained in:
@@ -191,9 +191,8 @@ class MessagesView extends React.Component {
|
|||||||
if (topic._new) {
|
if (topic._new) {
|
||||||
console.log('DEBUG: Fetching new topic description');
|
console.log('DEBUG: Fetching new topic description');
|
||||||
// topic.getMeta(topic.startMetaQuery().withDesc().build());
|
// topic.getMeta(topic.startMetaQuery().withDesc().build());
|
||||||
} else {
|
|
||||||
this.subscribe(topic);
|
|
||||||
}
|
}
|
||||||
|
this.subscribe(topic);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1023,6 +1022,7 @@ class MessagesView extends React.Component {
|
|||||||
|
|
||||||
const messageNodes = [];
|
const messageNodes = [];
|
||||||
let previousFrom = null;
|
let previousFrom = null;
|
||||||
|
let prevDate = null;
|
||||||
let chatBoxClass = null;
|
let chatBoxClass = null;
|
||||||
const dateFmt = new Intl.DateTimeFormat(this.props.intl.locale);
|
const dateFmt = new Intl.DateTimeFormat(this.props.intl.locale);
|
||||||
topic.messages((msg, prev, next, i) => {
|
topic.messages((msg, prev, next, i) => {
|
||||||
@@ -1067,14 +1067,16 @@ class MessagesView extends React.Component {
|
|||||||
key={msg.seq} />
|
key={msg.seq} />
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
const thisDate = new Date(msg.ts);
|
||||||
// This message was sent on a different date than the previous.
|
// This message was sent on a different date than the previous.
|
||||||
if (!prev || (!prev.hi && new Date(prev.ts).toDateString() != new Date(msg.ts).toDateString())) {
|
if (!prevDate || prevDate.toDateString() != thisDate.toDateString()) {
|
||||||
messageNodes.push(
|
messageNodes.push(
|
||||||
<MetaMessage
|
<MetaMessage
|
||||||
date={dateFmt.format(msg.ts)}
|
date={dateFmt.format(msg.ts)}
|
||||||
locale={this.props.intl.locale}
|
locale={this.props.intl.locale}
|
||||||
key={'date-' + msg.seq} />
|
key={'date-' + msg.seq} />
|
||||||
);
|
);
|
||||||
|
prevDate = thisDate;
|
||||||
}
|
}
|
||||||
messageNodes.push(
|
messageNodes.push(
|
||||||
<ChatMessage
|
<ChatMessage
|
||||||
|
|||||||
+7
-3
@@ -5465,9 +5465,9 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
|
|||||||
if (topic && (this.state.topic != prevState.topic || !prevProps.ready)) {
|
if (topic && (this.state.topic != prevState.topic || !prevProps.ready)) {
|
||||||
if (topic._new) {
|
if (topic._new) {
|
||||||
console.log('DEBUG: Fetching new topic description');
|
console.log('DEBUG: Fetching new topic description');
|
||||||
} else {
|
|
||||||
this.subscribe(topic);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.subscribe(topic);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6341,6 +6341,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
|
|||||||
|
|
||||||
const messageNodes = [];
|
const messageNodes = [];
|
||||||
let previousFrom = null;
|
let previousFrom = null;
|
||||||
|
let prevDate = null;
|
||||||
let chatBoxClass = null;
|
let chatBoxClass = null;
|
||||||
const dateFmt = new Intl.DateTimeFormat(this.props.intl.locale);
|
const dateFmt = new Intl.DateTimeFormat(this.props.intl.locale);
|
||||||
topic.messages((msg, prev, next, i) => {
|
topic.messages((msg, prev, next, i) => {
|
||||||
@@ -6385,12 +6386,15 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
|
|||||||
key: msg.seq
|
key: msg.seq
|
||||||
}));
|
}));
|
||||||
} else {
|
} else {
|
||||||
if (!prev || !prev.hi && new Date(prev.ts).toDateString() != new Date(msg.ts).toDateString()) {
|
const thisDate = new Date(msg.ts);
|
||||||
|
|
||||||
|
if (!prevDate || prevDate.toDateString() != thisDate.toDateString()) {
|
||||||
messageNodes.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_meta_message_jsx__WEBPACK_IMPORTED_MODULE_13__["default"], {
|
messageNodes.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_meta_message_jsx__WEBPACK_IMPORTED_MODULE_13__["default"], {
|
||||||
date: dateFmt.format(msg.ts),
|
date: dateFmt.format(msg.ts),
|
||||||
locale: this.props.intl.locale,
|
locale: this.props.intl.locale,
|
||||||
key: 'date-' + msg.seq
|
key: 'date-' + msg.seq
|
||||||
}));
|
}));
|
||||||
|
prevDate = thisDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
messageNodes.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_chat_message_jsx__WEBPACK_IMPORTED_MODULE_3__["default"], {
|
messageNodes.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_chat_message_jsx__WEBPACK_IMPORTED_MODULE_3__["default"], {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user