diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/React/NativeModuleCore.h b/packages/react-native/ReactCommon/react/nativemodule/core/React/NativeModuleCore.h index 3428575914d7..3c94e2cadd66 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/React/NativeModuleCore.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/React/NativeModuleCore.h @@ -33,13 +33,11 @@ #include #include -#include #include #include #include #ifdef ANDROID -#include #include #endif diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h index ca0990fd4f63..dc3d64711d2b 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h @@ -7,15 +7,14 @@ #pragma once -#include +#include #include #include +#include #include -#include - namespace facebook::react { class BridgelessNativeModuleProxy; diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h index 14a0a95b6456..59756d18ffa8 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h @@ -7,19 +7,17 @@ #pragma once -#include +#include #ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP #include #include -#include +#include #include #include -#include "JavaTurboModule.h" - namespace facebook::react { class JSI_EXPORT JavaInteropTurboModule : public JavaTurboModule { diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTInteropTurboModule.h b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTInteropTurboModule.h index 957be1e85147..2b6ccc8847f9 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTInteropTurboModule.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTInteropTurboModule.h @@ -7,6 +7,8 @@ #pragma once +#include + #ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP #import diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm index 10f87ec53f89..83cfe2308b63 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm @@ -28,6 +28,7 @@ #import #import #import +#import #import using namespace facebook; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt index 7e2cf030f990..6e05d8d09599 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt @@ -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 diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceComponentDescriptor.h index 55b3389958fc..62dab54cd3c2 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceComponentDescriptor.h @@ -7,10 +7,10 @@ #pragma once -#include +#include +#include #include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceProps.h b/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceProps.h index d66dfbfee722..41aef7005ef6 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceProps.h @@ -7,11 +7,10 @@ #pragma once -#include +#include -#include -#include -#include +#include +#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceShadowNode.h index 40eb27a32865..00bb83485360 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/LayoutConformanceShadowNode.h @@ -7,11 +7,10 @@ #pragma once -#include +#include -#include +#include #include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/React/View.h b/packages/react-native/ReactCommon/react/renderer/components/view/React/View.h index ce20d40aa0c6..40ce388c76f0 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/React/View.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/React/View.h @@ -41,9 +41,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -55,6 +52,7 @@ #include #include #include +#include #include #undef RN_UMBRELLA_CONTEXT diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index bf17995a1b2e..d76ed6d96171 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -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; @@ -424,7 +423,6 @@ using facebook::react::GradientDirection = std::variant; -using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; @@ -1685,19 +1683,6 @@ class facebook::react::JWritableMapBuffer : public facebook::jni::JavaClass& methodDescriptors); - public virtual std::vector getPropertyNames(facebook::jsi::Runtime& runtime) override; -} - -struct facebook::react::JavaInteropTurboModule::MethodDescriptor { - public facebook::react::TurboModuleMethodValueKind jsiReturnKind; - public int jsArgCount; - public std::string jniSignature; - public std::string methodName; -} - class facebook::react::JavaMessageQueueThread : public facebook::jni::JavaClass { public static constexpr auto kJavaDescriptor; } @@ -1724,9 +1709,6 @@ struct facebook::react::JavaTurboModule::InitParams { public std::string moduleName; } -class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { -} - 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); @@ -2489,12 +2471,6 @@ struct facebook::react::TurboModule::MethodMetadata { public size_t argCount; } -class facebook::react::TurboModuleBinding { - public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public ~TurboModuleBinding(); -} - class facebook::react::TurboModuleManager : public jni::HybridClass { public static constexpr auto kJavaDescriptor; public static jni::local_ref initHybrid(jni::alias_ref, jni::alias_ref jsCallInvokerHolder, jni::alias_ref nativeMethodCallInvokerHolder, jni::alias_ref delegate); @@ -3375,12 +3351,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; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api index 29e51c6d11da..b9451cb7a6b9 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -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; @@ -424,7 +423,6 @@ using facebook::react::GradientDirection = std::variant; -using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; @@ -1684,19 +1682,6 @@ class facebook::react::JWritableMapBuffer : public facebook::jni::JavaClass& methodDescriptors); - public virtual std::vector getPropertyNames(facebook::jsi::Runtime& runtime) override; -} - -struct facebook::react::JavaInteropTurboModule::MethodDescriptor { - public facebook::react::TurboModuleMethodValueKind jsiReturnKind; - public int jsArgCount; - public std::string jniSignature; - public std::string methodName; -} - class facebook::react::JavaMessageQueueThread : public facebook::jni::JavaClass { public static constexpr auto kJavaDescriptor; } @@ -1723,9 +1708,6 @@ struct facebook::react::JavaTurboModule::InitParams { public std::string moduleName; } -class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { -} - 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); @@ -2482,12 +2464,6 @@ struct facebook::react::TurboModule::MethodMetadata { public size_t argCount; } -class facebook::react::TurboModuleBinding { - public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public ~TurboModuleBinding(); -} - class facebook::react::TurboModuleManager : public jni::HybridClass { public static constexpr auto kJavaDescriptor; public static jni::local_ref initHybrid(jni::alias_ref, jni::alias_ref jsCallInvokerHolder, jni::alias_ref nativeMethodCallInvokerHolder, jni::alias_ref delegate); @@ -3368,12 +3344,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; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index 29e51c6d11da..b9451cb7a6b9 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -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; @@ -424,7 +423,6 @@ using facebook::react::GradientDirection = std::variant; -using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; @@ -1684,19 +1682,6 @@ class facebook::react::JWritableMapBuffer : public facebook::jni::JavaClass& methodDescriptors); - public virtual std::vector getPropertyNames(facebook::jsi::Runtime& runtime) override; -} - -struct facebook::react::JavaInteropTurboModule::MethodDescriptor { - public facebook::react::TurboModuleMethodValueKind jsiReturnKind; - public int jsArgCount; - public std::string jniSignature; - public std::string methodName; -} - class facebook::react::JavaMessageQueueThread : public facebook::jni::JavaClass { public static constexpr auto kJavaDescriptor; } @@ -1723,9 +1708,6 @@ struct facebook::react::JavaTurboModule::InitParams { public std::string moduleName; } -class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { -} - 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); @@ -2482,12 +2464,6 @@ struct facebook::react::TurboModule::MethodMetadata { public size_t argCount; } -class facebook::react::TurboModuleBinding { - public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public ~TurboModuleBinding(); -} - class facebook::react::TurboModuleManager : public jni::HybridClass { public static constexpr auto kJavaDescriptor; public static jni::local_ref initHybrid(jni::alias_ref, jni::alias_ref jsCallInvokerHolder, jni::alias_ref nativeMethodCallInvokerHolder, jni::alias_ref delegate); @@ -3368,12 +3344,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; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index ff1bf08374f5..4c1d41d6e1a5 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -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; @@ -3210,7 +3209,6 @@ using facebook::react::GradientDirection = std::variant; -using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; @@ -4018,9 +4016,6 @@ class facebook::react::JSBigString : public facebook::jsi::Buffer { public ~JSBigString() override = default; } -class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { -} - 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); @@ -4364,22 +4359,6 @@ class facebook::react::NativeWebSocketModuleSpecJSI : public facebook::react::Ob public NativeWebSocketModuleSpecJSI(const facebook::react::ObjCTurboModule::InitParams& params); } -class facebook::react::ObjCInteropTurboModule : public facebook::react::ObjCTurboModule { - protected virtual NSString* getArgumentTypeName(facebook::jsi::Runtime& runtime, NSString* methodName, int argIndex) override; - protected virtual facebook::jsi::Value convertReturnIdToJSIValue(facebook::jsi::Runtime& runtime, const char* methodName, facebook::react::TurboModuleMethodValueKind returnType, id result) override; - protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override; - protected virtual void setInvocationArg(facebook::jsi::Runtime& runtime, const char* methodName, const std::string& objCArgType, const facebook::jsi::Value& arg, size_t i, NSInvocation* inv, NSMutableArray* retainedObjectsForInvocation, bool mustCopyBytes) override; - public ObjCInteropTurboModule(const facebook::react::ObjCTurboModule::InitParams& params); - public virtual std::vector getPropertyNames(facebook::jsi::Runtime& runtime) override; -} - -struct facebook::react::ObjCInteropTurboModule::MethodDescriptor { - public SEL selector; - public facebook::react::TurboModuleMethodValueKind jsReturnKind; - public size_t jsArgCount; - public std::string methodName; -} - class facebook::react::ObjCTurboModule : public facebook::react::TurboModule { protected virtual NSString* getArgumentTypeName(facebook::jsi::Runtime& runtime, NSString* methodName, int argIndex); protected virtual facebook::jsi::Value convertReturnIdToJSIValue(facebook::jsi::Runtime& runtime, const char* methodName, facebook::react::TurboModuleMethodValueKind returnType, id result); @@ -4723,12 +4702,6 @@ struct facebook::react::TurboModule::MethodMetadata { public size_t argCount; } -class facebook::react::TurboModuleBinding { - public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public ~TurboModuleBinding(); -} - class facebook::react::TurboModuleWithJSIBindings { public static void installJSIBindings(const std::shared_ptr& cxxModule, facebook::jsi::Runtime& runtime); public virtual ~TurboModuleWithJSIBindings() = default; @@ -5459,12 +5432,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; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index c47fe92de8f6..5cf56f955825 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -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; @@ -3202,7 +3201,6 @@ using facebook::react::GradientDirection = std::variant; -using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; @@ -4009,9 +4007,6 @@ class facebook::react::JSBigString : public facebook::jsi::Buffer { public ~JSBigString() override = default; } -class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { -} - 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); @@ -4355,22 +4350,6 @@ class facebook::react::NativeWebSocketModuleSpecJSI : public facebook::react::Ob public NativeWebSocketModuleSpecJSI(const facebook::react::ObjCTurboModule::InitParams& params); } -class facebook::react::ObjCInteropTurboModule : public facebook::react::ObjCTurboModule { - protected virtual NSString* getArgumentTypeName(facebook::jsi::Runtime& runtime, NSString* methodName, int argIndex) override; - protected virtual facebook::jsi::Value convertReturnIdToJSIValue(facebook::jsi::Runtime& runtime, const char* methodName, facebook::react::TurboModuleMethodValueKind returnType, id result) override; - protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override; - protected virtual void setInvocationArg(facebook::jsi::Runtime& runtime, const char* methodName, const std::string& objCArgType, const facebook::jsi::Value& arg, size_t i, NSInvocation* inv, NSMutableArray* retainedObjectsForInvocation, bool mustCopyBytes) override; - public ObjCInteropTurboModule(const facebook::react::ObjCTurboModule::InitParams& params); - public virtual std::vector getPropertyNames(facebook::jsi::Runtime& runtime) override; -} - -struct facebook::react::ObjCInteropTurboModule::MethodDescriptor { - public SEL selector; - public facebook::react::TurboModuleMethodValueKind jsReturnKind; - public size_t jsArgCount; - public std::string methodName; -} - class facebook::react::ObjCTurboModule : public facebook::react::TurboModule { protected virtual NSString* getArgumentTypeName(facebook::jsi::Runtime& runtime, NSString* methodName, int argIndex); protected virtual facebook::jsi::Value convertReturnIdToJSIValue(facebook::jsi::Runtime& runtime, const char* methodName, facebook::react::TurboModuleMethodValueKind returnType, id result); @@ -4708,12 +4687,6 @@ struct facebook::react::TurboModule::MethodMetadata { public size_t argCount; } -class facebook::react::TurboModuleBinding { - public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public ~TurboModuleBinding(); -} - class facebook::react::TurboModuleWithJSIBindings { public static void installJSIBindings(const std::shared_ptr& cxxModule, facebook::jsi::Runtime& runtime); public virtual ~TurboModuleWithJSIBindings() = default; @@ -5444,12 +5417,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; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index 065b2049a3d8..042d96bda851 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -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; @@ -3210,7 +3209,6 @@ using facebook::react::GradientDirection = std::variant; -using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; using facebook::react::ModalHostViewSupportedOrientationsMask = uint32_t; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; @@ -4017,9 +4015,6 @@ class facebook::react::JSBigString : public facebook::jsi::Buffer { public ~JSBigString() override = default; } -class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { -} - 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); @@ -4363,22 +4358,6 @@ class facebook::react::NativeWebSocketModuleSpecJSI : public facebook::react::Ob public NativeWebSocketModuleSpecJSI(const facebook::react::ObjCTurboModule::InitParams& params); } -class facebook::react::ObjCInteropTurboModule : public facebook::react::ObjCTurboModule { - protected virtual NSString* getArgumentTypeName(facebook::jsi::Runtime& runtime, NSString* methodName, int argIndex) override; - protected virtual facebook::jsi::Value convertReturnIdToJSIValue(facebook::jsi::Runtime& runtime, const char* methodName, facebook::react::TurboModuleMethodValueKind returnType, id result) override; - protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override; - protected virtual void setInvocationArg(facebook::jsi::Runtime& runtime, const char* methodName, const std::string& objCArgType, const facebook::jsi::Value& arg, size_t i, NSInvocation* inv, NSMutableArray* retainedObjectsForInvocation, bool mustCopyBytes) override; - public ObjCInteropTurboModule(const facebook::react::ObjCTurboModule::InitParams& params); - public virtual std::vector getPropertyNames(facebook::jsi::Runtime& runtime) override; -} - -struct facebook::react::ObjCInteropTurboModule::MethodDescriptor { - public SEL selector; - public facebook::react::TurboModuleMethodValueKind jsReturnKind; - public size_t jsArgCount; - public std::string methodName; -} - class facebook::react::ObjCTurboModule : public facebook::react::TurboModule { protected virtual NSString* getArgumentTypeName(facebook::jsi::Runtime& runtime, NSString* methodName, int argIndex); protected virtual facebook::jsi::Value convertReturnIdToJSIValue(facebook::jsi::Runtime& runtime, const char* methodName, facebook::react::TurboModuleMethodValueKind returnType, id result); @@ -4716,12 +4695,6 @@ struct facebook::react::TurboModule::MethodMetadata { public size_t argCount; } -class facebook::react::TurboModuleBinding { - public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public ~TurboModuleBinding(); -} - class facebook::react::TurboModuleWithJSIBindings { public static void installJSIBindings(const std::shared_ptr& cxxModule, facebook::jsi::Runtime& runtime); public virtual ~TurboModuleWithJSIBindings() = default; @@ -5452,12 +5425,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; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index 6fd1e1a03a36..2d9927d6f131 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -73,7 +73,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; @@ -108,7 +107,6 @@ using facebook::react::GradientDirection = std::variant; -using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; using facebook::react::RawPropsPropNameHash = uint32_t; @@ -833,9 +831,6 @@ class facebook::react::JSBigString : public facebook::jsi::Buffer { public ~JSBigString() override = default; } -class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { -} - 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); @@ -1207,12 +1202,6 @@ struct facebook::react::TurboModule::MethodMetadata { public size_t argCount; } -class facebook::react::TurboModuleBinding { - public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public ~TurboModuleBinding(); -} - class facebook::react::TurboModuleWithJSIBindings { public static void installJSIBindings(const std::shared_ptr& cxxModule, facebook::jsi::Runtime& runtime); public virtual ~TurboModuleWithJSIBindings() = default; @@ -1842,12 +1831,6 @@ struct facebook::react::FilterFunction { public std::variant parameters; } -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; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api index e384134caa94..b41bd139b9c2 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api @@ -73,7 +73,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; @@ -108,7 +107,6 @@ using facebook::react::GradientDirection = std::variant; -using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; using facebook::react::RawPropsPropNameHash = uint32_t; @@ -832,9 +830,6 @@ class facebook::react::JSBigString : public facebook::jsi::Buffer { public ~JSBigString() override = default; } -class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { -} - 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); @@ -1200,12 +1195,6 @@ struct facebook::react::TurboModule::MethodMetadata { public size_t argCount; } -class facebook::react::TurboModuleBinding { - public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public ~TurboModuleBinding(); -} - class facebook::react::TurboModuleWithJSIBindings { public static void installJSIBindings(const std::shared_ptr& cxxModule, facebook::jsi::Runtime& runtime); public virtual ~TurboModuleWithJSIBindings() = default; @@ -1835,12 +1824,6 @@ struct facebook::react::FilterFunction { public std::variant parameters; } -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; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index e384134caa94..b41bd139b9c2 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -73,7 +73,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; @@ -108,7 +107,6 @@ using facebook::react::GradientDirection = std::variant; -using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; using facebook::react::RawPropsPropNameHash = uint32_t; @@ -832,9 +830,6 @@ class facebook::react::JSBigString : public facebook::jsi::Buffer { public ~JSBigString() override = default; } -class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode { -} - 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); @@ -1200,12 +1195,6 @@ struct facebook::react::TurboModule::MethodMetadata { public size_t argCount; } -class facebook::react::TurboModuleBinding { - public static void install(facebook::jsi::Runtime& runtime, TurboModuleProviderFunctionType&& moduleProvider, TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr longLivedObjectCollection = nullptr); - public ~TurboModuleBinding(); -} - class facebook::react::TurboModuleWithJSIBindings { public static void installJSIBindings(const std::shared_ptr& cxxModule, facebook::jsi::Runtime& runtime); public virtual ~TurboModuleWithJSIBindings() = default; @@ -1835,12 +1824,6 @@ struct facebook::react::FilterFunction { public std::variant parameters; } -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;