react-native-keyboard-controller 1.21.5 → 1.21.7

package/lib/module/module.js

@@ -12,7 +12,7 @@ KeyboardEvents.addListener("keyboardDidHide", e => {
   isClosed = true;
   lastState = e;
 });
-KeyboardEvents.addListener("keyboardDidShow", e => {
+KeyboardEvents.addListener("keyboardWillShow", e => {
   isClosed = false;
   lastState = e;
 });

package/lib/module/module.js.map

@@ -1 +1 @@
-{"version":3,"names":["KeyboardControllerNative","KeyboardEvents","isClosed","lastState","height","duration","timestamp","Date","getTime","target","type","appearance","addListener","e","dismiss","options","keepFocus","animated","Promise","resolve","subscription","undefined","remove","isVisible","state","KeyboardController","setDefaultMode","setInputMode","setFocusTo","preload"],"sources":["module.ts"],"sourcesContent":["import { KeyboardControllerNative, KeyboardEvents } from \"./bindings\";\n\nimport type {\n  DismissOptions,\n  KeyboardControllerModule,\n  KeyboardEventData,\n} from \"./types\";\n\nlet isClosed = true;\nlet lastState: KeyboardEventData = {\n  height: 0,\n  duration: 0,\n  timestamp: new Date().getTime(),\n  target: -1,\n  type: \"default\",\n  appearance: \"light\",\n};\n\nKeyboardEvents.addListener(\"keyboardDidHide\", (e) => {\n  isClosed = true;\n  lastState = e;\n});\n\nKeyboardEvents.addListener(\"keyboardDidShow\", (e) => {\n  isClosed = false;\n  lastState = e;\n});\n\nconst dismiss = async (options?: Partial<DismissOptions>): Promise<void> => {\n  const keepFocus = options?.keepFocus ?? false;\n  const animated = options?.animated ?? true;\n\n  return new Promise((resolve) => {\n    if (isClosed) {\n      resolve();\n\n      return;\n    }\n\n    const subscription = KeyboardEvents.addListener(\"keyboardDidHide\", () => {\n      resolve(undefined);\n      subscription.remove();\n    });\n\n    KeyboardControllerNative.dismiss(keepFocus, animated);\n  });\n};\nconst isVisible = () => !isClosed;\nconst state = () => lastState;\n\n/**\n * KeyboardController module. Helps to perform imperative actions/checks with keyboard.\n */\nexport const KeyboardController: KeyboardControllerModule = {\n  setDefaultMode: KeyboardControllerNative.setDefaultMode,\n  setInputMode: KeyboardControllerNative.setInputMode,\n  setFocusTo: KeyboardControllerNative.setFocusTo,\n  preload: KeyboardControllerNative.preload,\n  dismiss,\n  isVisible,\n  state,\n};\n"],"mappings":"AAAA,SAASA,wBAAwB,EAAEC,cAAc,QAAQ,YAAY;AAQrE,IAAIC,QAAQ,GAAG,IAAI;AACnB,IAAIC,SAA4B,GAAG;EACjCC,MAAM,EAAE,CAAC;EACTC,QAAQ,EAAE,CAAC;EACXC,SAAS,EAAE,IAAIC,IAAI,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC;EAC/BC,MAAM,EAAE,CAAC,CAAC;EACVC,IAAI,EAAE,SAAS;EACfC,UAAU,EAAE;AACd,CAAC;AAEDV,cAAc,CAACW,WAAW,CAAC,iBAAiB,EAAGC,CAAC,IAAK;EACnDX,QAAQ,GAAG,IAAI;EACfC,SAAS,GAAGU,CAAC;AACf,CAAC,CAAC;AAEFZ,cAAc,CAACW,WAAW,CAAC,iBAAiB,EAAGC,CAAC,IAAK;EACnDX,QAAQ,GAAG,KAAK;EAChBC,SAAS,GAAGU,CAAC;AACf,CAAC,CAAC;AAEF,MAAMC,OAAO,GAAG,MAAOC,OAAiC,IAAoB;EAC1E,MAAMC,SAAS,GAAG,CAAAD,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEC,SAAS,KAAI,KAAK;EAC7C,MAAMC,QAAQ,GAAG,CAAAF,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEE,QAAQ,KAAI,IAAI;EAE1C,OAAO,IAAIC,OAAO,CAAEC,OAAO,IAAK;IAC9B,IAAIjB,QAAQ,EAAE;MACZiB,OAAO,CAAC,CAAC;MAET;IACF;IAEA,MAAMC,YAAY,GAAGnB,cAAc,CAACW,WAAW,CAAC,iBAAiB,EAAE,MAAM;MACvEO,OAAO,CAACE,SAAS,CAAC;MAClBD,YAAY,CAACE,MAAM,CAAC,CAAC;IACvB,CAAC,CAAC;IAEFtB,wBAAwB,CAACc,OAAO,CAACE,SAAS,EAAEC,QAAQ,CAAC;EACvD,CAAC,CAAC;AACJ,CAAC;AACD,MAAMM,SAAS,GAAGA,CAAA,KAAM,CAACrB,QAAQ;AACjC,MAAMsB,KAAK,GAAGA,CAAA,KAAMrB,SAAS;;AAE7B;AACA;AACA;AACA,OAAO,MAAMsB,kBAA4C,GAAG;EAC1DC,cAAc,EAAE1B,wBAAwB,CAAC0B,cAAc;EACvDC,YAAY,EAAE3B,wBAAwB,CAAC2B,YAAY;EACnDC,UAAU,EAAE5B,wBAAwB,CAAC4B,UAAU;EAC/CC,OAAO,EAAE7B,wBAAwB,CAAC6B,OAAO;EACzCf,OAAO;EACPS,SAAS;EACTC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["KeyboardControllerNative","KeyboardEvents","isClosed","lastState","height","duration","timestamp","Date","getTime","target","type","appearance","addListener","e","dismiss","options","keepFocus","animated","Promise","resolve","subscription","undefined","remove","isVisible","state","KeyboardController","setDefaultMode","setInputMode","setFocusTo","preload"],"sources":["module.ts"],"sourcesContent":["import { KeyboardControllerNative, KeyboardEvents } from \"./bindings\";\n\nimport type {\n  DismissOptions,\n  KeyboardControllerModule,\n  KeyboardEventData,\n} from \"./types\";\n\nlet isClosed = true;\nlet lastState: KeyboardEventData = {\n  height: 0,\n  duration: 0,\n  timestamp: new Date().getTime(),\n  target: -1,\n  type: \"default\",\n  appearance: \"light\",\n};\n\nKeyboardEvents.addListener(\"keyboardDidHide\", (e) => {\n  isClosed = true;\n  lastState = e;\n});\n\nKeyboardEvents.addListener(\"keyboardWillShow\", (e) => {\n  isClosed = false;\n  lastState = e;\n});\n\nconst dismiss = async (options?: Partial<DismissOptions>): Promise<void> => {\n  const keepFocus = options?.keepFocus ?? false;\n  const animated = options?.animated ?? true;\n\n  return new Promise((resolve) => {\n    if (isClosed) {\n      resolve();\n\n      return;\n    }\n\n    const subscription = KeyboardEvents.addListener(\"keyboardDidHide\", () => {\n      resolve(undefined);\n      subscription.remove();\n    });\n\n    KeyboardControllerNative.dismiss(keepFocus, animated);\n  });\n};\nconst isVisible = () => !isClosed;\nconst state = () => lastState;\n\n/**\n * KeyboardController module. Helps to perform imperative actions/checks with keyboard.\n */\nexport const KeyboardController: KeyboardControllerModule = {\n  setDefaultMode: KeyboardControllerNative.setDefaultMode,\n  setInputMode: KeyboardControllerNative.setInputMode,\n  setFocusTo: KeyboardControllerNative.setFocusTo,\n  preload: KeyboardControllerNative.preload,\n  dismiss,\n  isVisible,\n  state,\n};\n"],"mappings":"AAAA,SAASA,wBAAwB,EAAEC,cAAc,QAAQ,YAAY;AAQrE,IAAIC,QAAQ,GAAG,IAAI;AACnB,IAAIC,SAA4B,GAAG;EACjCC,MAAM,EAAE,CAAC;EACTC,QAAQ,EAAE,CAAC;EACXC,SAAS,EAAE,IAAIC,IAAI,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC;EAC/BC,MAAM,EAAE,CAAC,CAAC;EACVC,IAAI,EAAE,SAAS;EACfC,UAAU,EAAE;AACd,CAAC;AAEDV,cAAc,CAACW,WAAW,CAAC,iBAAiB,EAAGC,CAAC,IAAK;EACnDX,QAAQ,GAAG,IAAI;EACfC,SAAS,GAAGU,CAAC;AACf,CAAC,CAAC;AAEFZ,cAAc,CAACW,WAAW,CAAC,kBAAkB,EAAGC,CAAC,IAAK;EACpDX,QAAQ,GAAG,KAAK;EAChBC,SAAS,GAAGU,CAAC;AACf,CAAC,CAAC;AAEF,MAAMC,OAAO,GAAG,MAAOC,OAAiC,IAAoB;EAC1E,MAAMC,SAAS,GAAG,CAAAD,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEC,SAAS,KAAI,KAAK;EAC7C,MAAMC,QAAQ,GAAG,CAAAF,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEE,QAAQ,KAAI,IAAI;EAE1C,OAAO,IAAIC,OAAO,CAAEC,OAAO,IAAK;IAC9B,IAAIjB,QAAQ,EAAE;MACZiB,OAAO,CAAC,CAAC;MAET;IACF;IAEA,MAAMC,YAAY,GAAGnB,cAAc,CAACW,WAAW,CAAC,iBAAiB,EAAE,MAAM;MACvEO,OAAO,CAACE,SAAS,CAAC;MAClBD,YAAY,CAACE,MAAM,CAAC,CAAC;IACvB,CAAC,CAAC;IAEFtB,wBAAwB,CAACc,OAAO,CAACE,SAAS,EAAEC,QAAQ,CAAC;EACvD,CAAC,CAAC;AACJ,CAAC;AACD,MAAMM,SAAS,GAAGA,CAAA,KAAM,CAACrB,QAAQ;AACjC,MAAMsB,KAAK,GAAGA,CAAA,KAAMrB,SAAS;;AAE7B;AACA;AACA;AACA,OAAO,MAAMsB,kBAA4C,GAAG;EAC1DC,cAAc,EAAE1B,wBAAwB,CAAC0B,cAAc;EACvDC,YAAY,EAAE3B,wBAAwB,CAAC2B,YAAY;EACnDC,UAAU,EAAE5B,wBAAwB,CAAC4B,UAAU;EAC/CC,OAAO,EAAE7B,wBAAwB,CAAC6B,OAAO;EACzCf,OAAO;EACPS,SAAS;EACTC;AACF,CAAC","ignoreList":[]}

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

@@ -5,10 +5,12 @@ declare const KeyboardChatScrollView: React.ForwardRefExoticComponent<{
     inverted?: boolean;
     offset?: number;
     keyboardLiftBehavior?: import("./hooks").KeyboardLiftBehavior;
-    freeze?: boolean;
+    freeze?: boolean | import("react-native-reanimated").SharedValue<boolean>;
     extraContentPadding?: import("react-native-reanimated").SharedValue<number>;
     applyWorkaroundForContentInsetHitTestBug?: boolean;
     blankSpace?: import("react-native-reanimated").SharedValue<number>;
+    onContentInsetChange?: (insets: import("../ScrollViewWithBottomPadding").ScrollViewContentInsets) => void;
+    onEndVisible?: (visible: boolean) => void;
 } & import("react-native").ScrollViewProps & {
     children?: React.ReactNode | undefined;
 } & React.RefAttributes<Reanimated.ScrollView>>;

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

@@ -1,4 +1,4 @@
-import type { AnimatedScrollViewComponent } from "../ScrollViewWithBottomPadding";
+import type { AnimatedScrollViewComponent, ScrollViewContentInsets } from "../ScrollViewWithBottomPadding";
 import type { KeyboardLiftBehavior } from "./useChatKeyboard/types";
 import type { ScrollViewProps } from "react-native";
 import type { SharedValue } from "react-native-reanimated";
@@ -45,7 +45,7 @@ export type KeyboardChatScrollViewProps = {
      *
      * Default is `false`.
      */
-    freeze?: boolean;
+    freeze?: boolean | SharedValue<boolean>;
     /**
      * A shared value representing additional padding from external elements
      * (e.g., a growing multiline `TextInput` in a `KeyboardStickyView`).
@@ -86,4 +86,28 @@ export type KeyboardChatScrollViewProps = {
      * Default is `undefined` (equivalent to `0` — no minimum floor).
      */
     blankSpace?: SharedValue<number>;
+    /**
+     * Fires whenever the effective content inset changes — the static `contentInset`
+     * prop combined with the dynamic keyboard-driven padding.
+     *
+     * Useful on Android, where the synthetic content inset is not reflected in the native
+     * `onScroll` event payload. Consumers such as virtualized lists computing their own
+     * `scrollToEnd` target can use this to track the current inset alongside scroll offsets.
+     */
+    onContentInsetChange?: (insets: ScrollViewContentInsets) => void;
+    /**
+     * Fires whenever the visibility of the content "end" changes — both when the user
+     * arrives at the end and when they leave it. The boolean parameter reflects the new state.
+     *
+     * For non-inverted lists, the "end" is the bottom of the content. For inverted lists
+     * (`inverted={true}`), the "end" is the top of the scroll view, where the latest messages
+     * are rendered. The same internal detection drives `keyboardLiftBehavior="whenAtEnd"`.
+     *
+     * The callback can be either a plain JS function or a Reanimated worklet — the type is
+     * detected automatically. Worklets run on the UI thread; plain functions are dispatched
+     * via `runOnJS`.
+     *
+     * Fires once on mount with the initial state (after the scroll view has been measured).
+     */
+    onEndVisible?: (visible: boolean) => void;
 } & ScrollViewProps;

package/lib/typescript/components/KeyboardChatScrollView/useChatKeyboard/types.d.ts

@@ -4,7 +4,7 @@ type KeyboardLiftBehavior = "always" | "whenAtEnd" | "persistent" | "never";
 type UseChatKeyboardOptions = {
     inverted: boolean;
     keyboardLiftBehavior: KeyboardLiftBehavior;
-    freeze: boolean;
+    freeze: SharedValue<boolean>;
     offset: number;
     blankSpace: SharedValue<number>;
     /** Extra content padding shared value — needed on iOS to correctly clamp contentOffset. */

package/lib/typescript/components/KeyboardChatScrollView/useEndVisible.d.ts

@@ -0,0 +1,17 @@
+import type { SharedValue } from "react-native-reanimated";
+type EndVisibleCallback = (visible: boolean) => void;
+type Options = {
+    scroll: SharedValue<number>;
+    layout: SharedValue<{
+        width: number;
+        height: number;
+    }>;
+    size: SharedValue<{
+        width: number;
+        height: number;
+    }>;
+    inverted: boolean;
+    onEndVisible?: EndVisibleCallback;
+};
+export declare const useEndVisible: ({ scroll, layout, size, inverted, onEndVisible, }: Options) => void;
+export {};

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

@@ -24,7 +24,7 @@ type UseExtraContentPaddingOptions = {
     contentOffsetY?: SharedValue<number>;
     inverted: boolean;
     keyboardLiftBehavior: KeyboardLiftBehavior;
-    freeze: boolean;
+    freeze: SharedValue<boolean>;
 };
 /**
  * Hook that reacts to `extraContentPadding` changes and conditionally

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

@@ -4,6 +4,12 @@ import type { ScrollViewProps } from "react-native";
 import type { SharedValue } from "react-native-reanimated";
 type AnimatedScrollViewProps = React.ComponentProps<typeof Reanimated.ScrollView>;
 export type AnimatedScrollViewComponent = React.ForwardRefExoticComponent<AnimatedScrollViewProps & React.RefAttributes<Reanimated.ScrollView>>;
+export type ScrollViewContentInsets = {
+    top: number;
+    bottom: number;
+    left: number;
+    right: number;
+};
 declare const ScrollViewWithBottomPadding: React.ForwardRefExoticComponent<{
     ScrollViewComponent: AnimatedScrollViewComponent;
     children?: React.ReactNode;
@@ -14,5 +20,11 @@ declare const ScrollViewWithBottomPadding: React.ForwardRefExoticComponent<{
     /** Absolute Y content offset (iOS only, for KeyboardChatScrollView). */
     contentOffsetY?: SharedValue<number>;
     applyWorkaroundForContentInsetHitTestBug?: boolean;
+    /**
+     * Fires whenever the effective content inset changes (combines the static `contentInset`
+     * prop with the dynamic keyboard-driven padding). Useful on Android where the synthetic
+     * inset is not reflected in `onScroll` events.
+     */
+    onContentInsetChange?: (insets: ScrollViewContentInsets) => void;
 } & ScrollViewProps & React.RefAttributes<Reanimated.ScrollView>>;
 export default ScrollViewWithBottomPadding;

package/package.json

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

package/src/components/KeyboardChatScrollView/index.tsx

@@ -12,6 +12,7 @@ import useCombinedRef from "../hooks/useCombinedRef";
 import ScrollViewWithBottomPadding from "../ScrollViewWithBottomPadding";
 
 import { useChatKeyboard } from "./useChatKeyboard";
+import { useEndVisible } from "./useEndVisible";
 import { useExtraContentPadding } from "./useExtraContentPadding";
 
 import type { KeyboardChatScrollViewProps } from "./types";
@@ -37,12 +38,16 @@ const KeyboardChatScrollView = forwardRef<
       applyWorkaroundForContentInsetHitTestBug = false,
       onLayout: onLayoutProp,
       onContentSizeChange: onContentSizeChangeProp,
+      onEndVisible,
       ...rest
     },
     ref,
   ) => {
     const scrollViewRef = useAnimatedRef<Reanimated.ScrollView>();
     const onRef = useCombinedRef(ref, scrollViewRef);
+    const freezeSV = useDerivedValue(() =>
+      typeof freeze === "boolean" ? freeze : freeze.value,
+    );
     const {
       padding,
       currentHeight,
@@ -55,7 +60,7 @@ const KeyboardChatScrollView = forwardRef<
     } = useChatKeyboard(scrollViewRef, {
       inverted,
       keyboardLiftBehavior,
-      freeze,
+      freeze: freezeSV,
       offset,
       blankSpace,
       extraContentPadding,
@@ -72,7 +77,15 @@ const KeyboardChatScrollView = forwardRef<
       contentOffsetY,
       inverted,
       keyboardLiftBehavior,
-      freeze,
+      freeze: freezeSV,
+    });
+
+    useEndVisible({
+      scroll,
+      layout,
+      size,
+      inverted,
+      onEndVisible,
     });
 
     const totalPadding = useDerivedValue(() =>

package/src/components/KeyboardChatScrollView/types.ts

@@ -1,4 +1,7 @@
-import type { AnimatedScrollViewComponent } from "../ScrollViewWithBottomPadding";
+import type {
+  AnimatedScrollViewComponent,
+  ScrollViewContentInsets,
+} from "../ScrollViewWithBottomPadding";
 import type { KeyboardLiftBehavior } from "./useChatKeyboard/types";
 import type { ScrollViewProps } from "react-native";
 import type { SharedValue } from "react-native-reanimated";
@@ -46,7 +49,7 @@ export type KeyboardChatScrollViewProps = {
    *
    * Default is `false`.
    */
-  freeze?: boolean;
+  freeze?: boolean | SharedValue<boolean>;
   /**
    * A shared value representing additional padding from external elements
    * (e.g., a growing multiline `TextInput` in a `KeyboardStickyView`).
@@ -87,4 +90,28 @@ export type KeyboardChatScrollViewProps = {
    * Default is `undefined` (equivalent to `0` — no minimum floor).
    */
   blankSpace?: SharedValue<number>;
+  /**
+   * Fires whenever the effective content inset changes — the static `contentInset`
+   * prop combined with the dynamic keyboard-driven padding.
+   *
+   * Useful on Android, where the synthetic content inset is not reflected in the native
+   * `onScroll` event payload. Consumers such as virtualized lists computing their own
+   * `scrollToEnd` target can use this to track the current inset alongside scroll offsets.
+   */
+  onContentInsetChange?: (insets: ScrollViewContentInsets) => void;
+  /**
+   * Fires whenever the visibility of the content "end" changes — both when the user
+   * arrives at the end and when they leave it. The boolean parameter reflects the new state.
+   *
+   * For non-inverted lists, the "end" is the bottom of the content. For inverted lists
+   * (`inverted={true}`), the "end" is the top of the scroll view, where the latest messages
+   * are rendered. The same internal detection drives `keyboardLiftBehavior="whenAtEnd"`.
+   *
+   * The callback can be either a plain JS function or a Reanimated worklet — the type is
+   * detected automatically. Worklets run on the UI thread; plain functions are dispatched
+   * via `runOnJS`.
+   *
+   * Fires once on mount with the initial state (after the scroll view has been measured).
+   */
+  onEndVisible?: (visible: boolean) => void;
 } & ScrollViewProps;

package/src/components/KeyboardChatScrollView/useChatKeyboard/index.ios.ts

@@ -64,7 +64,7 @@ function useChatKeyboard(
       onStart: (e) => {
         "worklet";
 
-        if (freeze) {
+        if (freeze.value) {
           return;
         }
 
@@ -229,7 +229,7 @@ function useChatKeyboard(
       onEnd: (e) => {
         "worklet";
 
-        if (freeze) {
+        if (freeze.value) {
           return;
         }
 
@@ -242,7 +242,7 @@ function useChatKeyboard(
         padding.value = effective;
       },
     },
-    [inverted, keyboardLiftBehavior, freeze, offset, extraContentPadding],
+    [inverted, keyboardLiftBehavior, offset, extraContentPadding],
   );
 
   return {

package/src/components/KeyboardChatScrollView/useChatKeyboard/index.ts

@@ -82,7 +82,7 @@ function useChatKeyboard(
       onStart: (e) => {
         "worklet";
 
-        if (freeze) {
+        if (freeze.value) {
           return;
         }
 
@@ -166,7 +166,7 @@ function useChatKeyboard(
       onMove: (e) => {
         "worklet";
 
-        if (freeze) {
+        if (freeze.value) {
           return;
         }
 
@@ -340,7 +340,7 @@ function useChatKeyboard(
       onEnd: (e) => {
         "worklet";
 
-        if (freeze) {
+        if (freeze.value) {
           return;
         }
 
@@ -358,7 +358,7 @@ function useChatKeyboard(
         }
       },
     },
-    [inverted, keyboardLiftBehavior, freeze, offset],
+    [inverted, keyboardLiftBehavior, offset],
   );
 
   return {

package/src/components/KeyboardChatScrollView/useChatKeyboard/types.ts

@@ -6,7 +6,7 @@ type KeyboardLiftBehavior = "always" | "whenAtEnd" | "persistent" | "never";
 type UseChatKeyboardOptions = {
   inverted: boolean;
   keyboardLiftBehavior: KeyboardLiftBehavior;
-  freeze: boolean;
+  freeze: SharedValue<boolean>;
   offset: number;
   blankSpace: SharedValue<number>;
   /** Extra content padding shared value — needed on iOS to correctly clamp contentOffset. */

package/src/components/KeyboardChatScrollView/useEndVisible.ts

@@ -0,0 +1,66 @@
+import { useMemo } from "react";
+import {
+  runOnJS,
+  useAnimatedReaction,
+  useDerivedValue,
+} from "react-native-reanimated";
+
+import { isScrollAtEnd } from "./useChatKeyboard/helpers";
+
+import type { SharedValue } from "react-native-reanimated";
+
+type EndVisibleCallback = (visible: boolean) => void;
+
+type Options = {
+  scroll: SharedValue<number>;
+  layout: SharedValue<{ width: number; height: number }>;
+  size: SharedValue<{ width: number; height: number }>;
+  inverted: boolean;
+  onEndVisible?: EndVisibleCallback;
+};
+
+const hasWorkletHash = (value: unknown): boolean =>
+  typeof value === "function" &&
+  !!(value as unknown as Record<string, unknown>).__workletHash;
+
+export const useEndVisible = ({
+  scroll,
+  layout,
+  size,
+  inverted,
+  onEndVisible,
+}: Options) => {
+  const isWorklet = useMemo(() => hasWorkletHash(onEndVisible), [onEndVisible]);
+
+  const isAtEnd = useDerivedValue(() => {
+    // Wait until the scroll view has been measured to avoid a spurious initial
+    // `true` on a (0,0,0) layout (the helper would otherwise treat unmeasured
+    // state as "at end" because 0 + 0 >= 0 - threshold).
+    if (layout.value.height === 0 || size.value.height === 0) {
+      return null;
+    }
+
+    return isScrollAtEnd(
+      scroll.value,
+      layout.value.height,
+      size.value.height,
+      inverted,
+    );
+  });
+
+  useAnimatedReaction(
+    () => isAtEnd.value,
+    (current, previous) => {
+      if (current === null || current === previous || !onEndVisible) {
+        return;
+      }
+
+      if (isWorklet) {
+        onEndVisible(current);
+      } else {
+        runOnJS(onEndVisible)(current);
+      }
+    },
+    [onEndVisible, isWorklet, inverted],
+  );
+};

package/src/components/KeyboardChatScrollView/useExtraContentPadding/index.ts

@@ -26,7 +26,7 @@ type UseExtraContentPaddingOptions = {
   contentOffsetY?: SharedValue<number>;
   inverted: boolean;
   keyboardLiftBehavior: KeyboardLiftBehavior;
-  freeze: boolean;
+  freeze: SharedValue<boolean>;
 };
 
 /**
@@ -81,7 +81,7 @@ function useExtraContentPadding(options: UseExtraContentPaddingOptions): void {
   useAnimatedReaction(
     () => extraContentPadding.value,
     (current, previous) => {
-      if (freeze || previous === null) {
+      if (freeze.value || previous === null) {
         return;
       }
 
@@ -141,7 +141,7 @@ function useExtraContentPadding(options: UseExtraContentPaddingOptions): void {
         scrollToTarget(target);
       }
     },
-    [inverted, keyboardLiftBehavior, freeze],
+    [inverted, keyboardLiftBehavior],
   );
 }
 

package/src/components/KeyboardStickyView/index.tsx

@@ -1,7 +1,10 @@
 import React, { forwardRef, useMemo } from "react";
-import { Animated } from "react-native";
+import Reanimated, {
+  interpolate,
+  useAnimatedStyle,
+} from "react-native-reanimated";
 
-import { useKeyboardAnimation } from "../../hooks";
+import { useReanimatedKeyboardAnimation } from "../../hooks";
 
 import type { View, ViewProps } from "react-native";
 
@@ -51,29 +54,25 @@ const KeyboardStickyView = forwardRef<
     },
     ref,
   ) => {
-    const { height, progress } = useKeyboardAnimation();
+    const { height, progress } = useReanimatedKeyboardAnimation();
 
-    const offset = progress.interpolate({
-      inputRange: [0, 1],
-      outputRange: [closed, opened],
-    });
+    const stickyViewStyle = useAnimatedStyle(() => {
+      const offset = interpolate(progress.value, [0, 1], [closed, opened]);
 
-    const styles = useMemo(() => {
-      const disabled = Animated.add(Animated.multiply(height, 0), closed);
-      const active = Animated.add(height, offset);
+      return {
+        transform: [{ translateY: enabled ? height.value + offset : closed }],
+      };
+    }, [closed, opened, enabled]);
 
-      return [
-        {
-          transform: [{ translateY: enabled ? active : disabled }],
-        },
-        style,
-      ];
-    }, [closed, enabled, height, offset, style]);
+    const styles = useMemo(
+      () => [style, stickyViewStyle],
+      [style, stickyViewStyle],
+    );
 
     return (
-      <Animated.View ref={ref} style={styles} {...props}>
+      <Reanimated.View ref={ref} style={styles} {...props}>
         {children}
-      </Animated.View>
+      </Reanimated.View>
     );
   },
 );

package/src/components/KeyboardToolbar/index.tsx

@@ -99,11 +99,13 @@ const KeyboardToolbar: React.FC<KeyboardToolbarProps> & {
   );
   const containerStyle = useMemo(
     () => [
+      // CRUCIAL: gives the native view real bounds
+      styles.sticky,
       KEYBOARD_HAS_ROUNDED_CORNERS
-        ? {
-            marginLeft: (insets?.left ?? 0) + 16,
-            marginRight: (insets?.right ?? 0) + 16,
-          }
+        ? ({
+            left: (insets?.left ?? 0) + 16,
+            right: (insets?.right ?? 0) + 16,
+          } as const)
         : null,
     ],
     [insets],
@@ -207,6 +209,13 @@ const KeyboardToolbar: React.FC<KeyboardToolbarProps> & {
 };
 
 const styles = StyleSheet.create({
+  sticky: {
+    position: "absolute",
+    left: 0,
+    right: 0,
+    bottom: 0,
+    height: KEYBOARD_TOOLBAR_HEIGHT,
+  },
   toolbar: {
     position: "absolute",
     bottom: 0,

package/src/components/ScrollViewWithBottomPadding/index.tsx

@@ -1,7 +1,10 @@
 import React, { forwardRef } from "react";
-import { Platform, View } from "react-native";
+import { Platform } from "react-native";
 import Reanimated, {
+  runOnJS,
   useAnimatedProps,
+  useAnimatedReaction,
+  useDerivedValue,
   useSharedValue,
 } from "react-native-reanimated";
 
@@ -26,6 +29,13 @@ export type AnimatedScrollViewComponent = React.ForwardRefExoticComponent<
   AnimatedScrollViewProps & React.RefAttributes<Reanimated.ScrollView>
 >;
 
+export type ScrollViewContentInsets = {
+  top: number;
+  bottom: number;
+  left: number;
+  right: number;
+};
+
 type ScrollViewWithBottomPaddingProps = {
   ScrollViewComponent: AnimatedScrollViewComponent;
   children?: React.ReactNode;
@@ -36,6 +46,12 @@ type ScrollViewWithBottomPaddingProps = {
   /** Absolute Y content offset (iOS only, for KeyboardChatScrollView). */
   contentOffsetY?: SharedValue<number>;
   applyWorkaroundForContentInsetHitTestBug?: boolean;
+  /**
+   * Fires whenever the effective content inset changes (combines the static `contentInset`
+   * prop with the dynamic keyboard-driven padding). Useful on Android where the synthetic
+   * inset is not reflected in `onScroll` events.
+   */
+  onContentInsetChange?: (insets: ScrollViewContentInsets) => void;
 } & ScrollViewProps;
 
 const ScrollViewWithBottomPadding = forwardRef<
@@ -52,6 +68,7 @@ const ScrollViewWithBottomPadding = forwardRef<
       inverted,
       contentOffsetY,
       applyWorkaroundForContentInsetHitTestBug,
+      onContentInsetChange,
       children,
       ...rest
     },
@@ -59,11 +76,52 @@ const ScrollViewWithBottomPadding = forwardRef<
   ) => {
     const prevContentOffsetY = useSharedValue<number | null>(null);
 
+    const insets = useDerivedValue(() => {
+      const dynamicTop = inverted ? bottomPadding.value : 0;
+      const dynamicBottom = !inverted ? bottomPadding.value : 0;
+
+      return {
+        dynamic: {
+          top: dynamicTop,
+          bottom: dynamicBottom,
+        },
+        effective: {
+          top: dynamicTop + (contentInset?.top || 0),
+          bottom: dynamicBottom + (contentInset?.bottom || 0),
+          left: contentInset?.left || 0,
+          right: contentInset?.right || 0,
+        } as ScrollViewContentInsets,
+      };
+    }, [
+      inverted,
+      contentInset?.top,
+      contentInset?.bottom,
+      contentInset?.left,
+      contentInset?.right,
+    ]);
+
+    useAnimatedReaction(
+      () => insets.value.effective,
+      (current, previous) => {
+        if (!onContentInsetChange) {
+          return;
+        }
+        if (
+          previous &&
+          current.top === previous.top &&
+          current.bottom === previous.bottom &&
+          current.left === previous.left &&
+          current.right === previous.right
+        ) {
+          return;
+        }
+        runOnJS(onContentInsetChange)(current);
+      },
+      [onContentInsetChange],
+    );
+
     const animatedProps = useAnimatedProps(() => {
-      const insetTop = inverted ? bottomPadding.value : 0;
-      const insetBottom = !inverted ? bottomPadding.value : 0;
-      const bottom = insetBottom + (contentInset?.bottom || 0);
-      const top = insetTop + (contentInset?.top || 0);
+      const { dynamic, effective } = insets.value;
 
       const indicatorPadding = scrollIndicatorPadding ?? bottomPadding;
       const indicatorTop =
@@ -75,12 +133,7 @@ const ScrollViewWithBottomPadding = forwardRef<
 
       const result: Record<string, unknown> = {
         // iOS prop
-        contentInset: {
-          bottom: bottom,
-          top: top,
-          right: contentInset?.right,
-          left: contentInset?.left,
-        },
+        contentInset: effective,
         scrollIndicatorInsets: {
           bottom: indicatorBottom,
           top: indicatorTop,
@@ -88,8 +141,8 @@ const ScrollViewWithBottomPadding = forwardRef<
           left: scrollIndicatorInsets?.left,
         },
         // Android prop
-        contentInsetBottom: insetBottom,
-        contentInsetTop: insetTop,
+        contentInsetBottom: dynamic.bottom,
+        contentInsetTop: dynamic.top,
       };
 
       if (contentOffsetY) {
@@ -104,10 +157,6 @@ const ScrollViewWithBottomPadding = forwardRef<
 
       return result;
     }, [
-      contentInset?.bottom,
-      contentInset?.top,
-      contentInset?.right,
-      contentInset?.left,
       scrollIndicatorInsets?.bottom,
       scrollIndicatorInsets?.top,
       scrollIndicatorInsets?.right,
@@ -125,17 +174,7 @@ const ScrollViewWithBottomPadding = forwardRef<
         style={styles.container}
       >
         <ScrollViewComponent ref={ref} animatedProps={animatedProps} {...rest}>
-          {inverted ? (
-            // The only thing it can break is `StickyHeader`, but it's already broken in FlatList and other lists
-            // don't support this functionality, so we can add additional view here
-            // The correct fix would be to add a new prop in ScrollView that allows
-            // to customize children extraction logic and skip custom view
-            <View collapsable={false} nativeID="container">
-              {children}
-            </View>
-          ) : (
-            children
-          )}
+          {children}
         </ScrollViewComponent>
       </ReanimatedClippingScrollView>
     );