Guard contentOffsetY path behind new arch and skip rAF on non-Android

Author: trcoffman

src/components/KeyboardChatScrollView/useExtraContentPadding/__fixtures__/setup.ts

@@ -48,3 +48,24 @@ export const createRender = () => {
 beforeEach(() => {
   mockScrollTo.mockClear();
 });
+
+/**
+ * Temporarily removes `nativeFabricUIManager` from global to simulate legacy
+ * (bridge) architecture for the duration of the provided callback.
+ *
+ * @param fn - Callback to run under legacy arch conditions.
+ */
+export function withLegacyArch(fn: () => void) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const original = (global as any).nativeFabricUIManager;
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  (global as any).nativeFabricUIManager = undefined;
+
+  try {
+    fn();
+  } finally {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (global as any).nativeFabricUIManager = original;
+  }
+}

src/components/KeyboardChatScrollView/useExtraContentPadding/__tests__/contentOffsetY.spec.ts

@@ -4,6 +4,7 @@ import {
   flushRAF,
   mockScrollTo,
   reactionEffect,
+  withLegacyArch,
 } from "../__fixtures__/setup";
 
 describe("useExtraContentPadding — contentOffsetY (iOS atomic path)", () => {
@@ -140,3 +141,53 @@ describe("useExtraContentPadding — contentOffsetY (iOS atomic path)", () => {
     expect(mockScrollTo).toHaveBeenCalledWith(expect.anything(), 0, 120, false);
   });
 });
+
+describe("useExtraContentPadding — iOS legacy arch (scrollTo path)", () => {
+  it("should use scrollTo directly when on legacy arch even if contentOffsetY is provided (non-inverted)", () => {
+    const render = createRender();
+    const contentOffsetY = sv(100);
+
+    withLegacyArch(() => {
+      render({
+        extraContentPadding: sv(20),
+        keyboardPadding: sv(300),
+        scroll: sv(100),
+        layout: sv({ width: 390, height: 800 }),
+        size: sv({ width: 390, height: 2000 }),
+        contentOffsetY,
+        inverted: false,
+        keyboardLiftBehavior: "always",
+        freeze: false,
+      });
+    });
+
+    reactionEffect(20, 0);
+
+    expect(contentOffsetY.value).toBe(100);
+    expect(mockScrollTo).toHaveBeenCalledWith(expect.anything(), 0, 120, false);
+  });
+
+  it("should use scrollTo directly when on legacy arch even if contentOffsetY is provided (inverted)", () => {
+    const render = createRender();
+    const contentOffsetY = sv(5);
+
+    withLegacyArch(() => {
+      render({
+        extraContentPadding: sv(20),
+        keyboardPadding: sv(300),
+        scroll: sv(5),
+        layout: sv({ width: 390, height: 800 }),
+        size: sv({ width: 390, height: 2000 }),
+        contentOffsetY,
+        inverted: true,
+        keyboardLiftBehavior: "always",
+        freeze: false,
+      });
+    });
+
+    reactionEffect(20, 0);
+
+    expect(contentOffsetY.value).toBe(5);
+    expect(mockScrollTo).toHaveBeenCalledWith(expect.anything(), 0, -15, false);
+  });
+});

src/components/KeyboardChatScrollView/useExtraContentPadding/index.ts

@@ -1,4 +1,5 @@
 import { useCallback } from "react";
+import { Platform } from "react-native";
 import { scrollTo, useAnimatedReaction } from "react-native-reanimated";
 
 import { isScrollAtEnd, shouldShiftContent } from "../useChatKeyboard/helpers";
@@ -56,22 +57,27 @@ function useExtraContentPadding(options: UseExtraContentPaddingOptions): void {
     freeze,
   } = options;
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const isNewArch = !!(global as any).nativeFabricUIManager;
+
   const scrollToTarget = useCallback(
     (target: number) => {
       "worklet";
 
-      if (contentOffsetY) {
+      if (contentOffsetY && isNewArch) {
         // eslint-disable-next-line react-compiler/react-compiler
         contentOffsetY.value = target;
-      } else {
+      } else if (Platform.OS === "android") {
         // Defer scrollTo so the animatedProps inset commit lands first;
         // otherwise the native ScrollView clamps to the old range.
         requestAnimationFrame(() => {
           scrollTo(scrollViewRef, 0, target, false);
         });
+      } else {
+        scrollTo(scrollViewRef, 0, target, false);
       }
     },
-    [scrollViewRef, contentOffsetY],
+    [scrollViewRef, contentOffsetY, isNewArch],
   );
 
   useAnimatedReaction(