From e42bea6277175e94bcd9ed92ee32c384e283a500 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 12 Jan 2018 18:17:03 +0000 Subject: [PATCH 1/2] Don't paginate whilst decrypting events As comment hopefully explains. This meant loading the app on an e2e room would often be very slow as it tried to pull hundreds of events into the timeline. --- src/components/structures/TimelinePanel.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js index 3760bb37c5..4ade78af85 100644 --- a/src/components/structures/TimelinePanel.js +++ b/src/components/structures/TimelinePanel.js @@ -302,6 +302,8 @@ var TimelinePanel = React.createClass({ // set off a pagination request. onMessageListFillRequest: function(backwards) { + if (!this._shouldPaginate()) return Promise.resolve(false); + const dir = backwards ? EventTimeline.BACKWARDS : EventTimeline.FORWARDS; const canPaginateKey = backwards ? 'canBackPaginate' : 'canForwardPaginate'; const paginatingKey = backwards ? 'backPaginating' : 'forwardPaginating'; @@ -1091,6 +1093,17 @@ var TimelinePanel = React.createClass({ }, this.props.onReadMarkerUpdated); }, + _shouldPaginate: function() { + // don't try to paginate while events in the timeline are + // still being decrypted. We don't render events while they're + // being decrypted, so they don't take up space in the timeline. + // This means we can pull quite a lot of events into the timeline + // and end up trying to render a lot of events. + return !this.state.events.some((e) => { + return e.isBeingDecrypted(); + }); + }, + render: function() { const MessagePanel = sdk.getComponent("structures.MessagePanel"); const Loader = sdk.getComponent("elements.Spinner"); From 47f3e511b6dc9ce3b094d8b9c2ba92c40fd2aaae Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 17 Jan 2018 11:01:50 +0000 Subject: [PATCH 2/2] Retest please