blade/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2024-12-17 17:20:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed scroll to unread when not visible

Browse Source
This commit is contained in:
Diogo
2024-11-06 16:21:10 +00:00
parent 9155a2f02a
commit 1c697c4a31
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/Shared/Views/Chat/ChatView.swift
+4 -2
View File
@@ -363,8 +363,10 @@ struct ChatView: View {
}
ChatView.FloatingButtonModel.shared.totalUnread = chat.chatStats.unreadCount
Task {
if let firstunreadItem = self.getFirstUnreadItem() {
scrollModel.scrollToUnread(id: firstunreadItem.id)
DispatchQueue.main.async {
if let firstunreadItem = self.getFirstUnreadItem() {
scrollModel.scrollToUnread(id: firstunreadItem.id)
}
}
}
}
apps/ios/Shared/Views/Chat/ReverseList.swift
+13 -6
View File
@@ -38,6 +38,7 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
case .bottom:
controller.scroll(to: 0, position: .top)
case let .unread(id):
logger.error("[scrolling] to unread id: (\(id)) size: \(items.count)")
controller.scrollToUnread(to: items.first(where: { $0.id == id }))
}
} else {
@@ -177,20 +178,23 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
func scrollToUnread(to cItem: ChatItem?) {
if let it = cItem, let indexPath = dataSource.indexPath(for: it) {
if isVisible(indexPath: indexPath) {
self.scroll(to: 0, position: .top)
logger.error("[scrolling] unread visible")
self.scroll(to: 0, position: .bottom)
} else {
self.scroll(to: indexPath.row, position: .bottom)
logger.error("[scrolling] unread not visible and at line index: \(indexPath.row)")
self.scrollToItem(to: cItem, position: .bottom)
}
} else {
self.scroll(to: nil, position: .bottom)
logger.error("[scrolling] unread not found")
self.scroll(to: nil, position: .top)
}
}
func scrollToItem(to cItem: ChatItem?, position: UITableView.ScrollPosition) {
func scrollToItem(to cItem: ChatItem?, position: UITableView.ScrollPosition) {
if let it = cItem, let indexPath = dataSource.indexPath(for: it) {
self.scroll(to: indexPath.row, position: position)
} else {
scroll(to: nil, position: position)
self.scroll(to: nil, position: position)
}
}
@@ -201,7 +205,10 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
if #available(iOS 16.0, *) {
animated = true
}
if let index, tableView.numberOfRows(inSection: 0) != 0, !isVisible(indexPath: IndexPath(row: index, section: 0)) {
logger.error("[scrolling] requesting scroll")
if let index, tableView.numberOfRows(inSection: 0) != 0 {
logger.error("[scrolling] requesting scroll to index: \(index) position: \(position.rawValue)")
tableView.scrollToRow(
at: IndexPath(row: index, section: 0),
at: position,