Merge pull request #107 from yongseongkim/master

bigMOTOR · web-flow · commit 63f6377975c9 · 2023-04-11T12:29:20.000+03:00
The visibleHeight's output is wrong when 'Reduce Motion' and 'Prefer Cross-Fade Transitions' are on.
diff --git a/Sources/RxKeyboard/RxKeyboard.swift b/Sources/RxKeyboard/RxKeyboard.swift
@@ -63,7 +63,7 @@ public class RxKeyboard: NSObject, RxKeyboardType {
     )
     let frameVariable = BehaviorRelay<CGRect>(value: defaultFrame)
     self.frame = frameVariable.asDriver().distinctUntilChanged()
-    self.visibleHeight = self.frame.map { UIScreen.main.bounds.height - $0.origin.y }
+    self.visibleHeight = self.frame.map { UIScreen.main.bounds.intersection($0).height }
     self.willShowVisibleHeight = self.visibleHeight
       .scan((visibleHeight: 0, isShowing: false)) { lastState, newVisibleHeight in
         return (visibleHeight: newVisibleHeight, isShowing: lastState.visibleHeight == 0 && newVisibleHeight > 0)

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public class RxKeyboard: NSObject, RxKeyboardType {`
`63`	`63`	`)`
`64`	`64`	`let frameVariable = BehaviorRelay<CGRect>(value: defaultFrame)`
`65`	`65`	`self.frame = frameVariable.asDriver().distinctUntilChanged()`
`66`		`- self.visibleHeight = self.frame.map { UIScreen.main.bounds.height - $0.origin.y }`
	`66`	`+ self.visibleHeight = self.frame.map { UIScreen.main.bounds.intersection($0).height }`
`67`	`67`	`self.willShowVisibleHeight = self.visibleHeight`
`68`	`68`	`.scan((visibleHeight: 0, isShowing: false)) { lastState, newVisibleHeight in`
`69`	`69`	`return (visibleHeight: newVisibleHeight, isShowing: lastState.visibleHeight == 0 && newVisibleHeight > 0)`