Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,11 @@

#include <ReactCommon/CxxTurboModuleUtils.h>
#include <ReactCommon/TurboModule.h>
#include <ReactCommon/TurboModuleBinding.h>
#include <ReactCommon/TurboModulePerfLogger.h>
#include <ReactCommon/TurboModuleUtils.h>
#include <ReactCommon/TurboModuleWithJSIBindings.h>

#ifdef ANDROID
#include <ReactCommon/JavaInteropTurboModule.h>
#include <ReactCommon/JavaTurboModule.h>
#endif

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@

#pragma once

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

#include <string>

#include <React/Bridging.h>
#include <React/NativeModuleCore.h>
#include <jsi/jsi.h>

#include <ReactCommon/TurboModule.h>

namespace facebook::react {

class BridgelessNativeModuleProxy;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@

#pragma once

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

#ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP

#include <string>
#include <vector>

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

#include "JavaTurboModule.h"

namespace facebook::react {

class JSI_EXPORT JavaInteropTurboModule : public JavaTurboModule {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/FrameworksGuard.h>

#ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP

#import <string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#import <React/RCTUtils.h>
#import <ReactCommon/CxxTurboModuleUtils.h>
#import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
#import <ReactCommon/TurboModuleBinding.h>
#import <ReactCommon/TurboModulePerfLogger.h>

using namespace facebook;
Expand Down
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
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
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
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
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
30 changes: 0 additions & 30 deletions scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api
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 @@ -1685,19 +1683,6 @@ class facebook::react::JWritableMapBuffer : public facebook::jni::JavaClass<face
public static constexpr auto kJavaDescriptor;
}

class facebook::react::JavaInteropTurboModule : public facebook::react::JavaTurboModule {
protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override;
public JavaInteropTurboModule(const facebook::react::JavaTurboModule::InitParams& params, const std::vector<facebook::react::JavaInteropTurboModule::MethodDescriptor>& methodDescriptors);
public virtual std::vector<facebook::jsi::PropNameID> 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<facebook::react::JavaMessageQueueThread> {
public static constexpr auto kJavaDescriptor;
}
Expand All @@ -1724,9 +1709,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 @@ -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<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
public ~TurboModuleBinding();
}

class facebook::react::TurboModuleManager : public jni::HybridClass<facebook::react::TurboModuleManager> {
public static constexpr auto kJavaDescriptor;
public static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>, jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder, jni::alias_ref<NativeMethodCallInvokerHolder::javaobject> nativeMethodCallInvokerHolder, jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
Expand Down Expand Up @@ -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;
Expand Down
30 changes: 0 additions & 30 deletions scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api
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 @@ -1684,19 +1682,6 @@ class facebook::react::JWritableMapBuffer : public facebook::jni::JavaClass<face
public static constexpr auto kJavaDescriptor;
}

class facebook::react::JavaInteropTurboModule : public facebook::react::JavaTurboModule {
protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override;
public JavaInteropTurboModule(const facebook::react::JavaTurboModule::InitParams& params, const std::vector<facebook::react::JavaInteropTurboModule::MethodDescriptor>& methodDescriptors);
public virtual std::vector<facebook::jsi::PropNameID> 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<facebook::react::JavaMessageQueueThread> {
public static constexpr auto kJavaDescriptor;
}
Expand All @@ -1723,9 +1708,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 @@ -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<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
public ~TurboModuleBinding();
}

class facebook::react::TurboModuleManager : public jni::HybridClass<facebook::react::TurboModuleManager> {
public static constexpr auto kJavaDescriptor;
public static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>, jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder, jni::alias_ref<NativeMethodCallInvokerHolder::javaobject> nativeMethodCallInvokerHolder, jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
Expand Down Expand Up @@ -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;
Expand Down
30 changes: 0 additions & 30 deletions scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api
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 @@ -1684,19 +1682,6 @@ class facebook::react::JWritableMapBuffer : public facebook::jni::JavaClass<face
public static constexpr auto kJavaDescriptor;
}

class facebook::react::JavaInteropTurboModule : public facebook::react::JavaTurboModule {
protected virtual facebook::jsi::Value create(facebook::jsi::Runtime& runtime, const facebook::jsi::PropNameID& propName) override;
public JavaInteropTurboModule(const facebook::react::JavaTurboModule::InitParams& params, const std::vector<facebook::react::JavaInteropTurboModule::MethodDescriptor>& methodDescriptors);
public virtual std::vector<facebook::jsi::PropNameID> 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<facebook::react::JavaMessageQueueThread> {
public static constexpr auto kJavaDescriptor;
}
Expand All @@ -1723,9 +1708,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 @@ -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<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
public static void install(facebook::jsi::Runtime& runtime, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider, facebook::react::TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider = nullptr, std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection = nullptr);
public ~TurboModuleBinding();
}

class facebook::react::TurboModuleManager : public jni::HybridClass<facebook::react::TurboModuleManager> {
public static constexpr auto kJavaDescriptor;
public static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>, jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder, jni::alias_ref<NativeMethodCallInvokerHolder::javaobject> nativeMethodCallInvokerHolder, jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
Expand Down Expand Up @@ -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;
Expand Down
Loading
Loading