react-native-keyboard-controller 1.19.4 → 1.19.5

package/ios/observers/movement/KeyboardTrackingView.swift

@@ -11,7 +11,7 @@ import UIKit
  * A compatibility view that resolves to `KeyboardView` on iOS < 26
  * and uses `keyboardLayoutGuide` on iOS 26+.
  */
-final class KeyboardTrackingView: UIView {
+public final class KeyboardTrackingView: UIView {
   private var keyboardView: UIView? { KeyboardViewLocator.shared.resolve() }
   private var keyboardHeight = 0.0
   private weak var currentAttachedView: UIView?
@@ -56,23 +56,17 @@ final class KeyboardTrackingView: UIView {
       name: UIResponder.keyboardDidShowNotification,
       object: nil
     )
-    NotificationCenter.default.addObserver(
-      self,
-      selector: #selector(attachToTopmostView),
-      name: UIApplication.didBecomeActiveNotification,
-      object: nil
-    )
   }
 
-  override func willMove(toWindow newWindow: UIWindow?) {
+  override public func willMove(toWindow newWindow: UIWindow?) {
     // When the view is being removed from the window, we need to re-attach it
     if newWindow == nil, !isAttaching {
       attachToTopmostView()
     }
   }
 
-  @objc private func attachToTopmostView() {
-    guard let topView = UIApplication.topViewController()?.view else { return }
+  @objc public func attachToTopmostView(toWindow window: UIWindow? = nil) {
+    guard let topView = (window?.rootViewController ?? UIApplication.topViewController())?.view else { return }
 
     if currentAttachedView === topView { return }
 

package/ios/observers/movement/observer/KeyboardMovementObserver.swift

@@ -18,7 +18,7 @@ public class KeyboardMovementObserver: NSObject {
   var onRequestAnimation: () -> Void
   var onCancelAnimation: () -> Void
   // progress tracker
-  var keyboardTrackingView = KeyboardTrackingView()
+  @objc public var keyboardTrackingView = KeyboardTrackingView()
   var animation: KeyboardAnimation?
 
   var prevKeyboardPosition = 0.0

package/ios/views/KeyboardControllerView.mm

@@ -259,6 +259,14 @@ using namespace facebook::react;
   }
 }
 
+- (void)didMoveToWindow
+{
+  [super didMoveToWindow];
+  if (self.window) {
+    [keyboardObserver.keyboardTrackingView attachToTopmostViewToWindow:self.window];
+  }
+}
+
 - (void)mount
 {
   [inputObserver mount];

package/ios/views/KeyboardControllerViewManager.swift

@@ -85,6 +85,13 @@ class KeyboardControllerView: UIView {
     }
   }
 
+  override func didMoveToWindow() {
+    super.didMoveToWindow()
+    if window != nil {
+      keyboardObserver?.keyboardTrackingView.attachToTopmostView(toWindow: window)
+    }
+  }
+
   override func layoutSubviews() {
     super.layoutSubviews()
 

package/package.json

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