Skip to content

Add umbrella for react/renderer/uimanager subtree (#58025)#58025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
coado wants to merge 2 commits into from
Closed

Add umbrella for react/renderer/uimanager subtree (#58025) #58025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92e4484
Add stable public MapBuffer C++ entry point (#58013)
coado Aug 21, 2026
7dcfcc4
Add umbrella for `react/renderer/uimanager` subtree (#58025)
coado Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/react-native/ReactAndroid/build.gradle.kts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,6 +160,7 @@ val preparePrefab by
Pair("../ReactCommon/react/renderer/scheduler/", "react/renderer/scheduler/"),
// react_renderer_uimanager
Pair("../ReactCommon/react/renderer/uimanager/", "react/renderer/uimanager/"),
Pair("../ReactCommon/react/renderer/uimanager/React/", "React/"),
// react_utils
Pair("../ReactCommon/react/utils/", "react/utils/"),
// rrc_image
Expand DownExpand Up@@ -252,6 +253,7 @@ val preparePrefab by
"react/renderer/leakchecker/",
),
Pair("../ReactCommon/react/renderer/mapbuffer/", "react/renderer/mapbuffer/"),
Pair("../ReactCommon/react/renderer/mapbuffer/React/", "React/"),
Pair("../ReactCommon/react/renderer/mounting/", "react/renderer/mounting/"),
Pair(
"../ReactCommon/react/renderer/runtimescheduler/",
Expand Down
6 changes: 6 additions & 0 deletions packages/react-native/ReactCommon/React-Fabric.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,12 @@ Pod::Spec.new do |s|
ss.header_dir = "react/renderer/uimanager"
end

s.subspec "uimanagerUmbrella" do |ss|
ss.source_files = "react/renderer/uimanager/React/*.h"
ss.header_dir = "React"
ss.header_mappings_dir = "react/renderer/uimanager/React"
end

s.subspec "leakchecker" do |ss|
ss.source_files = podspec_sources("react/renderer/leakchecker/**/*.{cpp,h}", "react/renderer/leakchecker/**/*.h")
ss.exclude_files = "react/renderer/leakchecker/tests"
Expand Down
9 changes: 8 additions & 1 deletion packages/react-native/ReactCommon/React-Mapbuffer.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,21 @@ Pod::Spec.new do |s|
s.platforms = min_supported_versions
s.source = source
s.source_files = podspec_sources("react/renderer/mapbuffer/*.{cpp,h}", "react/renderer/mapbuffer/*.h")
s.exclude_files = "react/renderer/mapbuffer/tests"
s.exclude_files = ["react/renderer/mapbuffer/tests", "react/renderer/mapbuffer/React"]
s.public_header_files = 'react/renderer/mapbuffer/*.h'
s.header_dir = "react/renderer/mapbuffer"
s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => ["\"$(PODS_TARGET_SRCROOT)\""], "USE_HEADERMAP" => "YES",
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }

s.subspec "MapBufferUmbrella" do |ss|
ss.source_files = "react/renderer/mapbuffer/React/*.h"
ss.header_dir = "React"
ss.header_mappings_dir = "react/renderer/mapbuffer/React"
end

resolve_use_frameworks(s, header_mappings_dir: './', module_name: "React_Mapbuffer")

s.dependency "React-cxxstableapi"
add_dependency(s, "React-debug")
add_rn_third_party_dependencies(s)
add_rncore_dependency(s)
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,6 @@ file(GLOB react_renderer_mapbuffer_SRC CONFIGURE_DEPENDS *.cpp)
add_library(react_renderer_mapbuffer OBJECT ${react_renderer_mapbuffer_SRC})

target_include_directories(react_renderer_mapbuffer PUBLIC ${REACT_COMMON_DIR})
target_link_libraries(react_renderer_mapbuffer glog glog_init react_debug)
target_link_libraries(react_renderer_mapbuffer glog glog_init react_cxxstableapi react_debug)
target_compile_reactnative_options(react_renderer_mapbuffer PRIVATE)
target_compile_options(react_renderer_mapbuffer PRIVATE -Wpedantic)
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/debug/react_native_assert.h>

#include <glog/logging.h>
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/debug/react_native_assert.h>
#include <vector>
#include "MapBuffer.h"
Expand Down
27 changes: 27 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/mapbuffer/React/MapBuffer.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// =============================================================================
// Umbrella header for the `react/renderer/mapbuffer` module - public entry point.
//
// #include <React/MapBuffer.h>
//
// Re-exports the module's public interface headers. React Native's own code
// should keep using the fine-grained `<react/renderer/mapbuffer/...>` includes;
// only outside consumers use this umbrella.
// =============================================================================

// Marks that the following headers are pulled in through the umbrella, so their
// shared guard (<react/cxxstableapi/UmbrellaGuard.h>) accepts them.
#define RN_UMBRELLA_CONTEXT

#include <react/renderer/mapbuffer/MapBuffer.h>
#include <react/renderer/mapbuffer/MapBufferBuilder.h>

#undef RN_UMBRELLA_CONTEXT
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <folly/dynamic.h>
#include <jsi/jsi.h>
#include <react/renderer/core/ReactPrimitives.h>
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ target_link_libraries(react_renderer_uimanager
folly_runtime
jsi
react_cxxreact
react_cxxstableapi
react_debug
react_featureflags
react_renderer_componentregistry
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/LayoutAnimationStatusDelegate.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

namespace facebook::react {

class LayoutAnimationStatusDelegate {
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/uimanager/UIManagerCommitHook.h>

namespace facebook::react {
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <functional>

#include <jsi/jsi.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/PointerHoverTracker.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <functional>
#include <initializer_list>
#include <memory>
Expand Down
41 changes: 41 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/React/UIManager.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// =============================================================================
// Umbrella header for the `react/renderer/uimanager` module - public entry
// point.
//
// #include <React/UIManager.h>
//
// Re-exports the module's public interface headers. React Native's own code
// should keep using the fine-grained `<react/renderer/uimanager/...>` includes;
// only outside consumers use this umbrella.
// =============================================================================

// Marks that the following headers are pulled in through the umbrella, so their
// shared guard (<react/cxxstableapi/UmbrellaGuard.h>) accepts them.
#define RN_UMBRELLA_CONTEXT

#include <react/renderer/uimanager/AppRegistryBinding.h>
#include <react/renderer/uimanager/LayoutAnimationStatusDelegate.h>
#include <react/renderer/uimanager/LayoutEventEmitter.h>
#include <react/renderer/uimanager/PointerEventsProcessor.h>
#include <react/renderer/uimanager/PointerHoverTracker.h>
#include <react/renderer/uimanager/UIManager.h>
#include <react/renderer/uimanager/UIManagerAnimationBackend.h>
#include <react/renderer/uimanager/UIManagerAnimationDelegate.h>
#include <react/renderer/uimanager/UIManagerBinding.h>
#include <react/renderer/uimanager/UIManagerCommitHook.h>
#include <react/renderer/uimanager/UIManagerDelegate.h>
#include <react/renderer/uimanager/UIManagerMountHook.h>
#include <react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h>
#include <react/renderer/uimanager/UIManagerViewTransitionDelegate.h>
#include <react/renderer/uimanager/primitives.h>

#undef RN_UMBRELLA_CONTEXT
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <folly/dynamic.h>
#include <jsi/jsi.h>

Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <ReactCommon/CallInvoker.h>
#include <react/renderer/core/ReactPrimitives.h>
#include <chrono>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <jsi/jsi.h>

#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <jsi/jsi.h>
#include <react/renderer/core/RawValue.h>
#include <react/renderer/uimanager/PointerEventsProcessor.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/root/RootShadowNode.h>

namespace facebook::react {
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/core/ReactPrimitives.h>
#include <react/renderer/core/ShadowNode.h>
#include <react/renderer/mounting/MountingCoordinator.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/root/RootShadowNode.h>
#include "UIManager.h"

Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <jsi/jsi.h>

#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/core/ShadowNode.h>
#include <react/renderer/graphics/Float.h>
#include <functional>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <folly/dynamic.h>
#include <jsi/JSIDynamic.h>
#include <jsi/jsi.h>
Expand Down
22 changes: 22 additions & 0 deletions packages/react-native/scripts/ios-prebuild/headers-config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -231,6 +231,12 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
headerDir: 'react/renderer/uimanager',
},

{
name: 'uimanagerUmbrella',
headerPatterns: ['react/renderer/uimanager/React/*.h'],
headerDir: 'React',
},

{
name: 'leakchecker',
headerPatterns: ['react/renderer/leakchecker/**/*.h'],
Expand DownExpand Up@@ -466,6 +472,22 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
},
],
},
'ReactCommon/React-Mapbuffer.podspec': {
name: 'React-Mapbuffer',
headerPatterns: ['react/renderer/mapbuffer/**/*.h'],
excludePatterns: [
'react/renderer/mapbuffer/tests',
'react/renderer/mapbuffer/React',
],
headerDir: 'react/renderer/mapbuffer',
subSpecs: [
{
name: 'MapBufferUmbrella',
headerPatterns: ['react/renderer/mapbuffer/React/*.h'],
headerDir: 'React',
},
],
},
'ReactCommon/React-FabricImage.podspec': {
name: 'React-FabricImage',
headerPatterns: ['react/renderer/components/image/**/*.h'],
Expand Down
Loading