From f4dc7ae8b18c0106a9dac1672c9dc393977ae2db Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 28 Mar 2017 10:38:57 +0100 Subject: [PATCH] Improve zeroing of RoomList notification badges Use an action and force an update when zeroing the number of notifications in a room. This is better than waiting for a `render` to happen at some point. This will hopefully fix https://github.com/vector-im/riot-web/issues/3257 --- src/components/structures/TimelinePanel.js | 7 ++++--- src/components/views/rooms/RoomList.js | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js index 8ef0e7631f..cc14bd7c02 100644 --- a/src/components/structures/TimelinePanel.js +++ b/src/components/structures/TimelinePanel.js @@ -476,9 +476,10 @@ var TimelinePanel = React.createClass({ // if we are scrolled to the bottom, do a quick-reset of our unreadNotificationCount // to avoid having to wait from the remote echo from the homeserver. if (this.isAtEndOfLiveTimeline()) { - this.props.timelineSet.room.setUnreadNotificationCount('total', 0); - this.props.timelineSet.room.setUnreadNotificationCount('highlight', 0); - // XXX: i'm a bit surprised we don't have to emit an event or dispatch to get this picked up + dis.dispatch({ + action: 'on_room_read', + room: this.props.timelineSet.room, + }); } var currentReadUpToEventId = this._getCurrentReadReceipt(true); diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index 51811f672a..1ec3c152e4 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -96,6 +96,12 @@ module.exports = React.createClass({ }); } break; + case 'on_room_read': + payload.room.setUnreadNotificationCount('total', 0); + payload.room.setUnreadNotificationCount('highlight', 0); + // Force an update because this state is too deep to cause an update + this.forceUpdate(); + break; } },