Skip to content

Make LayoutConformance component headers for-frameworks (#58929) #58929

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 1 commit into from
Closed

Make LayoutConformance component headers for-frameworks (#58929) #58929

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/renderer/components/view/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ react_native_android_selector(platform_DIR
${CMAKE_CURRENT_SOURCE_DIR}/platform/android/
${CMAKE_CURRENT_SOURCE_DIR}/platform/cxx/)
target_include_directories(rrc_view PUBLIC ${REACT_COMMON_DIR} ${platform_DIR})
target_include_directories(rrc_view INTERFACE ${REACT_COMMON_DIR}/react/renderer/components/view)
target_include_directories(rrc_view PUBLIC ${REACT_COMMON_DIR}/react/renderer/components/view)

target_link_libraries(rrc_view
folly_runtime
Expand Down
4 changes: 2 additions & 2 deletions ...-native/ReactCommon/react/renderer/components/view/LayoutConformanceComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <React/RendererCore.h>
#include <react/renderer/components/view/LayoutConformanceShadowNode.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>

namespace facebook::react {

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

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <react/renderer/components/view/YogaStylableProps.h>
#include <react/renderer/components/view/conversions.h>
#include <react/renderer/core/propsConversions.h>
#include <React/RendererCore.h>
#include <React/View.h>

namespace facebook::react {

Expand Down
5 changes: 2 additions & 3 deletions ...ges/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <react/renderer/components/view/ConcreteViewShadowNode.h>
#include <React/View.h>
#include <react/renderer/components/view/LayoutConformanceProps.h>
#include <react/renderer/components/view/YogaLayoutableShadowNode.h>

namespace facebook::react {

Expand Down
4 changes: 1 addition & 3 deletions packages/react-native/ReactCommon/react/renderer/components/view/React/View.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
#include <react/renderer/components/view/HostPlatformViewEventEmitter.h>
#include <react/renderer/components/view/HostPlatformViewProps.h>
#include <react/renderer/components/view/HostPlatformViewTraitsInitializer.h>
#include <react/renderer/components/view/LayoutConformanceComponentDescriptor.h>
#include <react/renderer/components/view/LayoutConformanceProps.h>
#include <react/renderer/components/view/LayoutConformanceShadowNode.h>
#include <react/renderer/components/view/PointerEvent.h>
#include <react/renderer/components/view/Touch.h>
#include <react/renderer/components/view/TouchEvent.h>
Expand All @@ -55,6 +52,7 @@
#include <react/renderer/components/view/YogaLayoutableShadowNode.h>
#include <react/renderer/components/view/YogaStylableProps.h>
#include <react/renderer/components/view/accessibilityPropsConversions.h>
#include <react/renderer/components/view/conversions.h>
#include <react/renderer/components/view/primitives.h>

#undef RN_UMBRELLA_CONTEXT
Expand Down
11 changes: 0 additions & 11 deletions scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,6 @@ struct facebook::hermes::ISetEventLoopControl : public facebook::jsi::ICast {
const char facebook::react::ViewComponentName[];
const facebook::react::EventTag facebook::react::EMPTY_EVENT_TAG;
constexpr auto facebook::react::rncore_ModuleProvider;
constexpr char facebook::react::LayoutConformanceShadowNodeComponentName[];
constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion;
constexpr facebook::react::Tag facebook::react::kNoTag;
constexpr uint32_t facebook::react::INITIAL_BUCKETS_SIZE;
Expand Down Expand Up @@ -424,7 +423,6 @@ using facebook::react::GradientDirection = std::variant<facebook::react::Float,
using facebook::react::HostPlatformTouch = facebook::react::BaseTouch;
using facebook::react::HostPlatformViewEventEmitter = facebook::react::BaseViewEventEmitter;
using facebook::react::ImageSources = std::vector<facebook::react::ImageSource>;
using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor<facebook::react::LayoutConformanceShadowNode>;
using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t;
using facebook::react::NativeMethodCallFunc = std::function<void()>;
using facebook::react::PromiseSetupFunctionType = std::function<void(facebook::jsi::Runtime& rt, std::shared_ptr<facebook::react::Promise>)>;
Expand Down Expand Up @@ -1724,9 +1722,6 @@ struct facebook::react::JavaTurboModule::InitParams {
public std::string moduleName;
}

class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode<facebook::react::LayoutConformanceShadowNodeComponentName, facebook::react::YogaLayoutableShadowNode, facebook::react::LayoutConformanceProps> {
}

class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode {
public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);
Expand Down Expand Up @@ -3375,12 +3370,6 @@ struct facebook::react::JTurboModuleWithJSIBindings : public facebook::jni::Java
public static constexpr auto kJavaDescriptor;
}

struct facebook::react::LayoutConformanceProps : public facebook::react::YogaStylableProps {
public LayoutConformanceProps() = default;
public LayoutConformanceProps(const facebook::react::PropsParserContext& context, const facebook::react::LayoutConformanceProps& sourceProps, const facebook::react::RawProps& rawProps);
public facebook::react::LayoutConformance mode;
}

struct facebook::react::LayoutConstraints {
public facebook::react::LayoutDirection layoutDirection;
public facebook::react::Size clamp(const facebook::react::Size& size) const;
Expand Down
11 changes: 0 additions & 11 deletions scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,6 @@ struct facebook::hermes::ISetEventLoopControl : public facebook::jsi::ICast {
const char facebook::react::ViewComponentName[];
const facebook::react::EventTag facebook::react::EMPTY_EVENT_TAG;
constexpr auto facebook::react::rncore_ModuleProvider;
constexpr char facebook::react::LayoutConformanceShadowNodeComponentName[];
constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion;
constexpr facebook::react::Tag facebook::react::kNoTag;
constexpr uint32_t facebook::react::INITIAL_BUCKETS_SIZE;
Expand Down Expand Up @@ -424,7 +423,6 @@ using facebook::react::GradientDirection = std::variant<facebook::react::Float,
using facebook::react::HostPlatformTouch = facebook::react::BaseTouch;
using facebook::react::HostPlatformViewEventEmitter = facebook::react::BaseViewEventEmitter;
using facebook::react::ImageSources = std::vector<facebook::react::ImageSource>;
using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor<facebook::react::LayoutConformanceShadowNode>;
using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t;
using facebook::react::NativeMethodCallFunc = std::function<void()>;
using facebook::react::PromiseSetupFunctionType = std::function<void(facebook::jsi::Runtime& rt, std::shared_ptr<facebook::react::Promise>)>;
Expand Down Expand Up @@ -1723,9 +1721,6 @@ struct facebook::react::JavaTurboModule::InitParams {
public std::string moduleName;
}

class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode<facebook::react::LayoutConformanceShadowNodeComponentName, facebook::react::YogaLayoutableShadowNode, facebook::react::LayoutConformanceProps> {
}

class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode {
public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);
Expand Down Expand Up @@ -3368,12 +3363,6 @@ struct facebook::react::JTurboModuleWithJSIBindings : public facebook::jni::Java
public static constexpr auto kJavaDescriptor;
}

struct facebook::react::LayoutConformanceProps : public facebook::react::YogaStylableProps {
public LayoutConformanceProps() = default;
public LayoutConformanceProps(const facebook::react::PropsParserContext& context, const facebook::react::LayoutConformanceProps& sourceProps, const facebook::react::RawProps& rawProps);
public facebook::react::LayoutConformance mode;
}

struct facebook::react::LayoutConstraints {
public facebook::react::LayoutDirection layoutDirection;
public facebook::react::Size clamp(const facebook::react::Size& size) const;
Expand Down
11 changes: 0 additions & 11 deletions scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,6 @@ struct facebook::hermes::ISetEventLoopControl : public facebook::jsi::ICast {
const char facebook::react::ViewComponentName[];
const facebook::react::EventTag facebook::react::EMPTY_EVENT_TAG;
constexpr auto facebook::react::rncore_ModuleProvider;
constexpr char facebook::react::LayoutConformanceShadowNodeComponentName[];
constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion;
constexpr facebook::react::Tag facebook::react::kNoTag;
constexpr uint32_t facebook::react::INITIAL_BUCKETS_SIZE;
Expand Down Expand Up @@ -424,7 +423,6 @@ using facebook::react::GradientDirection = std::variant<facebook::react::Float,
using facebook::react::HostPlatformTouch = facebook::react::BaseTouch;
using facebook::react::HostPlatformViewEventEmitter = facebook::react::BaseViewEventEmitter;
using facebook::react::ImageSources = std::vector<facebook::react::ImageSource>;
using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor<facebook::react::LayoutConformanceShadowNode>;
using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t;
using facebook::react::NativeMethodCallFunc = std::function<void()>;
using facebook::react::PromiseSetupFunctionType = std::function<void(facebook::jsi::Runtime& rt, std::shared_ptr<facebook::react::Promise>)>;
Expand Down Expand Up @@ -1723,9 +1721,6 @@ struct facebook::react::JavaTurboModule::InitParams {
public std::string moduleName;
}

class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode<facebook::react::LayoutConformanceShadowNodeComponentName, facebook::react::YogaLayoutableShadowNode, facebook::react::LayoutConformanceProps> {
}

class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode {
public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);
Expand Down Expand Up @@ -3368,12 +3363,6 @@ struct facebook::react::JTurboModuleWithJSIBindings : public facebook::jni::Java
public static constexpr auto kJavaDescriptor;
}

struct facebook::react::LayoutConformanceProps : public facebook::react::YogaStylableProps {
public LayoutConformanceProps() = default;
public LayoutConformanceProps(const facebook::react::PropsParserContext& context, const facebook::react::LayoutConformanceProps& sourceProps, const facebook::react::RawProps& rawProps);
public facebook::react::LayoutConformance mode;
}

struct facebook::react::LayoutConstraints {
public facebook::react::LayoutDirection layoutDirection;
public facebook::react::Size clamp(const facebook::react::Size& size) const;
Expand Down
11 changes: 0 additions & 11 deletions scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3163,7 +3163,6 @@ struct facebook::hermes::ISetEventLoopControl : public facebook::jsi::ICast {

const char facebook::react::ViewComponentName[];
const facebook::react::EventTag facebook::react::EMPTY_EVENT_TAG;
constexpr char facebook::react::LayoutConformanceShadowNodeComponentName[];
constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion;
constexpr facebook::react::Tag facebook::react::kNoTag;
constexpr uint32_t facebook::react::INITIAL_BUCKETS_SIZE;
Expand Down Expand Up @@ -3210,7 +3209,6 @@ using facebook::react::GradientDirection = std::variant<facebook::react::Float,
using facebook::react::HostPlatformTouch = facebook::react::BaseTouch;
using facebook::react::HostPlatformViewEventEmitter = facebook::react::BaseViewEventEmitter;
using facebook::react::ImageSources = std::vector<facebook::react::ImageSource>;
using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor<facebook::react::LayoutConformanceShadowNode>;
using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t;
using facebook::react::NativeMethodCallFunc = std::function<void()>;
using facebook::react::PromiseSetupFunctionType = std::function<void(facebook::jsi::Runtime& rt, std::shared_ptr<facebook::react::Promise>)>;
Expand Down Expand Up @@ -4018,9 +4016,6 @@ class facebook::react::JSBigString : public facebook::jsi::Buffer {
public ~JSBigString() override = default;
}

class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode<facebook::react::LayoutConformanceShadowNodeComponentName, facebook::react::YogaLayoutableShadowNode, facebook::react::LayoutConformanceProps> {
}

class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode {
public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);
Expand Down Expand Up @@ -5459,12 +5454,6 @@ struct facebook::react::ImageURLLoaderAttribution {
public std::string queryRootName;
}

struct facebook::react::LayoutConformanceProps : public facebook::react::YogaStylableProps {
public LayoutConformanceProps() = default;
public LayoutConformanceProps(const facebook::react::PropsParserContext& context, const facebook::react::LayoutConformanceProps& sourceProps, const facebook::react::RawProps& rawProps);
public facebook::react::LayoutConformance mode;
}

struct facebook::react::LayoutConstraints {
public facebook::react::LayoutDirection layoutDirection;
public facebook::react::Size clamp(const facebook::react::Size& size) const;
Expand Down
11 changes: 0 additions & 11 deletions scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3155,7 +3155,6 @@ struct facebook::hermes::ISetEventLoopControl : public facebook::jsi::ICast {

const char facebook::react::ViewComponentName[];
const facebook::react::EventTag facebook::react::EMPTY_EVENT_TAG;
constexpr char facebook::react::LayoutConformanceShadowNodeComponentName[];
constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion;
constexpr facebook::react::Tag facebook::react::kNoTag;
constexpr uint32_t facebook::react::INITIAL_BUCKETS_SIZE;
Expand Down Expand Up @@ -3202,7 +3201,6 @@ using facebook::react::GradientDirection = std::variant<facebook::react::Float,
using facebook::react::HostPlatformTouch = facebook::react::BaseTouch;
using facebook::react::HostPlatformViewEventEmitter = facebook::react::BaseViewEventEmitter;
using facebook::react::ImageSources = std::vector<facebook::react::ImageSource>;
using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor<facebook::react::LayoutConformanceShadowNode>;
using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t;
using facebook::react::NativeMethodCallFunc = std::function<void()>;
using facebook::react::PromiseSetupFunctionType = std::function<void(facebook::jsi::Runtime& rt, std::shared_ptr<facebook::react::Promise>)>;
Expand Down Expand Up @@ -4009,9 +4007,6 @@ class facebook::react::JSBigString : public facebook::jsi::Buffer {
public ~JSBigString() override = default;
}

class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode<facebook::react::LayoutConformanceShadowNodeComponentName, facebook::react::YogaLayoutableShadowNode, facebook::react::LayoutConformanceProps> {
}

class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode {
public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);
Expand Down Expand Up @@ -5444,12 +5439,6 @@ struct facebook::react::ImageURLLoaderAttribution {
public std::string queryRootName;
}

struct facebook::react::LayoutConformanceProps : public facebook::react::YogaStylableProps {
public LayoutConformanceProps() = default;
public LayoutConformanceProps(const facebook::react::PropsParserContext& context, const facebook::react::LayoutConformanceProps& sourceProps, const facebook::react::RawProps& rawProps);
public facebook::react::LayoutConformance mode;
}

struct facebook::react::LayoutConstraints {
public facebook::react::LayoutDirection layoutDirection;
public facebook::react::Size clamp(const facebook::react::Size& size) const;
Expand Down
11 changes: 0 additions & 11 deletions scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3163,7 +3163,6 @@ struct facebook::hermes::ISetEventLoopControl : public facebook::jsi::ICast {

const char facebook::react::ViewComponentName[];
const facebook::react::EventTag facebook::react::EMPTY_EVENT_TAG;
constexpr char facebook::react::LayoutConformanceShadowNodeComponentName[];
constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion;
constexpr facebook::react::Tag facebook::react::kNoTag;
constexpr uint32_t facebook::react::INITIAL_BUCKETS_SIZE;
Expand Down Expand Up @@ -3210,7 +3209,6 @@ using facebook::react::GradientDirection = std::variant<facebook::react::Float,
using facebook::react::HostPlatformTouch = facebook::react::BaseTouch;
using facebook::react::HostPlatformViewEventEmitter = facebook::react::BaseViewEventEmitter;
using facebook::react::ImageSources = std::vector<facebook::react::ImageSource>;
using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor<facebook::react::LayoutConformanceShadowNode>;
using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t;
using facebook::react::NativeMethodCallFunc = std::function<void()>;
using facebook::react::PromiseSetupFunctionType = std::function<void(facebook::jsi::Runtime& rt, std::shared_ptr<facebook::react::Promise>)>;
Expand Down Expand Up @@ -4017,9 +4015,6 @@ class facebook::react::JSBigString : public facebook::jsi::Buffer {
public ~JSBigString() override = default;
}

class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode<facebook::react::LayoutConformanceShadowNodeComponentName, facebook::react::YogaLayoutableShadowNode, facebook::react::LayoutConformanceProps> {
}

class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode {
public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);
Expand Down Expand Up @@ -5452,12 +5447,6 @@ struct facebook::react::ImageURLLoaderAttribution {
public std::string queryRootName;
}

struct facebook::react::LayoutConformanceProps : public facebook::react::YogaStylableProps {
public LayoutConformanceProps() = default;
public LayoutConformanceProps(const facebook::react::PropsParserContext& context, const facebook::react::LayoutConformanceProps& sourceProps, const facebook::react::RawProps& rawProps);
public facebook::react::LayoutConformance mode;
}

struct facebook::react::LayoutConstraints {
public facebook::react::LayoutDirection layoutDirection;
public facebook::react::Size clamp(const facebook::react::Size& size) const;
Expand Down
Loading
Loading