react-native-keyboard-controller 1.16.1 → 1.16.3

package/android/build.gradle

@@ -70,6 +70,12 @@ android {
       } else {
         java.srcDirs += ['src/paper']
       }
+
+      if (project.ext.shouldUseBaseReactPackage()) {
+        java.srcDirs += ['src/base']
+      } else {
+        java.srcDirs += ['src/turbo']
+      }
     }
   }
 

package/android/react-native-helpers.gradle

@@ -39,4 +39,8 @@ project.ext.resolveReactNativeDirectory = { ->
 
 project.ext.shouldConsumeReactNativeFromMavenCentral = { ->
   return REACT_NATIVE_MINOR_VERSION >= 71
-}
+}
+
+project.ext.shouldUseBaseReactPackage = { ->
+  return REACT_NATIVE_MINOR_VERSION >= 74
+}

package/android/src/base/java/com/reactnativekeyboardcontroller/KeyboardControllerPackage.kt

@@ -0,0 +1,61 @@
+package com.reactnativekeyboardcontroller
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+import com.facebook.react.uimanager.ViewManager
+import com.reactnativekeyboardcontroller.modules.KeyboardControllerModuleImpl
+import com.reactnativekeyboardcontroller.modules.StatusBarManagerCompatModuleImpl
+
+class KeyboardControllerPackage : BaseReactPackage() {
+  override fun getModule(
+    name: String,
+    reactContext: ReactApplicationContext,
+  ): NativeModule? =
+    when (name) {
+      KeyboardControllerModuleImpl.NAME -> {
+        KeyboardControllerModule(reactContext)
+      }
+      StatusBarManagerCompatModuleImpl.NAME -> {
+        StatusBarManagerCompatModule(reactContext)
+      }
+      else -> {
+        null
+      }
+    }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider =
+    ReactModuleInfoProvider {
+      val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+      val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+
+      moduleInfos[KeyboardControllerModuleImpl.NAME] =
+        ReactModuleInfo(
+          KeyboardControllerModuleImpl.NAME,
+          KeyboardControllerModuleImpl.NAME,
+          false, // canOverrideExistingModule
+          false, // needsEagerInit
+          false, // isCxxModule
+          isTurboModule, // isTurboModule
+        )
+      moduleInfos[StatusBarManagerCompatModuleImpl.NAME] =
+        ReactModuleInfo(
+          StatusBarManagerCompatModuleImpl.NAME,
+          StatusBarManagerCompatModuleImpl.NAME,
+          false, // canOverrideExistingModule
+          false, // needsEagerInit
+          false, // isCxxModule
+          isTurboModule, // isTurboModule
+        )
+      moduleInfos
+    }
+
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
+    listOf(
+      KeyboardControllerViewManager(reactContext),
+      KeyboardGestureAreaViewManager(reactContext),
+      OverKeyboardViewManager(reactContext),
+    )
+}

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()
   }
 }
 

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/FocusedInputObserver.swift

@@ -80,12 +80,6 @@ public class FocusedInputObserver: NSObject {
       name: UIResponder.keyboardWillShowNotification,
       object: nil
     )
-    NotificationCenter.default.addObserver(
-      self,
-      selector: #selector(keyboardWillHide),
-      name: UIResponder.keyboardWillHideNotification,
-      object: nil
-    )
     NotificationCenter.default.addObserver(
       self,
       selector: #selector(didReceiveFocus),
@@ -118,10 +112,6 @@ public class FocusedInputObserver: NSObject {
     NotificationCenter.default.removeObserver(self)
   }
 
-  @objc func keyboardWillHide(_: Notification) {
-    onBlur()
-  }
-
   @objc func didReceiveFocus(_: Notification) {
     if UIResponder.current == currentResponder {
       // focus was already handled by keyboard event
@@ -131,22 +121,13 @@ public class FocusedInputObserver: NSObject {
     onFocus()
   }
 
-  /**
-   * We handle blur events in `keyboardWillHide` handler
-   * And this additional handler is needed only to have
-   * a consistent state when keyboard is not shown
-   */
   @objc func didReceiveBlur(_: Notification) {
-    if currentResponder == nil {
-      // blur was already handled by keyboard event
-      return
-    }
     // blur gets triggered on endEditing, so we check if no upcoming
     // didReceiveFocus events are coming to exclude `noFocusedInput`
     // event when user switches between inputs
     DispatchQueue.main.async {
       // check that it wasn't a switch between inputs
-      if self.currentResponder == nil {
+      if !(UIResponder.current is TextInput) {
         self.onBlur()
       }
     }
@@ -173,10 +154,6 @@ public class FocusedInputObserver: NSObject {
   }
 
   func onBlur() {
-    // when we switch to next input, but `showSoftInput={false}`
-    if UIResponder.current is TextInput {
-      return
-    }
     removeObservers(newResponder: nil)
     currentInput = nil
     currentResponder = nil

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.16.1",
+  "version": "1.16.3",
   "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",
@@ -79,11 +80,11 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^11.0.0",
-    "@react-native/babel-preset": "0.76.2",
-    "@react-native/eslint-config": "0.76.2",
+    "@react-native/babel-preset": "0.77.0",
+    "@react-native/eslint-config": "0.77.0",
     "@release-it/conventional-changelog": "^2.0.0",
     "@testing-library/react-hooks": "^8.0.1",
-    "@types/jest": "^29.2.1",
+    "@types/jest": "^29.5.13",
     "@types/react": "^18.2.6",
     "@typescript-eslint/eslint-plugin": "^6.7.4",
     "@typescript-eslint/parser": "^6.7.4",
@@ -104,9 +105,9 @@
     "pod-install": "^0.1.0",
     "prettier": "^2.8.8",
     "react": "18.3.1",
-    "react-native": "0.76.2",
+    "react-native": "0.77.0",
     "react-native-builder-bob": "^0.18.0",
-    "react-native-reanimated": "3.16.1",
+    "react-native-reanimated": "3.16.7",
     "react-test-renderer": "18.2.0",
     "release-it": "^14.2.2",
     "typescript": "5.6.3"
@@ -169,6 +170,13 @@
     "jsSrcsDir": "./src/specs",
     "android": {
       "javaPackageName": "com.reactnativekeyboardcontroller"
+    },
+    "ios": {
+      "componentProvider": {
+        "KeyboardControllerView": "KeyboardControllerView",
+        "KeyboardGestureArea": "KeyboardGestureArea",
+        "OverKeyboardView": "OverKeyboardView"
+      }
     }
   }
 }

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())
-  }
-}