Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only scroll when the unread marker was added in the same messages batch #1394

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Only scroll when the unread marker was added in the same messages batch #1394

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion NextcloudTalk/ChatViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,13 +863,16 @@ import UIKit
var insertSections: IndexSet = []
var reloadIndexPaths: Set<IndexPath> = []

var addedUnreadMessageSeparator = false

// Check if unread messages separator should be added (only if it's not already shown)
if firstNewMessagesAfterHistory, self.getLastRealMessage() != nil, self.indexPathForUnreadMessageSeparator() == nil, newMessagesContainVisibleMessages,
let lastDateSection = self.dateSections.last, var messagesBeforeUpdate = self.messages[lastDateSection] {

messagesBeforeUpdate.append(self.unreadMessagesSeparator)
self.messages[lastDateSection] = messagesBeforeUpdate
insertIndexPaths.insert(IndexPath(row: messagesBeforeUpdate.count - 1, section: self.dateSections.count - 1))
addedUnreadMessageSeparator = true
}

self.appendMessages(messages: messages)
Expand Down Expand Up @@ -925,7 +928,9 @@ import UIKit
self.removeUnreadMessagesSeparator()
}

if let indexPathUnreadMessageSeparator = self.indexPathForUnreadMessageSeparator() {
// Only scroll to unread message separator if we added it while processing the received messages
// Otherwise we would scroll whenever a unread message separator is available
if addedUnreadMessageSeparator, let indexPathUnreadMessageSeparator = self.indexPathForUnreadMessageSeparator() {
tableView.scrollToRow(at: indexPathUnreadMessageSeparator, at: .middle, animated: true)
} else if (shouldScrollOnNewMessages || messages.containsUserMessage()), let lastIndexPath = self.getLastRealMessage()?.indexPath {
tableView.scrollToRow(at: lastIndexPath, at: .none, animated: true)
Expand Down
Loading