matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Render children EventTiles before passing to summary element

Browse Source
This commit is contained in:
Luke Barnard
2016-11-10 13:25:48 +00:00
parent 764959ec1c
commit 566034cf2b
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -320,12 +320,13 @@ module.exports = React.createClass({
} }
).reduce((a,b) => a.concat(b)); ).reduce((a,b) => a.concat(b));
}; };
let eventTiles = renderEvents(prevEvent, summarisedEvents);
ret.push( ret.push(
<MemberEventListSummary <MemberEventListSummary events={summarisedEvents}>
events={summarisedEvents} {eventTiles}
previousEvent={prevEvent} </MemberEventListSummary>
renderEvents={renderEvents}
/>
); );
prevEvent = mxEv; prevEvent = mxEv;
continue; continue;

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

@@ -180,7 +180,7 @@ module.exports = React.createClass({
let expandedEvents = null; let expandedEvents = null;
if (expanded) { if (expanded) {
expandedEvents = this.props.renderEvents(this.props.previousEvent, eventsToRender); expandedEvents = this.props.children;
} }
let avatars = this.renderAvatars(joinEvents.concat(leaveEvents)); let avatars = this.renderAvatars(joinEvents.concat(leaveEvents));