react-native-keyboard-controller 1.16.2 → 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/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.2",
+  "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",
@@ -80,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",
@@ -105,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"
@@ -170,6 +170,13 @@
     "jsSrcsDir": "./src/specs",
     "android": {
       "javaPackageName": "com.reactnativekeyboardcontroller"
+    },
+    "ios": {
+      "componentProvider": {
+        "KeyboardControllerView": "KeyboardControllerView",
+        "KeyboardGestureArea": "KeyboardGestureArea",
+        "OverKeyboardView": "OverKeyboardView"
+      }
     }
   }
 }