Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-01-01 13:14:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2 from nylas-mail-lives/mailspring-convo-desc-order

Browse source 
Displaying conversation in a descending chronological order
This commit is contained in:
Ben Gotow 2017-09-18 07:06:10 -07:00 committed by GitHub
commit a81cf69f7e
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -238,11 +238,22 @@ class MessageList extends React.Component {
_messageElements() {
const {messagesExpandedState, currentThread} = this.state;
const elements = []
const elements = [];
let lastMessageIdx;
const lastItem = this.state.messages[this.state.messages.length - 1];
const descendingOrderMessageList = NylasEnv.config.get('core.reading.descendingOrderMessageList');
let messages = this._messagesWithMinification(this.state.messages);
// Check on whether to display items in descending order
if (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;
const messages = this._messagesWithMinification(this.state.messages)
messages.forEach((message, idx) => {
if (message.type === "minifiedBundle") {
@ -251,7 +262,7 @@ class MessageList extends React.Component {
}
const collapsed = !messagesExpandedState[message.id];
const isLastItem = (messages.length - 1 === idx);
const isLastItem = (lastMessageIdx === idx);
const isBeforeReplyArea = isLastItem && hasReplyArea;
elements.push(
@ -268,7 +279,7 @@ class MessageList extends React.Component {
/>
);
});
if (hasReplyArea) {
if (hasReplyArea && lastItem) {
elements.push(this._renderReplyArea());
}
return elements;

2
app/internal_packages/message-list/styles/message-list.less
View file

@ -504,7 +504,7 @@ body.platform-win32 {
overflow: hidden;
max-width: @message-max-width;
margin: -3px auto 0 auto;
margin: -3px auto 10px auto;
position: relative;
z-index: 2;

5
app/src/config-schema.es6
View file

@ -94,6 +94,11 @@ export default {
'default': false,
'title': "Swipe gesture and backspace / delete move messages to trash",
},
descendingOrderMessageList: {
'type': 'boolean',
'default': false,
'title': "Display conversations in descending chronological order",
},
},
},
composing: {