react-native-keyboard-controller 1.21.0-beta.1 → 1.21.0-beta.2

package/src/components/ScrollViewWithBottomPadding/index.tsx

@@ -6,11 +6,12 @@ import { ClippingScrollView } from "../../bindings";
 
 import styles from "./styles";
 
-import type { ScrollViewProps } from "react-native";
+import type { ScrollViewProps, StyleProp, ViewStyle } from "react-native";
 import type { SharedValue } from "react-native-reanimated";
 
+const OS = Platform.OS;
 const ReanimatedClippingScrollView =
-  Platform.OS === "android"
+  OS === "android"
     ? Reanimated.createAnimatedComponent(ClippingScrollView)
     : ClippingScrollView;
 
@@ -25,7 +26,12 @@ export type AnimatedScrollViewComponent = React.ForwardRefExoticComponent<
 type ScrollViewWithBottomPaddingProps = {
   ScrollViewComponent: AnimatedScrollViewComponent;
   children?: React.ReactNode;
+  inverted?: boolean;
   bottomPadding: SharedValue<number>;
+  /** Absolute Y content offset (iOS only, for ChatKit). */
+  contentOffsetY?: SharedValue<number>;
+  /** Style applied to the container wrapper (Android only, for ChatKit translateY). */
+  containerStyle?: StyleProp<ViewStyle>;
 } & ScrollViewProps;
 
 const ScrollViewWithBottomPadding = forwardRef<
@@ -33,35 +39,78 @@ const ScrollViewWithBottomPadding = forwardRef<
   ScrollViewWithBottomPaddingProps
 >(
   (
-    { ScrollViewComponent, bottomPadding, contentInset, children, ...rest },
+    {
+      ScrollViewComponent,
+      bottomPadding,
+      contentInset,
+      scrollIndicatorInsets,
+      inverted,
+      contentOffsetY,
+      containerStyle,
+      children,
+      style,
+      ...rest
+    },
     ref,
   ) => {
-    const animatedProps = useAnimatedProps(
-      () => ({
+    const animatedProps = useAnimatedProps(() => {
+      const bottom = inverted
+        ? 0
+        : bottomPadding.value + (contentInset?.bottom || 0);
+      const top = !inverted
+        ? 0
+        : bottomPadding.value + (contentInset?.top || 0);
+
+      const result: Record<string, unknown> = {
         // iOS prop
         contentInset: {
-          bottom: bottomPadding.value + (contentInset?.bottom || 0),
-          top: contentInset?.top,
+          bottom: bottom,
+          top: top,
           right: contentInset?.right,
           left: contentInset?.left,
         },
+        scrollIndicatorInsets: {
+          bottom: bottom,
+          top: top,
+          right: scrollIndicatorInsets?.right,
+          left: scrollIndicatorInsets?.left,
+        },
         // Android prop
         contentInsetBottom: bottomPadding.value,
-      }),
-      [
-        contentInset?.bottom,
-        contentInset?.top,
-        contentInset?.right,
-        contentInset?.left,
-      ],
-    );
+      };
+
+      if (contentOffsetY) {
+        result.contentOffset = { x: 0, y: contentOffsetY.value };
+      }
+
+      return result;
+    }, [
+      contentInset?.bottom,
+      contentInset?.top,
+      contentInset?.right,
+      contentInset?.left,
+      scrollIndicatorInsets?.bottom,
+      scrollIndicatorInsets?.top,
+      scrollIndicatorInsets?.right,
+      scrollIndicatorInsets?.left,
+      inverted,
+      contentOffsetY,
+    ]);
 
     return (
       <ReanimatedClippingScrollView
         animatedProps={animatedProps}
-        style={styles.container}
+        style={[
+          styles.container,
+          OS === "android" ? containerStyle : undefined,
+        ]}
       >
-        <ScrollViewComponent ref={ref} animatedProps={animatedProps} {...rest}>
+        <ScrollViewComponent
+          ref={ref}
+          animatedProps={animatedProps}
+          style={style}
+          {...rest}
+        >
           {children}
         </ScrollViewComponent>
       </ReanimatedClippingScrollView>

package/src/components/index.ts

@@ -5,6 +5,7 @@ export {
   default as KeyboardToolbar,
   DefaultKeyboardToolbarTheme,
 } from "./KeyboardToolbar";
+export { default as ChatKit } from "./ChatKit";
 export type { KeyboardAvoidingViewProps } from "./KeyboardAvoidingView";
 export type { KeyboardStickyViewProps } from "./KeyboardStickyView";
 export type {
@@ -12,3 +13,4 @@ export type {
   KeyboardAwareScrollViewRef,
 } from "./KeyboardAwareScrollView";
 export type { KeyboardToolbarProps } from "./KeyboardToolbar";
+export type { ChatKitScrollViewProps } from "./ChatKit/types";

package/src/index.ts

@@ -8,6 +8,7 @@ export * from "./types";
 export * from "./compat";
 
 export {
+  ChatKit,
   KeyboardAvoidingView,
   KeyboardStickyView,
   KeyboardAwareScrollView,
@@ -16,6 +17,7 @@ export {
   DefaultKeyboardToolbarTheme,
 } from "./components";
 export type {
+  ChatKitScrollViewProps,
   KeyboardAvoidingViewProps,
   KeyboardStickyViewProps,
   KeyboardAwareScrollViewProps,