react-native-keyboard-controller 1.12.7 → 1.13.1

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

@@ -27,6 +27,11 @@ class KeyboardGestureAreaViewManager(mReactContext: ReactApplicationContext) :
     return manager.createViewInstance(context)
   }
 
+  @ReactProp(name = "offset")
+  override fun setOffset(view: ReactViewGroup, value: Double) {
+    manager.setOffset(view as KeyboardGestureAreaReactViewGroup, value)
+  }
+
   @ReactProp(name = "interpolator")
   override fun setInterpolator(view: ReactViewGroup, value: String?) {
     manager.setInterpolator(view as KeyboardGestureAreaReactViewGroup, value ?: "linear")

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

@@ -0,0 +1,13 @@
+package com.reactnativekeyboardcontroller.extensions
+
+import android.view.View
+import android.view.ViewGroup
+import com.facebook.react.bridge.ReactContext
+
+val ReactContext.rootView: View?
+  get() = this.currentActivity?.window?.decorView?.rootView
+
+val ReactContext.content: ViewGroup?
+  get() = this.currentActivity?.window?.decorView?.rootView?.findViewById(
+    androidx.appcompat.R.id.action_bar_root,
+  )

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

@@ -1,8 +1,6 @@
 package com.reactnativekeyboardcontroller.extensions
 
 import android.util.Log
-import android.view.View
-import android.view.ViewGroup
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
@@ -12,14 +10,6 @@ import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.reactnativekeyboardcontroller.listeners.WindowDimensionListener
 
-val ThemedReactContext.rootView: View?
-  get() = this.currentActivity?.window?.decorView?.rootView
-
-val ThemedReactContext.content: ViewGroup?
-  get() = this.currentActivity?.window?.decorView?.rootView?.findViewById(
-    androidx.appcompat.R.id.action_bar_root,
-  )
-
 fun ThemedReactContext.setupWindowDimensionsListener() {
   WindowDimensionListener(this)
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/interactive/interpolators/Interpolator.kt

@@ -8,7 +8,8 @@ interface Interpolator {
    * @param dy the distance that the finger has moved relative to the previous location.
    * @param absoluteFingerPosition current position of the finger.
    * @param keyboardPosition current keyboard position.
+   * @param offset extra space to the keyboard to activate a gesture
    * @return the distance the keyboard should be moved from its current location.
    */
-  fun interpolate(dy: Int, absoluteFingerPosition: Int, keyboardPosition: Int): Int
+  fun interpolate(dy: Int, absoluteFingerPosition: Int, keyboardPosition: Int, offset: Int): Int
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/interactive/interpolators/IosInterpolator.kt

@@ -5,9 +5,10 @@ class IosInterpolator : Interpolator {
     dy: Int,
     absoluteFingerPosition: Int,
     keyboardPosition: Int,
+    offset: Int,
   ): Int {
     if (
-      absoluteFingerPosition <= keyboardPosition || // user over scrolled keyboard
+      absoluteFingerPosition <= keyboardPosition + offset || // user over scrolled keyboard
       dy <= 0 // user scrolls up
     ) {
       return dy

package/android/src/main/java/com/reactnativekeyboardcontroller/interactive/interpolators/LinearInterpolator.kt

@@ -5,6 +5,7 @@ class LinearInterpolator : Interpolator {
     dy: Int,
     absoluteFingerPosition: Int,
     keyboardPosition: Int,
+    offset: Int,
   ): Int {
     return dy
   }

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

@@ -1,6 +1,7 @@
 package com.reactnativekeyboardcontroller.listeners
 
 import android.text.TextWatcher
+import android.view.View
 import android.view.View.OnLayoutChangeListener
 import android.view.ViewTreeObserver.OnGlobalFocusChangeListener
 import com.facebook.react.bridge.Arguments
@@ -35,7 +36,11 @@ val noFocusedInputEvent = FocusedInputLayoutChangedEventData(
   parentScrollViewTarget = -1,
 )
 
-class FocusedInputObserver(val view: ReactViewGroup, private val context: ThemedReactContext?) {
+class FocusedInputObserver(
+  val view: View,
+  private val eventPropagationView: ReactViewGroup,
+  private val context: ThemedReactContext?,
+) {
   // constructor variables
   private val surfaceId = UIManagerHelper.getSurfaceId(view)
 
@@ -53,10 +58,10 @@ class FocusedInputObserver(val view: ReactViewGroup, private val context: Themed
   private val textListener: (String) -> Unit = { text ->
     syncUpLayout()
     context.dispatchEvent(
-      view.id,
+      eventPropagationView.id,
       FocusedInputTextChangedEvent(
         surfaceId,
-        view.id,
+        eventPropagationView.id,
         text = text,
       ),
     )
@@ -73,10 +78,10 @@ class FocusedInputObserver(val view: ReactViewGroup, private val context: Themed
 
     syncUpLayout()
     context.dispatchEvent(
-      view.id,
+      eventPropagationView.id,
       FocusedInputSelectionChangedEvent(
         surfaceId,
-        view.id,
+        eventPropagationView.id,
         event = FocusedInputSelectionChangedEventData(
           target = input.id,
           start = start,
@@ -90,7 +95,7 @@ class FocusedInputObserver(val view: ReactViewGroup, private val context: Themed
     )
   }
   private val focusListener = OnGlobalFocusChangeListener { oldFocus, newFocus ->
-    // unfocused or focused was changed
+    // unfocused or focus was changed
     if (newFocus == null || oldFocus != null) {
       lastFocusedInput?.removeOnLayoutChangeListener(layoutListener)
       lastFocusedInput?.removeTextChangedListener(textWatcher)
@@ -152,10 +157,10 @@ class FocusedInputObserver(val view: ReactViewGroup, private val context: Themed
     if (event != lastEventDispatched) {
       lastEventDispatched = event
       context.dispatchEvent(
-        view.id,
+        eventPropagationView.id,
         FocusedInputLayoutChangedEvent(
           surfaceId,
-          view.id,
+          eventPropagationView.id,
           event = event,
         ),
       )

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

@@ -26,15 +26,20 @@ import kotlin.math.abs
 private val TAG = KeyboardAnimationCallback::class.qualifiedName
 private val isResizeHandledInCallbackMethods = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
 
-class KeyboardAnimationCallback(
-  val view: ReactViewGroup,
+data class KeyboardAnimationCallbackConfig(
   val persistentInsetTypes: Int,
   val deferredInsetTypes: Int,
-  dispatchMode: Int = DISPATCH_MODE_STOP,
-  val context: ThemedReactContext?,
+  val dispatchMode: Int = WindowInsetsAnimationCompat.Callback.DISPATCH_MODE_STOP,
   val hasTranslucentNavigationBar: Boolean = false,
-) : WindowInsetsAnimationCompat.Callback(dispatchMode), OnApplyWindowInsetsListener {
-  private val surfaceId = UIManagerHelper.getSurfaceId(view)
+)
+
+class KeyboardAnimationCallback(
+  val eventPropagationView: ReactViewGroup,
+  val view: View,
+  val context: ThemedReactContext?,
+  private val config: KeyboardAnimationCallbackConfig,
+) : WindowInsetsAnimationCompat.Callback(config.dispatchMode), OnApplyWindowInsetsListener {
+  private val surfaceId = UIManagerHelper.getSurfaceId(eventPropagationView)
 
   // state variables
   private var persistentKeyboardHeight = 0.0
@@ -58,10 +63,10 @@ class KeyboardAnimationCallback(
         // 100% included in onStart/onMove/onEnd life cycles, but triggering onStart/onEnd several time
         // can bring breaking changes
         context.dispatchEvent(
-          view.id,
+          eventPropagationView.id,
           KeyboardTransitionEvent(
             surfaceId,
-            view.id,
+            eventPropagationView.id,
             "topKeyboardMoveStart",
             this.persistentKeyboardHeight,
             1.0,
@@ -70,10 +75,10 @@ class KeyboardAnimationCallback(
           ),
         )
         context.dispatchEvent(
-          view.id,
+          eventPropagationView.id,
           KeyboardTransitionEvent(
             surfaceId,
-            view.id,
+            eventPropagationView.id,
             "topKeyboardMoveEnd",
             this.persistentKeyboardHeight,
             1.0,
@@ -89,12 +94,12 @@ class KeyboardAnimationCallback(
   private var layoutObserver: FocusedInputObserver? = null
 
   init {
-    require(persistentInsetTypes and deferredInsetTypes == 0) {
+    require(config.persistentInsetTypes and config.deferredInsetTypes == 0) {
       "persistentInsetTypes and deferredInsetTypes can not contain any of " +
         " same WindowInsetsCompat.Type values"
     }
 
-    layoutObserver = FocusedInputObserver(view = view, context = context)
+    layoutObserver = FocusedInputObserver(view = view, eventPropagationView = eventPropagationView, context = context)
     view.viewTreeObserver.addOnGlobalFocusChangeListener(focusListener)
   }
 
@@ -137,7 +142,7 @@ class KeyboardAnimationCallback(
       this.onKeyboardResized(keyboardHeight)
     }
 
-    return insets
+    return WindowInsetsCompat.CONSUMED
   }
 
   @Suppress("detekt:ReturnCount")
@@ -179,10 +184,10 @@ class KeyboardAnimationCallback(
 
     Log.i(TAG, "HEIGHT:: $keyboardHeight TAG:: $viewTagFocused")
     context.dispatchEvent(
-      view.id,
+      eventPropagationView.id,
       KeyboardTransitionEvent(
         surfaceId,
-        view.id,
+        eventPropagationView.id,
         "topKeyboardMoveStart",
         keyboardHeight,
         if (!isKeyboardVisible) 0.0 else 1.0,
@@ -204,13 +209,13 @@ class KeyboardAnimationCallback(
     runningAnimations.find { it.isKeyboardAnimation && !animationsToSkip.contains(it) } ?: return insets
 
     // First we get the insets which are potentially deferred
-    val typesInset = insets.getInsets(deferredInsetTypes)
+    val typesInset = insets.getInsets(config.deferredInsetTypes)
     // Then we get the persistent inset types which are applied as padding during layout
-    var otherInset = insets.getInsets(persistentInsetTypes)
+    var otherInset = insets.getInsets(config.persistentInsetTypes)
 
     // Now that we subtract the two insets, to calculate the difference. We also coerce
     // the insets to be >= 0, to make sure we don't use negative insets.
-    if (hasTranslucentNavigationBar) {
+    if (config.hasTranslucentNavigationBar) {
       otherInset = Insets.NONE
     }
     val diff = Insets.subtract(typesInset, otherInset).let {
@@ -233,10 +238,10 @@ class KeyboardAnimationCallback(
 
     val event = if (InteractiveKeyboardProvider.isInteractive) "topKeyboardMoveInteractive" else "topKeyboardMove"
     context.dispatchEvent(
-      view.id,
+      eventPropagationView.id,
       KeyboardTransitionEvent(
         surfaceId,
-        view.id,
+        eventPropagationView.id,
         event,
         height,
         progress,
@@ -284,10 +289,10 @@ class KeyboardAnimationCallback(
       getEventParams(keyboardHeight),
     )
     context.dispatchEvent(
-      view.id,
+      eventPropagationView.id,
       KeyboardTransitionEvent(
         surfaceId,
-        view.id,
+        eventPropagationView.id,
         "topKeyboardMoveEnd",
         keyboardHeight,
         if (!isKeyboardVisible) 0.0 else 1.0,
@@ -300,6 +305,35 @@ class KeyboardAnimationCallback(
     duration = 0
   }
 
+  fun syncKeyboardPosition() {
+    val keyboardHeight = getCurrentKeyboardHeight()
+    // update internal state
+    isKeyboardVisible = isKeyboardVisible()
+    prevKeyboardHeight = keyboardHeight
+    isTransitioning = false
+    duration = 0
+
+    context.emitEvent(
+      "KeyboardController::" + if (!isKeyboardVisible) "keyboardDidHide" else "keyboardDidShow",
+      getEventParams(keyboardHeight),
+    )
+    // dispatch `onMove` to update RN animated value and `onEnd` to indicate that transition finished
+    listOf("topKeyboardMove", "topKeyboardMoveEnd").forEach { eventName ->
+      context.dispatchEvent(
+        eventPropagationView.id,
+        KeyboardTransitionEvent(
+          surfaceId,
+          eventPropagationView.id,
+          eventName,
+          keyboardHeight,
+          if (!isKeyboardVisible) 0.0 else 1.0,
+          duration,
+          viewTagFocused,
+        ),
+      )
+    }
+  }
+
   fun destroy() {
     view.viewTreeObserver.removeOnGlobalFocusChangeListener(focusListener)
     layoutObserver?.destroy()
@@ -312,42 +346,20 @@ class KeyboardAnimationCallback(
     duration = 0
 
     context.emitEvent("KeyboardController::keyboardWillShow", getEventParams(keyboardHeight))
-    context.dispatchEvent(
-      view.id,
-      KeyboardTransitionEvent(
-        surfaceId,
-        view.id,
-        "topKeyboardMoveStart",
-        keyboardHeight,
-        1.0,
-        0,
-        viewTagFocused,
-      ),
-    )
-    context.dispatchEvent(
-      view.id,
-      KeyboardTransitionEvent(
-        surfaceId,
-        view.id,
-        "topKeyboardMove",
-        keyboardHeight,
-        1.0,
-        0,
-        viewTagFocused,
-      ),
-    )
-    context.dispatchEvent(
-      view.id,
-      KeyboardTransitionEvent(
-        surfaceId,
-        view.id,
-        "topKeyboardMoveEnd",
-        keyboardHeight,
-        1.0,
-        0,
-        viewTagFocused,
-      ),
-    )
+    listOf("topKeyboardMoveStart", "topKeyboardMove", "topKeyboardMoveEnd").forEach { eventName ->
+      context.dispatchEvent(
+        eventPropagationView.id,
+        KeyboardTransitionEvent(
+          surfaceId,
+          eventPropagationView.id,
+          eventName,
+          keyboardHeight,
+          1.0,
+          0,
+          viewTagFocused,
+        ),
+      )
+    }
     context.emitEvent("KeyboardController::keyboardDidShow", getEventParams(keyboardHeight))
 
     this.persistentKeyboardHeight = keyboardHeight
@@ -363,7 +375,7 @@ class KeyboardAnimationCallback(
     val insets = ViewCompat.getRootWindowInsets(view)
     val keyboardHeight = insets?.getInsets(WindowInsetsCompat.Type.ime())?.bottom ?: 0
     val navigationBar =
-      if (hasTranslucentNavigationBar) {
+      if (config.hasTranslucentNavigationBar) {
         0
       } else {
         insets?.getInsets(WindowInsetsCompat.Type.navigationBars())?.bottom ?: 0

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

@@ -10,6 +10,10 @@ class KeyboardGestureAreaViewManagerImpl(mReactContext: ReactApplicationContext)
     return KeyboardGestureAreaReactViewGroup(reactContext)
   }
 
+  fun setOffset(view: KeyboardGestureAreaReactViewGroup, offset: Double) {
+    view.setOffset(offset)
+  }
+
   fun setInterpolator(view: KeyboardGestureAreaReactViewGroup, interpolator: String) {
     view.setInterpolator(interpolator)
   }

package/android/src/main/java/com/reactnativekeyboardcontroller/modal/ModalAttachedWatcher.kt

@@ -0,0 +1,80 @@
+package com.reactnativekeyboardcontroller.modal
+
+import android.util.Log
+import android.view.WindowManager
+import androidx.core.view.ViewCompat
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.common.UIManagerType
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.EventDispatcherListener
+import com.facebook.react.views.modal.ReactModalHostView
+import com.facebook.react.views.view.ReactViewGroup
+import com.reactnativekeyboardcontroller.BuildConfig
+import com.reactnativekeyboardcontroller.listeners.KeyboardAnimationCallback
+import com.reactnativekeyboardcontroller.listeners.KeyboardAnimationCallbackConfig
+
+private val TAG = ModalAttachedWatcher::class.qualifiedName
+
+class ModalAttachedWatcher(
+  private val view: ReactViewGroup,
+  private val reactContext: ThemedReactContext,
+  private val config: () -> KeyboardAnimationCallbackConfig,
+) : EventDispatcherListener {
+  private val archType = if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) UIManagerType.FABRIC else UIManagerType.DEFAULT
+  private val uiManager = UIManagerHelper.getUIManager(reactContext.reactApplicationContext, archType)
+  private val eventDispatcher = UIManagerHelper.getEventDispatcher(reactContext.reactApplicationContext, archType)
+
+  override fun onEventDispatch(event: Event<out Event<*>>?) {
+    if (event?.eventName != MODAL_SHOW_EVENT) {
+      return
+    }
+
+    val modal = try {
+      uiManager?.resolveView(event.viewTag) as? ReactModalHostView
+    } catch (ignore: Exception) {
+      Log.w(TAG, "Can not resolve view for Modal#${event.viewTag}", ignore)
+      null
+    }
+
+    if (modal == null) {
+      return
+    }
+
+    val dialog = modal.dialog
+    val window = dialog?.window
+    val rootView = window?.decorView?.rootView
+
+    if (rootView != null) {
+      val callback = KeyboardAnimationCallback(
+        view = rootView,
+        eventPropagationView = view,
+        context = reactContext,
+        config = config(),
+      )
+
+      ViewCompat.setWindowInsetsAnimationCallback(rootView, callback)
+      ViewCompat.setOnApplyWindowInsetsListener(rootView, callback)
+
+      dialog.setOnDismissListener {
+        callback.syncKeyboardPosition()
+        callback.destroy()
+      }
+
+      // imitating edge-to-edge mode behavior
+      window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
+    }
+  }
+
+  fun enable() {
+    eventDispatcher?.addListener(this)
+  }
+
+  fun disable() {
+    eventDispatcher?.removeListener(this)
+  }
+
+  companion object {
+    private const val MODAL_SHOW_EVENT = "topShow"
+  }
+}

package/android/src/main/java/com/reactnativekeyboardcontroller/modules/StatusBarManagerCompatModuleImpl.kt

@@ -9,6 +9,8 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.UiThreadUtil
+import com.reactnativekeyboardcontroller.extensions.rootView
+import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
 
 private val TAG = StatusBarManagerCompatModuleImpl::class.qualifiedName
 
@@ -50,19 +52,11 @@ class StatusBarManagerCompatModuleImpl(private val mReactContext: ReactApplicati
     }
   }
 
-  @Suppress("detekt:UnusedParameter")
   fun setTranslucent(translucent: Boolean) {
-    // the status bar is translucent by default (once you wrapped App in Provider,
-    // and EdgeToEdgeReactViewGroup has been mounted and called
-    // `setDecorFitsSystemWindows(window, false)`. By default this library applies default padding
-    // which equal to StatusBar height, so it will have a default RN app behavior. Though once you
-    // need to set StatusBar as translucent, you will need to use `statusBarTranslucent` prop on
-    // `KeyboardProvider` (it will preventing of applying additional padding, and status bar will be
-    // translucent. Though it's important to note, that this value is not reactive (i. e. if you change
-    // `statusBarTranslucent` in runtime it will not have any effect. Just theoretically I could make
-    // it reactive, but I know, that most of apps or don't use StatusBar translucency at all or they are
-    // specifying it for entire app, so I don't see a lot of sense to make it reactive as of now. If your
-    // app requires to dynamically manage it - just shoot an issue and I will try to add a support fot that.
+    UiThreadUtil.runOnUiThread {
+      val view = mReactContext.rootView?.findViewWithTag<EdgeToEdgeReactViewGroup>(EdgeToEdgeReactViewGroup.VIEW_TAG)
+      view?.forceStatusBarTranslucent(translucent)
+    }
   }
 
   fun setStyle(style: String) {

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

@@ -1,6 +1,7 @@
 package com.reactnativekeyboardcontroller.views
 
 import android.annotation.SuppressLint
+import android.content.res.Configuration
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
@@ -17,6 +18,8 @@ import com.reactnativekeyboardcontroller.extensions.requestApplyInsetsWhenAttach
 import com.reactnativekeyboardcontroller.extensions.rootView
 import com.reactnativekeyboardcontroller.extensions.setupWindowDimensionsListener
 import com.reactnativekeyboardcontroller.listeners.KeyboardAnimationCallback
+import com.reactnativekeyboardcontroller.listeners.KeyboardAnimationCallbackConfig
+import com.reactnativekeyboardcontroller.modal.ModalAttachedWatcher
 
 private val TAG = EdgeToEdgeReactViewGroup::class.qualifiedName
 
@@ -32,9 +35,20 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
   private var eventView: ReactViewGroup? = null
   private var wasMounted = false
   private var callback: KeyboardAnimationCallback? = null
+  private val config: KeyboardAnimationCallbackConfig
+    get() = KeyboardAnimationCallbackConfig(
+      persistentInsetTypes = WindowInsetsCompat.Type.systemBars(),
+      deferredInsetTypes = WindowInsetsCompat.Type.ime(),
+      dispatchMode = WindowInsetsAnimationCompat.Callback.DISPATCH_MODE_CONTINUE_ON_SUBTREE,
+      hasTranslucentNavigationBar = isNavigationBarTranslucent,
+    )
+
+  // managers/watchers
+  private val modalAttachedWatcher = ModalAttachedWatcher(this, reactContext, ::config)
 
   init {
     reactContext.setupWindowDimensionsListener()
+    tag = VIEW_TAG
   }
 
   // region View life cycles
@@ -55,6 +69,10 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
 
     this.removeKeyboardCallbacks()
   }
+
+  override fun onConfigurationChanged(newConfig: Configuration?) {
+    this.reApplyWindowInsets()
+  }
   // endregion
 
   // region State manager helpers
@@ -70,25 +88,23 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
 
         val shouldApplyZeroPaddingTop = !active || this.isStatusBarTranslucent
         val shouldApplyZeroPaddingBottom = !active || this.isNavigationBarTranslucent
+        val navBarInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+        val systemBarInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+
         params.setMargins(
-          0,
+          navBarInsets.left,
           if (shouldApplyZeroPaddingTop) {
             0
           } else {
-            (
-              insets?.getInsets(WindowInsetsCompat.Type.systemBars())?.top
-                ?: 0
-              )
+            systemBarInsets.top
           },
-          0,
+          navBarInsets.right,
           if (shouldApplyZeroPaddingBottom) {
             0
           } else {
-            insets?.getInsets(WindowInsetsCompat.Type.navigationBars())?.bottom
-              ?: 0
+            navBarInsets.bottom
           },
         )
-
         content?.layoutParams = params
 
         val defaultInsets = ViewCompat.onApplyWindowInsets(v, insets)
@@ -122,11 +138,9 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
 
       callback = KeyboardAnimationCallback(
         view = this,
-        persistentInsetTypes = WindowInsetsCompat.Type.systemBars(),
-        deferredInsetTypes = WindowInsetsCompat.Type.ime(),
-        dispatchMode = WindowInsetsAnimationCompat.Callback.DISPATCH_MODE_CONTINUE_ON_SUBTREE,
+        eventPropagationView = this,
         context = reactContext,
-        hasTranslucentNavigationBar = isNavigationBarTranslucent,
+        config = config,
       )
 
       eventView?.let {
@@ -153,6 +167,11 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
     // for more details
     Handler(Looper.getMainLooper()).post { view.removeSelf() }
   }
+
+  private fun reApplyWindowInsets() {
+    this.setupWindowInsets()
+    this.requestApplyInsetsWhenAttached()
+  }
   // endregion
 
   // region State managers
@@ -160,12 +179,14 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
     this.goToEdgeToEdge(true)
     this.setupWindowInsets()
     this.setupKeyboardCallbacks()
+    modalAttachedWatcher.enable()
   }
 
   private fun disable() {
     this.goToEdgeToEdge(false)
     this.setupWindowInsets()
     this.removeKeyboardCallbacks()
+    modalAttachedWatcher.disable()
   }
   // endregion
 
@@ -188,4 +209,17 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
     }
   }
   // endregion
+
+  // region external methods
+  fun forceStatusBarTranslucent(isStatusBarTranslucent: Boolean) {
+    if (active && this.isStatusBarTranslucent != isStatusBarTranslucent) {
+      this.isStatusBarTranslucent = isStatusBarTranslucent
+      this.reApplyWindowInsets()
+    }
+  }
+  // endregion
+
+  companion object {
+    val VIEW_TAG = EdgeToEdgeReactViewGroup::class.simpleName
+  }
 }

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

@@ -12,6 +12,7 @@ import androidx.core.view.WindowInsetsCompat
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 import com.reactnativekeyboardcontroller.extensions.copyBoundsInWindow
+import com.reactnativekeyboardcontroller.extensions.px
 import com.reactnativekeyboardcontroller.interactive.KeyboardAnimationController
 import com.reactnativekeyboardcontroller.interactive.interpolators.Interpolator
 import com.reactnativekeyboardcontroller.interactive.interpolators.IosInterpolator
@@ -35,6 +36,7 @@ class KeyboardGestureAreaReactViewGroup(private val reactContext: ThemedReactCon
   private var keyboardHeight = 0
 
   // react props
+  private var offset = 0
   private var interpolator: Interpolator = LinearInterpolator()
   private var scrollKeyboardOnScreenWhenNotVisible = false
   private var scrollKeyboardOffScreenWhenVisible = true
@@ -63,6 +65,10 @@ class KeyboardGestureAreaReactViewGroup(private val reactContext: ThemedReactCon
   }
 
   // region Props setters
+  fun setOffset(offset: Double) {
+    this.offset = offset.toFloat().px.toInt()
+  }
+
   fun setInterpolator(interpolator: String) {
     this.interpolator = interpolators[interpolator] ?: LinearInterpolator()
   }
@@ -125,6 +131,7 @@ class KeyboardGestureAreaReactViewGroup(private val reactContext: ThemedReactCon
           dy.roundToInt(),
           this.getWindowHeight() - event.rawY.toInt(),
           controller.getCurrentKeyboardHeight(),
+          offset,
         )
 
         if (moveBy != 0) {