Merge pull request #2567 from matrix-org/bwindels/fixjumpdownwhitespace

Fix: 'jump to bottom' creates big amounts of whitespace at the bottom
matrix-org · Feb 5, 2019 · 4dd8feb · 4dd8feb
2 parents 24db3e4 + 3d393b6
commit 4dd8feb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
@@ -642,14 +642,13 @@ module.exports = React.createClass({
 
     updateTimelineMinHeight: function() {
         const scrollPanel = this.refs.scrollPanel;
-        const whoIsTyping = this.refs.whoIsTyping;
-        const isTypingVisible = whoIsTyping && whoIsTyping.isVisible();
 
         if (scrollPanel) {
-            if (isTypingVisible) {
+            const isAtBottom = scrollPanel.isAtBottom();
+            const whoIsTyping = this.refs.whoIsTyping;
+            const isTypingVisible = whoIsTyping && whoIsTyping.isVisible();
+            if (isAtBottom && isTypingVisible) {
                 scrollPanel.blockShrinking();
-            } else {
-                scrollPanel.clearBlockShrinking();
             }
         }
     },

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
@@ -169,6 +169,10 @@ module.exports = React.createClass({
         //
         // This will also re-check the fill state, in case the paginate was inadequate
         this.checkScroll();
+
+        if (!this.isAtBottom()) {
+            this.clearBlockShrinking();
+        }
     },
 
     componentWillUnmount: function() {