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

clear min-height on ScrollPanel::componentDidUpdate to catch all cases

Browse source
This commit is contained in:
Bruno Windels 2019-02-04 18:27:22 +00:00
parent a6914274b0
commit 3d393b654b
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/structures/MessagePanel.js
View file

@ -642,14 +642,13 @@ module.exports = React.createClass({
updateTimelineMinHeight: function() { updateTimelineMinHeight: function() {
const scrollPanel = this.refs.scrollPanel; const scrollPanel = this.refs.scrollPanel;
const whoIsTyping = this.refs.whoIsTyping;
const isTypingVisible = whoIsTyping && whoIsTyping.isVisible();
if (scrollPanel) { if (scrollPanel) {
if (isTypingVisible) { const isAtBottom = scrollPanel.isAtBottom();
const whoIsTyping = this.refs.whoIsTyping;
const isTypingVisible = whoIsTyping && whoIsTyping.isVisible();
if (isAtBottom && isTypingVisible) {
scrollPanel.blockShrinking(); scrollPanel.blockShrinking();
} else {
scrollPanel.clearBlockShrinking();
} }
} }
}, },

4
src/components/structures/ScrollPanel.js
View file

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