react-native-keyboard-controller 1.21.2 → 1.21.4

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["KeyboardChatScrollView","KeyboardAvoidingView","KeyboardStickyView","KeyboardAwareScrollView","KeyboardToolbar","DefaultKeyboardToolbarTheme","OverKeyboardView","KeyboardExtender"],"sources":["index.ts"],"sourcesContent":["export * from \"./bindings\";\nexport * from \"./animated\";\nexport * from \"./context\";\nexport * from \"./hooks\";\nexport * from \"./constants\";\nexport * from \"./module\";\nexport * from \"./types\";\nexport * from \"./compat\";\n\nexport {\n  KeyboardChatScrollView,\n  KeyboardAvoidingView,\n  KeyboardStickyView,\n  KeyboardAwareScrollView,\n  // keyboard toolbar\n  KeyboardToolbar,\n  DefaultKeyboardToolbarTheme,\n} from \"./components\";\nexport type {\n  KeyboardChatScrollViewProps,\n  KeyboardAvoidingViewProps,\n  KeyboardStickyViewProps,\n  KeyboardAwareScrollViewProps,\n  KeyboardAwareScrollViewRef,\n  KeyboardToolbarProps,\n} from \"./components\";\nexport { OverKeyboardView, KeyboardExtender } from \"./views\";\n"],"mappings":"AAAA,cAAc,YAAY;AAC1B,cAAc,YAAY;AAC1B,cAAc,WAAW;AACzB,cAAc,SAAS;AACvB,cAAc,aAAa;AAC3B,cAAc,UAAU;AACxB,cAAc,SAAS;AACvB,cAAc,UAAU;AAExB,SACEA,sBAAsB,EACtBC,oBAAoB,EACpBC,kBAAkB,EAClBC,uBAAuB;AACvB;AACAC,eAAe,EACfC,2BAA2B,QACtB,cAAc;AASrB,SAASC,gBAAgB,EAAEC,gBAAgB,QAAQ,SAAS","ignoreList":[]}
+{"version":3,"names":["KeyboardChatScrollView","KeyboardAvoidingView","KeyboardStickyView","KeyboardAwareScrollView","KeyboardToolbar","DefaultKeyboardToolbarTheme","OverKeyboardView","KeyboardExtender"],"sources":["index.ts"],"sourcesContent":["export * from \"./bindings\";\nexport * from \"./animated\";\nexport * from \"./context\";\nexport * from \"./hooks\";\nexport * from \"./constants\";\nexport * from \"./module\";\nexport * from \"./types\";\nexport * from \"./compat\";\n\nexport {\n  KeyboardChatScrollView,\n  KeyboardAvoidingView,\n  KeyboardStickyView,\n  KeyboardAwareScrollView,\n  // keyboard toolbar\n  KeyboardToolbar,\n  DefaultKeyboardToolbarTheme,\n} from \"./components\";\nexport type {\n  KeyboardChatScrollViewProps,\n  KeyboardAvoidingViewProps,\n  KeyboardStickyViewProps,\n  KeyboardAwareScrollViewMode,\n  KeyboardAwareScrollViewProps,\n  KeyboardAwareScrollViewRef,\n  KeyboardToolbarProps,\n} from \"./components\";\nexport { OverKeyboardView, KeyboardExtender } from \"./views\";\n"],"mappings":"AAAA,cAAc,YAAY;AAC1B,cAAc,YAAY;AAC1B,cAAc,WAAW;AACzB,cAAc,SAAS;AACvB,cAAc,aAAa;AAC3B,cAAc,UAAU;AACxB,cAAc,SAAS;AACvB,cAAc,UAAU;AAExB,SACEA,sBAAsB,EACtBC,oBAAoB,EACpBC,kBAAkB,EAClBC,uBAAuB;AACvB;AACAC,eAAe,EACfC,2BAA2B,QACtB,cAAc;AAUrB,SAASC,gBAAgB,EAAEC,gBAAgB,QAAQ,SAAS","ignoreList":[]}

package/lib/module/specs/NativeKeyboardController.js.map

@@ -1 +1 @@
-{"version":3,"names":["TurboModuleRegistry","get"],"sources":["NativeKeyboardController.ts"],"sourcesContent":["import { TurboModuleRegistry } from \"react-native\";\n\nimport type { TurboModule } from \"react-native\";\n\nexport interface Spec extends TurboModule {\n  readonly getConstants: () => {};\n\n  // methods\n  setInputMode(mode: number): void;\n  setDefaultMode(): void;\n  preload(): void;\n  dismiss(keepFocus: boolean, animated: boolean): void;\n  setFocusTo(direction: string): void;\n  viewPositionInWindow(viewTag: number): Promise<object>;\n\n  // event emitter\n  addListener: (eventName: string) => void;\n  removeListeners: (count: number) => void;\n}\n\nexport default TurboModuleRegistry.get<Spec>(\"KeyboardController\");\n"],"mappings":"AAAA,SAASA,mBAAmB,QAAQ,cAAc;AAoBlD,eAAeA,mBAAmB,CAACC,GAAG,CAAO,oBAAoB,CAAC","ignoreList":[]}
+{"version":3,"names":["TurboModuleRegistry","get"],"sources":["NativeKeyboardController.ts"],"sourcesContent":["import { TurboModuleRegistry } from \"react-native\";\n\nimport type { TurboModule } from \"react-native\";\n\nexport interface Spec extends TurboModule {\n  readonly getConstants: () => {\n    keyboardBorderRadius: number;\n  };\n\n  // methods\n  setInputMode(mode: number): void;\n  setDefaultMode(): void;\n  preload(): void;\n  dismiss(keepFocus: boolean, animated: boolean): void;\n  setFocusTo(direction: string): void;\n  viewPositionInWindow(viewTag: number): Promise<object>;\n\n  // event emitter\n  addListener: (eventName: string) => void;\n  removeListeners: (count: number) => void;\n}\n\nexport default TurboModuleRegistry.get<Spec>(\"KeyboardController\");\n"],"mappings":"AAAA,SAASA,mBAAmB,QAAQ,cAAc;AAsBlD,eAAeA,mBAAmB,CAACC,GAAG,CAAO,oBAAoB,CAAC","ignoreList":[]}

package/lib/module/types/module.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["module.ts"],"sourcesContent":["import type { EmitterSubscription, TextInputProps } from \"react-native\";\n\n// Event module declarations\nexport type KeyboardControllerEvents =\n  | \"keyboardWillShow\"\n  | \"keyboardDidShow\"\n  | \"keyboardWillHide\"\n  | \"keyboardDidHide\";\nexport type KeyboardEventData = {\n  /** Height of the keyboard. */\n  height: number;\n  /** Duration of the keyboard animation. */\n  duration: number;\n  /** Timestamp of the last keyboard event. */\n  timestamp: number;\n  /** Tag of the focused `TextInput`. */\n  target: number;\n  /** `keyboardType` property from focused `TextInput`. */\n  type: NonNullable<TextInputProps[\"keyboardType\"]>;\n  /** Keyboard appearance. Can be one of `dark` or `light`. */\n  appearance: \"dark\" | \"light\";\n};\n/**\n * An object that represent current keyboard state.\n */\nexport type IKeyboardState = {\n  /** Whether the keyboard is currently visible. */\n  isVisible: boolean;\n} & KeyboardEventData;\nexport type KeyboardEventsModule = {\n  /**\n   * The `addListener` function connects a JavaScript function to an identified native\n   * keyboard notification event.\n   *\n   * This function then returns the reference to the listener.\n   *\n   * `name` is the string that identifies the event you're listening for. This\n   * can be any of the following:\n   *\n   * - `keyboardWillShow`;\n   * - `keyboardDidShow`;\n   * - `keyboardWillHide`;\n   * - `keyboardDidHide`.\n   */\n  addListener: (\n    name: KeyboardControllerEvents,\n    cb: (e: KeyboardEventData) => void,\n  ) => EmitterSubscription;\n};\nexport type Direction = \"next\" | \"prev\" | \"current\";\nexport type DismissOptions = {\n  /**\n   * A boolean property indicating whether focus should be kept on the input after dismissing the keyboard. Default is `false`.\n   */\n  keepFocus: boolean;\n  /**\n   * A boolean property controlling whether dismissal should be animated. Default is `true`.\n   */\n  animated: boolean;\n};\nexport type KeyboardControllerModule = {\n  // android only\n  /**\n   * Sets default `windowSoftInputMode` (the one that declared in `AndroidManifest.xml`).\n   *\n   * @platform android\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#setdefaultmode-|docs} page for more details.\n   */\n  setDefaultMode: () => void;\n  /**\n   * Changes `windowSoftInputMode` on Android.\n   *\n   * @platform android\n   * @see AndroidSoftInputModes for all possible values and {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#setinputmode-|docs} page for more details.\n   */\n  setInputMode: (mode: number) => void;\n  // ios only\n  /**\n   * A method that preloads the keyboard. It's useful when you want to avoid a delay when the user focuses the first input.\n   *\n   * @platform ios\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#preload-|docs} page for more details.\n   */\n  preload: () => void;\n  // all platforms\n  /**\n   * Dismisses the active keyboard. Removes a focus by default, but allows to pass `{keepFocus: true}` to keep focus.\n   * If you want to close keyboard immediately pass `{animated: false}`.\n   *\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#dismiss|docs} page for more details.\n   */\n  dismiss: (options?: Partial<DismissOptions>) => Promise<void>;\n  /**\n   * Moves focus to the specified direction (`next`, `prev` or `current` to restore a focus).\n   *\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#setfocusto|docs} page for more details.\n   */\n  setFocusTo: (direction: Direction) => void;\n  /**\n   * Whether the keyboard is fully visible.\n   *\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#isvisible|docs} page for more details.\n   */\n  isVisible: () => boolean;\n  /**\n   * Method that returns current keyboard state.\n   *\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#state|docs} page for more details.\n   */\n  state: () => KeyboardEventData;\n};\nexport type ViewPositionInWindowResult = {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n};\nexport type KeyboardControllerNativeModule = {\n  // android only\n  setDefaultMode: () => void;\n  setInputMode: (mode: number) => void;\n  // ios only\n  preload: () => void;\n  // all platforms\n  dismiss: (keepFocus: boolean, animated: boolean) => void;\n  setFocusTo: (direction: Direction) => void;\n  viewPositionInWindow: (\n    viewTag: number,\n  ) => Promise<ViewPositionInWindowResult>;\n  // native event module stuff\n  addListener: (eventName: string) => void;\n  removeListeners: (count: number) => void;\n};\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["module.ts"],"sourcesContent":["import type { EmitterSubscription, TextInputProps } from \"react-native\";\n\n// Event module declarations\nexport type KeyboardControllerEvents =\n  | \"keyboardWillShow\"\n  | \"keyboardDidShow\"\n  | \"keyboardWillHide\"\n  | \"keyboardDidHide\";\nexport type KeyboardEventData = {\n  /** Height of the keyboard. */\n  height: number;\n  /** Duration of the keyboard animation. */\n  duration: number;\n  /** Timestamp of the last keyboard event. */\n  timestamp: number;\n  /** Tag of the focused `TextInput`. */\n  target: number;\n  /** `keyboardType` property from focused `TextInput`. */\n  type: NonNullable<TextInputProps[\"keyboardType\"]>;\n  /** Keyboard appearance. Can be one of `dark` or `light`. */\n  appearance: \"dark\" | \"light\";\n};\n/**\n * An object that represent current keyboard state.\n */\nexport type IKeyboardState = {\n  /** Whether the keyboard is currently visible. */\n  isVisible: boolean;\n} & KeyboardEventData;\nexport type KeyboardEventsModule = {\n  /**\n   * The `addListener` function connects a JavaScript function to an identified native\n   * keyboard notification event.\n   *\n   * This function then returns the reference to the listener.\n   *\n   * `name` is the string that identifies the event you're listening for. This\n   * can be any of the following:\n   *\n   * - `keyboardWillShow`;\n   * - `keyboardDidShow`;\n   * - `keyboardWillHide`;\n   * - `keyboardDidHide`.\n   */\n  addListener: (\n    name: KeyboardControllerEvents,\n    cb: (e: KeyboardEventData) => void,\n  ) => EmitterSubscription;\n};\nexport type Direction = \"next\" | \"prev\" | \"current\";\nexport type DismissOptions = {\n  /**\n   * A boolean property indicating whether focus should be kept on the input after dismissing the keyboard. Default is `false`.\n   */\n  keepFocus: boolean;\n  /**\n   * A boolean property controlling whether dismissal should be animated. Default is `true`.\n   */\n  animated: boolean;\n};\nexport type KeyboardControllerModule = {\n  // android only\n  /**\n   * Sets default `windowSoftInputMode` (the one that declared in `AndroidManifest.xml`).\n   *\n   * @platform android\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#setdefaultmode-|docs} page for more details.\n   */\n  setDefaultMode: () => void;\n  /**\n   * Changes `windowSoftInputMode` on Android.\n   *\n   * @platform android\n   * @see AndroidSoftInputModes for all possible values and {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#setinputmode-|docs} page for more details.\n   */\n  setInputMode: (mode: number) => void;\n  // ios only\n  /**\n   * A method that preloads the keyboard. It's useful when you want to avoid a delay when the user focuses the first input.\n   *\n   * @platform ios\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#preload-|docs} page for more details.\n   */\n  preload: () => void;\n  // all platforms\n  /**\n   * Dismisses the active keyboard. Removes a focus by default, but allows to pass `{keepFocus: true}` to keep focus.\n   * If you want to close keyboard immediately pass `{animated: false}`.\n   *\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#dismiss|docs} page for more details.\n   */\n  dismiss: (options?: Partial<DismissOptions>) => Promise<void>;\n  /**\n   * Moves focus to the specified direction (`next`, `prev` or `current` to restore a focus).\n   *\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#setfocusto|docs} page for more details.\n   */\n  setFocusTo: (direction: Direction) => void;\n  /**\n   * Whether the keyboard is fully visible.\n   *\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#isvisible|docs} page for more details.\n   */\n  isVisible: () => boolean;\n  /**\n   * Method that returns current keyboard state.\n   *\n   * @see {@link https://kirillzyusko.github.io/react-native-keyboard-controller/docs/api/keyboard-controller#state|docs} page for more details.\n   */\n  state: () => KeyboardEventData;\n};\nexport type ViewPositionInWindowResult = {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n};\nexport type KeyboardControllerNativeModule = {\n  // android only\n  setDefaultMode: () => void;\n  setInputMode: (mode: number) => void;\n  // ios only\n  preload: () => void;\n  // all platforms\n  dismiss: (keepFocus: boolean, animated: boolean) => void;\n  setFocusTo: (direction: Direction) => void;\n  viewPositionInWindow: (\n    viewTag: number,\n  ) => Promise<ViewPositionInWindowResult>;\n  // native event module stuff\n  addListener: (eventName: string) => void;\n  removeListeners: (count: number) => void;\n  // constants\n  getConstants: () => {\n    keyboardBorderRadius: number;\n  };\n};\n"],"mappings":"","ignoreList":[]}

package/lib/typescript/components/KeyboardAwareScrollView/index.d.ts

@@ -1,21 +1,5 @@
 import React from "react";
-import type { AnimatedScrollViewComponent } from "../ScrollViewWithBottomPadding";
-import type { ScrollView, ScrollViewProps } from "react-native";
-export type KeyboardAwareScrollViewProps = {
-    /** The distance between the keyboard and the caret inside a focused `TextInput` when the keyboard is shown. Default is `0`. */
-    bottomOffset?: number;
-    /** Prevents automatic scrolling of the `ScrollView` when the keyboard gets hidden, maintaining the current screen position. Default is `false`. */
-    disableScrollOnKeyboardHide?: boolean;
-    /** Controls whether this `KeyboardAwareScrollView` instance should take effect. Default is `true`. */
-    enabled?: boolean;
-    /** Adjusting the bottom spacing of KeyboardAwareScrollView. Default is `0`. */
-    extraKeyboardSpace?: number;
-    /** Custom component for `ScrollView`. Default is `ScrollView`. */
-    ScrollViewComponent?: AnimatedScrollViewComponent;
-} & ScrollViewProps;
-export type KeyboardAwareScrollViewRef = {
-    assureFocusedInputVisible: () => void;
-} & ScrollView;
+import type { KeyboardAwareScrollViewRef } from "react-native-keyboard-controller";
 /**
  * A ScrollView component that automatically handles keyboard appearance and disappearance
  * by adjusting its content position to ensure the focused input remains visible.
@@ -34,17 +18,13 @@ export type KeyboardAwareScrollViewRef = {
  * ```
  */
 declare const KeyboardAwareScrollView: React.ForwardRefExoticComponent<{
-    /** The distance between the keyboard and the caret inside a focused `TextInput` when the keyboard is shown. Default is `0`. */
     bottomOffset?: number;
-    /** Prevents automatic scrolling of the `ScrollView` when the keyboard gets hidden, maintaining the current screen position. Default is `false`. */
     disableScrollOnKeyboardHide?: boolean;
-    /** Controls whether this `KeyboardAwareScrollView` instance should take effect. Default is `true`. */
     enabled?: boolean;
-    /** Adjusting the bottom spacing of KeyboardAwareScrollView. Default is `0`. */
     extraKeyboardSpace?: number;
-    /** Custom component for `ScrollView`. Default is `ScrollView`. */
-    ScrollViewComponent?: AnimatedScrollViewComponent;
-} & ScrollViewProps & {
+    mode?: import("react-native-keyboard-controller").KeyboardAwareScrollViewMode;
+    ScrollViewComponent?: import("../ScrollViewWithBottomPadding").AnimatedScrollViewComponent;
+} & import("react-native").ScrollViewProps & {
     children?: React.ReactNode | undefined;
 } & React.RefAttributes<KeyboardAwareScrollViewRef>>;
 export default KeyboardAwareScrollView;

package/lib/typescript/components/KeyboardAwareScrollView/types.d.ts

@@ -0,0 +1,27 @@
+import type { AnimatedScrollViewComponent } from "../ScrollViewWithBottomPadding";
+import type { ScrollView, ScrollViewProps } from "react-native";
+export type KeyboardAwareScrollViewMode = "insets" | "layout";
+export type KeyboardAwareScrollViewProps = {
+    /** The distance between the keyboard and the caret inside a focused `TextInput` when the keyboard is shown. Default is `0`. */
+    bottomOffset?: number;
+    /** Prevents automatic scrolling of the `ScrollView` when the keyboard gets hidden, maintaining the current screen position. Default is `false`. */
+    disableScrollOnKeyboardHide?: boolean;
+    /** Controls whether this `KeyboardAwareScrollView` instance should take effect. Default is `true`. */
+    enabled?: boolean;
+    /** Adjusting the bottom spacing of KeyboardAwareScrollView. Default is `0`. */
+    extraKeyboardSpace?: number;
+    /**
+     * Controls how keyboard space is created at the bottom of the `ScrollView`.
+     *
+     * - `"insets"` *(default)*: Extends the scrollable area via `contentInset` (iOS) and `ClippingScrollView` (Android). No layout reflow occurs — content positions remain stable during keyboard animation. Recommended for most use cases.
+     * - `"layout"`: Appends a spacer `View` as the last child of the `ScrollView`. The spacer participates in layout, so flex-based arrangements (e.g. `justifyContent: "space-between"`, `gap`) reflow naturally when the keyboard appears. Use this when you need content to physically rearrange around the keyboard space.
+     *
+     * Default is `"insets"`.
+     */
+    mode?: KeyboardAwareScrollViewMode;
+    /** Custom component for `ScrollView`. Default is `ScrollView`. */
+    ScrollViewComponent?: AnimatedScrollViewComponent;
+} & ScrollViewProps;
+export type KeyboardAwareScrollViewRef = {
+    assureFocusedInputVisible: () => void;
+} & ScrollView;

package/lib/typescript/components/index.d.ts

@@ -5,6 +5,6 @@ export { default as KeyboardToolbar, DefaultKeyboardToolbarTheme, } from "./Keyb
 export { default as KeyboardChatScrollView } from "./KeyboardChatScrollView";
 export type { KeyboardAvoidingViewProps } from "./KeyboardAvoidingView";
 export type { KeyboardStickyViewProps } from "./KeyboardStickyView";
-export type { KeyboardAwareScrollViewProps, KeyboardAwareScrollViewRef, } from "./KeyboardAwareScrollView";
+export type { KeyboardAwareScrollViewMode, KeyboardAwareScrollViewProps, KeyboardAwareScrollViewRef, } from "./KeyboardAwareScrollView/types";
 export type { KeyboardToolbarProps } from "./KeyboardToolbar";
 export type { KeyboardChatScrollViewProps } from "./KeyboardChatScrollView/types";

package/lib/typescript/constants.d.ts

@@ -14,3 +14,4 @@ export declare enum AndroidSoftInputModes {
     SOFT_INPUT_STATE_UNSPECIFIED = 0,
     SOFT_INPUT_STATE_VISIBLE = 4
 }
+export declare const KEYBOARD_BORDER_RADIUS: number;

package/lib/typescript/index.d.ts

@@ -7,5 +7,5 @@ export * from "./module";
 export * from "./types";
 export * from "./compat";
 export { KeyboardChatScrollView, KeyboardAvoidingView, KeyboardStickyView, KeyboardAwareScrollView, KeyboardToolbar, DefaultKeyboardToolbarTheme, } from "./components";
-export type { KeyboardChatScrollViewProps, KeyboardAvoidingViewProps, KeyboardStickyViewProps, KeyboardAwareScrollViewProps, KeyboardAwareScrollViewRef, KeyboardToolbarProps, } from "./components";
+export type { KeyboardChatScrollViewProps, KeyboardAvoidingViewProps, KeyboardStickyViewProps, KeyboardAwareScrollViewMode, KeyboardAwareScrollViewProps, KeyboardAwareScrollViewRef, KeyboardToolbarProps, } from "./components";
 export { OverKeyboardView, KeyboardExtender } from "./views";

package/lib/typescript/specs/NativeKeyboardController.d.ts

@@ -1,6 +1,8 @@
 import type { TurboModule } from "react-native";
 export interface Spec extends TurboModule {
-    readonly getConstants: () => {};
+    readonly getConstants: () => {
+        keyboardBorderRadius: number;
+    };
     setInputMode(mode: number): void;
     setDefaultMode(): void;
     preload(): void;

package/lib/typescript/types/module.d.ts

@@ -112,4 +112,7 @@ export type KeyboardControllerNativeModule = {
     viewPositionInWindow: (viewTag: number) => Promise<ViewPositionInWindowResult>;
     addListener: (eventName: string) => void;
     removeListeners: (count: number) => void;
+    getConstants: () => {
+        keyboardBorderRadius: number;
+    };
 };

package/package.json

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

package/src/bindings.ts

@@ -27,6 +27,9 @@ export const KeyboardControllerNative: KeyboardControllerNativeModule = {
     Promise.resolve({ x: 0, y: 0, width: 0, height: 0 }),
   addListener: NOOP,
   removeListeners: NOOP,
+  getConstants: () => ({
+    keyboardBorderRadius: 0,
+  }),
 };
 /**
  * An event emitter that provides a way to subscribe to next keyboard events:

package/src/components/KeyboardAwareScrollView/index.tsx

@@ -12,6 +12,7 @@ import Reanimated, {
   scrollTo,
   useAnimatedReaction,
   useAnimatedRef,
+  useAnimatedStyle,
   useDerivedValue,
   useSharedValue,
 } from "react-native-reanimated";
@@ -30,34 +31,15 @@ import ScrollViewWithBottomPadding from "../ScrollViewWithBottomPadding";
 import { useSmoothKeyboardHandler } from "./useSmoothKeyboardHandler";
 import { debounce, scrollDistanceWithRespectToSnapPoints } from "./utils";
 
-import type { AnimatedScrollViewComponent } from "../ScrollViewWithBottomPadding";
-import type {
-  LayoutChangeEvent,
-  ScrollView,
-  ScrollViewProps,
-} from "react-native";
+import type { LayoutChangeEvent, ScrollView } from "react-native";
 import type {
   FocusedInputLayoutChangedEvent,
   FocusedInputSelectionChangedEvent,
+  KeyboardAwareScrollViewProps,
+  KeyboardAwareScrollViewRef,
   NativeEvent,
 } from "react-native-keyboard-controller";
 
-export type KeyboardAwareScrollViewProps = {
-  /** The distance between the keyboard and the caret inside a focused `TextInput` when the keyboard is shown. Default is `0`. */
-  bottomOffset?: number;
-  /** Prevents automatic scrolling of the `ScrollView` when the keyboard gets hidden, maintaining the current screen position. Default is `false`. */
-  disableScrollOnKeyboardHide?: boolean;
-  /** Controls whether this `KeyboardAwareScrollView` instance should take effect. Default is `true`. */
-  enabled?: boolean;
-  /** Adjusting the bottom spacing of KeyboardAwareScrollView. Default is `0`. */
-  extraKeyboardSpace?: number;
-  /** Custom component for `ScrollView`. Default is `ScrollView`. */
-  ScrollViewComponent?: AnimatedScrollViewComponent;
-} & ScrollViewProps;
-export type KeyboardAwareScrollViewRef = {
-  assureFocusedInputVisible: () => void;
-} & ScrollView;
-
 // Everything begins from `onStart` handler. This handler is called every time,
 // when keyboard changes its size or when focused `TextInput` was changed. In
 // this handler we are calculating/memoizing values which later will be used
@@ -123,6 +105,7 @@ const KeyboardAwareScrollView = forwardRef<
       disableScrollOnKeyboardHide = false,
       enabled = true,
       extraKeyboardSpace = 0,
+      mode = "insets",
       ScrollViewComponent = Reanimated.ScrollView,
       snapToOffsets,
       ...rest
@@ -151,6 +134,7 @@ const KeyboardAwareScrollView = forwardRef<
       useSharedValue<FocusedInputSelectionChangedEvent | null>(null);
     const ghostViewSpace = useSharedValue(-1);
     const pendingSelectionForFocus = useSharedValue(false);
+    const selectionUpdatedSinceHide = useSharedValue(false);
     const scrollViewPageY = useSharedValue(0);
 
     const { height } = useWindowDimensions();
@@ -237,30 +221,39 @@ const KeyboardAwareScrollView = forwardRef<
       },
       [bottomOffset, enabled, height, snapToOffsets],
     );
-    const removeGhostPadding = useCallback((e: number) => {
-      "worklet";
+    const removeGhostPadding = useCallback(
+      (e: number) => {
+        "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
-      if (!keyboardWillAppear.value && ghostViewSpace.value > 0) {
-        scrollTo(
-          scrollViewAnimatedRef,
-          0,
-          scrollPosition.value -
-            interpolate(
-              e,
-              [initialKeyboardSize.value, keyboardHeight.value],
-              [ghostViewSpace.value, 0],
-            ),
-          false,
-        );
+        // 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;
+        }
 
-        return true;
-      }
+        // 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) {
+          scrollTo(
+            scrollViewAnimatedRef,
+            0,
+            scrollPosition.value -
+              interpolate(
+                e,
+                [initialKeyboardSize.value, keyboardHeight.value],
+                [ghostViewSpace.value, 0],
+              ),
+            false,
+          );
+
+          return true;
+        }
 
-      return false;
-    }, []);
+        return false;
+      },
+      [mode],
+    );
     const performScrollWithPositionRestoration = useCallback(
       (newPosition: number) => {
         "worklet";
@@ -339,8 +332,9 @@ const KeyboardAwareScrollView = forwardRef<
         const latestSelection = lastSelection.value?.selection;
 
         lastSelection.value = e;
+        selectionUpdatedSinceHide.value = true;
 
-        if (e.target !== lastTarget) {
+        if (e.target !== lastTarget || pendingSelectionForFocus.value) {
           if (pendingSelectionForFocus.value) {
             // selection arrived after onStart - complete the deferred setup
             pendingSelectionForFocus.value = false;
@@ -420,22 +414,36 @@ const KeyboardAwareScrollView = 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
           if (focusWasChanged) {
             tag.value = e.target;
 
-            if (lastSelection.value?.target === e.target) {
-              // selection arrived before onStart - use it to update layout
+            if (
+              lastSelection.value?.target === e.target &&
+              selectionUpdatedSinceHide.value
+            ) {
+              // fresh selection arrived before onStart - use it to update layout
               updateLayoutFromSelection();
               pendingSelectionForFocus.value = false;
             } else {
-              // selection hasn't arrived yet for the new target.
-              // use input layout as-is; will be refined when selection arrives.
-              if (input.value) {
+              // selection hasn't arrived yet for the new target (iOS 15),
+              // or it's stale from previous session (Android refocus same input).
+              // Use stale selection as best-effort fallback if available for same target,
+              // otherwise fall back to full input layout.
+              // Will be corrected if a fresh onSelectionChange arrives.
+              if (lastSelection.value?.target === e.target) {
+                updateLayoutFromSelection();
+              } else if (input.value) {
                 layout.value = input.value;
               }
               pendingSelectionForFocus.value = true;
@@ -454,13 +462,15 @@ const KeyboardAwareScrollView = forwardRef<
             }
           }
 
-          ghostViewSpace.value =
-            position.value +
-            scrollViewLayout.value.height -
-            scrollViewContentSize.value.height;
+          if (mode === "insets") {
+            ghostViewSpace.value =
+              position.value +
+              scrollViewLayout.value.height -
+              scrollViewContentSize.value.height;
 
-          if (ghostViewSpace.value > 0) {
-            scrollPosition.value = position.value;
+            if (ghostViewSpace.value > 0) {
+              scrollPosition.value = position.value;
+            }
           }
         },
         onMove: (e) => {
@@ -470,6 +480,11 @@ const KeyboardAwareScrollView = 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);
@@ -484,13 +499,21 @@ const KeyboardAwareScrollView = forwardRef<
           scrollPosition.value = position.value;
 
           if (e.height === 0) {
-            lastSelection.value = null;
+            selectionUpdatedSinceHide.value = false;
+          } else if (keyboardWillAppear.value) {
+            // keyboard fully shown after appearing from hidden state — clear
+            // pending flag to prevent leaking into next focus-change session.
+            // Only when the keyboard was actually appearing (not a focus switch
+            // with same keyboard height), otherwise we'd clear the flag before
+            // onSelectionChange has a chance to process it.
+            pendingSelectionForFocus.value = false;
           }
 
           syncKeyboardFrame(e);
         },
       },
       [
+        mode,
         maybeScroll,
         removeGhostPadding,
         disableScrollOnKeyboardHide,
@@ -557,6 +580,31 @@ const KeyboardAwareScrollView = forwardRef<
       () => (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 = useAnimatedStyle(
+      () =>
+        enabled && mode === "layout"
+          ? { paddingBottom: currentKeyboardFrameHeight.value + 1 }
+          : {},
+      [enabled, mode],
+    );
+
+    if (mode === "layout") {
+      return (
+        <ScrollViewComponent
+          ref={onRef}
+          {...rest}
+          scrollEventThrottle={16}
+          onLayout={onScrollViewLayout}
+        >
+          {children}
+          {enabled && <Reanimated.View style={layoutSpacerStyle} />}
+        </ScrollViewComponent>
+      );
+    }
 
     return (
       <ScrollViewWithBottomPadding

package/src/components/KeyboardAwareScrollView/types.ts

@@ -0,0 +1,29 @@
+import type { AnimatedScrollViewComponent } from "../ScrollViewWithBottomPadding";
+import type { ScrollView, ScrollViewProps } from "react-native";
+
+export type KeyboardAwareScrollViewMode = "insets" | "layout";
+
+export type KeyboardAwareScrollViewProps = {
+  /** The distance between the keyboard and the caret inside a focused `TextInput` when the keyboard is shown. Default is `0`. */
+  bottomOffset?: number;
+  /** Prevents automatic scrolling of the `ScrollView` when the keyboard gets hidden, maintaining the current screen position. Default is `false`. */
+  disableScrollOnKeyboardHide?: boolean;
+  /** Controls whether this `KeyboardAwareScrollView` instance should take effect. Default is `true`. */
+  enabled?: boolean;
+  /** Adjusting the bottom spacing of KeyboardAwareScrollView. Default is `0`. */
+  extraKeyboardSpace?: number;
+  /**
+   * Controls how keyboard space is created at the bottom of the `ScrollView`.
+   *
+   * - `"insets"` *(default)*: Extends the scrollable area via `contentInset` (iOS) and `ClippingScrollView` (Android). No layout reflow occurs — content positions remain stable during keyboard animation. Recommended for most use cases.
+   * - `"layout"`: Appends a spacer `View` as the last child of the `ScrollView`. The spacer participates in layout, so flex-based arrangements (e.g. `justifyContent: "space-between"`, `gap`) reflow naturally when the keyboard appears. Use this when you need content to physically rearrange around the keyboard space.
+   *
+   * Default is `"insets"`.
+   */
+  mode?: KeyboardAwareScrollViewMode;
+  /** Custom component for `ScrollView`. Default is `ScrollView`. */
+  ScrollViewComponent?: AnimatedScrollViewComponent;
+} & ScrollViewProps;
+export type KeyboardAwareScrollViewRef = {
+  assureFocusedInputVisible: () => void;
+} & ScrollView;

package/src/components/KeyboardToolbar/constants.ts

@@ -1,4 +1,4 @@
-import { Platform } from "react-native";
+import { KEYBOARD_BORDER_RADIUS } from "../../constants";
 
 import type { HEX } from "./types";
 
@@ -10,6 +10,5 @@ export const TEST_ID_KEYBOARD_TOOLBAR_DONE = `${TEST_ID_KEYBOARD_TOOLBAR}.done`;
 
 export const KEYBOARD_TOOLBAR_HEIGHT = 42;
 export const DEFAULT_OPACITY: HEX = "FF";
-export const KEYBOARD_HAS_ROUNDED_CORNERS =
-  Platform.OS === "ios" && parseInt(Platform.Version, 10) >= 26;
+export const KEYBOARD_HAS_ROUNDED_CORNERS = KEYBOARD_BORDER_RADIUS > 0;
 export const OPENED_OFFSET = KEYBOARD_HAS_ROUNDED_CORNERS ? -11 : 0;

package/src/components/index.ts

@@ -9,8 +9,9 @@ export { default as KeyboardChatScrollView } from "./KeyboardChatScrollView";
 export type { KeyboardAvoidingViewProps } from "./KeyboardAvoidingView";
 export type { KeyboardStickyViewProps } from "./KeyboardStickyView";
 export type {
+  KeyboardAwareScrollViewMode,
   KeyboardAwareScrollViewProps,
   KeyboardAwareScrollViewRef,
-} from "./KeyboardAwareScrollView";
+} from "./KeyboardAwareScrollView/types";
 export type { KeyboardToolbarProps } from "./KeyboardToolbar";
 export type { KeyboardChatScrollViewProps } from "./KeyboardChatScrollView/types";

package/src/constants.ts

@@ -1,3 +1,5 @@
+import { KeyboardControllerNative } from "./bindings";
+
 // copied from `android.view.WindowManager.LayoutParams`
 export enum AndroidSoftInputModes {
   SOFT_INPUT_ADJUST_NOTHING = 48,
@@ -17,3 +19,5 @@ export enum AndroidSoftInputModes {
   SOFT_INPUT_STATE_UNSPECIFIED = 0,
   SOFT_INPUT_STATE_VISIBLE = 4,
 }
+export const KEYBOARD_BORDER_RADIUS =
+  KeyboardControllerNative.getConstants().keyboardBorderRadius;

package/src/index.ts

@@ -20,6 +20,7 @@ export type {
   KeyboardChatScrollViewProps,
   KeyboardAvoidingViewProps,
   KeyboardStickyViewProps,
+  KeyboardAwareScrollViewMode,
   KeyboardAwareScrollViewProps,
   KeyboardAwareScrollViewRef,
   KeyboardToolbarProps,

package/src/specs/NativeKeyboardController.ts

@@ -3,7 +3,9 @@ import { TurboModuleRegistry } from "react-native";
 import type { TurboModule } from "react-native";
 
 export interface Spec extends TurboModule {
-  readonly getConstants: () => {};
+  readonly getConstants: () => {
+    keyboardBorderRadius: number;
+  };
 
   // methods
   setInputMode(mode: number): void;

package/src/types/module.ts

@@ -130,4 +130,8 @@ export type KeyboardControllerNativeModule = {
   // native event module stuff
   addListener: (eventName: string) => void;
   removeListeners: (count: number) => void;
+  // constants
+  getConstants: () => {
+    keyboardBorderRadius: number;
+  };
 };