From 8bb8ec141eea4230768c75b2eec3ea32f3c9e9fd Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 22 Feb 2019 16:23:05 +0100
Subject: [PATCH] clear min-height on timeline resets and other occasions where
we load it
---
src/components/structures/MessagePanel.js | 7 +++++++
src/components/structures/TimelinePanel.js | 5 +++++
2 files changed, 12 insertions(+)
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 291769fa03..9034123e52 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -658,6 +658,13 @@ module.exports = React.createClass({
}
},
+ clearTimelineHeight: function() {
+ const scrollPanel = this.refs.scrollPanel;
+ if (scrollPanel) {
+ scrollPanel.clearBlockShrinking();
+ }
+ },
+
onResize: function() {
dis.dispatch({ action: 'timeline_resize' }, true);
},
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 8890c26d42..911499e314 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -935,6 +935,11 @@ var TimelinePanel = React.createClass({
{windowLimit: this.props.timelineCap});
const onLoaded = () => {
+ // clear the timeline min-height when
+ // (re)loading the timeline
+ if (this.refs.messagePanel) {
+ this.refs.messagePanel.clearTimelineHeight();
+ }
this._reloadEvents();
// If we switched away from the room while there were pending