zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

fix: notification always trigger scroll-to-top issue

This commit is contained in:
CMK 2021-06-30 16:20:46 +08:00
parent 9e5d7836ee
commit 37df2fbd45
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mastodon/Scene/Notification/NotificationViewController.swift
View File

@ -93,6 +93,7 @@ extension NotificationViewController {
.receive(on: RunLoop.main) .receive(on: RunLoop.main)
.sink { [weak self] in .sink { [weak self] in
guard let self = self else { return } guard let self = self else { return }
guard self.viewModel.needsScrollToTopAfterDataSourceUpdate else { return }
self.viewModel.needsScrollToTopAfterDataSourceUpdate = false self.viewModel.needsScrollToTopAfterDataSourceUpdate = false
DispatchQueue.main.asyncAfter(deadline: .now() + 0.33) { DispatchQueue.main.asyncAfter(deadline: .now() + 0.33) {
self.scrollToTop(animated: true) self.scrollToTop(animated: true)
@ -106,6 +107,9 @@ extension NotificationViewController {
.sink { [weak self] segment in .sink { [weak self] segment in
guard let self = self else { return } guard let self = self else { return }
self.segmentControl.selectedSegmentIndex = segment.rawValue self.segmentControl.selectedSegmentIndex = segment.rawValue
// trigger scroll-to-top after data reload
self.viewModel.needsScrollToTopAfterDataSourceUpdate = true
guard let domain = self.viewModel.activeMastodonAuthenticationBox.value?.domain, let userID = self.viewModel.activeMastodonAuthenticationBox.value?.userID else { guard let domain = self.viewModel.activeMastodonAuthenticationBox.value?.domain, let userID = self.viewModel.activeMastodonAuthenticationBox.value?.userID else {
return return