imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
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));

6
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),
}; };
}, },
@ -376,7 +378,7 @@ module.exports = React.createClass({
return items[0]; return items[0];
} else if (remaining) { } else if (remaining) {
items = items.slice(0, itemLimit); items = items.slice(0, itemLimit);
return (remaining > 1) return (remaining > 1)
? _t("%(items)s and %(remaining)s others", { items: items.join(', '), remaining: remaining } ) ? _t("%(items)s and %(remaining)s others", { items: items.join(', '), remaining: remaining } )
: _t("%(items)s and one other", { items: items.join(', ') }); : _t("%(items)s and one other", { items: items.join(', ') });
} else { } else {