Skip to content

Commit 02cec2e

Browse files
committed
fix observables
1 parent 4698580 commit 02cec2e

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

iOSDesignPatternSamples/Sources/UI/Search/SearchViewModel.swift

+1-4
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,11 @@ final class SearchViewModel {
110110
.filter { $1 != nil }
111111
Observable.merge(initialLoad, loadMore)
112112
.map { SearchUserRequest(query: $0, after: $1) }
113-
.withLatestFrom(_isFetchingUsers.asObservable()) { ($0 , $1) }
114-
.filter { !$1 }
115-
.map { $0.0 }
116113
.distinctUntilChanged { $0.query == $1.query && $0.after == $1.after }
117114
.do(onNext: { [weak self] _ in
118115
self?._isFetchingUsers.value = true
119116
})
120-
.flatMap { ApiSession.shared.rx.send($0) }
117+
.flatMapLatest { ApiSession.shared.rx.send($0) }
121118
.subscribe(onNext: { [weak self] (response: Response<User>) in
122119
self?.pageInfo.value = response.pageInfo
123120
self?._users.value.append(contentsOf: response.nodes)

iOSDesignPatternSamples/Sources/UI/UserRepository/UserRepositoryViewModel.swift

-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ final class UserRepositoryViewModel {
6565
.filter { $1 != nil }
6666
Observable.merge(initialLoadRequest, loadMoreRequest)
6767
.map { UserNodeRequest(id: $0.id, after: $1) }
68-
.withLatestFrom(_isFetchingRepositories.asObservable()) { ($0, $1) }
69-
.filter { !$1 }
70-
.map { $0.0 }
7168
.distinctUntilChanged { $0.id == $1.id && $0.after == $1.after }
7269
.do(onNext: { [weak self] _ in
7370
self?._isFetchingRepositories.value = true

0 commit comments

Comments
 (0)