react-native-keyboard-controller 1.14.0 → 1.14.2

package/android/src/main/java/com/reactnativekeyboardcontroller/constants/Keyboard.kt

@@ -0,0 +1,7 @@
+package com.reactnativekeyboardcontroller.constants
+
+import android.os.Build
+
+object Keyboard {
+  val IS_ANIMATION_EMULATED = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+}

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

@@ -1,6 +1,5 @@
 package com.reactnativekeyboardcontroller.listeners
 
-import android.os.Build
 import android.view.View
 import android.view.ViewTreeObserver.OnGlobalFocusChangeListener
 import androidx.core.graphics.Insets
@@ -14,6 +13,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.views.textinput.ReactEditText
 import com.facebook.react.views.view.ReactViewGroup
+import com.reactnativekeyboardcontroller.constants.Keyboard
 import com.reactnativekeyboardcontroller.events.KeyboardTransitionEvent
 import com.reactnativekeyboardcontroller.extensions.dispatchEvent
 import com.reactnativekeyboardcontroller.extensions.dp
@@ -24,7 +24,7 @@ import com.reactnativekeyboardcontroller.log.Logger
 import kotlin.math.abs
 
 private val TAG = KeyboardAnimationCallback::class.qualifiedName
-private val isResizeHandledInCallbackMethods = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+private val isResizeHandledInCallbackMethods = Keyboard.IS_ANIMATION_EMULATED
 
 data class KeyboardAnimationCallbackConfig(
   val persistentInsetTypes: Int,
@@ -33,13 +33,22 @@ data class KeyboardAnimationCallbackConfig(
   val hasTranslucentNavigationBar: Boolean = false,
 )
 
+interface Suspendable {
+  var isSuspended: Boolean
+
+  fun suspend(suspended: Boolean) {
+    isSuspended = suspended
+  }
+}
+
 class KeyboardAnimationCallback(
   val eventPropagationView: ReactViewGroup,
   val view: View,
   val context: ThemedReactContext?,
   private val config: KeyboardAnimationCallbackConfig,
 ) : WindowInsetsAnimationCompat.Callback(config.dispatchMode),
-  OnApplyWindowInsetsListener {
+  OnApplyWindowInsetsListener,
+  Suspendable {
   private val surfaceId = UIManagerHelper.getSurfaceId(eventPropagationView)
 
   // state variables
@@ -50,6 +59,7 @@ class KeyboardAnimationCallback(
   private var duration = 0
   private var viewTagFocused = -1
   private var animationsToSkip = hashSetOf<WindowInsetsAnimationCompat>()
+  override var isSuspended: Boolean = false
 
   // listeners
   private val focusListener =
@@ -69,7 +79,7 @@ class KeyboardAnimationCallback(
             KeyboardTransitionEvent(
               surfaceId,
               eventPropagationView.id,
-              "topKeyboardMoveStart",
+              KeyboardTransitionEvent.Start,
               this.persistentKeyboardHeight,
               1.0,
               0,
@@ -81,7 +91,7 @@ class KeyboardAnimationCallback(
             KeyboardTransitionEvent(
               surfaceId,
               eventPropagationView.id,
-              "topKeyboardMoveEnd",
+              KeyboardTransitionEvent.End,
               this.persistentKeyboardHeight,
               1.0,
               0,
@@ -147,7 +157,7 @@ class KeyboardAnimationCallback(
       this.onKeyboardResized(keyboardHeight)
     }
 
-    return WindowInsetsCompat.CONSUMED
+    return insets
   }
 
   @Suppress("detekt:ReturnCount")
@@ -155,7 +165,7 @@ class KeyboardAnimationCallback(
     animation: WindowInsetsAnimationCompat,
     bounds: WindowInsetsAnimationCompat.BoundsCompat,
   ): WindowInsetsAnimationCompat.BoundsCompat {
-    if (!animation.isKeyboardAnimation) {
+    if (!animation.isKeyboardAnimation || isSuspended) {
       return bounds
     }
 
@@ -193,7 +203,7 @@ class KeyboardAnimationCallback(
       KeyboardTransitionEvent(
         surfaceId,
         eventPropagationView.id,
-        "topKeyboardMoveStart",
+        KeyboardTransitionEvent.Start,
         keyboardHeight,
         if (!isKeyboardVisible) 0.0 else 1.0,
         duration,
@@ -211,7 +221,13 @@ class KeyboardAnimationCallback(
     // onProgress() is called when any of the running animations progress...
 
     // ignore non-keyboard animation or animation that we intentionally want to skip
-    runningAnimations.find { it.isKeyboardAnimation && !animationsToSkip.contains(it) } ?: return insets
+    val shouldSkipAnimation =
+      runningAnimations.find {
+        it.isKeyboardAnimation && !animationsToSkip.contains(it)
+      } == null
+    if (isSuspended || shouldSkipAnimation) {
+      return insets
+    }
 
     // First we get the insets which are potentially deferred
     val typesInset = insets.getInsets(config.deferredInsetTypes)
@@ -242,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(
@@ -262,7 +283,7 @@ class KeyboardAnimationCallback(
   override fun onEnd(animation: WindowInsetsAnimationCompat) {
     super.onEnd(animation)
 
-    if (!animation.isKeyboardAnimation) {
+    if (!animation.isKeyboardAnimation || isSuspended) {
       return
     }
 
@@ -299,7 +320,7 @@ class KeyboardAnimationCallback(
       KeyboardTransitionEvent(
         surfaceId,
         eventPropagationView.id,
-        "topKeyboardMoveEnd",
+        KeyboardTransitionEvent.End,
         keyboardHeight,
         if (!isKeyboardVisible) 0.0 else 1.0,
         duration,
@@ -311,10 +332,13 @@ class KeyboardAnimationCallback(
     duration = 0
   }
 
-  fun syncKeyboardPosition() {
-    val keyboardHeight = getCurrentKeyboardHeight()
+  fun syncKeyboardPosition(
+    height: Double? = null,
+    isVisible: Boolean? = null,
+  ) {
+    val keyboardHeight = height ?: getCurrentKeyboardHeight()
     // update internal state
-    isKeyboardVisible = isKeyboardVisible()
+    isKeyboardVisible = isVisible ?: isKeyboardVisible()
     prevKeyboardHeight = keyboardHeight
     isTransitioning = false
     duration = 0
@@ -324,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(
@@ -352,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/android/src/main/java/com/reactnativekeyboardcontroller/modal/ModalAttachedWatcher.kt

@@ -1,5 +1,6 @@
 package com.reactnativekeyboardcontroller.modal
 
+import android.view.ViewGroup
 import android.view.WindowManager
 import androidx.core.view.ViewCompat
 import com.facebook.react.uimanager.ThemedReactContext
@@ -10,16 +11,20 @@ import com.facebook.react.uimanager.events.EventDispatcherListener
 import com.facebook.react.views.modal.ReactModalHostView
 import com.facebook.react.views.view.ReactViewGroup
 import com.reactnativekeyboardcontroller.BuildConfig
+import com.reactnativekeyboardcontroller.constants.Keyboard
+import com.reactnativekeyboardcontroller.extensions.removeSelf
 import com.reactnativekeyboardcontroller.listeners.KeyboardAnimationCallback
 import com.reactnativekeyboardcontroller.listeners.KeyboardAnimationCallbackConfig
 import com.reactnativekeyboardcontroller.log.Logger
 
 private val TAG = ModalAttachedWatcher::class.qualifiedName
+private val areEventsComingFromOwnWindow = !Keyboard.IS_ANIMATION_EMULATED
 
 class ModalAttachedWatcher(
   private val view: ReactViewGroup,
   private val reactContext: ThemedReactContext,
   private val config: () -> KeyboardAnimationCallbackConfig,
+  private var callback: () -> KeyboardAnimationCallback?,
 ) : EventDispatcherListener {
   private val archType = if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) UIManagerType.FABRIC else UIManagerType.DEFAULT
   private val uiManager = UIManagerHelper.getUIManager(reactContext.reactApplicationContext, archType)
@@ -44,9 +49,13 @@ class ModalAttachedWatcher(
 
     val dialog = modal.dialog
     val window = dialog?.window
-    val rootView = window?.decorView?.rootView
+    val rootView = window?.decorView?.rootView as ViewGroup?
 
     if (rootView != null) {
+      val eventView =
+        ReactViewGroup(reactContext).apply {
+          layoutParams = ViewGroup.LayoutParams(0, 0)
+        }
       val callback =
         KeyboardAnimationCallback(
           view = rootView,
@@ -55,16 +64,35 @@ class ModalAttachedWatcher(
           config = config(),
         )
 
+      rootView.addView(eventView)
+      // on Android < 12 all events for `WindowInsetsAnimationCallback`
+      // go through main `rootView`, so we don't need to stop main
+      // callback - otherwise keyboard transitions will not be animated
+      this.callback()?.suspend(areEventsComingFromOwnWindow)
       ViewCompat.setWindowInsetsAnimationCallback(rootView, callback)
-      ViewCompat.setOnApplyWindowInsetsListener(rootView, callback)
+      ViewCompat.setOnApplyWindowInsetsListener(eventView, callback)
 
-      dialog.setOnDismissListener {
+      if (areEventsComingFromOwnWindow) {
+        // when modal is shown then keyboard will be hidden by default
+        //
+        // - if events are coming from main window - then keyboard position
+        //   will be synchronized from main window callback
+        // - if events are coming from modal window - then we need to update
+        //   position ourself, because callback can be attached after keyboard
+        //   auto-dismissal and we may miss some events and keyboard position
+        //   will be outdated
+        callback.syncKeyboardPosition(0.0, false)
+      }
+
+      dialog?.setOnDismissListener {
         callback.syncKeyboardPosition()
         callback.destroy()
+        eventView.removeSelf()
+        this.callback()?.suspend(false)
       }
 
       // imitating edge-to-edge mode behavior
-      window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
+      window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
     }
   }
 

package/android/src/main/java/com/reactnativekeyboardcontroller/modules/StatusBarManagerCompatModuleImpl.kt

@@ -2,6 +2,7 @@ package com.reactnativekeyboardcontroller.modules
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
+import android.app.Activity
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.core.view.WindowInsetsCompat
@@ -11,6 +12,7 @@ import com.facebook.react.bridge.UiThreadUtil
 import com.reactnativekeyboardcontroller.extensions.rootView
 import com.reactnativekeyboardcontroller.log.Logger
 import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
+import java.lang.ref.WeakReference
 
 private val TAG = StatusBarManagerCompatModuleImpl::class.qualifiedName
 
@@ -18,6 +20,7 @@ class StatusBarManagerCompatModuleImpl(
   private val mReactContext: ReactApplicationContext,
 ) {
   private var controller: WindowInsetsControllerCompat? = null
+  private var lastActivity = WeakReference<Activity?>(null)
 
   fun setHidden(hidden: Boolean) {
     UiThreadUtil.runOnUiThread {
@@ -71,8 +74,9 @@ class StatusBarManagerCompatModuleImpl(
   }
 
   private fun getController(): WindowInsetsControllerCompat? {
-    if (this.controller == null) {
-      val activity = mReactContext.currentActivity
+    val activity = mReactContext.currentActivity
+
+    if (this.controller == null || activity != lastActivity.get()) {
       if (activity == null) {
         Logger.w(
           TAG,
@@ -82,6 +86,7 @@ class StatusBarManagerCompatModuleImpl(
       }
 
       val window = activity.window
+      lastActivity = WeakReference(activity)
 
       this.controller = WindowInsetsControllerCompat(window, window.decorView)
     }

package/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt

@@ -47,7 +47,7 @@ class EdgeToEdgeReactViewGroup(
       )
 
   // managers/watchers
-  private val modalAttachedWatcher = ModalAttachedWatcher(this, reactContext, ::config)
+  private val modalAttachedWatcher = ModalAttachedWatcher(this, reactContext, ::config, ::getKeyboardCallback)
 
   init {
     reactContext.setupWindowDimensionsListener()
@@ -195,6 +195,10 @@ class EdgeToEdgeReactViewGroup(
   }
   // endregion
 
+  // region Helpers
+  private fun getKeyboardCallback(): KeyboardAnimationCallback? = this.callback
+  // endregion
+
   // region Props setters
   fun setStatusBarTranslucent(isStatusBarTranslucent: Boolean) {
     this.isStatusBarTranslucent = isStatusBarTranslucent

package/ios/{core → animations}/KeyboardAnimation.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import QuartzCore
 
 protocol KeyboardAnimationProtocol {
   var startTime: CFTimeInterval { get }

package/ios/{core → animations}/SpringAnimation.swift

@@ -10,7 +10,7 @@ import Foundation
 import QuartzCore
 
 // swiftlint:disable identifier_name
-public class SpringAnimation: KeyboardAnimation {
+public final class SpringAnimation: KeyboardAnimation {
   // internal variables
   private let zeta: Double // Damping ratio
   private let omega0: Double // Undamped angular frequency of the oscillator

package/ios/{core → animations}/TimingAnimation.swift

@@ -15,13 +15,13 @@ import QuartzCore
  * This class calculates the progress of animations based on Bézier curve control points.
  * For more details on the Bézier curves, see [Desmos Graph](https://www.desmos.com/calculator/eynenh1aga?lang=en).
  */
-public class TimingAnimation: KeyboardAnimation {
+public final class TimingAnimation: KeyboardAnimation {
   private let p1: CGPoint
   private let p2: CGPoint
 
   init(animation: CABasicAnimation, fromValue: Double, toValue: Double) {
     let timingFunction = animation.timingFunction
-    var controlPoints: [Float] = [0, 0, 0, 0]
+    var controlPoints: ContiguousArray<Float> = ContiguousArray([0, 0, 0, 0])
     timingFunction?.getControlPoint(at: 1, values: &controlPoints[0])
     timingFunction?.getControlPoint(at: 2, values: &controlPoints[2])
     let p1 = CGPoint(x: CGFloat(controlPoints[0]), y: CGFloat(controlPoints[1]))
@@ -33,7 +33,20 @@ public class TimingAnimation: KeyboardAnimation {
     super.init(fromValue: fromValue, toValue: toValue, animation: animation)
   }
 
-  func bezier(t: CGFloat, valueForPoint: (CGPoint) -> CGFloat) -> CGFloat {
+  // public functions
+  override func valueAt(time: Double) -> Double {
+    let x = time * Double(speed)
+    let frames = (animation?.duration ?? 0.0) * Double(speed)
+    let fraction = min(x / frames, 1)
+    let t = findTForX(xTarget: fraction)
+
+    let progress = bezierY(t: t)
+
+    return fromValue + (toValue - fromValue) * CGFloat(progress)
+  }
+
+  // private functions
+  private func bezier(t: CGFloat, valueForPoint: (CGPoint) -> CGFloat) -> CGFloat {
     let u = 1 - t
     let tt = t * t
     let uu = u * u
@@ -49,27 +62,15 @@ public class TimingAnimation: KeyboardAnimation {
     return term1 + term2 + term3
   }
 
-  func bezierY(t: CGFloat) -> CGFloat {
+  private func bezierY(t: CGFloat) -> CGFloat {
     return bezier(t: t) { $0.y }
   }
 
-  func bezierX(t: CGFloat) -> CGFloat {
+  private func bezierX(t: CGFloat) -> CGFloat {
     return bezier(t: t) { $0.x }
   }
 
-  // public functions
-  override func valueAt(time: Double) -> Double {
-    let x = time * Double(speed)
-    let frames = (animation?.duration ?? 0.0) * Double(speed)
-    let fraction = min(x / frames, 1)
-    let t = findTForX(xTarget: fraction)
-
-    let progress = bezierY(t: t)
-
-    return fromValue + (toValue - fromValue) * CGFloat(progress)
-  }
-
-  func findTForX(xTarget: CGFloat, epsilon: CGFloat = 0.0001, maxIterations: Int = 100) -> CGFloat {
+  private func findTForX(xTarget: CGFloat, epsilon: CGFloat = 0.0001, maxIterations: Int = 100) -> CGFloat {
     var t: CGFloat = 0.5 // Start with an initial guess of t = 0.5
     for _ in 0 ..< maxIterations {
       let currentX = bezierX(t: t) // Compute the x-coordinate at t
@@ -84,7 +85,7 @@ public class TimingAnimation: KeyboardAnimation {
     return t // Return the approximation of t
   }
 
-  func bezierDerivative(t: CGFloat, valueForPoint: (CGPoint) -> CGFloat) -> CGFloat {
+  private func bezierDerivative(t: CGFloat, valueForPoint: (CGPoint) -> CGFloat) -> CGFloat {
     let u = 1 - t
     let uu = u * u
     let tt = t * t
@@ -100,7 +101,7 @@ public class TimingAnimation: KeyboardAnimation {
     return term1 + term2 + term3
   }
 
-  func bezierXDerivative(t: CGFloat) -> CGFloat {
+  private func bezierXDerivative(t: CGFloat) -> CGFloat {
     return bezierDerivative(t: t) { $0.x }
   }
 }

package/ios/extensions/UIApplication.swift

@@ -9,8 +9,24 @@ import Foundation
 import UIKit
 
 public extension UIApplication {
+  var activeWindow: UIWindow? {
+    if #available(iOS 13.0, *) {
+      for scene in connectedScenes {
+        if scene.activationState == .foregroundActive,
+           let windowScene = scene as? UIWindowScene,
+           let keyWindow = windowScene.windows.first(where: { $0.isKeyWindow })
+        {
+          return keyWindow
+        }
+      }
+      return nil
+    } else {
+      return windows.last { $0.isKeyWindow }
+    }
+  }
+
   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.windows.last
+      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/lib/commonjs/components/KeyboardAvoidingView/hooks.js

@@ -31,6 +31,12 @@ const useKeyboardAnimation = () => {
       progress.value = e.progress;
       height.value = e.height;
     },
+    onInteractive: e => {
+      "worklet";
+
+      progress.value = e.progress;
+      height.value = e.height;
+    },
     onEnd: e => {
       "worklet";
 

package/lib/commonjs/components/KeyboardAvoidingView/hooks.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_context","_hooks","useKeyboardAnimation","reanimated","useKeyboardContext","heightWhenOpened","useSharedValue","height","value","progress","isClosed","useKeyboardHandler","onStart","e","onMove","onEnd","exports"],"sources":["hooks.ts"],"sourcesContent":["import { useSharedValue } from \"react-native-reanimated\";\n\nimport { useKeyboardContext } from \"../../context\";\nimport { useKeyboardHandler } from \"../../hooks\";\n\nexport const useKeyboardAnimation = () => {\n  const { reanimated } = useKeyboardContext();\n  const heightWhenOpened = useSharedValue(-reanimated.height.value);\n  const height = useSharedValue(-reanimated.height.value);\n  const progress = useSharedValue(reanimated.progress.value);\n  const isClosed = useSharedValue(reanimated.progress.value === 0);\n\n  useKeyboardHandler(\n    {\n      onStart: (e) => {\n        \"worklet\";\n\n        if (e.height > 0) {\n          // eslint-disable-next-line react-compiler/react-compiler\n          isClosed.value = false;\n          heightWhenOpened.value = e.height;\n        }\n      },\n      onMove: (e) => {\n        \"worklet\";\n\n        progress.value = e.progress;\n        height.value = e.height;\n      },\n      onEnd: (e) => {\n        \"worklet\";\n\n        isClosed.value = e.height === 0;\n\n        height.value = e.height;\n        progress.value = e.progress;\n      },\n    },\n    [],\n  );\n\n  return { height, progress, heightWhenOpened, isClosed };\n};\n"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAEA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AAEO,MAAMG,oBAAoB,GAAGA,CAAA,KAAM;EACxC,MAAM;IAAEC;EAAW,CAAC,GAAG,IAAAC,2BAAkB,EAAC,CAAC;EAC3C,MAAMC,gBAAgB,GAAG,IAAAC,qCAAc,EAAC,CAACH,UAAU,CAACI,MAAM,CAACC,KAAK,CAAC;EACjE,MAAMD,MAAM,GAAG,IAAAD,qCAAc,EAAC,CAACH,UAAU,CAACI,MAAM,CAACC,KAAK,CAAC;EACvD,MAAMC,QAAQ,GAAG,IAAAH,qCAAc,EAACH,UAAU,CAACM,QAAQ,CAACD,KAAK,CAAC;EAC1D,MAAME,QAAQ,GAAG,IAAAJ,qCAAc,EAACH,UAAU,CAACM,QAAQ,CAACD,KAAK,KAAK,CAAC,CAAC;EAEhE,IAAAG,yBAAkB,EAChB;IACEC,OAAO,EAAGC,CAAC,IAAK;MACd,SAAS;;MAET,IAAIA,CAAC,CAACN,MAAM,GAAG,CAAC,EAAE;QAChB;QACAG,QAAQ,CAACF,KAAK,GAAG,KAAK;QACtBH,gBAAgB,CAACG,KAAK,GAAGK,CAAC,CAACN,MAAM;MACnC;IACF,CAAC;IACDO,MAAM,EAAGD,CAAC,IAAK;MACb,SAAS;;MAETJ,QAAQ,CAACD,KAAK,GAAGK,CAAC,CAACJ,QAAQ;MAC3BF,MAAM,CAACC,KAAK,GAAGK,CAAC,CAACN,MAAM;IACzB,CAAC;IACDQ,KAAK,EAAGF,CAAC,IAAK;MACZ,SAAS;;MAETH,QAAQ,CAACF,KAAK,GAAGK,CAAC,CAACN,MAAM,KAAK,CAAC;MAE/BA,MAAM,CAACC,KAAK,GAAGK,CAAC,CAACN,MAAM;MACvBE,QAAQ,CAACD,KAAK,GAAGK,CAAC,CAACJ,QAAQ;IAC7B;EACF,CAAC,EACD,EACF,CAAC;EAED,OAAO;IAAEF,MAAM;IAAEE,QAAQ;IAAEJ,gBAAgB;IAAEK;EAAS,CAAC;AACzD,CAAC;AAACM,OAAA,CAAAd,oBAAA,GAAAA,oBAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_context","_hooks","useKeyboardAnimation","reanimated","useKeyboardContext","heightWhenOpened","useSharedValue","height","value","progress","isClosed","useKeyboardHandler","onStart","e","onMove","onInteractive","onEnd","exports"],"sources":["hooks.ts"],"sourcesContent":["import { useSharedValue } from \"react-native-reanimated\";\n\nimport { useKeyboardContext } from \"../../context\";\nimport { useKeyboardHandler } from \"../../hooks\";\n\nexport const useKeyboardAnimation = () => {\n  const { reanimated } = useKeyboardContext();\n  const heightWhenOpened = useSharedValue(-reanimated.height.value);\n  const height = useSharedValue(-reanimated.height.value);\n  const progress = useSharedValue(reanimated.progress.value);\n  const isClosed = useSharedValue(reanimated.progress.value === 0);\n\n  useKeyboardHandler(\n    {\n      onStart: (e) => {\n        \"worklet\";\n\n        if (e.height > 0) {\n          // eslint-disable-next-line react-compiler/react-compiler\n          isClosed.value = false;\n          heightWhenOpened.value = e.height;\n        }\n      },\n      onMove: (e) => {\n        \"worklet\";\n\n        progress.value = e.progress;\n        height.value = e.height;\n      },\n      onInteractive: (e) => {\n        \"worklet\";\n\n        progress.value = e.progress;\n        height.value = e.height;\n      },\n      onEnd: (e) => {\n        \"worklet\";\n\n        isClosed.value = e.height === 0;\n\n        height.value = e.height;\n        progress.value = e.progress;\n      },\n    },\n    [],\n  );\n\n  return { height, progress, heightWhenOpened, isClosed };\n};\n"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAEA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AAEO,MAAMG,oBAAoB,GAAGA,CAAA,KAAM;EACxC,MAAM;IAAEC;EAAW,CAAC,GAAG,IAAAC,2BAAkB,EAAC,CAAC;EAC3C,MAAMC,gBAAgB,GAAG,IAAAC,qCAAc,EAAC,CAACH,UAAU,CAACI,MAAM,CAACC,KAAK,CAAC;EACjE,MAAMD,MAAM,GAAG,IAAAD,qCAAc,EAAC,CAACH,UAAU,CAACI,MAAM,CAACC,KAAK,CAAC;EACvD,MAAMC,QAAQ,GAAG,IAAAH,qCAAc,EAACH,UAAU,CAACM,QAAQ,CAACD,KAAK,CAAC;EAC1D,MAAME,QAAQ,GAAG,IAAAJ,qCAAc,EAACH,UAAU,CAACM,QAAQ,CAACD,KAAK,KAAK,CAAC,CAAC;EAEhE,IAAAG,yBAAkB,EAChB;IACEC,OAAO,EAAGC,CAAC,IAAK;MACd,SAAS;;MAET,IAAIA,CAAC,CAACN,MAAM,GAAG,CAAC,EAAE;QAChB;QACAG,QAAQ,CAACF,KAAK,GAAG,KAAK;QACtBH,gBAAgB,CAACG,KAAK,GAAGK,CAAC,CAACN,MAAM;MACnC;IACF,CAAC;IACDO,MAAM,EAAGD,CAAC,IAAK;MACb,SAAS;;MAETJ,QAAQ,CAACD,KAAK,GAAGK,CAAC,CAACJ,QAAQ;MAC3BF,MAAM,CAACC,KAAK,GAAGK,CAAC,CAACN,MAAM;IACzB,CAAC;IACDQ,aAAa,EAAGF,CAAC,IAAK;MACpB,SAAS;;MAETJ,QAAQ,CAACD,KAAK,GAAGK,CAAC,CAACJ,QAAQ;MAC3BF,MAAM,CAACC,KAAK,GAAGK,CAAC,CAACN,MAAM;IACzB,CAAC;IACDS,KAAK,EAAGH,CAAC,IAAK;MACZ,SAAS;;MAETH,QAAQ,CAACF,KAAK,GAAGK,CAAC,CAACN,MAAM,KAAK,CAAC;MAE/BA,MAAM,CAACC,KAAK,GAAGK,CAAC,CAACN,MAAM;MACvBE,QAAQ,CAACD,KAAK,GAAGK,CAAC,CAACJ,QAAQ;IAC7B;EACF,CAAC,EACD,EACF,CAAC;EAED,OAAO;IAAEF,MAAM;IAAEE,QAAQ;IAAEJ,gBAAgB;IAAEK;EAAS,CAAC;AACzD,CAAC;AAACO,OAAA,CAAAf,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/lib/module/components/KeyboardAvoidingView/hooks.js

@@ -25,6 +25,12 @@ export const useKeyboardAnimation = () => {
       progress.value = e.progress;
       height.value = e.height;
     },
+    onInteractive: e => {
+      "worklet";
+
+      progress.value = e.progress;
+      height.value = e.height;
+    },
     onEnd: e => {
       "worklet";
 

package/lib/module/components/KeyboardAvoidingView/hooks.js.map

@@ -1 +1 @@
-{"version":3,"names":["useSharedValue","useKeyboardContext","useKeyboardHandler","useKeyboardAnimation","reanimated","heightWhenOpened","height","value","progress","isClosed","onStart","e","onMove","onEnd"],"sources":["hooks.ts"],"sourcesContent":["import { useSharedValue } from \"react-native-reanimated\";\n\nimport { useKeyboardContext } from \"../../context\";\nimport { useKeyboardHandler } from \"../../hooks\";\n\nexport const useKeyboardAnimation = () => {\n  const { reanimated } = useKeyboardContext();\n  const heightWhenOpened = useSharedValue(-reanimated.height.value);\n  const height = useSharedValue(-reanimated.height.value);\n  const progress = useSharedValue(reanimated.progress.value);\n  const isClosed = useSharedValue(reanimated.progress.value === 0);\n\n  useKeyboardHandler(\n    {\n      onStart: (e) => {\n        \"worklet\";\n\n        if (e.height > 0) {\n          // eslint-disable-next-line react-compiler/react-compiler\n          isClosed.value = false;\n          heightWhenOpened.value = e.height;\n        }\n      },\n      onMove: (e) => {\n        \"worklet\";\n\n        progress.value = e.progress;\n        height.value = e.height;\n      },\n      onEnd: (e) => {\n        \"worklet\";\n\n        isClosed.value = e.height === 0;\n\n        height.value = e.height;\n        progress.value = e.progress;\n      },\n    },\n    [],\n  );\n\n  return { height, progress, heightWhenOpened, isClosed };\n};\n"],"mappings":"AAAA,SAASA,cAAc,QAAQ,yBAAyB;AAExD,SAASC,kBAAkB,QAAQ,eAAe;AAClD,SAASC,kBAAkB,QAAQ,aAAa;AAEhD,OAAO,MAAMC,oBAAoB,GAAGA,CAAA,KAAM;EACxC,MAAM;IAAEC;EAAW,CAAC,GAAGH,kBAAkB,CAAC,CAAC;EAC3C,MAAMI,gBAAgB,GAAGL,cAAc,CAAC,CAACI,UAAU,CAACE,MAAM,CAACC,KAAK,CAAC;EACjE,MAAMD,MAAM,GAAGN,cAAc,CAAC,CAACI,UAAU,CAACE,MAAM,CAACC,KAAK,CAAC;EACvD,MAAMC,QAAQ,GAAGR,cAAc,CAACI,UAAU,CAACI,QAAQ,CAACD,KAAK,CAAC;EAC1D,MAAME,QAAQ,GAAGT,cAAc,CAACI,UAAU,CAACI,QAAQ,CAACD,KAAK,KAAK,CAAC,CAAC;EAEhEL,kBAAkB,CAChB;IACEQ,OAAO,EAAGC,CAAC,IAAK;MACd,SAAS;;MAET,IAAIA,CAAC,CAACL,MAAM,GAAG,CAAC,EAAE;QAChB;QACAG,QAAQ,CAACF,KAAK,GAAG,KAAK;QACtBF,gBAAgB,CAACE,KAAK,GAAGI,CAAC,CAACL,MAAM;MACnC;IACF,CAAC;IACDM,MAAM,EAAGD,CAAC,IAAK;MACb,SAAS;;MAETH,QAAQ,CAACD,KAAK,GAAGI,CAAC,CAACH,QAAQ;MAC3BF,MAAM,CAACC,KAAK,GAAGI,CAAC,CAACL,MAAM;IACzB,CAAC;IACDO,KAAK,EAAGF,CAAC,IAAK;MACZ,SAAS;;MAETF,QAAQ,CAACF,KAAK,GAAGI,CAAC,CAACL,MAAM,KAAK,CAAC;MAE/BA,MAAM,CAACC,KAAK,GAAGI,CAAC,CAACL,MAAM;MACvBE,QAAQ,CAACD,KAAK,GAAGI,CAAC,CAACH,QAAQ;IAC7B;EACF,CAAC,EACD,EACF,CAAC;EAED,OAAO;IAAEF,MAAM;IAAEE,QAAQ;IAAEH,gBAAgB;IAAEI;EAAS,CAAC;AACzD,CAAC","ignoreList":[]}
+{"version":3,"names":["useSharedValue","useKeyboardContext","useKeyboardHandler","useKeyboardAnimation","reanimated","heightWhenOpened","height","value","progress","isClosed","onStart","e","onMove","onInteractive","onEnd"],"sources":["hooks.ts"],"sourcesContent":["import { useSharedValue } from \"react-native-reanimated\";\n\nimport { useKeyboardContext } from \"../../context\";\nimport { useKeyboardHandler } from \"../../hooks\";\n\nexport const useKeyboardAnimation = () => {\n  const { reanimated } = useKeyboardContext();\n  const heightWhenOpened = useSharedValue(-reanimated.height.value);\n  const height = useSharedValue(-reanimated.height.value);\n  const progress = useSharedValue(reanimated.progress.value);\n  const isClosed = useSharedValue(reanimated.progress.value === 0);\n\n  useKeyboardHandler(\n    {\n      onStart: (e) => {\n        \"worklet\";\n\n        if (e.height > 0) {\n          // eslint-disable-next-line react-compiler/react-compiler\n          isClosed.value = false;\n          heightWhenOpened.value = e.height;\n        }\n      },\n      onMove: (e) => {\n        \"worklet\";\n\n        progress.value = e.progress;\n        height.value = e.height;\n      },\n      onInteractive: (e) => {\n        \"worklet\";\n\n        progress.value = e.progress;\n        height.value = e.height;\n      },\n      onEnd: (e) => {\n        \"worklet\";\n\n        isClosed.value = e.height === 0;\n\n        height.value = e.height;\n        progress.value = e.progress;\n      },\n    },\n    [],\n  );\n\n  return { height, progress, heightWhenOpened, isClosed };\n};\n"],"mappings":"AAAA,SAASA,cAAc,QAAQ,yBAAyB;AAExD,SAASC,kBAAkB,QAAQ,eAAe;AAClD,SAASC,kBAAkB,QAAQ,aAAa;AAEhD,OAAO,MAAMC,oBAAoB,GAAGA,CAAA,KAAM;EACxC,MAAM;IAAEC;EAAW,CAAC,GAAGH,kBAAkB,CAAC,CAAC;EAC3C,MAAMI,gBAAgB,GAAGL,cAAc,CAAC,CAACI,UAAU,CAACE,MAAM,CAACC,KAAK,CAAC;EACjE,MAAMD,MAAM,GAAGN,cAAc,CAAC,CAACI,UAAU,CAACE,MAAM,CAACC,KAAK,CAAC;EACvD,MAAMC,QAAQ,GAAGR,cAAc,CAACI,UAAU,CAACI,QAAQ,CAACD,KAAK,CAAC;EAC1D,MAAME,QAAQ,GAAGT,cAAc,CAACI,UAAU,CAACI,QAAQ,CAACD,KAAK,KAAK,CAAC,CAAC;EAEhEL,kBAAkB,CAChB;IACEQ,OAAO,EAAGC,CAAC,IAAK;MACd,SAAS;;MAET,IAAIA,CAAC,CAACL,MAAM,GAAG,CAAC,EAAE;QAChB;QACAG,QAAQ,CAACF,KAAK,GAAG,KAAK;QACtBF,gBAAgB,CAACE,KAAK,GAAGI,CAAC,CAACL,MAAM;MACnC;IACF,CAAC;IACDM,MAAM,EAAGD,CAAC,IAAK;MACb,SAAS;;MAETH,QAAQ,CAACD,KAAK,GAAGI,CAAC,CAACH,QAAQ;MAC3BF,MAAM,CAACC,KAAK,GAAGI,CAAC,CAACL,MAAM;IACzB,CAAC;IACDO,aAAa,EAAGF,CAAC,IAAK;MACpB,SAAS;;MAETH,QAAQ,CAACD,KAAK,GAAGI,CAAC,CAACH,QAAQ;MAC3BF,MAAM,CAACC,KAAK,GAAGI,CAAC,CAACL,MAAM;IACzB,CAAC;IACDQ,KAAK,EAAGH,CAAC,IAAK;MACZ,SAAS;;MAETF,QAAQ,CAACF,KAAK,GAAGI,CAAC,CAACL,MAAM,KAAK,CAAC;MAE/BA,MAAM,CAACC,KAAK,GAAGI,CAAC,CAACL,MAAM;MACvBE,QAAQ,CAACD,KAAK,GAAGI,CAAC,CAACH,QAAQ;IAC7B;EACF,CAAC,EACD,EACF,CAAC;EAED,OAAO;IAAEF,MAAM;IAAEE,QAAQ;IAAEH,gBAAgB;IAAEI;EAAS,CAAC;AACzD,CAAC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.14.0",
+  "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",

package/src/components/KeyboardAvoidingView/hooks.ts

@@ -27,6 +27,12 @@ export const useKeyboardAnimation = () => {
         progress.value = e.progress;
         height.value = e.height;
       },
+      onInteractive: (e) => {
+        "worklet";
+
+        progress.value = e.progress;
+        height.value = e.height;
+      },
       onEnd: (e) => {
         "worklet";