Merge pull request #52 from cpwhidden/will-show

fixed willShowVisibleHeight called when hiding
RxSwiftCommunity · Dec 28, 2017 · a5b53e1 · a5b53e1
2 parents be305c2 + 4b9cbe9
commit a5b53e1
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/Sources/RxKeyboard/RxKeyboard.swift b/Sources/RxKeyboard/RxKeyboard.swift
@@ -62,11 +62,10 @@ public class RxKeyboard: NSObject, RxKeyboardType {
     self.visibleHeight = self.frame.map { UIScreen.main.bounds.height - $0.origin.y }
     self.willShowVisibleHeight = self.visibleHeight
       .scan((visibleHeight: 0, isShowing: false)) { lastState, newVisibleHeight in
-        return (visibleHeight: newVisibleHeight, isShowing: lastState.visibleHeight == 0)
+        return (visibleHeight: newVisibleHeight, isShowing: lastState.visibleHeight == 0 && newVisibleHeight > 0)
       }
       .filter { state in state.isShowing }
       .map { state in state.visibleHeight }
-      .skip(1)
     self.isHidden = self.visibleHeight.map({ $0 == 0.0 }).distinctUntilChanged()
     super.init()