+ this.itemH = (this.props.layout == 'message-on-right' ? 60 : 30);
+ this.total = 0;
+ return (
@@ -243,46 +284,9 @@ export default class MessageList extends ListWithSelection
style={{ top: this.state.firstDayTop, display: this.state.firstDay ? '' : 'none' }}>
{(this.state.firstDay||'').toUpperCase()}
- {(this.props.groups||[]).map((grp, i) =>
- {
- if (i > 0)
- total++;
- let start = total+(this.state.firstGrp == i ? this.state.firstMsg : 0);
- let r = [
- i > 0 ?
{grp.name.toUpperCase()}
: null,
-
- {(this.state.firstGrp > i || this.state.lastGrp < i
- ?
- : [
- (this.state.firstGrp == i
- ?
- : null),
- this.getMessages(grp,
- this.state.firstGrp == i ? this.state.firstMsg : 0,
- this.state.lastGrp == i ? this.state.lastMsg+1 : grp.messageCount
- ).map((msg, j) => (msg
- ? [
-
,
- /*(msg.thread && this.props.threads ?
-
- {msg.thread.map(reply => )}
-
- : null)*/
- ]
- :
- )),
- (this.state.lastGrp == i
- ?
- : null)
- ]
- )}
-
- ];
- total += grp.messageCount;
- return r;
- })}
+ {(this.props.groups||[]).map(this.renderGroup)}