react-native-keyboard-controller 1.5.1 → 1.5.2

package/android/src/main/java/com/reactnativekeyboardcontroller/KeyboardAnimationCallback.kt

@@ -156,7 +156,7 @@ class KeyboardAnimationCallback(
       // then we need to reset the state
       InteractiveKeyboardProvider.shown = false
     }
-    val isKeyboardVisible = isKeyboardVisible || isKeyboardShown
+    isKeyboardVisible = isKeyboardVisible || isKeyboardShown
 
     this.emitEvent("KeyboardController::" + if (!isKeyboardVisible) "keyboardDidHide" else "keyboardDidShow", getEventParams(this.persistentKeyboardHeight))
     this.sendEventToJS(KeyboardTransitionEvent(view.id, "topKeyboardMoveEnd", this.persistentKeyboardHeight, if (!isKeyboardVisible) 0.0 else 1.0))

package/ios/KeyboardMovementObserver.swift

@@ -42,6 +42,7 @@ public class KeyboardMovementObserver: NSObject {
   private var prevKeyboardPosition = 0.0
   private var displayLink: CADisplayLink?
   private var keyboardHeight: CGFloat = 0.0
+  private var hasKVObserver = false
 
   @objc public init(
     handler: @escaping (NSString, NSNumber, NSNumber) -> Void,
@@ -82,18 +83,40 @@ public class KeyboardMovementObserver: NSObject {
       name: UIWindow.didBecomeVisibleNotification,
       object: nil
     )
+    NotificationCenter.default.addObserver(
+      self,
+      selector: #selector(windowDidBecomeHidden),
+      name: UIWindow.didBecomeHiddenNotification,
+      object: nil
+    )
+  }
+
+  @objc func windowDidBecomeHidden(_: Notification) {
+    removeKVObserver()
   }
 
   @objc func windowDidBecomeVisible(_: Notification) {
-    let keyboardView = findKeyboardView()
+    setupKVObserver()
+  }
 
-    if keyboardView == _keyboardView {
+  private func setupKVObserver() {
+    if hasKVObserver {
       return
     }
 
-    _keyboardView = keyboardView
+    if keyboardView != nil {
+      hasKVObserver = true
+      keyboardView?.addObserver(self, forKeyPath: "center", options: .new, context: nil)
+    }
+  }
+
+  private func removeKVObserver() {
+    if !hasKVObserver {
+      return
+    }
 
-    keyboardView?.addObserver(self, forKeyPath: "center", options: .new, context: nil)
+    hasKVObserver = false
+    keyboardView?.removeObserver(self, forKeyPath: "center", context: nil)
   }
 
   // swiftlint:disable:next block_based_kvo

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Keyboard manager which works in identical way on both iOS and Android",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",