fix flatMap

dqh147258 · Sep 26, 2022 · a63187d · a63187d
1 parent 8506556
commit a63187d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/rxandroidextensions/src/main/java/com/yxf/rxandroidextensions/Pair.kt b/rxandroidextensions/src/main/java/com/yxf/rxandroidextensions/Pair.kt
@@ -13,8 +13,8 @@ fun <T, D, R> Observable<Pair<T, D>>.map(block: (t: T, d: D) -> R): Observable<R
     return map { block(it.first, it.second) }
 }
 
-fun <T, D, R> Observable<Pair<T, D>>.flatMap(block: (t: T, d: D) -> R): Observable<R> {
-    return flatMap { Observable.just(block(it.first, it.second)) }
+fun <T, D, R> Observable<Pair<T, D>>.flatMap(block: (t: T, d: D) -> Observable<R>): Observable<R> {
+    return flatMap { block(it.first, it.second) }
 }
 
 fun <F, S, T> Observable<F>.pairWith(second: S, third: T): Observable<ThreePair<F, S, T>> {
@@ -25,7 +25,7 @@ fun <F, S, T, R> Observable<ThreePair<F, S, T>>.map(block: (f: F, s: S, t: T) ->
     return map { block(it.first, it.second, it.third) }
 }
 
-fun <F, S, T, R> Observable<ThreePair<F, S, T>>.flatMap(block: (f: F, s: S, t: T) -> R): Observable<R> {
-    return flatMap { Observable.just(block(it.first, it.second, it.third)) }
+fun <F, S, T, R> Observable<ThreePair<F, S, T>>.flatMap(block: (f: F, s: S, t: T) -> Observable<R>): Observable<R> {
+    return flatMap { block(it.first, it.second, it.third) }
 }