Skip to content

Commit bdcd3ea

Browse files
j-piaseckifacebook-github-bot
authored andcommitted
Use module umbrella headers in react/renderer/animated headers (#58729)
Summary: Replace direct includes of umbrella-guarded headers in the public and internal headers of `react/renderer/animated` with the module umbrellas: `<React/Debug.h>`, `<React/RendererCore.h>`, `<React/Graphics.h>`, `<React/Bridging.h>` and `<React/NativeModuleCore.h>`. `react/bridging` and `react/nativemodule/core` are added as explicit dependencies in Buck and CMake, and the `animated` CocoaPods subspec now depends on the `React-Fabric/coreUmbrella` and `ReactCommon/turbomodule/coreUmbrella` subspecs so the umbrella paths resolve. Changelog: [Internal] Differential Revision: D122315385
1 parent 9b131e4 commit bdcd3ea

14 files changed

Lines changed: 19 additions & 22 deletions

File tree

‎packages/react-native/ReactCommon/React-Fabric.podspec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ Pod::Spec.new do |s|
5959

6060
s.subspec "animated" do |ss|
6161
ss.dependency "React-Fabric/animationbackend"
62+
ss.dependency "React-Fabric/coreUmbrella"
63+
ss.dependency "ReactCommon/turbomodule/coreUmbrella"
6264
ss.source_files = podspec_sources("react/renderer/animated/**/*.{m,mm,cpp,h}", "react/renderer/animated/**/*.{h}")
6365
ss.exclude_files = "react/renderer/animated/tests"
6466
ss.header_dir = "react/renderer/animated"

‎packages/react-native/ReactCommon/react/renderer/animated/AnimatedModule.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
#else
1515
#include <FBReactNativeSpec/FBReactNativeSpecJSI.h>
1616
#endif
17-
#include <ReactCommon/TurboModuleWithJSIBindings.h>
17+
#include <React/NativeModuleCore.h>
18+
#include <React/RendererCore.h>
1819
#include <folly/dynamic.h>
1920
#include <react/renderer/animated/NativeAnimatedNodesManager.h>
2021
#include <react/renderer/animated/NativeAnimatedNodesManagerProvider.h>
21-
#include <react/renderer/core/ReactPrimitives.h>
2222
#include <memory>
2323
#include <string>
2424
#include <variant>

‎packages/react-native/ReactCommon/react/renderer/animated/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ target_link_libraries(react_renderer_animated
2828
react_renderer_uimanager
2929
react_renderer_scheduler
3030
react_renderer_animationbackend
31+
react_bridging
32+
react_nativemodule_core
3133
glog
3234
folly_runtime
3335
)

‎packages/react-native/ReactCommon/react/renderer/animated/EventEmitterListener.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include <mutex>
1313
#include <shared_mutex>
1414

15-
#include <react/renderer/core/EventPayload.h>
16-
#include <react/renderer/core/ReactPrimitives.h>
15+
#include <React/RendererCore.h>
1716

1817
namespace facebook::react {
1918

‎packages/react-native/ReactCommon/react/renderer/animated/MergedValueDispatcher.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/RendererCore.h>
1213
#include <folly/dynamic.h>
13-
#include <react/renderer/core/ReactPrimitives.h>
1414
#include <functional>
1515
#include <mutex>
1616

‎packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
#else
1515
#include <FBReactNativeSpec/FBReactNativeSpecJSI.h>
1616
#endif
17+
#include <React/Bridging.h>
18+
#include <React/Debug.h>
19+
#include <React/RendererCore.h>
1720
#include <folly/dynamic.h>
18-
#include <react/bridging/Function.h>
19-
#include <react/debug/flags.h>
2021
#include <react/renderer/animated/EventEmitterListener.h>
2122
#include <react/renderer/animated/event_drivers/EventAnimationDriver.h>
2223
#include <react/renderer/animationbackend/AnimatedPropsBuilder.h>
2324
#include <react/renderer/animationbackend/AnimationBackend.h>
24-
#include <react/renderer/core/ReactPrimitives.h>
25-
#include <react/renderer/core/ShadowNode.h>
2625
#include <react/renderer/uimanager/UIManagerAnimationBackend.h>
2726
#include <chrono>
2827
#include <memory>

‎packages/react-native/ReactCommon/react/renderer/animated/drivers/AnimationDriver.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#pragma once
1515

16-
#include <react/debug/flags.h>
16+
#include <React/Debug.h>
1717
#include <react/renderer/animated/NativeAnimatedNodesManager.h>
1818

1919
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/animated/event_drivers/EventAnimationDriver.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313

1414
#pragma once
1515

16-
#include <react/renderer/core/EventPayload.h>
17-
#include <react/renderer/core/ReactPrimitives.h>
16+
#include <React/RendererCore.h>
1817
#include <optional>
1918
#include <string>
2019
#include <vector>

‎packages/react-native/ReactCommon/react/renderer/animated/internal/primitives.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12-
#include <react/renderer/core/ReactPrimitives.h>
12+
#include <React/RendererCore.h>
1313

1414
namespace facebook::react::animated {
1515
// Indicates that the animated node identifier is not defined.

‎packages/react-native/ReactCommon/react/renderer/animated/nodes/AnimatedNode.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
#pragma once
1515

16+
#include <React/Debug.h>
17+
#include <React/RendererCore.h>
1618
#include <folly/dynamic.h>
17-
#include <react/debug/flags.h>
18-
#include <react/renderer/core/ReactPrimitives.h>
1919

2020
namespace facebook::react {
2121

0 commit comments

Comments
 (0)