fix: move requestAnimationFrame back to Reanimated

packages/react-native-reanimated/src/ReanimatedModule/NativeReanimated.ts

@@ -29,6 +29,7 @@ import type {
   IReanimatedModule,
   ReanimatedModuleProxy,
 } from './reanimatedModuleProxy';
+import { setupRequestAnimationFrame } from '../requestAnimationFrame';
 
 const IS_WEB = shouldBeUseWeb();
 
@@ -81,7 +82,11 @@ See https://docs.swmansion.com/react-native-reanimated/docs/guides/troubleshooti
       checkCppVersion();
     }
     this.#reanimatedModuleProxy = global.__reanimatedModuleProxy;
-    executeOnUIRuntimeSync(registerReanimatedError);
+    executeOnUIRuntimeSync(function initializeUI() {
+      'worklet';
+      registerReanimatedError();
+      setupRequestAnimationFrame();
+    })();
   }
 
   registerSensor(

packages/react-native-reanimated/src/errors.ts

@@ -4,7 +4,9 @@ import { createCustomError, registerCustomError } from './WorkletsResolver';
 
 export const ReanimatedError = createCustomError('Reanimated');
 
+const ReanimatedErrorConstructor = ReanimatedError;
+
 export function registerReanimatedError() {
   'worklet';
-  registerCustomError(ReanimatedError, 'Reanimated');
+  registerCustomError(ReanimatedErrorConstructor, 'Reanimated');
 }

packages/react-native-reanimated/src/requestAnimationFrame.ts

@@ -0,0 +1,41 @@
+'use strict';
+
+import { callMicrotasks } from "./WorkletsResolver";
+
+export function setupRequestAnimationFrame() {
+  'worklet';
+
+  // Jest mocks requestAnimationFrame API and it does not like if that mock gets overridden
+  // so we avoid doing requestAnimationFrame batching in Jest environment.
+  const nativeRequestAnimationFrame = global.requestAnimationFrame;
+
+  let animationFrameCallbacks: Array<(timestamp: number) => void> = [];
+  let flushRequested = false;
+
+  global.__flushAnimationFrame = (frameTimestamp: number) => {
+    const currentCallbacks = animationFrameCallbacks;
+    animationFrameCallbacks = [];
+    currentCallbacks.forEach((f) => f(frameTimestamp));
+    callMicrotasks();
+  };
+
+  global.requestAnimationFrame = (
+    callback: (timestamp: number) => void
+  ): number => {
+    animationFrameCallbacks.push(callback);
+    if (!flushRequested) {
+      flushRequested = true;
+      nativeRequestAnimationFrame((timestamp) => {
+        flushRequested = false;
+        global.__frameTimestamp = timestamp;
+        global.__flushAnimationFrame(timestamp);
+        global.__frameTimestamp = undefined;
+      });
+    }
+    // Reanimated currently does not support cancelling callbacks requested with
+    // requestAnimationFrame. We return -1 as identifier which isn't in line
+    // with the spec but it should give users better clue in case they actually
+    // attempt to store the value returned from rAF and use it for cancelling.
+    return -1;
+  };
+}

packages/react-native-worklets/src/worklets/initializers.ts

@@ -14,12 +14,7 @@ import {
   isWeb,
   shouldBeUseWeb,
 } from './PlatformChecker';
-import {
-  callMicrotasks,
-  executeOnUIRuntimeSync,
-  runOnJS,
-  setupMicrotasks,
-} from './threads';
+import { executeOnUIRuntimeSync, runOnJS, setupMicrotasks } from './threads';
 import { registerWorkletsError, WorkletsError } from './WorkletsError';
 import type { IWorkletsModule } from './WorkletsModule';
 
@@ -148,44 +143,6 @@ export function setupConsole() {
   }
 }
 
-function setupRequestAnimationFrame() {
-  'worklet';
-
-  // Jest mocks requestAnimationFrame API and it does not like if that mock gets overridden
-  // so we avoid doing requestAnimationFrame batching in Jest environment.
-  const nativeRequestAnimationFrame = global.requestAnimationFrame;
-
-  let animationFrameCallbacks: Array<(timestamp: number) => void> = [];
-  let flushRequested = false;
-
-  global.__flushAnimationFrame = (frameTimestamp: number) => {
-    const currentCallbacks = animationFrameCallbacks;
-    animationFrameCallbacks = [];
-    currentCallbacks.forEach((f) => f(frameTimestamp));
-    callMicrotasks();
-  };
-
-  global.requestAnimationFrame = (
-    callback: (timestamp: number) => void
-  ): number => {
-    animationFrameCallbacks.push(callback);
-    if (!flushRequested) {
-      flushRequested = true;
-      nativeRequestAnimationFrame((timestamp) => {
-        flushRequested = false;
-        global.__frameTimestamp = timestamp;
-        global.__flushAnimationFrame(timestamp);
-        global.__frameTimestamp = undefined;
-      });
-    }
-    // Reanimated currently does not support cancelling callbacks requested with
-    // requestAnimationFrame. We return -1 as identifier which isn't in line
-    // with the spec but it should give users better clue in case they actually
-    // attempt to store the value returned from rAF and use it for cancelling.
-    return -1;
-  };
-}
-
 export function initializeUIRuntime(WorkletsModule: IWorkletsModule) {
   if (isWeb()) {
     return;
@@ -211,7 +168,6 @@ export function initializeUIRuntime(WorkletsModule: IWorkletsModule) {
       setupCallGuard();
       setupConsole();
       setupMicrotasks();
-      setupRequestAnimationFrame();
     })();
   }
 }