react-native-keyboard-controller 1.16.0 → 1.16.2

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

@@ -24,6 +24,11 @@ class KeyboardControllerViewManager(
 
   override fun createViewInstance(context: ThemedReactContext): ReactViewGroup = manager.createViewInstance(context)
 
+  override fun onAfterUpdateTransaction(view: ReactViewGroup) {
+    super.onAfterUpdateTransaction(view)
+    manager.setEdgeToEdge(view as EdgeToEdgeReactViewGroup)
+  }
+
   @ReactProp(name = "statusBarTranslucent")
   override fun setStatusBarTranslucent(
     view: ReactViewGroup,

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

@@ -44,6 +44,10 @@ class KeyboardControllerViewManagerImpl(
     view.setPreserveEdgeToEdge(isPreservingEdgeToEdge)
   }
 
+  fun setEdgeToEdge(view: EdgeToEdgeReactViewGroup) {
+    view.setEdgeToEdge()
+  }
+
   fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
     val map: MutableMap<String, Any> =
       MapBuilder.of(

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

@@ -33,6 +33,7 @@ class EdgeToEdgeReactViewGroup(
   private var isNavigationBarTranslucent = false
   private var isPreservingEdgeToEdge = false
   private var active = false
+  private var isEdgeToEdge = false
 
   // internal class members
   private var eventView: ReactViewGroup? = null
@@ -124,12 +125,18 @@ class EdgeToEdgeReactViewGroup(
     }
   }
 
-  private fun goToEdgeToEdge(edgeToEdge: Boolean) {
-    reactContext.currentActivity?.let {
-      WindowCompat.setDecorFitsSystemWindows(
-        it.window,
-        !edgeToEdge,
-      )
+  fun setEdgeToEdge() {
+    val nextValue = active || isPreservingEdgeToEdge
+
+    if (isEdgeToEdge != nextValue) {
+      isEdgeToEdge = nextValue
+
+      reactContext.currentActivity?.let {
+        WindowCompat.setDecorFitsSystemWindows(
+          it.window,
+          !isEdgeToEdge,
+        )
+      }
     }
   }
 
@@ -182,17 +189,12 @@ class EdgeToEdgeReactViewGroup(
 
   // region State managers
   private fun enable() {
-    this.goToEdgeToEdge(true)
     this.setupWindowInsets()
     this.setupKeyboardCallbacks()
     modalAttachedWatcher.enable()
   }
 
   private fun disable() {
-    if (!isPreservingEdgeToEdge) {
-      this.goToEdgeToEdge(false)
-    }
-
     this.setupWindowInsets()
     this.removeKeyboardCallbacks()
     modalAttachedWatcher.disable()

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

@@ -3,6 +3,7 @@ package com.reactnativekeyboardcontroller
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.views.view.ReactViewGroup
 import com.facebook.react.views.view.ReactViewManager
 import com.reactnativekeyboardcontroller.managers.KeyboardControllerViewManagerImpl
 import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
@@ -17,6 +18,11 @@ class KeyboardControllerViewManager(
   override fun createViewInstance(reactContext: ThemedReactContext): EdgeToEdgeReactViewGroup =
     manager.createViewInstance(reactContext)
 
+  override fun onAfterUpdateTransaction(view: ReactViewGroup) {
+    super.onAfterUpdateTransaction(view)
+    manager.setEdgeToEdge(view as EdgeToEdgeReactViewGroup)
+  }
+
   @ReactProp(name = "enabled")
   fun setEnabled(
     view: EdgeToEdgeReactViewGroup,

package/ios/KeyboardControllerModuleImpl.swift

@@ -14,9 +14,10 @@ public class KeyboardControllerModuleImpl: NSObject {
 
   @objc
   public static func dismiss(_ keepFocus: Bool) {
-    guard let input = UIResponder.current as? TextInput else { return }
+    let responder = UIResponder.current
 
     if keepFocus {
+      guard let input = responder as? TextInput else { return }
       let tapGesture = UITapGestureRecognizer(target: self, action: #selector(onTextInputTapped(_:)))
       tapGesture.name = keyboardRevealGestureName
       input.addGestureRecognizer(tapGesture)
@@ -31,7 +32,7 @@ public class KeyboardControllerModuleImpl: NSObject {
         object: input
       )
     } else {
-      input.resignFirstResponder()
+      responder?.resignFirstResponder()
     }
   }
 

package/ios/extensions/UIResponder.swift

@@ -11,28 +11,9 @@ import UIKit
 
 @objc
 public extension UIResponder {
-  private weak static var _currentFirstResponder: UIResponder?
-
   static var current: UIResponder? {
-    UIResponder._currentFirstResponder = nil
-    UIApplication.shared.sendAction(#selector(findFirstResponder(sender:)), to: nil, from: nil, for: nil)
-    return UIResponder._currentFirstResponder
-  }
-
-  internal func findFirstResponder(sender _: AnyObject) {
-    let type = String(describing: type(of: self))
-    // handle `contextMenuHidden` prop - in this case the parent is considered as a first responder
-    // (but actually its children is an actual input), so we apply correction here and point out
-    // to the actual first responder (first children)
-    let isChildrenActuallyFirstResponder =
-      type == "RCTMultilineTextInputView" ||
-      type == "RCTSinglelineTextInputView" ||
-      type == "RCTTextInputComponentView"
-    if isChildrenActuallyFirstResponder {
-      UIResponder._currentFirstResponder = (self as? UIView)?.subviews[0]
-    } else {
-      UIResponder._currentFirstResponder = self
-    }
+    guard let window = UIApplication.shared.activeWindow else { return nil }
+    return window.findFirstResponder()
   }
 }
 
@@ -49,7 +30,11 @@ public extension Optional where Wrapped == UIResponder {
     guard let superview = (self as? UIView)?.superview else { return nil }
 
     #if KEYBOARD_CONTROLLER_NEW_ARCH_ENABLED
-      return (superview as NSObject).value(forKey: "nativeId") as? String
+      if superview.responds(to: Selector(("nativeId"))) == true {
+        return (superview as NSObject).value(forKey: "nativeId") as? String
+      }
+
+      return nil
     #else
       return superview.nativeID
     #endif

package/ios/extensions/UIView.swift

@@ -34,6 +34,18 @@ public extension UIView {
       return false
     }
   }
+
+  func findFirstResponder() -> UIView? {
+    if isFirstResponder {
+      return self
+    }
+    for subview in subviews {
+      if let responder = subview.findFirstResponder() {
+        return responder
+      }
+    }
+    return nil
+  }
 }
 
 public extension Optional where Wrapped == UIView {

package/ios/observers/KeyboardMovementObserver.swift

@@ -33,7 +33,7 @@ public class KeyboardMovementObserver: NSObject {
   private var _windowsCount: Int = 0
   private var prevKeyboardPosition = 0.0
   private var displayLink: CADisplayLink?
-  private var hasKVObserver = false
+  private var interactiveKeyboardObserver: NSKeyValueObservation?
   private var isMounted = false
   // state variables
   private var _keyboardHeight: CGFloat = 0.0
@@ -93,73 +93,57 @@ public class KeyboardMovementObserver: NSObject {
   }
 
   private func setupKVObserver() {
-    if hasKVObserver {
-      return
-    }
+    guard interactiveKeyboardObserver == nil, let view = keyboardView else { return }
+
+    interactiveKeyboardObserver = view.observe(\.center, options: .new) { [weak self] _, change in
+      guard let self = self, let changeValue = change.newValue else { return }
 
-    if keyboardView != nil {
-      hasKVObserver = true
-      keyboardView?.addObserver(self, forKeyPath: "center", options: .new, context: nil)
+      self.keyboardDidMoveInteractively(changeValue: changeValue)
     }
   }
 
   private func removeKVObserver() {
-    if !hasKVObserver {
+    interactiveKeyboardObserver?.invalidate()
+    interactiveKeyboardObserver = nil
+  }
+
+  private func keyboardDidMoveInteractively(changeValue: CGPoint) {
+    // if we are currently animating keyboard -> we need to ignore values from KVO
+    if displayLink != nil {
+      return
+    }
+    // if keyboard height is not equal to its bounds - we can ignore
+    // values, since they'll be invalid and will cause UI jumps
+    if floor(keyboardView?.bounds.size.height ?? 0) != floor(_keyboardHeight) {
       return
     }
 
-    hasKVObserver = false
-    _keyboardView?.removeObserver(self, forKeyPath: "center", context: nil)
-  }
+    let keyboardFrameY = changeValue.y
+    let keyboardWindowH = keyboardView?.window?.bounds.size.height ?? 0
+    let keyboardPosition = keyboardWindowH - keyboardFrameY
 
-  // swiftlint:disable:next block_based_kvo
-  @objc override public func observeValue(
-    forKeyPath keyPath: String?,
-    of object: Any?,
-    change: [NSKeyValueChangeKey: Any]?,
-    context _: UnsafeMutableRawPointer?
-  ) {
-    if keyPath == "center", object as? NSObject == _keyboardView {
-      // if we are currently animating keyboard -> we need to ignore values from KVO
-      if displayLink != nil {
-        return
-      }
-      // if keyboard height is not equal to its bounds - we can ignore
-      // values, since they'll be invalid and will cause UI jumps
-      if floor(keyboardView?.bounds.size.height ?? 0) != floor(_keyboardHeight) {
-        return
-      }
+    let position = CGFloat.interpolate(
+      inputRange: [_keyboardHeight / 2, -_keyboardHeight / 2],
+      outputRange: [_keyboardHeight, 0],
+      currentValue: keyboardPosition
+    ) - KeyboardAreaExtender.shared.offset
 
-      guard let changeValue = change?[.newKey] as? NSValue else {
-        return
-      }
-      let keyboardFrameY = changeValue.cgPointValue.y
-      let keyboardWindowH = keyboardView?.window?.bounds.size.height ?? 0
-      let keyboardPosition = keyboardWindowH - keyboardFrameY
-
-      let position = CGFloat.interpolate(
-        inputRange: [_keyboardHeight / 2, -_keyboardHeight / 2],
-        outputRange: [_keyboardHeight, 0],
-        currentValue: keyboardPosition
-      ) - KeyboardAreaExtender.shared.offset
-
-      if position == 0 {
-        // it will be triggered before `keyboardWillDisappear` and
-        // we don't need to trigger `onInteractive` handler for that
-        // since it will be handled in `keyboardWillDisappear` function
-        return
-      }
+    if position == 0 {
+      // it will be triggered before `keyboardWillDisappear` and
+      // we don't need to trigger `onInteractive` handler for that
+      // since it will be handled in `keyboardWillDisappear` function
+      return
+    }
 
-      prevKeyboardPosition = position
+    prevKeyboardPosition = position
 
-      onEvent(
-        "onKeyboardMoveInteractive",
-        position as NSNumber,
-        position / CGFloat(keyboardHeight) as NSNumber,
-        -1,
-        tag
-      )
-    }
+    onEvent(
+      "onKeyboardMoveInteractive",
+      position as NSNumber,
+      position / CGFloat(keyboardHeight) as NSNumber,
+      -1,
+      tag
+    )
   }
 
   @objc public func unmount() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.16.0",
+  "version": "1.16.2",
   "description": "Keyboard manager which works in identical way on both iOS and Android",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -17,6 +17,7 @@
     "jest",
     "!lib/typescript/example",
     "!android/build",
+    "!android/src/test",
     "!android/.gradle",
     "!android/gradle",
     "!android/gradlew",

package/android/src/test/java/com/reactnativekeyboardcontroller/traversal/FocusedInputHolderTest.kt

@@ -1,45 +0,0 @@
-package com.reactnativekeyboardcontroller.traversal
-
-import android.content.Context
-import android.widget.EditText
-import androidx.test.core.app.ApplicationProvider
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-
-@RunWith(RobolectricTestRunner::class)
-class FocusedInputHolderTest {
-  @Test
-  fun `FocusedInputHolder should hold a weak reference`() {
-    val context = ApplicationProvider.getApplicationContext<Context>()
-    var input: EditText? = EditText(context)
-
-    FocusedInputHolder.set(input as EditText)
-
-    assertEquals(FocusedInputHolder.get(), input)
-
-    input = null
-
-    @Suppress("detekt:ExplicitGarbageCollectionCall")
-    System.gc()
-
-    assertNull(FocusedInputHolder.get())
-  }
-
-  @Test
-  fun `focus() should request focus on expected field`() {
-    val context = ApplicationProvider.getApplicationContext<Context>()
-    val input = EditText(context)
-
-    assertFalse(input.hasFocus())
-
-    FocusedInputHolder.set(input)
-    FocusedInputHolder.focus()
-
-    assertTrue(input.hasFocus())
-  }
-}

package/android/src/test/java/com/reactnativekeyboardcontroller/traversal/ViewHierarchyNavigatorTest.kt

@@ -1,198 +0,0 @@
-package com.reactnativekeyboardcontroller.traversal
-
-import android.content.Context
-import android.widget.EditText
-import android.widget.LinearLayout
-import androidx.test.core.app.ApplicationProvider
-import com.reactnativekeyboardcontroller.extensions.focus
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.shadows.ShadowLooper
-
-@RunWith(RobolectricTestRunner::class)
-class ViewHierarchyNavigatorTest {
-  private lateinit var layout: LinearLayout
-  private lateinit var editText1: EditText
-  private lateinit var editText2: EditText
-  private lateinit var editText3: EditText
-  private lateinit var editText4: EditText
-  private lateinit var editText5: EditText
-  private lateinit var editText6: EditText
-  private lateinit var editText7: EditText
-  private lateinit var editText8: EditText
-  private lateinit var editText9: EditText
-  private lateinit var editText10: EditText
-  private lateinit var editText11: EditText
-  private lateinit var editText12: EditText
-  private lateinit var editText13: EditText
-
-  @Suppress("detekt:CyclomaticComplexMethod")
-  @Before
-  fun setUp() {
-    val context = ApplicationProvider.getApplicationContext<Context>()
-
-    editText1 = EditText(context).apply { id = 1 }
-    editText2 = EditText(context).apply { id = 2 }
-    editText3 =
-      EditText(context).apply {
-        id = 3
-        isEnabled = false
-      }
-    editText4 =
-      EditText(context).apply {
-        id = 4
-        isEnabled = false
-      }
-    editText5 = EditText(context).apply { id = 5 }
-    editText6 = EditText(context).apply { id = 6 }
-    editText7 = EditText(context).apply { id = 7 }
-    editText8 = EditText(context).apply { id = 8 }
-    editText9 = EditText(context).apply { id = 9 }
-    editText10 = EditText(context).apply { id = 10 }
-    editText11 = EditText(context).apply { id = 11 }
-    editText12 = EditText(context).apply { id = 12 }
-    editText13 = EditText(context).apply { id = 13 }
-
-    layout =
-      LinearLayout(context).apply {
-        addView(editText1)
-        addView(editText2)
-        addView(editText3)
-        addView(editText4)
-        addView(
-          LinearLayout(context).apply {
-            addView(editText5)
-            addView(editText6)
-            addView(editText7)
-          },
-        )
-        addView(editText8)
-        addView(editText9)
-        addView(editText10)
-        addView(editText11)
-        addView(editText12)
-        addView(editText13)
-      }
-  }
-
-  @Test
-  fun `getAllInputFields returns all EditTexts in ViewGroup`() {
-    val editTexts = ViewHierarchyNavigator.getAllInputFields(layout)
-
-    // 13 (all) - 2 (disabled)
-    assertTrue(editTexts.size == 11)
-  }
-
-  @Test
-  fun `setFocusTo to 'next' should set focus to next field`() {
-    editText1.focus()
-
-    ViewHierarchyNavigator.setFocusTo("next", editText1)
-
-    ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
-
-    assertTrue(editText2.hasFocus())
-  }
-
-  @Test
-  fun `setFocusTo to 'prev' should set focus to previous field`() {
-    editText2.focus()
-
-    ViewHierarchyNavigator.setFocusTo("prev", editText2)
-
-    ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
-
-    assertTrue(editText1.hasFocus())
-  }
-
-  @Test
-  fun `setFocusTo to 'next' should skip non-editable fields`() {
-    editText2.focus()
-
-    ViewHierarchyNavigator.setFocusTo("next", editText2)
-
-    ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
-
-    assertTrue(editText5.hasFocus())
-  }
-
-  @Test
-  fun `setFocusTo to 'prev' should skip non-editable fields`() {
-    editText5.focus()
-
-    ViewHierarchyNavigator.setFocusTo("prev", editText5)
-
-    ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
-
-    assertTrue(editText2.hasFocus())
-  }
-
-  @Test
-  fun `setFocusTo to 'next' should set focus relatively to current group`() {
-    editText5.focus()
-
-    ViewHierarchyNavigator.setFocusTo("next", editText5)
-
-    ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
-
-    assertTrue(editText6.hasFocus())
-  }
-
-  @Test
-  fun `setFocusTo to 'prev' should set focus relatively to current group`() {
-    editText7.focus()
-
-    ViewHierarchyNavigator.setFocusTo("prev", editText7)
-
-    ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
-
-    assertTrue(editText6.hasFocus())
-  }
-
-  @Test
-  fun `setFocusTo to 'next' should correctly exit from current group`() {
-    editText7.focus()
-
-    ViewHierarchyNavigator.setFocusTo("next", editText7)
-
-    ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
-
-    assertTrue(editText8.hasFocus())
-  }
-
-  @Test
-  fun `setFocusTo to 'prev' should set focus to last element in group`() {
-    editText8.focus()
-
-    ViewHierarchyNavigator.setFocusTo("prev", editText8)
-
-    ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
-
-    assertTrue(editText7.hasFocus())
-  }
-
-  @Test
-  fun `setFocusTo to 'next' should do nothing if it's last element`() {
-    editText13.focus()
-
-    ViewHierarchyNavigator.setFocusTo("next", editText13)
-
-    ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
-
-    assertTrue(editText13.hasFocus())
-  }
-
-  @Test
-  fun `setFocusTo to 'prev' should do nothing if it's first element`() {
-    editText1.focus()
-
-    ViewHierarchyNavigator.setFocusTo("prev", editText1)
-
-    ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
-
-    assertTrue(editText1.hasFocus())
-  }
-}