diff --git a/packages/react-native/ReactCommon/react/renderer/consistency/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/consistency/CMakeLists.txt index 9f42cf6f800c..2d2dbf5fa202 100644 --- a/packages/react-native/ReactCommon/react/renderer/consistency/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/consistency/CMakeLists.txt @@ -12,5 +12,7 @@ file(GLOB react_renderer_consistency_SRC CONFIGURE_DEPENDS *.cpp) add_library(react_renderer_consistency OBJECT ${react_renderer_consistency_SRC}) target_include_directories(react_renderer_consistency PUBLIC ${REACT_COMMON_DIR}) + +target_link_libraries(react_renderer_consistency react_cxxstableapi) target_compile_reactnative_options(react_renderer_consistency PRIVATE) target_compile_options(react_renderer_consistency PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/consistency/React-rendererconsistency.podspec b/packages/react-native/ReactCommon/react/renderer/consistency/React-rendererconsistency.podspec index e4cf09b0d814..7fa840edb962 100644 --- a/packages/react-native/ReactCommon/react/renderer/consistency/React-rendererconsistency.podspec +++ b/packages/react-native/ReactCommon/react/renderer/consistency/React-rendererconsistency.podspec @@ -40,5 +40,7 @@ Pod::Spec.new do |s| resolve_use_frameworks(s, header_mappings_dir: "../../..", module_name: "React_rendererconsistency") + s.dependency "React-cxxstableapi" + mark_as_react_native_build(s) end diff --git a/packages/react-native/ReactCommon/react/renderer/consistency/ScopedShadowTreeRevisionLock.h b/packages/react-native/ReactCommon/react/renderer/consistency/ScopedShadowTreeRevisionLock.h index 51df90e7f261..66c35d8ad40d 100644 --- a/packages/react-native/ReactCommon/react/renderer/consistency/ScopedShadowTreeRevisionLock.h +++ b/packages/react-native/ReactCommon/react/renderer/consistency/ScopedShadowTreeRevisionLock.h @@ -7,6 +7,8 @@ #pragma once +#include + #include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/consistency/ShadowTreeRevisionConsistencyManager.h b/packages/react-native/ReactCommon/react/renderer/consistency/ShadowTreeRevisionConsistencyManager.h index d5afba016f64..6896b74a2b03 100644 --- a/packages/react-native/ReactCommon/react/renderer/consistency/ShadowTreeRevisionConsistencyManager.h +++ b/packages/react-native/ReactCommon/react/renderer/consistency/ShadowTreeRevisionConsistencyManager.h @@ -7,6 +7,8 @@ #pragma once +#include + namespace facebook::react { /** diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h index 828efcb7a9c3..1bbd101c96f5 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -20,6 +19,8 @@ namespace facebook::react { +class ShadowTreeRevisionConsistencyManager; + using RuntimeSchedulerRenderingUpdate = std::function; using SurfaceId = int32_t; diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.h index 6218ff02a120..ba148d3899e6 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.h @@ -10,7 +10,6 @@ #ifndef RCT_REMOVE_LEGACY_ARCH #include -#include #include #include #include @@ -19,6 +18,8 @@ namespace facebook::react { +class ShadowTreeRevisionConsistencyManager; + class RuntimeScheduler_Legacy final : public RuntimeSchedulerBase { public: explicit RuntimeScheduler_Legacy( diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.h index d40fc6c63e09..7f9600bc9de9 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.h @@ -8,7 +8,6 @@ #pragma once #include -#include #include #include #include @@ -18,6 +17,8 @@ namespace facebook::react { +class ShadowTreeRevisionConsistencyManager; + class RuntimeScheduler_Modern final : public RuntimeSchedulerBase { public: explicit RuntimeScheduler_Modern( diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp index 6b7c66679419..60f713c45b69 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -18,6 +19,7 @@ #include #include #include +#include #include diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h index f7452c8defe6..4982254b9a34 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h @@ -14,7 +14,6 @@ #include #include -#include #include #include #include @@ -28,13 +27,14 @@ #include #include #include -#include #include #include #include namespace facebook::react { +class LazyShadowTreeRevisionConsistencyManager; +class ShadowTreeRevisionConsistencyManager; class UIManagerBinding; class UIManagerCommitHook; class UIManagerMountHook;