react-native-keyboard-controller 1.21.3 → 1.21.5

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

@@ -11,6 +11,8 @@ class KeyboardControllerModule(
 
   override fun getName(): String = KeyboardControllerModuleImpl.NAME
 
+  override fun getTypedExportedConstants(): Map<String, Any> = module.getConstants()
+
   override fun setInputMode(mode: Double) {
     module.setInputMode(mode.toInt())
   }

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

@@ -2,6 +2,7 @@ package com.reactnativekeyboardcontroller.extensions
 
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
@@ -28,3 +29,12 @@ val ReactContext.content: ViewGroup?
     this.currentActivity?.window?.decorView?.rootView?.findViewById(
       androidx.appcompat.R.id.action_bar_root,
     )
+
+val ReactContext.windowSoftInputMode: Int
+  get() =
+    this
+      .currentActivity
+      ?.window
+      ?.attributes
+      ?.softInputMode
+      ?: WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED

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

@@ -4,9 +4,7 @@ import android.annotation.SuppressLint
 import android.graphics.Rect
 import android.os.Build
 import android.view.View
-import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.reactnativekeyboardcontroller.log.Logger
 
 /**
@@ -61,41 +59,3 @@ val View.screenLocation get(): IntArray {
 
   return point
 }
-
-/**
- * Safely replaces status bar insets so that when we edge-to-edge mode gets disabled/enabled
- * the app content is not jumping/resizing a window.
- * */
-@Suppress("DEPRECATION")
-fun View.replaceStatusBarInsets(
-  insets: WindowInsetsCompat,
-  isStatusBarTranslucent: Boolean,
-  active: Boolean,
-): WindowInsetsCompat {
-  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-    val sysBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-    val navBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
-    val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
-    val adjustedTop = if (isStatusBarTranslucent) 0 else sysBars.top
-    // pick bottom: use IME if present, otherwise nav bar bottom (respect translucency)
-    val bottomFromImeOrNav = if (ime.bottom > 0) ime.bottom else navBars.bottom
-    val adjustedInsets =
-      WindowInsetsCompat
-        .Builder(insets)
-        .setInsets(
-          WindowInsetsCompat.Type.systemBars(),
-          Insets.of(sysBars.left, adjustedTop, sysBars.right, if (active) sysBars.bottom else bottomFromImeOrNav),
-        ).build()
-
-    return ViewCompat.onApplyWindowInsets(this, adjustedInsets)
-  } else {
-    val defaultInsets = ViewCompat.onApplyWindowInsets(this, insets)
-
-    return defaultInsets.replaceSystemWindowInsets(
-      defaultInsets.systemWindowInsetLeft,
-      if (isStatusBarTranslucent) 0 else defaultInsets.systemWindowInsetTop,
-      defaultInsets.systemWindowInsetRight,
-      defaultInsets.systemWindowInsetBottom,
-    )
-  }
-}

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

@@ -43,6 +43,7 @@ class WindowDimensionListener(
     attachedContent?.viewTreeObserver?.removeOnGlobalLayoutListener(layoutListener)
     attachedContent = null
     layoutListener = null
+    listenerID = -1
   }
 
   private fun updateWindowDimensions(content: ViewGroup?) {

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

@@ -13,11 +13,14 @@ import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
 
 class KeyboardControllerViewManagerImpl {
   private var listener: WindowDimensionListener? = null
+  private var listenerContext: ThemedReactContext? = null
 
   fun createViewInstance(reactContext: ThemedReactContext): EdgeToEdgeReactViewGroup {
-    if (listener == null) {
+    if (listener == null || listenerContext !== reactContext) {
+      listener?.detachListener()
       listener = WindowDimensionListener(reactContext)
       listener?.attachListener()
+      listenerContext = reactContext
     }
     return EdgeToEdgeReactViewGroup(reactContext)
   }
@@ -25,6 +28,7 @@ class KeyboardControllerViewManagerImpl {
   fun invalidate() {
     listener?.detachListener()
     listener = null
+    listenerContext = null
   }
 
   fun synchronizeFocusedInputLayout(view: EdgeToEdgeReactViewGroup) {

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

@@ -3,7 +3,6 @@ package com.reactnativekeyboardcontroller.modules
 import android.content.Context
 import android.os.Build
 import android.view.View
-import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
@@ -12,6 +11,7 @@ import com.facebook.react.bridge.UiThreadUtil
 import com.reactnativekeyboardcontroller.extensions.dp
 import com.reactnativekeyboardcontroller.extensions.screenLocation
 import com.reactnativekeyboardcontroller.extensions.uiManager
+import com.reactnativekeyboardcontroller.extensions.windowSoftInputMode
 import com.reactnativekeyboardcontroller.interactive.KeyboardAnimationController
 import com.reactnativekeyboardcontroller.traversal.FocusedInputHolder
 import com.reactnativekeyboardcontroller.traversal.ViewHierarchyNavigator
@@ -21,8 +21,9 @@ class KeyboardControllerModuleImpl(
 ) {
   private val uiManager = mReactContext.uiManager
   private val controller = KeyboardAnimationController()
-  private val mDefaultMode: Int = getCurrentMode()
+  private val mDefaultMode: Int = mReactContext.windowSoftInputMode
 
+  // region Module methods
   fun setInputMode(mode: Int) {
     setSoftInputMode(mode)
   }
@@ -102,24 +103,23 @@ class KeyboardControllerModuleImpl(
       promise.resolve(map)
     }
   }
+  // endregion
 
+  // region Helpers
   private fun setSoftInputMode(mode: Int) {
     UiThreadUtil.runOnUiThread {
-      if (getCurrentMode() != mode) {
+      if (mReactContext.windowSoftInputMode != mode) {
         mReactContext.currentActivity?.window?.setSoftInputMode(mode)
       }
     }
   }
+  // endregion
 
-  private fun getCurrentMode(): Int =
-    mReactContext
-      .currentActivity
-      ?.window
-      ?.attributes
-      ?.softInputMode
-      ?: WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED
+  // region Module constants
+  fun getConstants(): MutableMap<String, Any> = mutableMapOf("keyboardBorderRadius" to 0)
 
   companion object {
     const val NAME = "KeyboardController"
   }
+  // endregion
 }

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

@@ -5,6 +5,7 @@ import android.content.res.Configuration
 import android.os.Handler
 import android.os.Looper
 import android.view.WindowManager
+import android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
 import android.widget.FrameLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
@@ -14,14 +15,15 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 import com.reactnativekeyboardcontroller.extensions.content
 import com.reactnativekeyboardcontroller.extensions.removeSelf
-import com.reactnativekeyboardcontroller.extensions.replaceStatusBarInsets
 import com.reactnativekeyboardcontroller.extensions.requestApplyInsetsWhenAttached
 import com.reactnativekeyboardcontroller.extensions.rootView
+import com.reactnativekeyboardcontroller.extensions.windowSoftInputMode
 import com.reactnativekeyboardcontroller.listeners.KeyboardAnimationCallback
 import com.reactnativekeyboardcontroller.listeners.KeyboardAnimationCallbackConfig
 import com.reactnativekeyboardcontroller.log.Logger
 import com.reactnativekeyboardcontroller.modal.ModalAttachedWatcher
 import java.lang.ref.WeakReference
+import kotlin.math.max
 
 private val TAG = EdgeToEdgeReactViewGroup::class.qualifiedName
 
@@ -44,7 +46,6 @@ class EdgeToEdgeReactViewGroup(
   private var isStatusBarTranslucent = false
   private var isNavigationBarTranslucent = false
   private var isPreservingEdgeToEdge = false
-  private var isEdgeToEdge = false
   var active: Boolean = false
     set(value) {
       field = value
@@ -110,47 +111,43 @@ class EdgeToEdgeReactViewGroup(
             FrameLayout.LayoutParams.MATCH_PARENT,
           )
 
-        val shouldApplyZeroPaddingTop = !active || this.isStatusBarTranslucent
-        val shouldApplyZeroPaddingBottom = !active || this.isNavigationBarTranslucent
+        val shouldApplyBottomPadding =
+          !active && reactContext.windowSoftInputMode == SOFT_INPUT_ADJUST_RESIZE && !isPreservingEdgeToEdge
         val navBarInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
         val systemBarInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val keyboardInsets =
+          if (!shouldApplyBottomPadding) 0 else insets.getInsets(WindowInsetsCompat.Type.ime()).bottom
 
         params.setMargins(
           navBarInsets.left,
-          if (shouldApplyZeroPaddingTop) {
+          if (this.isStatusBarTranslucent) {
             0
           } else {
             systemBarInsets.top
           },
           navBarInsets.right,
-          if (shouldApplyZeroPaddingBottom) {
-            0
+          if (this.isNavigationBarTranslucent) {
+            keyboardInsets
           } else {
-            navBarInsets.bottom
+            max(navBarInsets.bottom, keyboardInsets)
           },
         )
         content?.layoutParams = params
 
-        v.replaceStatusBarInsets(insets, this.isStatusBarTranslucent, active)
+        ViewCompat.onApplyWindowInsets(v, insets)
       }
     }
   }
 
   fun setEdgeToEdge() {
-    val nextValue = active || isPreservingEdgeToEdge
-
-    if (isEdgeToEdge != nextValue) {
-      isEdgeToEdge = nextValue
-
-      reactContext.currentActivity?.let {
-        WindowCompat.setDecorFitsSystemWindows(
-          it.window,
-          !isEdgeToEdge,
-        )
-      }
-      // unclear legacy flag if it was set earlier
-      reactContext.currentActivity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+    reactContext.currentActivity?.let {
+      WindowCompat.setDecorFitsSystemWindows(
+        it.window,
+        false,
+      )
     }
+    // unclear legacy flag if it was set earlier
+    reactContext.currentActivity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
   }
 
   private fun setupKeyboardCallbacks() {

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

@@ -13,6 +13,8 @@ class KeyboardControllerModule(
 
   override fun getName(): String = KeyboardControllerModuleImpl.NAME
 
+  override fun getConstants(): MutableMap<String, Any> = module.getConstants()
+
   @ReactMethod
   fun setInputMode(mode: Int) {
     module.setInputMode(mode)

package/ios/KeyboardControllerModule.mm

@@ -53,6 +53,18 @@ RCT_EXPORT_MODULE()
   return NO;
 }
 
+- (NSDictionary *)constantsToExport
+{
+  return @{
+    @"keyboardBorderRadius" : @([KeyboardExtenderContainerView keyboardBorderRadius]),
+  };
+}
+
+- (NSDictionary *)getConstants
+{
+  return [self constantsToExport];
+}
+
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)setDefaultMode
 #else

package/ios/observers/FocusedInputObserver.swift

@@ -112,9 +112,16 @@ public class FocusedInputObserver: NSObject {
     NotificationCenter.default.removeObserver(self)
   }
 
-  @objc func didReceiveFocus(_: Notification) {
+  @objc func didReceiveFocus(_ notification: Notification) {
     if UIResponder.current == currentResponder {
-      // focus was already handled by keyboard event
+      // The same input is still focused — no need to re-run the full onFocus()
+      // setup (observers, delegate substitution, focusDidSet event). However,
+      // keyboardWillShowNotification also fires when the keyboard *resizes*
+      // (e.g. switching between text and emoji keyboards). In that case we must
+      // refresh the layout so consumers receive an up-to-date absoluteY.
+      if notification.name == UIResponder.keyboardWillShowNotification {
+        syncUpLayout()
+      }
       return
     }
 

package/ios/views/KeyboardExtenderContainerView.swift

@@ -9,16 +9,26 @@ import UIKit
 
 @objc
 public class KeyboardExtenderContainerView: NSObject {
-  @objc public static func create(frame: CGRect, contentView: UIView) -> UIView {
+  private static func usesModernKeyboard() -> Bool {
     #if canImport(UIKit.UIGlassEffect)
       if #available(iOS 26.0, *) {
         let requiresCompat = Bundle.main.object(forInfoDictionaryKey: "UIDesignRequiresCompatibility") as? Bool ?? false
-        if !requiresCompat {
-          return ModernContainerView(frame: frame, contentView: contentView)
-        }
+        return !requiresCompat
       }
     #endif
+    return false
+  }
+
+  @objc public static func keyboardBorderRadius() -> CGFloat {
+    return usesModernKeyboard() ? 30 : 0
+  }
 
+  @objc public static func create(frame: CGRect, contentView: UIView) -> UIView {
+    if usesModernKeyboard() {
+      if #available(iOS 26.0, *) {
+        return ModernContainerView(frame: frame, contentView: contentView)
+      }
+    }
     return LegacyContainerView(frame: frame, contentView: contentView)
   }
 }

package/lib/commonjs/bindings.js

@@ -19,7 +19,10 @@ const KeyboardControllerNative = exports.KeyboardControllerNative = {
     height: 0
   }),
   addListener: NOOP,
-  removeListeners: NOOP
+  removeListeners: NOOP,
+  getConstants: () => ({
+    keyboardBorderRadius: 0
+  })
 };
 /**
  * An event emitter that provides a way to subscribe to next keyboard events:

package/lib/commonjs/bindings.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","NOOP","KeyboardControllerNative","exports","setDefaultMode","setInputMode","preload","dismiss","setFocusTo","viewPositionInWindow","Promise","resolve","x","y","width","height","addListener","removeListeners","KeyboardEvents","remove","FocusedInputEvents","WindowDimensionsEvents","KeyboardControllerView","View","KeyboardControllerViewCommands","synchronizeFocusedInputLayout","_ref","KeyboardGestureArea","RCTOverKeyboardView","KeyboardBackgroundView","RCTKeyboardExtender","ClippingScrollView","RCTKeyboardToolbarGroupView"],"sources":["bindings.ts"],"sourcesContent":["import { View } from \"react-native\";\n\nimport type {\n  ClippingScrollViewProps,\n  FocusedInputEventsModule,\n  KeyboardBackgroundViewProps,\n  KeyboardControllerNativeModule,\n  KeyboardControllerProps,\n  KeyboardEventsModule,\n  KeyboardExtenderProps,\n  KeyboardGestureAreaProps,\n  KeyboardToolbarGroupViewProps,\n  OverKeyboardViewProps,\n  WindowDimensionsEventsModule,\n} from \"./types\";\nimport type { EmitterSubscription } from \"react-native\";\n\nconst NOOP = () => {};\n\nexport const KeyboardControllerNative: KeyboardControllerNativeModule = {\n  setDefaultMode: NOOP,\n  setInputMode: NOOP,\n  preload: NOOP,\n  dismiss: NOOP,\n  setFocusTo: NOOP,\n  viewPositionInWindow: () =>\n    Promise.resolve({ x: 0, y: 0, width: 0, height: 0 }),\n  addListener: NOOP,\n  removeListeners: NOOP,\n};\n/**\n * An event emitter that provides a way to subscribe to next keyboard events:\n * - `keyboardWillShow`;\n * - `keyboardDidShow`;\n * - `keyboardWillHide`;\n * - `keyboardDidHide`.\n *\n * Use `addListener` function to add your event listener for a specific keyboard event.\n */\nexport const KeyboardEvents: KeyboardEventsModule = {\n  addListener: () => ({ remove: NOOP } as EmitterSubscription),\n};\n/**\n * This API is not documented, it's for internal usage only (for now), and is a subject to potential breaking changes in future.\n * Use it with cautious.\n */\nexport const FocusedInputEvents: FocusedInputEventsModule = {\n  addListener: () => ({ remove: NOOP } as EmitterSubscription),\n};\nexport const WindowDimensionsEvents: WindowDimensionsEventsModule = {\n  addListener: () => ({ remove: NOOP } as EmitterSubscription),\n};\n/**\n * A view that sends events whenever keyboard or focused events are happening.\n *\n * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller-view|Documentation} page for more details.\n */\nexport const KeyboardControllerView =\n  View as unknown as React.FC<KeyboardControllerProps>;\nexport const KeyboardControllerViewCommands = {\n  synchronizeFocusedInputLayout: (\n    _ref: React.Component<KeyboardControllerProps> | null,\n  ) => {},\n};\n/**\n * A view that defines a region on the screen, where gestures will control the keyboard position.\n *\n * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-gesture-area|Documentation} page for more details.\n */\nexport const KeyboardGestureArea =\n  View as unknown as React.FC<KeyboardGestureAreaProps>;\nexport const RCTOverKeyboardView =\n  View as unknown as React.FC<OverKeyboardViewProps>;\n/**\n * A view that matches keyboard background.\n *\n * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-background-view|Documentation} page for more details.\n */\nexport const KeyboardBackgroundView =\n  View as unknown as React.FC<KeyboardBackgroundViewProps>;\n/**\n * A container that will embed its children into the keyboard\n * and will always show them above the keyboard.\n *\n * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-extender|Documentation} page for more details.\n */\nexport const RCTKeyboardExtender =\n  View as unknown as React.FC<KeyboardExtenderProps>;\n/**\n * A decorator that will clip the content of the `ScrollView`. It helps to simulate `contentInset` behavior on Android\n * Supports only `bottom` property (`paddingBottom` is not supported property of `ScrollView.style`).\n * Using this component we can modify bottom inset without having a fake view.\n *\n * On iOS we use swizzling to apply runtime patches to fix some broken internal methods.\n * Ideally this component shouldn't exist and all its fixes/polyfills must be added directly to react-native and\n * we will port features/fixes back to upstream, but at the moment we use this view to\n * deliver desired functionality regardless of react-native version used.\n */\nexport const ClippingScrollView =\n  View as unknown as React.FC<ClippingScrollViewProps>;\n/**\n * A View that defines a group of `TextInput`s.\n * Used in toolbar navigation to assure that you can navigate only between inputs withing the same group.\n */\nexport const RCTKeyboardToolbarGroupView =\n  View as unknown as React.FC<KeyboardToolbarGroupViewProps>;\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAiBA,MAAMC,IAAI,GAAGA,CAAA,KAAM,CAAC,CAAC;AAEd,MAAMC,wBAAwD,GAAAC,OAAA,CAAAD,wBAAA,GAAG;EACtEE,cAAc,EAAEH,IAAI;EACpBI,YAAY,EAAEJ,IAAI;EAClBK,OAAO,EAAEL,IAAI;EACbM,OAAO,EAAEN,IAAI;EACbO,UAAU,EAAEP,IAAI;EAChBQ,oBAAoB,EAAEA,CAAA,KACpBC,OAAO,CAACC,OAAO,CAAC;IAAEC,CAAC,EAAE,CAAC;IAAEC,CAAC,EAAE,CAAC;IAAEC,KAAK,EAAE,CAAC;IAAEC,MAAM,EAAE;EAAE,CAAC,CAAC;EACtDC,WAAW,EAAEf,IAAI;EACjBgB,eAAe,EAAEhB;AACnB,CAAC;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMiB,cAAoC,GAAAf,OAAA,CAAAe,cAAA,GAAG;EAClDF,WAAW,EAAEA,CAAA,MAAO;IAAEG,MAAM,EAAElB;EAAK,CAAC;AACtC,CAAC;AACD;AACA;AACA;AACA;AACO,MAAMmB,kBAA4C,GAAAjB,OAAA,CAAAiB,kBAAA,GAAG;EAC1DJ,WAAW,EAAEA,CAAA,MAAO;IAAEG,MAAM,EAAElB;EAAK,CAAC;AACtC,CAAC;AACM,MAAMoB,sBAAoD,GAAAlB,OAAA,CAAAkB,sBAAA,GAAG;EAClEL,WAAW,EAAEA,CAAA,MAAO;IAAEG,MAAM,EAAElB;EAAK,CAAC;AACtC,CAAC;AACD;AACA;AACA;AACA;AACA;AACO,MAAMqB,sBAAsB,GAAAnB,OAAA,CAAAmB,sBAAA,GACjCC,iBAAoD;AAC/C,MAAMC,8BAA8B,GAAArB,OAAA,CAAAqB,8BAAA,GAAG;EAC5CC,6BAA6B,EAC3BC,IAAqD,IAClD,CAAC;AACR,CAAC;AACD;AACA;AACA;AACA;AACA;AACO,MAAMC,mBAAmB,GAAAxB,OAAA,CAAAwB,mBAAA,GAC9BJ,iBAAqD;AAChD,MAAMK,mBAAmB,GAAAzB,OAAA,CAAAyB,mBAAA,GAC9BL,iBAAkD;AACpD;AACA;AACA;AACA;AACA;AACO,MAAMM,sBAAsB,GAAA1B,OAAA,CAAA0B,sBAAA,GACjCN,iBAAwD;AAC1D;AACA;AACA;AACA;AACA;AACA;AACO,MAAMO,mBAAmB,GAAA3B,OAAA,CAAA2B,mBAAA,GAC9BP,iBAAkD;AACpD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMQ,kBAAkB,GAAA5B,OAAA,CAAA4B,kBAAA,GAC7BR,iBAAoD;AACtD;AACA;AACA;AACA;AACO,MAAMS,2BAA2B,GAAA7B,OAAA,CAAA6B,2BAAA,GACtCT,iBAA0D","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","NOOP","KeyboardControllerNative","exports","setDefaultMode","setInputMode","preload","dismiss","setFocusTo","viewPositionInWindow","Promise","resolve","x","y","width","height","addListener","removeListeners","getConstants","keyboardBorderRadius","KeyboardEvents","remove","FocusedInputEvents","WindowDimensionsEvents","KeyboardControllerView","View","KeyboardControllerViewCommands","synchronizeFocusedInputLayout","_ref","KeyboardGestureArea","RCTOverKeyboardView","KeyboardBackgroundView","RCTKeyboardExtender","ClippingScrollView","RCTKeyboardToolbarGroupView"],"sources":["bindings.ts"],"sourcesContent":["import { View } from \"react-native\";\n\nimport type {\n  ClippingScrollViewProps,\n  FocusedInputEventsModule,\n  KeyboardBackgroundViewProps,\n  KeyboardControllerNativeModule,\n  KeyboardControllerProps,\n  KeyboardEventsModule,\n  KeyboardExtenderProps,\n  KeyboardGestureAreaProps,\n  KeyboardToolbarGroupViewProps,\n  OverKeyboardViewProps,\n  WindowDimensionsEventsModule,\n} from \"./types\";\nimport type { EmitterSubscription } from \"react-native\";\n\nconst NOOP = () => {};\n\nexport const KeyboardControllerNative: KeyboardControllerNativeModule = {\n  setDefaultMode: NOOP,\n  setInputMode: NOOP,\n  preload: NOOP,\n  dismiss: NOOP,\n  setFocusTo: NOOP,\n  viewPositionInWindow: () =>\n    Promise.resolve({ x: 0, y: 0, width: 0, height: 0 }),\n  addListener: NOOP,\n  removeListeners: NOOP,\n  getConstants: () => ({\n    keyboardBorderRadius: 0,\n  }),\n};\n/**\n * An event emitter that provides a way to subscribe to next keyboard events:\n * - `keyboardWillShow`;\n * - `keyboardDidShow`;\n * - `keyboardWillHide`;\n * - `keyboardDidHide`.\n *\n * Use `addListener` function to add your event listener for a specific keyboard event.\n */\nexport const KeyboardEvents: KeyboardEventsModule = {\n  addListener: () => ({ remove: NOOP } as EmitterSubscription),\n};\n/**\n * This API is not documented, it's for internal usage only (for now), and is a subject to potential breaking changes in future.\n * Use it with cautious.\n */\nexport const FocusedInputEvents: FocusedInputEventsModule = {\n  addListener: () => ({ remove: NOOP } as EmitterSubscription),\n};\nexport const WindowDimensionsEvents: WindowDimensionsEventsModule = {\n  addListener: () => ({ remove: NOOP } as EmitterSubscription),\n};\n/**\n * A view that sends events whenever keyboard or focused events are happening.\n *\n * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller-view|Documentation} page for more details.\n */\nexport const KeyboardControllerView =\n  View as unknown as React.FC<KeyboardControllerProps>;\nexport const KeyboardControllerViewCommands = {\n  synchronizeFocusedInputLayout: (\n    _ref: React.Component<KeyboardControllerProps> | null,\n  ) => {},\n};\n/**\n * A view that defines a region on the screen, where gestures will control the keyboard position.\n *\n * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-gesture-area|Documentation} page for more details.\n */\nexport const KeyboardGestureArea =\n  View as unknown as React.FC<KeyboardGestureAreaProps>;\nexport const RCTOverKeyboardView =\n  View as unknown as React.FC<OverKeyboardViewProps>;\n/**\n * A view that matches keyboard background.\n *\n * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-background-view|Documentation} page for more details.\n */\nexport const KeyboardBackgroundView =\n  View as unknown as React.FC<KeyboardBackgroundViewProps>;\n/**\n * A container that will embed its children into the keyboard\n * and will always show them above the keyboard.\n *\n * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-extender|Documentation} page for more details.\n */\nexport const RCTKeyboardExtender =\n  View as unknown as React.FC<KeyboardExtenderProps>;\n/**\n * A decorator that will clip the content of the `ScrollView`. It helps to simulate `contentInset` behavior on Android\n * Supports only `bottom` property (`paddingBottom` is not supported property of `ScrollView.style`).\n * Using this component we can modify bottom inset without having a fake view.\n *\n * On iOS we use swizzling to apply runtime patches to fix some broken internal methods.\n * Ideally this component shouldn't exist and all its fixes/polyfills must be added directly to react-native and\n * we will port features/fixes back to upstream, but at the moment we use this view to\n * deliver desired functionality regardless of react-native version used.\n */\nexport const ClippingScrollView =\n  View as unknown as React.FC<ClippingScrollViewProps>;\n/**\n * A View that defines a group of `TextInput`s.\n * Used in toolbar navigation to assure that you can navigate only between inputs withing the same group.\n */\nexport const RCTKeyboardToolbarGroupView =\n  View as unknown as React.FC<KeyboardToolbarGroupViewProps>;\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAiBA,MAAMC,IAAI,GAAGA,CAAA,KAAM,CAAC,CAAC;AAEd,MAAMC,wBAAwD,GAAAC,OAAA,CAAAD,wBAAA,GAAG;EACtEE,cAAc,EAAEH,IAAI;EACpBI,YAAY,EAAEJ,IAAI;EAClBK,OAAO,EAAEL,IAAI;EACbM,OAAO,EAAEN,IAAI;EACbO,UAAU,EAAEP,IAAI;EAChBQ,oBAAoB,EAAEA,CAAA,KACpBC,OAAO,CAACC,OAAO,CAAC;IAAEC,CAAC,EAAE,CAAC;IAAEC,CAAC,EAAE,CAAC;IAAEC,KAAK,EAAE,CAAC;IAAEC,MAAM,EAAE;EAAE,CAAC,CAAC;EACtDC,WAAW,EAAEf,IAAI;EACjBgB,eAAe,EAAEhB,IAAI;EACrBiB,YAAY,EAAEA,CAAA,MAAO;IACnBC,oBAAoB,EAAE;EACxB,CAAC;AACH,CAAC;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,cAAoC,GAAAjB,OAAA,CAAAiB,cAAA,GAAG;EAClDJ,WAAW,EAAEA,CAAA,MAAO;IAAEK,MAAM,EAAEpB;EAAK,CAAC;AACtC,CAAC;AACD;AACA;AACA;AACA;AACO,MAAMqB,kBAA4C,GAAAnB,OAAA,CAAAmB,kBAAA,GAAG;EAC1DN,WAAW,EAAEA,CAAA,MAAO;IAAEK,MAAM,EAAEpB;EAAK,CAAC;AACtC,CAAC;AACM,MAAMsB,sBAAoD,GAAApB,OAAA,CAAAoB,sBAAA,GAAG;EAClEP,WAAW,EAAEA,CAAA,MAAO;IAAEK,MAAM,EAAEpB;EAAK,CAAC;AACtC,CAAC;AACD;AACA;AACA;AACA;AACA;AACO,MAAMuB,sBAAsB,GAAArB,OAAA,CAAAqB,sBAAA,GACjCC,iBAAoD;AAC/C,MAAMC,8BAA8B,GAAAvB,OAAA,CAAAuB,8BAAA,GAAG;EAC5CC,6BAA6B,EAC3BC,IAAqD,IAClD,CAAC;AACR,CAAC;AACD;AACA;AACA;AACA;AACA;AACO,MAAMC,mBAAmB,GAAA1B,OAAA,CAAA0B,mBAAA,GAC9BJ,iBAAqD;AAChD,MAAMK,mBAAmB,GAAA3B,OAAA,CAAA2B,mBAAA,GAC9BL,iBAAkD;AACpD;AACA;AACA;AACA;AACA;AACO,MAAMM,sBAAsB,GAAA5B,OAAA,CAAA4B,sBAAA,GACjCN,iBAAwD;AAC1D;AACA;AACA;AACA;AACA;AACA;AACO,MAAMO,mBAAmB,GAAA7B,OAAA,CAAA6B,mBAAA,GAC9BP,iBAAkD;AACpD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMQ,kBAAkB,GAAA9B,OAAA,CAAA8B,kBAAA,GAC7BR,iBAAoD;AACtD;AACA;AACA;AACA;AACO,MAAMS,2BAA2B,GAAA/B,OAAA,CAAA+B,2BAAA,GACtCT,iBAA0D","ignoreList":[]}

package/lib/commonjs/components/KeyboardAwareScrollView/index.js

@@ -77,6 +77,7 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
   disableScrollOnKeyboardHide = false,
   enabled = true,
   extraKeyboardSpace = 0,
+  mode = "insets",
   ScrollViewComponent = _reactNativeReanimated.default.ScrollView,
   snapToOffsets,
   ...rest
@@ -162,15 +163,21 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
   const removeGhostPadding = (0, _react.useCallback)(e => {
     "worklet";
 
-    // new `ScrollViewWithBottomPadding` behavior: if we hide keyboard and we are in the end of `ScrollView`
-    // then we always need to scroll back, because we apply a padding that doesn't change layout, so we will
-    // not have auto scroll back in this case
+    // layout mode: the spacer view participates in layout, so the ScrollView
+    // reflows naturally when it shrinks — no manual scroll correction needed.
+    if (mode === "layout") {
+      return false;
+    }
+
+    // insets mode: `ScrollViewWithBottomPadding` extends scrollable area without
+    // changing layout, so when the keyboard hides and we're at the end of the
+    // ScrollView we must manually scroll back.
     if (!keyboardWillAppear.value && ghostViewSpace.value > 0) {
       (0, _reactNativeReanimated.scrollTo)(scrollViewAnimatedRef, 0, scrollPosition.value - (0, _reactNativeReanimated.interpolate)(e, [initialKeyboardSize.value, keyboardHeight.value], [ghostViewSpace.value, 0]), false);
       return true;
     }
     return false;
-  }, []);
+  }, [mode]);
   const performScrollWithPositionRestoration = (0, _react.useCallback)(newPosition => {
     "worklet";
 
@@ -280,8 +287,14 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
         scrollPosition.value = position.value;
         // just persist height - later will be used in interpolation
         keyboardHeight.value = e.height;
-        // and update keyboard spacer size
-        syncKeyboardFrame(e);
+
+        // insets mode: set the full contentInset upfront so that maybeScroll
+        // calculations are correct from the very first onMove frame.
+        // layout mode: do NOT set it here — the spacer must grow frame-by-frame
+        // in onMove to avoid a premature full-height jump before the keyboard moves.
+        if (mode === "insets") {
+          syncKeyboardFrame(e);
+        }
       }
 
       // focus was changed
@@ -318,9 +331,11 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
           position.value += maybeScroll(e.height, true);
         }
       }
-      ghostViewSpace.value = position.value + scrollViewLayout.value.height - scrollViewContentSize.value.height;
-      if (ghostViewSpace.value > 0) {
-        scrollPosition.value = position.value;
+      if (mode === "insets") {
+        ghostViewSpace.value = position.value + scrollViewLayout.value.height - scrollViewContentSize.value.height;
+        if (ghostViewSpace.value > 0) {
+          scrollPosition.value = position.value;
+        }
       }
     },
     onMove: e => {
@@ -330,6 +345,11 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
         return;
       }
 
+      // layout mode: drive the spacer view animation frame-by-frame
+      if (mode === "layout") {
+        syncKeyboardFrame(e);
+      }
+
       // if the user has set disableScrollOnKeyboardHide, only auto-scroll when the keyboard opens
       if (!disableScrollOnKeyboardHide || keyboardWillAppear.value) {
         maybeScroll(e.height);
@@ -353,7 +373,7 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
       }
       syncKeyboardFrame(e);
     }
-  }, [maybeScroll, removeGhostPadding, disableScrollOnKeyboardHide, syncKeyboardFrame]);
+  }, [mode, maybeScroll, removeGhostPadding, disableScrollOnKeyboardHide, syncKeyboardFrame]);
   const synchronize = (0, _react.useCallback)(async () => {
     await update();
     (0, _reactNativeReanimated.runOnUI)(() => {
@@ -389,6 +409,23 @@ const KeyboardAwareScrollView = /*#__PURE__*/(0, _react.forwardRef)(({
     }
   }, []);
   const padding = (0, _reactNativeReanimated.useDerivedValue)(() => enabled ? currentKeyboardFrameHeight.value : 0, [enabled]);
+  // layout mode only: a spacer view whose paddingBottom grows with the keyboard.
+  // The `+ 1` ensures the scroll view never reaches its absolute end during animation,
+  // avoiding the layout recalculation that triggers on every frame at the boundary.
+  // see: https://github.com/kirillzyusko/react-native-keyboard-controller/pull/342
+  const layoutSpacerStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => enabled && mode === "layout" ? {
+    paddingBottom: currentKeyboardFrameHeight.value + 1
+  } : {}, [enabled, mode]);
+  if (mode === "layout") {
+    return /*#__PURE__*/_react.default.createElement(ScrollViewComponent, _extends({
+      ref: onRef
+    }, rest, {
+      scrollEventThrottle: 16,
+      onLayout: onScrollViewLayout
+    }), children, enabled && /*#__PURE__*/_react.default.createElement(_reactNativeReanimated.default.View, {
+      style: layoutSpacerStyle
+    }));
+  }
   return /*#__PURE__*/_react.default.createElement(_ScrollViewWithBottomPadding.default, _extends({
     ref: onRef
   }, rest, {