mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Some fixes for windowed render

Browse source
This commit is contained in:
Scott Nonnenberg 2019-08-15 07:59:56 -07:00
parent e4d2e28ec4
commit 0b0214cbf9
4 changed files with 84 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

52
ts/state/ducks/conversations.ts
View file

@ -857,6 +857,30 @@ export function reducer(
totalUnread,
} = existingConversation.metrics;
if (messages.length < 1) {
return state;
}
const lookup = fromPairs(
existingConversation.messageIds.map(id => [id, messagesLookup[id]])
);
messages.forEach(message => {
lookup[message.id] = message;
});
const sorted = orderBy(values(lookup), ['received_at'], ['ASC']);
const messageIds = sorted.map(message => message.id);
const first = sorted[0];
const last = sorted[sorted.length - 1];
if (!newest) {
newest = pick(first, ['id', 'received_at']);
}
if (!oldest) {
oldest = pick(last, ['id', 'received_at']);
}
const existingTotal = existingConversation.messageIds.length;
if (isNewMessage && existingTotal > 0) {
const lastMessageId = existingConversation.messageIds[existingTotal - 1];
@ -869,27 +893,6 @@ export function reducer(
}
}
const newIds = messages.map(message => message.id);
const newChanges = intersection(newIds, existingConversation.messageIds);
const heightChangeMessageIds = uniq([
...newChanges,
...existingConversation.heightChangeMessageIds,
]);
const lookup = fromPairs(
existingConversation.messageIds.map(id => [id, messagesLookup[id]])
);
messages.forEach(message => {
lookup[message.id] = message;
});
const sorted = orderBy(values(lookup), ['received_at'], ['ASC']);
const messageIds = sorted.map(message => message.id);
const first = sorted[0];
const last = sorted.length > 0 ? sorted[sorted.length - 1] : null;
if (first && oldest && first.received_at < oldest.received_at) {
oldest = pick(first, ['id', 'received_at']);
}
@ -897,6 +900,7 @@ export function reducer(
newest = pick(last, ['id', 'received_at']);
}
const newIds = messages.map(message => message.id);
const newMessageIds = difference(newIds, existingConversation.messageIds);
const { isNearBottom } = existingConversation;
@ -924,6 +928,12 @@ export function reducer(
totalUnread = (totalUnread || 0) + newUnread;
}
const changedIds = intersection(newIds, existingConversation.messageIds);
const heightChangeMessageIds = uniq([
...changedIds,
...existingConversation.heightChangeMessageIds,
]);
return {
...state,
messagesLookup: {