PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3226 from matrix-org/bwindels/readmarker-invisble-events

Browse source 
Move read marker past invisible events
This commit is contained in:
Bruno Windels 2019-07-19 15:10:03 +00:00 committed by GitHub
commit 84e2333105
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/components/structures/TimelinePanel.js
View file

@ -658,7 +658,6 @@ const TimelinePanel = React.createClass({
const lastReadEventIndex = this._getLastDisplayedEventIndex({ const lastReadEventIndex = this._getLastDisplayedEventIndex({
ignoreOwn: true, ignoreOwn: true,
allowEventsWithoutTiles: true,
}); });
if (lastReadEventIndex === null) { if (lastReadEventIndex === null) {
shouldSendRR = false; shouldSendRR = false;
@ -739,14 +738,8 @@ const TimelinePanel = React.createClass({
// move the RM to *after* the message at the bottom of the screen. This // move the RM to *after* the message at the bottom of the screen. This
// avoids a problem whereby we never advance the RM if there is a huge // avoids a problem whereby we never advance the RM if there is a huge
// message which doesn't fit on the screen. // message which doesn't fit on the screen.
//
// But ignore local echoes for this - they have a temporary event ID
// and we'll get confused when their ID changes and we can't figure out
// where the RM is pointing to. The read marker will be invisible for
// now anyway, so this doesn't really matter.
const lastDisplayedIndex = this._getLastDisplayedEventIndex({ const lastDisplayedIndex = this._getLastDisplayedEventIndex({
allowPartial: true, allowPartial: true,
ignoreEchoes: true,
}); });
if (lastDisplayedIndex === null) { if (lastDisplayedIndex === null) {
@ -1129,9 +1122,7 @@ const TimelinePanel = React.createClass({
_getLastDisplayedEventIndex: function(opts) { _getLastDisplayedEventIndex: function(opts) {
opts = opts || {}; opts = opts || {};
const ignoreOwn = opts.ignoreOwn || false; const ignoreOwn = opts.ignoreOwn || false;
const ignoreEchoes = opts.ignoreEchoes || false;
const allowPartial = opts.allowPartial || false; const allowPartial = opts.allowPartial || false;
const allowEventsWithoutTiles = opts.allowEventsWithoutTiles || false;
const messagePanel = this.refs.messagePanel; const messagePanel = this.refs.messagePanel;
if (messagePanel === undefined) return null; if (messagePanel === undefined) return null;
@ -1152,8 +1143,7 @@ const TimelinePanel = React.createClass({
return false; return false;
}; };
// if allowEventsWithoutTiles is enabled, we keep track // We keep track of how many of the adjacent events didn't have a tile
// of how many of the adjacent events didn't have a tile
// but should have the read receipt moved past them, so // but should have the read receipt moved past them, so
// we can include those once we find the last displayed (visible) event. // we can include those once we find the last displayed (visible) event.
// The counter is not started for events we don't want // The counter is not started for events we don't want
@ -1178,11 +1168,11 @@ const TimelinePanel = React.createClass({
adjacentInvisibleEventCount = 0; adjacentInvisibleEventCount = 0;
} }
const shouldIgnore = (ignoreEchoes && ev.status) || // local echo const shouldIgnore = !!ev.status || // local echo
(ignoreOwn && ev.sender && ev.sender.userId == myUserId); // own message (ignoreOwn && ev.sender && ev.sender.userId == myUserId); // own message
const isWithoutTile = !EventTile.haveTileForEvent(ev) || shouldHideEvent(ev); const isWithoutTile = !EventTile.haveTileForEvent(ev) || shouldHideEvent(ev);
if (allowEventsWithoutTiles && (isWithoutTile || !node)) { if (isWithoutTile || !node) {
// don't start counting if the event should be ignored, // don't start counting if the event should be ignored,
// but continue counting if we were already so the offset // but continue counting if we were already so the offset
// to the previous invisble event that didn't need to be ignored // to the previous invisble event that didn't need to be ignored