OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5737 from matrix-org/travis/message-states-fixes/edits 

Fix sent markers disappearing for edits/reactions
pull/21833/head
J. Ryan Stinnett 2021-03-10 13:42:46 +00:00 committed by GitHub
parent bb147a22c2 ac1ce24b74
commit 51ece182e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/structures/MessagePanel.js
View File

@ -534,10 +534,17 @@ export default class MessagePanel extends React.Component {
const nextEvent = i < this.props.events.length - 1 const nextEvent = i < this.props.events.length - 1
? this.props.events[i + 1] ? this.props.events[i + 1]
: null; : null;
// The next event with tile is used to to determine the 'last successful' flag
// when rendering the tile. The shouldShowEvent function is pretty quick at what
// it does, so this should have no significant cost even when a room is used for
// not-chat purposes.
const nextTile = this.props.events.slice(i + 1).find(e => this._shouldShowEvent(e));
// make sure we unpack the array returned by _getTilesForEvent, // make sure we unpack the array returned by _getTilesForEvent,
// otherwise react will auto-generate keys and we will end up // otherwise react will auto-generate keys and we will end up
// replacing all of the DOM elements every time we paginate. // replacing all of the DOM elements every time we paginate.
ret.push(...this._getTilesForEvent(prevEvent, mxEv, last, nextEvent)); ret.push(...this._getTilesForEvent(prevEvent, mxEv, last, nextEvent, nextTile));
prevEvent = mxEv; prevEvent = mxEv;
} }
@ -553,7 +560,7 @@ export default class MessagePanel extends React.Component {
return ret; return ret;
} }
_getTilesForEvent(prevEvent, mxEv, last, nextEvent) { _getTilesForEvent(prevEvent, mxEv, last, nextEvent, nextEventWithTile) {
const TileErrorBoundary = sdk.getComponent('messages.TileErrorBoundary'); const TileErrorBoundary = sdk.getComponent('messages.TileErrorBoundary');
const EventTile = sdk.getComponent('rooms.EventTile'); const EventTile = sdk.getComponent('rooms.EventTile');
const DateSeparator = sdk.getComponent('messages.DateSeparator'); const DateSeparator = sdk.getComponent('messages.DateSeparator');
@ -598,12 +605,21 @@ export default class MessagePanel extends React.Component {
let isLastSuccessful = false; let isLastSuccessful = false;
const isSentState = s => !s || s === 'sent'; const isSentState = s => !s || s === 'sent';
const isSent = isSentState(mxEv.getAssociatedStatus()); const isSent = isSentState(mxEv.getAssociatedStatus());
if (!nextEvent && isSent) { const hasNextEvent = nextEvent && this._shouldShowEvent(nextEvent);
if (!hasNextEvent && isSent) {
isLastSuccessful = true; isLastSuccessful = true;
} else if (nextEvent && isSent && !isSentState(nextEvent.getAssociatedStatus())) { } else if (hasNextEvent && isSent && !isSentState(nextEvent.getAssociatedStatus())) {
isLastSuccessful = true; isLastSuccessful = true;
} }
// This is a bit nuanced, but if our next event is hidden but a future event is not
// hidden then we're not the last successful.
if (nextEventWithTile) { // avoid length limit by wrapping in an if
if (isSentState(nextEventWithTile.getAssociatedStatus()) && nextEventWithTile !== nextEvent) {
isLastSuccessful = false;
}
}
// We only want to consider "last successful" if the event is sent by us, otherwise of course // We only want to consider "last successful" if the event is sent by us, otherwise of course
// it's successful: we received it. // it's successful: we received it.
isLastSuccessful = isLastSuccessful && mxEv.getSender() === MatrixClientPeg.get().getUserId(); isLastSuccessful = isLastSuccessful && mxEv.getSender() === MatrixClientPeg.get().getUserId();