mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-08-26 00:42:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #715 from matrix-org/luke/mels-scrolling-fix

Browse Source 
MELS: check scroll on load + use mels-1,-2,... key
This commit is contained in:
David Baker 2017-02-23 10:12:26 +00:00 committed by GitHub
commit 8737112a8c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/MessagePanel.js
View File

@ -349,7 +349,9 @@ module.exports = React.createClass({
<MemberEventListSummary <MemberEventListSummary
key={key} key={key}
events={summarisedEvents} events={summarisedEvents}
data-scroll-token={eventId}> data-scroll-token={eventId}
onToggle={this._onWidgetLoad} // Update scroll state
>
{eventTiles} {eventTiles}
</MemberEventListSummary> </MemberEventListSummary>
); );

3
src/components/views/elements/MemberEventListSummary.js
View File

@ -30,6 +30,8 @@ module.exports = React.createClass({
avatarsMaxLength: React.PropTypes.number, avatarsMaxLength: React.PropTypes.number,
// The minimum number of events needed to trigger summarisation // The minimum number of events needed to trigger summarisation
threshold: React.PropTypes.number, threshold: React.PropTypes.number,
// Called when the MELS expansion is toggled
onToggle: React.PropTypes.func,
}, },
getInitialState: function() { getInitialState: function() {
@ -63,6 +65,7 @@ module.exports = React.createClass({
this.setState({ this.setState({
expanded: !this.state.expanded, expanded: !this.state.expanded,
}); });
this.props.onToggle();
}, },
/** /**