From 4cfb2ee46831b57987873b1d7ce6306778463afd Mon Sep 17 00:00:00 2001 From: Zeya Peng Date: Fri, 23 Jan 2026 07:49:20 -0800 Subject: [PATCH] enable -DRN_USE_ANIMATION_BACKEND by default (#55266) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/55266 ## Changelog: [General] [Changed] - enable -DRN_USE_ANIMATION_BACKEND by default Reviewed By: cipolleschi Differential Revision: D91056420 fbshipit-source-id: bd8ef6b63a593540688c1af6a25274d047f43f9b --- packages/react-native/Package.swift | 2 +- packages/react-native/ReactCommon/React-Fabric.podspec | 1 + .../ReactCommon/react/renderer/animated/CMakeLists.txt | 1 - .../renderer/animated/NativeAnimatedNodesManager.cpp | 9 --------- .../react/renderer/animated/NativeAnimatedNodesManager.h | 6 ------ .../animated/NativeAnimatedNodesManagerProvider.cpp | 6 +----- .../ReactCommon/react/renderer/scheduler/CMakeLists.txt | 1 - .../ReactCommon/react/renderer/scheduler/Scheduler.cpp | 6 +----- private/react-native-fantom/runner/executables/tester.js | 3 --- private/react-native-fantom/runner/utils.js | 5 ----- 10 files changed, 4 insertions(+), 36 deletions(-) diff --git a/packages/react-native/Package.swift b/packages/react-native/Package.swift index 28549c1a9ac..275a70f8291 100644 --- 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 index 7b452f6e4cf..dc9f5e31f35 100644 --- 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 index cceac9a5a40..cb226be7ac1 100644 --- 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 index 7a10c85d85d..e270340b160 100644 --- 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>& 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 index 2231f09272b..b525c0a09db 100644 --- 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 #include #include -#ifdef RN_USE_ANIMATION_BACKEND #include #include -#endif #include #include #include @@ -121,7 +119,6 @@ class NativeAnimatedNodesManager { void setAnimatedNodeOffset(Tag tag, double offset); -#ifdef RN_USE_ANIMATION_BACKEND void insertMutations( std::unordered_map> &updates, AnimationMutations &mutations, @@ -129,7 +126,6 @@ class NativeAnimatedNodesManager { 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 index bd451c45d0c..7d95dcee3b5 100644 --- 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 #include #include -#ifdef RN_USE_ANIMATION_BACKEND -#include -#endif #include +#include #include #include #include @@ -87,7 +85,6 @@ NativeAnimatedNodesManagerProvider::getOrCreate( }; if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) { -#ifdef RN_USE_ANIMATION_BACKEND auto animationBackend = uiManager->unstable_getAnimationBackend().lock(); react_native_assert( animationBackend != nullptr && "animationBackend is nullptr"); @@ -95,7 +92,6 @@ NativeAnimatedNodesManagerProvider::getOrCreate( nativeAnimatedNodesManager_ = std::make_shared(animationBackend); -#endif } else { nativeAnimatedNodesManager_ = std::make_shared( diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt index 2563bc12c6e..b39e940016a 100644 --- 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 index 268cffdc191..bf0e3d93a04 100644 --- 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 #include #include +#include #include #include #include @@ -21,9 +22,6 @@ #include #include #include -#ifdef RN_USE_ANIMATION_BACKEND -#include -#endif namespace facebook::react { @@ -59,7 +57,6 @@ Scheduler::Scheduler( std::make_shared(runtimeExecutor_, contextContainer_); if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) { -#ifdef RN_USE_ANIMATION_BACKEND auto animationBackend = std::make_shared( schedulerToolbox.animationChoreographer, uiManager); @@ -67,7 +64,6 @@ Scheduler::Scheduler( animationBackend); uiManager->unstable_setAnimationBackend(animationBackend); -#endif } auto eventOwnerBox = std::make_shared(); diff --git a/private/react-native-fantom/runner/executables/tester.js b/private/react-native-fantom/runner/executables/tester.js index 634f89d6fc0..b3459c802f3 100644 --- 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 index 65dbe6a92f1..31105f4c569 100644 --- 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 { - return ['-c rn.use_animationbackend=true']; -} - export type AsyncCommandResult = { originalCommand: string, childProcess: ReturnType,