Skip to content

Reach public modules through umbrellas from for-frameworks headers #58969

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

Open
coado wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −28
Open

Reach public modules through umbrellas from for-frameworks headers #58969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion packages/react-native/ReactCommon/react/nativemodule/defaults/DefaultTurboModules.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <react/cxxstableapi/FrameworksGuard.h>

#include <ReactCommon/TurboModule.h>
#include <React/NativeModuleCore.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/componentregistry/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ file(GLOB react_renderer_componentregistry_SRC CONFIGURE_DEPENDS *.cpp)
add_library(react_renderer_componentregistry OBJECT ${react_renderer_componentregistry_SRC})

target_include_directories(react_renderer_componentregistry PUBLIC ${REACT_COMMON_DIR})
target_include_directories(react_renderer_componentregistry INTERFACE ${REACT_COMMON_DIR}/react/renderer/componentregistry)
target_include_directories(react_renderer_componentregistry PUBLIC ${REACT_COMMON_DIR}/react/renderer/componentregistry)

target_link_libraries(react_renderer_componentregistry
folly_runtime
Expand Down
7 changes: 3 additions & 4 deletions ...es/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@

#include <memory>

#include <react/renderer/core/ComponentDescriptor.h>
#include <react/renderer/core/EventDispatcher.h>
#include <react/utils/ContextContainer.h>
#include <React/RendererCore.h>
#include <React/Utils.h>

#include "ComponentDescriptorRegistry.h"
#include <React/ComponentRegistry.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#include <memory>

#include <React/RendererCore.h>
#include <react/renderer/components/image/ImageShadowNode.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>

namespace facebook::react {

Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#include <cstdint>

#include <react/renderer/components/view/ViewEventEmitter.h>
#include <react/renderer/imagemanager/primitives.h>
#include <React/ImageManager.h>
#include <React/View.h>

namespace facebook::react {

Expand Down
8 changes: 4 additions & 4 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include <optional>
#include <string>

#include <react/renderer/components/view/ViewProps.h>
#include <react/renderer/core/PropsParserContext.h>
#include <react/renderer/graphics/Color.h>
#include <react/renderer/imagemanager/primitives.h>
#include <React/Graphics.h>
#include <React/ImageManager.h>
#include <React/RendererCore.h>
#include <React/View.h>

namespace facebook::react {

Expand Down
7 changes: 3 additions & 4 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@

#include <memory>

#include <React/ImageManager.h>
#include <React/RendererCore.h>
#include <React/View.h>
#include <react/renderer/components/image/ImageEventEmitter.h>
#include <react/renderer/components/image/ImageProps.h>
#include <react/renderer/components/image/ImageState.h>
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
#include <react/renderer/core/ShadowNodeFamily.h>
#include <react/renderer/imagemanager/ImageManager.h>
#include <react/renderer/imagemanager/primitives.h>

namespace facebook::react {

Expand Down
4 changes: 1 addition & 3 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
#include <memory>
#include <utility>

#include <react/renderer/imagemanager/ImageRequest.h>
#include <react/renderer/imagemanager/ImageRequestParams.h>
#include <react/renderer/imagemanager/primitives.h>
#include <React/ImageManager.h>

#ifdef ANDROID
#include <folly/dynamic.h>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ file(GLOB react_renderer_core_SRC CONFIGURE_DEPENDS *.cpp)
add_library(react_renderer_core OBJECT ${react_renderer_core_SRC})

target_include_directories(react_renderer_core PUBLIC ${REACT_COMMON_DIR})
target_include_directories(react_renderer_core INTERFACE ${REACT_COMMON_DIR}/react/renderer/core)
target_include_directories(react_renderer_core PUBLIC ${REACT_COMMON_DIR}/react/renderer/core)
target_link_libraries(react_renderer_core
folly_runtime
glog
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/DynamicEventPayload.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include <react/cxxstableapi/FrameworksGuard.h>

#include <React/RendererCore.h>
#include <folly/dynamic.h>
#include <react/renderer/core/EventPayload.h>

namespace facebook::react {

Expand Down
3 changes: 1 addition & 2 deletions packages/react-native/ReactCommon/react/renderer/core/DynamicPointerEvent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@

#include <react/cxxstableapi/FrameworksGuard.h>

#include <React/RendererCore.h>
#include <folly/dynamic.h>
#include <react/renderer/core/DynamicEventPayload.h>
#include <react/renderer/core/EventPayload.h>
#include <react/renderer/core/ReactPrimitives.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/DynamicPropsUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include <react/cxxstableapi/FrameworksGuard.h>

#include <React/RendererCore.h>
#include <folly/dynamic.h>
#include <react/renderer/core/RawProps.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/ReactRootViewTagGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <react/cxxstableapi/FrameworksGuard.h>

#include <react/renderer/core/ReactPrimitives.h>
#include <React/RendererCore.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion ...t-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTContextContainerHandling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#import <Foundation/Foundation.h>

#import <react/utils/ContextContainer.h>
#import <React/Utils.h>

@protocol RCTContextContainerHandling <NSObject>

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

#import <UIKit/UIKit.h>

#import <React/CallInvoker.h>
#import <React/RCTDefines.h>
#import <React/RCTJavaScriptLoader.h>
#import <ReactCommon/CallInvoker.h>
#import <jsinspector-modern/ReactCdp.h>
#import <react/runtime/JSRuntimeFactory.h>

Expand Down
Loading