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

feat: make content inset take effect for page navigation

This commit is contained in:
CMK 2021-07-14 20:40:27 +08:00
parent e006ea92c0
commit d8af11a9bc
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mastodon/Scene/Search/SearchResult/SearchResultViewController.swift
View File

@ -64,11 +64,12 @@ extension SearchResultViewController {
KeyboardResponderService.shared.state,
KeyboardResponderService.shared.endFrame
)
Publishers.CombineLatest(
Publishers.CombineLatest3(
keyboardEventPublishers,
viewModel.viewDidAppear
viewModel.viewDidAppear,
viewModel.didDataSourceUpdate
)
.sink(receiveValue: { [weak self] keyboardEvents, _ in
.sink(receiveValue: { [weak self] keyboardEvents, _, _ in
guard let self = self else { return }
let (isShow, state, endFrame) = keyboardEvents

6
Mastodon/Scene/Search/SearchResult/SearchResultViewModel.swift
View File

@ -36,6 +36,7 @@ final class SearchResultViewModel {
}()
let items = CurrentValueSubject<[SearchResultItem], Never>([])
var diffableDataSource: UITableViewDiffableDataSource<SearchResultSection, SearchResultItem>!
let didDataSourceUpdate = PassthroughSubject<Void, Never>()
init(context: AppContext, searchScope: SearchDetailViewModel.SearchScope) {
self.context = context
@ -93,7 +94,10 @@ final class SearchResultViewModel {
}
diffableDataSource.defaultRowAnimation = .fade
diffableDataSource.apply(snapshot, animatingDifferences: true)
diffableDataSource.apply(snapshot, animatingDifferences: true) { [weak self] in
guard let self = self else { return }
self.didDataSourceUpdate.send()
}
}
.store(in: &disposeBag)