Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-21 15:56:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

In “descending” mode, show “reply” button below the first message

Browse source
This commit is contained in:
Ben Gotow 2017-09-25 17:07:11 -07:00
parent 182a8692e7
commit edff68e04f
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/internal_packages/message-list/lib/message-list.jsx
View file

@ -239,31 +239,25 @@ class MessageList extends React.Component {
_messageElements() {
const {messagesExpandedState, currentThread} = this.state;
const elements = [];
let lastMessageIdx;
const descendingOrderMessageList = NylasEnv.config.get('core.reading.descendingOrderMessageList');
let messages = this._messagesWithMinification(this.state.messages);
const mostRecentMessage = messages[messages.length - 1];
const hasReplyArea = mostRecentMessage && !mostRecentMessage.draft;
// Check on whether to display items in descending order
if (descendingOrderMessageList) {
// Invert the message list if the descending option is set
if (NylasEnv.config.get('core.reading.descendingOrderMessageList')) {
messages = messages.reverse();
lastMessageIdx = 0;
} else {
lastMessageIdx = messages.length - 1;
}
const lastItem = this.state.messages[descendingOrderMessageList ? 0 : this.state.messages.length - 1];
const hasReplyArea = lastItem && !lastItem.draft;
messages.forEach((message, idx) => {
messages.forEach((message) => {
if (message.type === "minifiedBundle") {
elements.push(this._renderMinifiedBundle(message))
return;
}
const collapsed = !messagesExpandedState[message.id];
const isLastItem = (lastMessageIdx === idx);
const isBeforeReplyArea = isLastItem && hasReplyArea;
const isMostRecent = message === mostRecentMessage;
const isBeforeReplyArea = isMostRecent && hasReplyArea;
elements.push(
<MessageItemContainer
@ -273,15 +267,17 @@ class MessageList extends React.Component {
message={message}
messages={messages}
collapsed={collapsed}
isLastItem={isLastItem}
isMostRecent={isMostRecent}
isBeforeReplyArea={isBeforeReplyArea}
scrollTo={this._scrollTo}
/>
);
if (isBeforeReplyArea) {
elements.push(this._renderReplyArea());
}
});
if (hasReplyArea && lastItem) {
elements.push(this._renderReplyArea());
}
return elements;
}