react-native-keyboard-controller 1.14.1 → 1.14.2

package/android/src/main/java/com/reactnativekeyboardcontroller/events/FocusedInputLayoutChangedEvent.kt

@@ -20,7 +20,7 @@ class FocusedInputLayoutChangedEvent(
   viewId: Int,
   private val event: FocusedInputLayoutChangedEventData,
 ) : Event<FocusedInputLayoutChangedEvent>(surfaceId, viewId) {
-  override fun getEventName() = "topFocusedInputLayoutChanged"
+  override fun getEventName() = EVENT_NAME
 
   // All events for a given view can be coalesced
   override fun getCoalescingKey(): Short = 0
@@ -41,4 +41,8 @@ class FocusedInputLayoutChangedEvent(
         },
       )
     }
+
+  companion object {
+    const val EVENT_NAME = "topFocusedInputLayoutChanged"
+  }
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/events/FocusedInputSelectionChangedEvent.kt

@@ -19,7 +19,7 @@ class FocusedInputSelectionChangedEvent(
   viewId: Int,
   private val event: FocusedInputSelectionChangedEventData,
 ) : Event<FocusedInputSelectionChangedEvent>(surfaceId, viewId) {
-  override fun getEventName() = "topFocusedInputSelectionChanged"
+  override fun getEventName() = EVENT_NAME
 
   // All events for a given view can be coalesced
   override fun getCoalescingKey(): Short = 0
@@ -49,4 +49,8 @@ class FocusedInputSelectionChangedEvent(
         },
       )
     }
+
+  companion object {
+    const val EVENT_NAME = "topFocusedInputSelectionChanged"
+  }
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/events/FocusedInputTextChangedEvent.kt

@@ -9,7 +9,7 @@ class FocusedInputTextChangedEvent(
   viewId: Int,
   private val text: String,
 ) : Event<FocusedInputTextChangedEvent>(surfaceId, viewId) {
-  override fun getEventName() = "topFocusedInputTextChanged"
+  override fun getEventName() = EVENT_NAME
 
   // All events for a given view can be coalesced
   override fun getCoalescingKey(): Short = 0
@@ -18,4 +18,8 @@ class FocusedInputTextChangedEvent(
     Arguments.createMap().apply {
       putString("text", text)
     }
+
+  companion object {
+    const val EVENT_NAME = "topFocusedInputTextChanged"
+  }
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/events/KeyboardTransitionEvent.kt

@@ -8,13 +8,13 @@ import com.facebook.react.uimanager.events.Event
 class KeyboardTransitionEvent(
   surfaceId: Int,
   viewId: Int,
-  private val event: String,
+  private val event: EventName,
   private val height: Double,
   private val progress: Double,
   private val duration: Int,
   private val target: Int,
 ) : Event<KeyboardTransitionEvent>(surfaceId, viewId) {
-  override fun getEventName() = event
+  override fun getEventName() = event.value
 
   // All events for a given view can be coalesced?
   override fun getCoalescingKey(): Short = 0
@@ -26,4 +26,20 @@ class KeyboardTransitionEvent(
       putInt("duration", duration)
       putInt("target", target)
     }
+
+  companion object {
+    enum class EventName(
+      val value: String,
+    ) {
+      Move("topKeyboardMove"),
+      Start("topKeyboardMoveStart"),
+      End("topKeyboardMoveEnd"),
+      Interactive("topKeyboardMoveInteractive"),
+    }
+
+    val Move = EventName.Move
+    val Start = EventName.Start
+    val End = EventName.End
+    val Interactive = EventName.Interactive
+  }
 }

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

@@ -79,7 +79,7 @@ class KeyboardAnimationCallback(
             KeyboardTransitionEvent(
               surfaceId,
               eventPropagationView.id,
-              "topKeyboardMoveStart",
+              KeyboardTransitionEvent.Start,
               this.persistentKeyboardHeight,
               1.0,
               0,
@@ -91,7 +91,7 @@ class KeyboardAnimationCallback(
             KeyboardTransitionEvent(
               surfaceId,
               eventPropagationView.id,
-              "topKeyboardMoveEnd",
+              KeyboardTransitionEvent.End,
               this.persistentKeyboardHeight,
               1.0,
               0,
@@ -203,7 +203,7 @@ class KeyboardAnimationCallback(
       KeyboardTransitionEvent(
         surfaceId,
         eventPropagationView.id,
-        "topKeyboardMoveStart",
+        KeyboardTransitionEvent.Start,
         keyboardHeight,
         if (!isKeyboardVisible) 0.0 else 1.0,
         duration,
@@ -258,7 +258,12 @@ class KeyboardAnimationCallback(
       "DiffY: $diffY $height $progress ${InteractiveKeyboardProvider.isInteractive} $viewTagFocused",
     )
 
-    val event = if (InteractiveKeyboardProvider.isInteractive) "topKeyboardMoveInteractive" else "topKeyboardMove"
+    val event =
+      if (InteractiveKeyboardProvider.isInteractive) {
+        KeyboardTransitionEvent.Interactive
+      } else {
+        KeyboardTransitionEvent.Move
+      }
     context.dispatchEvent(
       eventPropagationView.id,
       KeyboardTransitionEvent(
@@ -315,7 +320,7 @@ class KeyboardAnimationCallback(
       KeyboardTransitionEvent(
         surfaceId,
         eventPropagationView.id,
-        "topKeyboardMoveEnd",
+        KeyboardTransitionEvent.End,
         keyboardHeight,
         if (!isKeyboardVisible) 0.0 else 1.0,
         duration,
@@ -343,7 +348,7 @@ class KeyboardAnimationCallback(
       getEventParams(keyboardHeight),
     )
     // dispatch `onMove` to update RN animated value and `onEnd` to indicate that transition finished
-    listOf("topKeyboardMove", "topKeyboardMoveEnd").forEach { eventName ->
+    listOf(KeyboardTransitionEvent.Move, KeyboardTransitionEvent.End).forEach { eventName ->
       context.dispatchEvent(
         eventPropagationView.id,
         KeyboardTransitionEvent(
@@ -371,7 +376,11 @@ class KeyboardAnimationCallback(
     duration = 0
 
     context.emitEvent("KeyboardController::keyboardWillShow", getEventParams(keyboardHeight))
-    listOf("topKeyboardMoveStart", "topKeyboardMove", "topKeyboardMoveEnd").forEach { eventName ->
+    listOf(
+      KeyboardTransitionEvent.Start,
+      KeyboardTransitionEvent.Move,
+      KeyboardTransitionEvent.End,
+    ).forEach { eventName ->
       context.dispatchEvent(
         eventPropagationView.id,
         KeyboardTransitionEvent(

package/android/src/main/java/com/reactnativekeyboardcontroller/managers/KeyboardControllerViewManagerImpl.kt

@@ -3,6 +3,10 @@ package com.reactnativekeyboardcontroller.managers
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
+import com.reactnativekeyboardcontroller.events.FocusedInputLayoutChangedEvent
+import com.reactnativekeyboardcontroller.events.FocusedInputSelectionChangedEvent
+import com.reactnativekeyboardcontroller.events.FocusedInputTextChangedEvent
+import com.reactnativekeyboardcontroller.events.KeyboardTransitionEvent
 import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
 
 @Suppress("detekt:UnusedPrivateProperty")
@@ -36,19 +40,19 @@ class KeyboardControllerViewManagerImpl(
   fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
     val map: MutableMap<String, Any> =
       MapBuilder.of(
-        "topKeyboardMove",
+        KeyboardTransitionEvent.Move.value,
         MapBuilder.of("registrationName", "onKeyboardMove"),
-        "topKeyboardMoveStart",
+        KeyboardTransitionEvent.Start.value,
         MapBuilder.of("registrationName", "onKeyboardMoveStart"),
-        "topKeyboardMoveEnd",
+        KeyboardTransitionEvent.End.value,
         MapBuilder.of("registrationName", "onKeyboardMoveEnd"),
-        "topKeyboardMoveInteractive",
+        KeyboardTransitionEvent.Interactive.value,
         MapBuilder.of("registrationName", "onKeyboardMoveInteractive"),
-        "topFocusedInputLayoutChanged",
+        FocusedInputLayoutChangedEvent.EVENT_NAME,
         MapBuilder.of("registrationName", "onFocusedInputLayoutChanged"),
-        "topFocusedInputTextChanged",
+        FocusedInputTextChangedEvent.EVENT_NAME,
         MapBuilder.of("registrationName", "onFocusedInputTextChanged"),
-        "topFocusedInputSelectionChanged",
+        FocusedInputSelectionChangedEvent.EVENT_NAME,
         MapBuilder.of("registrationName", "onFocusedInputSelectionChanged"),
       )
 

package/ios/extensions/UIApplication.swift

@@ -26,7 +26,7 @@ public extension UIApplication {
   }
 
   static func topViewController(
-    base: UIViewController? = UIApplication.shared.keyWindow?.rootViewController
+    base: UIViewController? = UIApplication.shared.activeWindow?.rootViewController
   ) -> UIViewController? {
     if let nav = base as? UINavigationController {
       return topViewController(base: nav.visibleViewController)

package/ios/extensions/UIView.swift

@@ -11,9 +11,29 @@ import UIKit
 
 public extension UIView {
   var globalFrame: CGRect? {
-    let rootView = UIApplication.shared.keyWindow?.rootViewController?.view
+    let rootView = UIApplication.shared.activeWindow?.rootViewController?.view
     return superview?.convert(frame, to: rootView)
   }
+
+  func isVisibleInHierarchy(initial: Bool = true) -> Bool {
+    guard let window = window else {
+      return false
+    }
+    if isHidden || alpha == 0.0 {
+      return false
+    }
+    if superview === window {
+      return true
+    } else if let superview = superview {
+      if initial, frame.minY >= superview.frame.height {
+        return false
+      } else {
+        return superview.isVisibleInHierarchy(initial: false)
+      }
+    } else {
+      return false
+    }
+  }
 }
 
 public extension Optional where Wrapped == UIView {
@@ -32,4 +52,11 @@ public extension Optional where Wrapped == UIView {
 
     return (position, frameY)
   }
+
+  func isVisibleInHierarchy(initial: Bool = true) -> Bool {
+    guard let view = self else {
+      return false
+    }
+    return view.isVisibleInHierarchy(initial: initial)
+  }
 }

package/ios/extensions/UIWindow.swift

@@ -37,8 +37,11 @@ public extension UIWindow {
     }
 
     func getTopWindow() -> UIWindow? {
-      // Return the keyboard window if it's available, otherwise return the last window
-      return keyboardWindow ?? UIApplication.shared.activeWindow
+      let keyboardView = KeyboardView.find()
+      // return the keyboard window if it's available and keyboard is visible, otherwise return the last window
+      return (keyboardWindow != nil && keyboardView.isVisibleInHierarchy())
+        ? keyboardWindow
+        : UIApplication.shared.activeWindow
     }
   }
 

package/ios/observers/FocusedInputObserver.swift

@@ -204,10 +204,10 @@ public class FocusedInputObserver: NSObject {
   }
 
   private func substituteDelegateBack(_ input: UIResponder?) {
-    if let textField = input as? UITextField {
-      textField.delegate = delegate.activeDelegate as? UITextFieldDelegate
-    } else if let textView = input as? UITextView {
-      (textView as? RCTUITextView)?.setForceDelegate(delegate.activeDelegate as? UITextViewDelegate)
+    if let textField = input as? UITextField, let oldDelegate = delegate.activeDelegate as? UITextFieldDelegate {
+      textField.delegate = oldDelegate
+    } else if let textView = input as? UITextView, let oldDelegate = delegate.activeDelegate as? UITextViewDelegate {
+      (textView as? RCTUITextView)?.setForceDelegate(oldDelegate)
     }
   }
 

package/ios/views/OverKeyboardViewManager.mm

@@ -102,10 +102,27 @@ RCT_EXPORT_VIEW_PROPERTY(visible, BOOL)
     _touchHandler = [[RCTTouchHandler alloc] initWithBridge:bridge];
     _contentView = [[UIView alloc] initWithFrame:CGRectZero];
   }
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(hide)
+                                               name:RCTJavaScriptWillStartLoadingNotification
+                                             object:nil];
   return self;
 }
 #endif
 
+- (void)dealloc
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+// MARK: lifecycle methods
+- (void)didMoveToSuperview
+{
+  if (self.superview == nil) {
+    [self hide];
+  }
+}
+
 // MARK: touch handling
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {

package/package.json

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