Render children EventTiles before passing to summary element
This commit is contained in:
parent
764959ec1c
commit
566034cf2b
2 changed files with 7 additions and 6 deletions
|
@ -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;
|
||||||
|
|
|
@ -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));
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue