Merge pull request #641 from matrix-org/luke/fix-statusbar-hidden

Expand timeline in situations when _getIndicator not null
This commit is contained in:
David Baker
2017-01-24 14:43:46 +00:00
committed by GitHub
+5 -1
View File
@@ -135,7 +135,11 @@ module.exports = React.createClass({
// changed - so we use '0' to indicate normal size, and other values to // changed - so we use '0' to indicate normal size, and other values to
// indicate other sizes. // indicate other sizes.
_getSize: function(state, props) { _getSize: function(state, props) {
if (state.syncState === "ERROR" || state.whoisTypingString) { if (state.syncState === "ERROR" ||
state.whoisTypingString ||
props.numUnreadMessages ||
!props.atEndOfLiveTimeline ||
props.hasActiveCall) {
return STATUS_BAR_EXPANDED; return STATUS_BAR_EXPANDED;
} else if (props.tabCompleteEntries) { } else if (props.tabCompleteEntries) {
return STATUS_BAR_HIDDEN; return STATUS_BAR_HIDDEN;