react-native-keyboard-controller 1.4.2 → 1.4.3

package/android/src/main/java/com/reactnativekeyboardcontroller/KeyboardAnimationCallback.kt

@@ -11,9 +11,9 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsAnimationCompat
 import androidx.core.view.WindowInsetsCompat
 import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
+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
@@ -26,7 +26,7 @@ class KeyboardAnimationCallback(
   val persistentInsetTypes: Int,
   val deferredInsetTypes: Int,
   dispatchMode: Int = DISPATCH_MODE_STOP,
-  val context: ReactApplicationContext?,
+  val context: ThemedReactContext?,
   val onApplyWindowInsetsListener: OnApplyWindowInsetsListener,
 ) : WindowInsetsAnimationCompat.Callback(dispatchMode), OnApplyWindowInsetsListener {
   private val TAG = KeyboardAnimationCallback::class.qualifiedName

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

@@ -0,0 +1,29 @@
+package com.reactnativekeyboardcontroller.extensions
+
+import android.os.Build
+import android.view.View
+
+/**
+ * Call this everytime when using [ViewCompat.setOnApplyWindowInsetsListener]
+ * to ensure that insets are always received.
+ * @see https://stackoverflow.com/a/61909205/9272042
+ */
+fun View.requestApplyInsetsWhenAttached() {
+  // https://chris.banes.dev/2019/04/12/insets-listeners-to-layouts/
+  if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT && isAttachedToWindow) {
+    // We're already attached, just request as normal
+    requestApplyInsets()
+  } else {
+    // We're not attached to the hierarchy, add a listener to request when we are
+    addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
+      override fun onViewAttachedToWindow(v: View) {
+        v.removeOnAttachStateChangeListener(this)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) {
+          v.requestApplyInsets()
+        }
+      }
+
+      override fun onViewDetachedFromWindow(v: View) = Unit
+    })
+  }
+}

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

@@ -11,16 +11,16 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 import com.reactnativekeyboardcontroller.KeyboardAnimationCallback
 import com.reactnativekeyboardcontroller.R
+import com.reactnativekeyboardcontroller.extensions.requestApplyInsetsWhenAttached
 import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
 
-class KeyboardControllerViewManagerImpl(reactContext: ReactApplicationContext) {
+class KeyboardControllerViewManagerImpl(private val mReactContext: ReactApplicationContext) {
   private val TAG = KeyboardControllerViewManagerImpl::class.qualifiedName
-  private var mReactContext = reactContext
   private var isStatusBarTranslucent = false
 
   fun createViewInstance(reactContext: ThemedReactContext): ReactViewGroup {
     val view = EdgeToEdgeReactViewGroup(reactContext)
-    val activity = mReactContext.currentActivity
+    val activity = reactContext.currentActivity
 
     if (activity == null) {
       Log.w(TAG, "Can not setup keyboard animation listener, since `currentActivity` is null")
@@ -34,10 +34,10 @@ class KeyboardControllerViewManagerImpl(reactContext: ReactApplicationContext) {
       // We explicitly allow dispatch to continue down to binding.messageHolder's
       // child views, so that step 2.5 below receives the call
       dispatchMode = WindowInsetsAnimationCompat.Callback.DISPATCH_MODE_CONTINUE_ON_SUBTREE,
-      context = mReactContext,
+      context = reactContext,
       onApplyWindowInsetsListener = { v, insets ->
         val content =
-          mReactContext.currentActivity?.window?.decorView?.rootView?.findViewById<FitWindowsLinearLayout>(
+          reactContext.currentActivity?.window?.decorView?.rootView?.findViewById<FitWindowsLinearLayout>(
             R.id.action_bar_root,
           )
         content?.setPadding(
@@ -52,6 +52,7 @@ class KeyboardControllerViewManagerImpl(reactContext: ReactApplicationContext) {
     )
     ViewCompat.setWindowInsetsAnimationCallback(view, callback)
     ViewCompat.setOnApplyWindowInsetsListener(view, callback)
+    view.requestApplyInsetsWhenAttached()
 
     return view
   }

package/package.json

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