react-native-keyboard-controller 1.17.3 → 1.17.4

package/android/src/fabric/java/com/reactnativekeyboardcontroller/KeyboardControllerViewManager.kt

@@ -18,17 +18,21 @@ class KeyboardControllerViewManager(
   private val manager = KeyboardControllerViewManagerImpl(mReactContext)
   private val mDelegate = KeyboardControllerViewManagerDelegate(this)
 
-  override fun getDelegate(): ViewManagerDelegate<ReactViewGroup> = mDelegate
-
-  override fun getName(): String = KeyboardControllerViewManagerImpl.NAME
-
+  // region Lifecycle
   override fun createViewInstance(context: ThemedReactContext): ReactViewGroup = manager.createViewInstance(context)
 
+  override fun invalidate() {
+    super.invalidate()
+    manager.invalidate()
+  }
+
   override fun onAfterUpdateTransaction(view: ReactViewGroup) {
     super.onAfterUpdateTransaction(view)
     manager.setEdgeToEdge(view as EdgeToEdgeReactViewGroup)
   }
+  // endregion
 
+  // region Props setters
   @ReactProp(name = "statusBarTranslucent")
   override fun setStatusBarTranslucent(
     view: ReactViewGroup,
@@ -52,7 +56,14 @@ class KeyboardControllerViewManager(
     view: ReactViewGroup,
     value: Boolean,
   ) = manager.setEnabled(view as EdgeToEdgeReactViewGroup, value)
+  // endregion
 
+  // region Getters
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
     manager.getExportedCustomDirectEventTypeConstants()
+
+  override fun getDelegate(): ViewManagerDelegate<ReactViewGroup> = mDelegate
+
+  override fun getName(): String = KeyboardControllerViewManagerImpl.NAME
+  // endregion
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/extensions/ThemedReactContext.kt

@@ -10,13 +10,8 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.EventDispatcher
-import com.reactnativekeyboardcontroller.listeners.WindowDimensionListener
 import com.reactnativekeyboardcontroller.log.Logger
 
-fun ThemedReactContext.setupWindowDimensionsListener() {
-  WindowDimensionListener(this)
-}
-
 fun ThemedReactContext?.dispatchEvent(
   viewId: Int,
   event: Event<*>,

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

@@ -1,6 +1,7 @@
 package com.reactnativekeyboardcontroller.listeners
 
 import android.view.ViewGroup
+import android.view.ViewTreeObserver
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.uimanager.ThemedReactContext
 import com.reactnativekeyboardcontroller.extensions.content
@@ -16,8 +17,9 @@ class WindowDimensionListener(
   private val context: ThemedReactContext?,
 ) {
   private var lastDispatchedDimensions = Dimensions(0.0, 0.0)
+  private var layoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null
 
-  init {
+  public fun attachListener() {
     // attach to content view only once per app instance
     if (context != null && listenerID != context.hashCode()) {
       listenerID = context.hashCode()
@@ -26,12 +28,19 @@ class WindowDimensionListener(
 
       updateWindowDimensions(content)
 
-      content?.viewTreeObserver?.addOnGlobalLayoutListener {
-        updateWindowDimensions(content)
-      }
+      layoutListener =
+        ViewTreeObserver.OnGlobalLayoutListener {
+          updateWindowDimensions(content)
+        }
+
+      content?.viewTreeObserver?.addOnGlobalLayoutListener(layoutListener)
     }
   }
 
+  public fun detachListener() {
+    context?.content?.viewTreeObserver?.removeOnGlobalLayoutListener(layoutListener)
+  }
+
   private fun updateWindowDimensions(content: ViewGroup?) {
     if (content == null) {
       return

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

@@ -7,14 +7,26 @@ import com.reactnativekeyboardcontroller.events.FocusedInputLayoutChangedEvent
 import com.reactnativekeyboardcontroller.events.FocusedInputSelectionChangedEvent
 import com.reactnativekeyboardcontroller.events.FocusedInputTextChangedEvent
 import com.reactnativekeyboardcontroller.events.KeyboardTransitionEvent
+import com.reactnativekeyboardcontroller.listeners.WindowDimensionListener
 import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
 
 @Suppress("detekt:UnusedPrivateProperty")
 class KeyboardControllerViewManagerImpl(
   mReactContext: ReactApplicationContext,
 ) {
-  fun createViewInstance(reactContext: ThemedReactContext): EdgeToEdgeReactViewGroup =
-    EdgeToEdgeReactViewGroup(reactContext)
+  private var listener: WindowDimensionListener? = null
+
+  fun createViewInstance(reactContext: ThemedReactContext): EdgeToEdgeReactViewGroup {
+    if (listener == null) {
+      listener = WindowDimensionListener(reactContext)
+      listener?.attachListener()
+    }
+    return EdgeToEdgeReactViewGroup(reactContext)
+  }
+
+  fun invalidate() {
+    listener?.detachListener()
+  }
 
   fun setEnabled(
     view: EdgeToEdgeReactViewGroup,

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

@@ -15,7 +15,6 @@ import com.reactnativekeyboardcontroller.extensions.content
 import com.reactnativekeyboardcontroller.extensions.removeSelf
 import com.reactnativekeyboardcontroller.extensions.requestApplyInsetsWhenAttached
 import com.reactnativekeyboardcontroller.extensions.rootView
-import com.reactnativekeyboardcontroller.extensions.setupWindowDimensionsListener
 import com.reactnativekeyboardcontroller.listeners.KeyboardAnimationCallback
 import com.reactnativekeyboardcontroller.listeners.KeyboardAnimationCallbackConfig
 import com.reactnativekeyboardcontroller.log.Logger
@@ -51,7 +50,6 @@ class EdgeToEdgeReactViewGroup(
   private val modalAttachedWatcher = ModalAttachedWatcher(this, reactContext, config, ::getKeyboardCallback)
 
   init {
-    reactContext.setupWindowDimensionsListener()
     tag = VIEW_TAG
   }
 
@@ -65,13 +63,13 @@ class EdgeToEdgeReactViewGroup(
       return
     }
 
-    this.setupKeyboardCallbacks()
+    this.activate()
   }
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
 
-    this.removeKeyboardCallbacks()
+    this.deactivate()
   }
 
   override fun onConfigurationChanged(newConfig: Configuration?) {
@@ -189,12 +187,20 @@ class EdgeToEdgeReactViewGroup(
   // region State managers
   private fun enable() {
     this.setupWindowInsets()
-    this.setupKeyboardCallbacks()
-    modalAttachedWatcher.enable()
+    this.activate()
   }
 
   private fun disable() {
     this.setupWindowInsets()
+    this.deactivate()
+  }
+
+  private fun activate() {
+    this.setupKeyboardCallbacks()
+    modalAttachedWatcher.enable()
+  }
+
+  private fun deactivate() {
     this.removeKeyboardCallbacks()
     modalAttachedWatcher.disable()
   }

package/android/src/main/java/com/reactnativekeyboardcontroller/views/overlay/OverKeyboardViewGroup.kt

@@ -6,6 +6,7 @@ import android.graphics.PixelFormat
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
+import android.view.accessibility.AccessibilityEvent
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
@@ -84,6 +85,16 @@ class OverKeyboardHostView(
   }
   // endregion
 
+  // region Accessibility
+  override fun addChildrenForAccessibility(outChildren: ArrayList<View>) {
+    // Don’t let Android try to reach children that are not actual descendants
+  }
+
+  // Explicitly override this to prevent accessibility events being passed down to children
+  // Those will be handled by the `hostView` which lives in the `windowManager`
+  override fun dispatchPopulateAccessibilityEvent(event: AccessibilityEvent): Boolean = false
+  // endregion
+
   fun show() {
     val layoutParams =
       WindowManager.LayoutParams(

package/android/src/paper/java/com/reactnativekeyboardcontroller/KeyboardControllerViewManager.kt

@@ -13,16 +13,21 @@ class KeyboardControllerViewManager(
 ) : ReactViewManager() {
   private val manager = KeyboardControllerViewManagerImpl(mReactContext)
 
-  override fun getName(): String = KeyboardControllerViewManagerImpl.NAME
+  // region Lifecycle
+  override fun createViewInstance(context: ThemedReactContext): ReactViewGroup = manager.createViewInstance(context)
 
-  override fun createViewInstance(reactContext: ThemedReactContext): EdgeToEdgeReactViewGroup =
-    manager.createViewInstance(reactContext)
+  override fun invalidate() {
+    super.invalidate()
+    manager.invalidate()
+  }
 
   override fun onAfterUpdateTransaction(view: ReactViewGroup) {
     super.onAfterUpdateTransaction(view)
     manager.setEdgeToEdge(view as EdgeToEdgeReactViewGroup)
   }
+  // endregion
 
+  // region Props setters
   @ReactProp(name = "enabled")
   fun setEnabled(
     view: EdgeToEdgeReactViewGroup,
@@ -54,7 +59,12 @@ class KeyboardControllerViewManager(
   ) {
     manager.setPreserveEdgeToEdge(view, isPreservingEdgeToEdge)
   }
+  // endregion
 
+  // region Getters
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
     manager.getExportedCustomDirectEventTypeConstants()
+
+  override fun getName(): String = KeyboardControllerViewManagerImpl.NAME
+  // endregion
 }

package/ios/swizzling/UIResponderSwizzle.swift

@@ -8,29 +8,64 @@
 import Foundation
 import UIKit
 
+private var pendingBecomeResponder: TextInput?
 private var originalResignFirstResponder: IMP?
+private var originalBecomeFirstResponder: IMP?
 
 @objc
 extension UIResponder {
+  public static func swizzleBecomeFirstResponder() {
+    let originalBecomeSelector = #selector(becomeFirstResponder)
+    guard
+      let originalBecomeMethod = class_getInstanceMethod(UIResponder.self, originalBecomeSelector)
+    else {
+      return
+    }
+
+    originalBecomeFirstResponder = method_getImplementation(originalBecomeMethod)
+
+    let swizzledBecomeImplementation: @convention(block) (UIResponder) -> Bool = { (self) in
+      pendingBecomeResponder = self as? TextInput
+
+      DispatchQueue.main.asyncAfter(deadline: .now() + UIUtils.nextFrame) {
+        pendingBecomeResponder = nil
+      }
+
+      return self.callOriginalBecomeFirstResponder(originalBecomeSelector)
+    }
+
+    let implementation = imp_implementationWithBlock(swizzledBecomeImplementation)
+    method_setImplementation(originalBecomeMethod, implementation)
+  }
+
   public static func swizzleResignFirstResponder() {
-    let originalSelector = #selector(resignFirstResponder)
+    let originalResignSelector = #selector(resignFirstResponder)
 
-    guard let originalMethod = class_getInstanceMethod(UIResponder.self, originalSelector) else {
+    guard
+      let originalResignMethod = class_getInstanceMethod(UIResponder.self, originalResignSelector)
+    else {
       return
     }
 
-    originalResignFirstResponder = method_getImplementation(originalMethod)
+    originalResignFirstResponder = method_getImplementation(originalResignMethod)
 
-    let swizzledImplementation: @convention(block) (UIResponder) -> Bool = { (self) in
+    let swizzledResignImplementation: @convention(block) (UIResponder) -> Bool = { (self) in
       // Check the type of responder
       if let textField = self as? TextInput {
         // check inputAccessoryView and call original method immediately if not InvisibleInputAccessoryView
         if !(textField.inputAccessoryView is InvisibleInputAccessoryView) {
-          return self.callOriginalResignFirstResponder(originalSelector)
+          return self.callOriginalResignFirstResponder(originalResignSelector)
+        } else if pendingBecomeResponder != nil {
+          // if we already have a new focus request
+          pendingBecomeResponder = nil
+          KeyboardAreaExtender.shared.hide()
+          (self as? TextInput)?.inputAccessoryView = nil
+          KeyboardAreaExtender.shared.remove()
+          return self.callOriginalResignFirstResponder(originalResignSelector)
         }
       } else {
         // If casting to TextInput fails
-        return self.callOriginalResignFirstResponder(originalSelector)
+        return self.callOriginalResignFirstResponder(originalResignSelector)
       }
 
       KeyboardAreaExtender.shared.hide()
@@ -39,22 +74,34 @@ extension UIResponder {
       DispatchQueue.main.asyncAfter(deadline: .now() + UIUtils.nextFrame) {
         (self as? TextInput)?.inputAccessoryView = nil
         KeyboardAreaExtender.shared.remove()
-        _ = self.callOriginalResignFirstResponder(originalSelector)
+        _ = self.callOriginalResignFirstResponder(originalResignSelector)
       }
 
       // We need to return a value immediately, even though the actual action is delayed
       return false
     }
 
-    let implementation = imp_implementationWithBlock(swizzledImplementation)
-    method_setImplementation(originalMethod, implementation)
+    let implementation = imp_implementationWithBlock(swizzledResignImplementation)
+    method_setImplementation(originalResignMethod, implementation)
   }
 
   private func callOriginalResignFirstResponder(_ selector: Selector) -> Bool {
     guard let originalResignFirstResponder = originalResignFirstResponder else { return false }
     typealias Function = @convention(c) (AnyObject, Selector) -> Bool
-    let castOriginalResignFirstResponder = unsafeBitCast(originalResignFirstResponder, to: Function.self)
+    let castOriginalResignFirstResponder = unsafeBitCast(
+      originalResignFirstResponder, to: Function.self
+    )
     let result = castOriginalResignFirstResponder(self, selector)
     return result
   }
+
+  private func callOriginalBecomeFirstResponder(_ selector: Selector) -> Bool {
+    guard let originalBecomeFirstResponder = originalBecomeFirstResponder else { return false }
+    typealias Function = @convention(c) (AnyObject, Selector) -> Bool
+    let castOriginalBecomeFirstResponder = unsafeBitCast(
+      originalBecomeFirstResponder, to: Function.self
+    )
+    let result = castOriginalBecomeFirstResponder(self, selector)
+    return result
+  }
 }

package/ios/views/KeyboardGestureAreaManager.mm

@@ -75,6 +75,7 @@ RCT_EXPORT_VIEW_PROPERTY(offset, NSNumber *)
   [super load];
 
   [UIResponder swizzleResignFirstResponder];
+  [UIResponder swizzleBecomeFirstResponder];
 }
 
 // MARK: Constructor

package/package.json

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