enable -DRN_USE_ANIMATION_BACKEND by default (#55266)

zeyap · meta-codesync[bot] · commit 4cfb2ee46831 · 2026-01-23T07:49:20.000-08:00
Summary: Pull Request resolved: #55266 ## Changelog: [General] [Changed] - enable -DRN_USE_ANIMATION_BACKEND by default Reviewed By: cipolleschi Differential Revision: D91056420 fbshipit-source-id: bd8ef6b63a593540688c1af6a25274d047f43f9b
diff --git a/packages/react-native/Package.swift b/packages/react-native/Package.swift
@@ -456,7 +456,7 @@ let reactFabric = RNTarget(
     "components/root/tests",
   ],
   dependencies: [.reactNativeDependencies, .reactJsiExecutor, .rctTypesafety, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .reactRendererDebug, .reactGraphics, .yoga],
-  sources: ["animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/view/platform/cxx", "components/scrollview", "components/scrollview/platform/cxx", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "observers/intersection", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"]
+  sources: ["animationbackend", "animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/view/platform/cxx", "components/scrollview", "components/scrollview/platform/cxx", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "observers/intersection", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"]
 )
 
 let reactFabricInputAccessory = RNTarget(
diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -56,6 +56,7 @@ Pod::Spec.new do |s|
   add_rncore_dependency(s)
 
   s.subspec "animated" do |ss|
+    ss.dependency             "React-Fabric/animationbackend"
     ss.source_files         = podspec_sources("react/renderer/animated/**/*.{m,mm,cpp,h}", "react/renderer/animated/**/*.{h}")
     ss.exclude_files        = "react/renderer/animated/tests"
     ss.header_dir           = "react/renderer/animated"
diff --git a/packages/react-native/ReactCommon/react/renderer/animated/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/animated/CMakeLists.txt
@@ -32,4 +32,3 @@ target_link_libraries(react_renderer_animated
 )
 target_compile_reactnative_options(react_renderer_animated PRIVATE)
 target_compile_options(react_renderer_animated PRIVATE -Wpedantic)
-target_compile_definitions(react_renderer_animated PRIVATE RN_USE_ANIMATION_BACKEND)
diff --git a/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp b/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp
@@ -514,11 +514,9 @@ void NativeAnimatedNodesManager::handleAnimatedEvent(
     // proactivelly trigger the animation loop to avoid showing stale
     // frames.
     if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
-#ifdef RN_USE_ANIMATION_BACKEND
       if (auto animationBackend = animationBackend_.lock()) {
         animationBackend->trigger();
       }
-#endif
     } else {
       onRender();
     }
@@ -553,14 +551,12 @@ void NativeAnimatedNodesManager::startRenderCallbackIfNeeded(bool isAsync) {
   }
 
   if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
-#ifdef RN_USE_ANIMATION_BACKEND
     if (auto animationBackend = animationBackend_.lock()) {
       animationBackendCallbackId_ =
           animationBackend->start([this](AnimationTimestamp timestamp) {
             return pullAnimationMutations(timestamp);
           });
     }
-#endif
 
     return;
   }
@@ -579,13 +575,11 @@ void NativeAnimatedNodesManager::stopRenderCallbackIfNeeded(
   auto isRenderCallbackStarted = isRenderCallbackStarted_.exchange(false);
 
   if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
-#ifdef RN_USE_ANIMATION_BACKEND
     if (isRenderCallbackStarted) {
       if (auto animationBackend = animationBackend_.lock()) {
         animationBackend->stop(animationBackendCallbackId_);
       }
     }
-#endif
     return;
   }
 
@@ -947,8 +941,6 @@ void NativeAnimatedNodesManager::schedulePropsCommit(
   }
 }
 
-#ifdef RN_USE_ANIMATION_BACKEND
-
 void NativeAnimatedNodesManager::insertMutations(
     std::unordered_map<Tag, std::pair<ShadowNodeFamily::Weak, folly::dynamic>>&
         updates,
@@ -1089,7 +1081,6 @@ AnimationMutations NativeAnimatedNodesManager::pullAnimationMutations(
   shouldRequestAsyncFlush_.clear();
   return mutations;
 }
-#endif
 
 void NativeAnimatedNodesManager::onRender() {
   if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
diff --git a/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.h b/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.h
@@ -17,10 +17,8 @@
 #include <react/debug/flags.h>
 #include <react/renderer/animated/EventEmitterListener.h>
 #include <react/renderer/animated/event_drivers/EventAnimationDriver.h>
-#ifdef RN_USE_ANIMATION_BACKEND
 #include <react/renderer/animationbackend/AnimatedPropsBuilder.h>
 #include <react/renderer/animationbackend/AnimationBackend.h>
-#endif
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/uimanager/UIManagerAnimationBackend.h>
@@ -121,15 +119,13 @@ class NativeAnimatedNodesManager {
 
   void setAnimatedNodeOffset(Tag tag, double offset);
 
-#ifdef RN_USE_ANIMATION_BACKEND
   void insertMutations(
       std::unordered_map<Tag, std::pair<ShadowNodeFamily::Weak, folly::dynamic>> &updates,
       AnimationMutations &mutations,
       AnimatedPropsBuilder &propsBuilder,
       bool hasLayoutUpdates = false);
   AnimationMutations onAnimationFrameForBackend(AnimatedPropsBuilder &propsBuilder, AnimationTimestamp timestamp);
   AnimationMutations pullAnimationMutations(AnimationTimestamp timestamp);
-#endif
 
 #pragma mark - Drivers
 
@@ -286,9 +282,7 @@ class NativeAnimatedNodesManager {
   bool warnedAboutGraphTraversal_ = false;
 #endif
 
-#ifdef RN_USE_ANIMATION_BACKEND
   CallbackId animationBackendCallbackId_{0};
-#endif
 
   friend class ColorAnimatedNode;
   friend class AnimationDriver;
diff --git a/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManagerProvider.cpp b/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManagerProvider.cpp
@@ -11,10 +11,8 @@
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/animated/MergedValueDispatcher.h>
 #include <react/renderer/animated/internal/AnimatedMountingOverrideDelegate.h>
-#ifdef RN_USE_ANIMATION_BACKEND
-#include <react/renderer/animationbackend/AnimationBackend.h>
-#endif
 #include <react/renderer/animated/internal/primitives.h>
+#include <react/renderer/animationbackend/AnimationBackend.h>
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/scheduler/Scheduler.h>
 #include <react/renderer/uimanager/UIManagerBinding.h>
@@ -87,15 +85,13 @@ NativeAnimatedNodesManagerProvider::getOrCreate(
     };
 
     if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
-#ifdef RN_USE_ANIMATION_BACKEND
       auto animationBackend = uiManager->unstable_getAnimationBackend().lock();
       react_native_assert(
           animationBackend != nullptr && "animationBackend is nullptr");
       animationBackend->registerJSInvoker(jsInvoker);
 
       nativeAnimatedNodesManager_ =
           std::make_shared<NativeAnimatedNodesManager>(animationBackend);
-#endif
     } else {
       nativeAnimatedNodesManager_ =
           std::make_shared<NativeAnimatedNodesManager>(
diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt
@@ -37,4 +37,3 @@ target_link_libraries(react_renderer_scheduler
 )
 target_compile_reactnative_options(react_renderer_scheduler PRIVATE)
 target_compile_options(react_renderer_scheduler PRIVATE -Wpedantic)
-target_compile_definitions(react_renderer_scheduler PRIVATE RN_USE_ANIMATION_BACKEND)
diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp
@@ -13,6 +13,7 @@
 #include <cxxreact/TraceSection.h>
 #include <react/debug/react_native_assert.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
+#include <react/renderer/animationbackend/AnimationBackend.h>
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
 #include <react/renderer/core/EventQueueProcessor.h>
 #include <react/renderer/core/LayoutContext.h>
@@ -21,9 +22,6 @@
 #include <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #include <react/renderer/uimanager/UIManager.h>
 #include <react/renderer/uimanager/UIManagerBinding.h>
-#ifdef RN_USE_ANIMATION_BACKEND
-#include <react/renderer/animationbackend/AnimationBackend.h>
-#endif
 
 namespace facebook::react {
 
@@ -59,15 +57,13 @@ Scheduler::Scheduler(
       std::make_shared<UIManager>(runtimeExecutor_, contextContainer_);
 
   if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
-#ifdef RN_USE_ANIMATION_BACKEND
     auto animationBackend = std::make_shared<AnimationBackend>(
         schedulerToolbox.animationChoreographer, uiManager);
 
     schedulerToolbox.animationChoreographer->setAnimationBackend(
         animationBackend);
 
     uiManager->unstable_setAnimationBackend(animationBackend);
-#endif
   }
 
   auto eventOwnerBox = std::make_shared<EventBeat::OwnerBox>();
diff --git a/private/react-native-fantom/runner/executables/tester.js b/private/react-native-fantom/runner/executables/tester.js
@@ -15,7 +15,6 @@ import {NATIVE_BUILD_OUTPUT_PATH} from '../paths';
 import {
   getBuckModesForPlatform,
   getBuckOptionsForHermes,
-  getConfigForAnimationBackend,
   getDebugInfoFromCommandResult,
   runBuck2,
   runBuck2Sync,
@@ -55,7 +54,6 @@ export function build(options: TesterOptions): void {
       'build',
       ...getBuckModesForPlatform(options.isOptimizedMode),
       ...getBuckOptionsForHermes(options.hermesVariant),
-      ...getConfigForAnimationBackend(),
       FANTOM_TESTER_BUCK_TARGET,
       '--out',
       tmpPath,
@@ -96,7 +94,6 @@ export function run(
         'run',
         ...getBuckModesForPlatform(options.isOptimizedMode),
         ...getBuckOptionsForHermes(options.hermesVariant),
-        ...getConfigForAnimationBackend(),
         FANTOM_TESTER_BUCK_TARGET,
         '--',
         ...args,
diff --git a/private/react-native-fantom/runner/utils.js b/private/react-native-fantom/runner/utils.js
@@ -109,11 +109,6 @@ export function getBuckModesForPlatform(
   return modes;
 }
 
-// TODO: T240293839 Remove when we get rid of RN_USE_ANIMATION_BACKEND preprocessor flag
-export function getConfigForAnimationBackend(): ReadonlyArray<string> {
-  return ['-c rn.use_animationbackend=true'];
-}
-
 export type AsyncCommandResult = {
   originalCommand: string,
   childProcess: ReturnType<typeof spawn>,

Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ let reactFabric = RNTarget(`
`456`	`456`	`"components/root/tests",`
`457`	`457`	`],`
`458`	`458`	`dependencies: [.reactNativeDependencies, .reactJsiExecutor, .rctTypesafety, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .reactRendererDebug, .reactGraphics, .yoga],`
`459`		`- sources: ["animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/view/platform/cxx", "components/scrollview", "components/scrollview/platform/cxx", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "observers/intersection", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"]`
	`459`	`+ sources: ["animationbackend", "animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/view/platform/cxx", "components/scrollview", "components/scrollview/platform/cxx", "components/legacyviewmanagerinterop", "dom", "scheduler", "mounting", "observers/events", "observers/intersection", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency"]`
`460`	`460`	`)`
`461`	`461`
`462`	`462`	`let reactFabricInputAccessory = RNTarget(`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,3 @@ target_link_libraries(react_renderer_animated`
`32`	`32`	`)`
`33`	`33`	`target_compile_reactnative_options(react_renderer_animated PRIVATE)`
`34`	`34`	`target_compile_options(react_renderer_animated PRIVATE -Wpedantic)`
`35`		`-target_compile_definitions(react_renderer_animated PRIVATE RN_USE_ANIMATION_BACKEND)`
Original file line number	Diff line number	Diff line change
`@@ -514,11 +514,9 @@ void NativeAnimatedNodesManager::handleAnimatedEvent(`
`514`	`514`	`// proactivelly trigger the animation loop to avoid showing stale`
`515`	`515`	`// frames.`
`516`	`516`	`if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {`
`517`		`-#ifdef RN_USE_ANIMATION_BACKEND`
`518`	`517`	`if (auto animationBackend = animationBackend_.lock()) {`
`519`	`518`	`animationBackend->trigger();`
`520`	`519`	`}`
`521`		`-#endif`
`522`	`520`	`} else {`
`523`	`521`	`onRender();`
`524`	`522`	`}`
`@@ -553,14 +551,12 @@ void NativeAnimatedNodesManager::startRenderCallbackIfNeeded(bool isAsync) {`
`553`	`551`	`}`
`554`	`552`
`555`	`553`	`if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {`
`556`		`-#ifdef RN_USE_ANIMATION_BACKEND`
`557`	`554`	`if (auto animationBackend = animationBackend_.lock()) {`
`558`	`555`	`animationBackendCallbackId_ =`
`559`	`556`	`animationBackend->start([this](AnimationTimestamp timestamp) {`
`560`	`557`	`return pullAnimationMutations(timestamp);`
`561`	`558`	`});`
`562`	`559`	`}`
`563`		`-#endif`
`564`	`560`
`565`	`561`	`return;`
`566`	`562`	`}`
`@@ -579,13 +575,11 @@ void NativeAnimatedNodesManager::stopRenderCallbackIfNeeded(`
`579`	`575`	`auto isRenderCallbackStarted = isRenderCallbackStarted_.exchange(false);`
`580`	`576`
`581`	`577`	`if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {`
`582`		`-#ifdef RN_USE_ANIMATION_BACKEND`
`583`	`578`	`if (isRenderCallbackStarted) {`
`584`	`579`	`if (auto animationBackend = animationBackend_.lock()) {`
`585`	`580`	`animationBackend->stop(animationBackendCallbackId_);`
`586`	`581`	`}`
`587`	`582`	`}`
`588`		`-#endif`
`589`	`583`	`return;`
`590`	`584`	`}`
`591`	`585`
`@@ -947,8 +941,6 @@ void NativeAnimatedNodesManager::schedulePropsCommit(`
`947`	`941`	`}`
`948`	`942`	`}`
`949`	`943`
`950`		`-#ifdef RN_USE_ANIMATION_BACKEND`
`951`		`-`
`952`	`944`	`void NativeAnimatedNodesManager::insertMutations(`
`953`	`945`	`std::unordered_map<Tag, std::pair<ShadowNodeFamily::Weak, folly::dynamic>>&`
`954`	`946`	`updates,`
`@@ -1089,7 +1081,6 @@ AnimationMutations NativeAnimatedNodesManager::pullAnimationMutations(`
`1089`	`1081`	`shouldRequestAsyncFlush_.clear();`
`1090`	`1082`	`return mutations;`
`1091`	`1083`	`}`
`1092`		`-#endif`
`1093`	`1084`
`1094`	`1085`	`void NativeAnimatedNodesManager::onRender() {`
`1095`	`1086`	`if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,3 @@ target_link_libraries(react_renderer_scheduler`
`37`	`37`	`)`
`38`	`38`	`target_compile_reactnative_options(react_renderer_scheduler PRIVATE)`
`39`	`39`	`target_compile_options(react_renderer_scheduler PRIVATE -Wpedantic)`
`40`		`-target_compile_definitions(react_renderer_scheduler PRIVATE RN_USE_ANIMATION_BACKEND)`