matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-16 22:01:54 +03:00
Code Activity

Merge pull request #1388 from matrix-org/t3chguy/start_mels_expanded

Browse Source 
start MELS expanded if it contains a highlighted/permalinked event.
This commit is contained in:
Matthew Hodgson
2017-09-17 22:09:44 +01:00
committed by GitHub
parent 6a53b7b149 f612b1933b
commit b06d540f4c
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,8 +365,13 @@ module.exports = React.createClass({
summarisedEvents.push(collapsedMxEv); summarisedEvents.push(collapsedMxEv);
} }
let highlightInMels = false;
// At this point, i = the index of the last event in the summary sequence // At this point, i = the index of the last event in the summary sequence
let eventTiles = summarisedEvents.map((e) => { let eventTiles = summarisedEvents.map((e) => {
if (e.getId() === this.props.highlightedEventId) {
highlightInMels = true;
}
// In order to prevent DateSeparators from appearing in the expanded form // In order to prevent DateSeparators from appearing in the expanded form
// of MemberEventListSummary, render each member event as if the previous // of MemberEventListSummary, render each member event as if the previous
// one was itself. This way, the timestamp of the previous event === the // one was itself. This way, the timestamp of the previous event === the
@ -380,15 +385,13 @@ module.exports = React.createClass({
eventTiles = null; eventTiles = null;
} }
ret.push( ret.push(<MemberEventListSummary key={key}
<MemberEventListSummary events={summarisedEvents}
key={key} onToggle={this._onWidgetLoad} // Update scroll state
events={summarisedEvents} startExpanded={highlightInMels}
onToggle={this._onWidgetLoad} // Update scroll state >
> {eventTiles}
{eventTiles} </MemberEventListSummary>);
</MemberEventListSummary>
);
if (readMarkerInMels) { if (readMarkerInMels) {
ret.push(this._getReadMarkerTile(visible)); ret.push(this._getReadMarkerTile(visible));

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

@ -34,11 +34,13 @@ module.exports = React.createClass({
threshold: React.PropTypes.number, threshold: React.PropTypes.number,
// Called when the MELS expansion is toggled // Called when the MELS expansion is toggled
onToggle: React.PropTypes.func, onToggle: React.PropTypes.func,
// Whether or not to begin with state.expanded=true
startExpanded: React.PropTypes.bool,
}, },
getInitialState: function() { getInitialState: function() {
return { return {
expanded: false, expanded: Boolean(this.props.startExpanded),
}; };
}, },