From fd150efa299e3d812c6107acc96bbad7494a0648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= Date: Tue, 31 Mar 2026 08:32:57 -0700 Subject: [PATCH] Exclude Android specific symbols from the ReactApple snapshot (#56243) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/56243 Modifies C++ API parser config to accept `exclude_symbols` at the platform level and sets `Android` symbols to be excluded from the ReactApple snapshot. Changelog: [Internal] Reviewed By: cipolleschi Differential Revision: D98298766 fbshipit-source-id: 70b39fe4935e6791701c173e7c9e12532c2817a5 --- .../api-snapshots/ReactAppleDebugCxx.api | 381 +----------------- .../api-snapshots/ReactAppleReleaseCxx.api | 351 +--------------- scripts/cxx-api/config.yml | 4 + scripts/cxx-api/parser/config.py | 13 +- scripts/cxx-api/tests/test_config.py | 58 +++ 5 files changed, 75 insertions(+), 732 deletions(-) diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index 7b251fe2c83..75ffea4aa1e 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -2946,25 +2946,6 @@ protocol NativeWebSocketModuleSpec : public NSObjectRCTBridgeModule, public RCTT protocol RCTActivityIndicatorViewViewProtocol : public NSObject { } -protocol RCTAndroidDrawerLayoutViewProtocol : public NSObject { - public virtual void closeDrawer(); - public virtual void openDrawer(); -} - -protocol RCTAndroidHorizontalScrollContentViewViewProtocol : public NSObject { -} - -protocol RCTAndroidProgressBarViewProtocol : public NSObject { -} - -protocol RCTAndroidSwipeRefreshLayoutViewProtocol : public NSObject { - public virtual void setNativeRefreshing:(BOOL value); -} - -protocol RCTAndroidSwitchViewProtocol : public NSObject { - public virtual void setNativeValue:(BOOL value); -} - protocol RCTAnimatedImage : public NSObject { public @property (assign, readonly) NSUInteger animatedImageFrameCount; public @property (assign, readonly) NSUInteger animatedImageLoopCount; @@ -3806,13 +3787,10 @@ class facebook::hermes::IHermesSHUnit : public facebook::jsi::ICast { } -const char facebook::react::AndroidProgressBarComponentName[]; -const char facebook::react::AndroidSwitchComponentName[]; const char facebook::react::AppleSwitchComponentName[]; const char facebook::react::ImageComponentName[]; const char facebook::react::ImageManagerKey[]; const char facebook::react::InputAccessoryComponentName[]; -const char facebook::react::LegacyViewManagerAndroidInteropComponentName[]; const char facebook::react::LegacyViewManagerInteropComponentName[]; const char facebook::react::ModalHostViewComponentName[]; const char facebook::react::ParagraphComponentName[]; @@ -3869,12 +3847,6 @@ using facebook::react::ActivePointerRegistry = std::unordered_map; using facebook::react::ActivityIndicatorViewShadowNode = facebook::react::ConcreteViewShadowNode; using facebook::react::ActivityIndicatorViewState = facebook::react::StateData; -using facebook::react::AndroidDrawerLayoutComponentDescriptor = facebook::react::ConcreteComponentDescriptor; -using facebook::react::AndroidDrawerLayoutShadowNode = facebook::react::ConcreteViewShadowNode; -using facebook::react::AndroidDrawerLayoutState = facebook::react::StateData; -using facebook::react::AndroidSwipeRefreshLayoutComponentDescriptor = facebook::react::ConcreteComponentDescriptor; -using facebook::react::AndroidSwipeRefreshLayoutShadowNode = facebook::react::ConcreteViewShadowNode; -using facebook::react::AndroidSwipeRefreshLayoutState = facebook::react::StateData; using facebook::react::AnimationEndCallback = facebook::react::AsyncCallback; using facebook::react::AnimationTimestamp = std::chrono::duration; using facebook::react::BackgroundExecutor = std::function&& callback)>; @@ -3938,7 +3910,6 @@ using facebook::react::InteractionTypesMap = std::unordered_map& invokee, std::function errorMessageProducer)>; using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; -using facebook::react::LegacyViewManagerAndroidInteropShadowNode = facebook::react::ConcreteViewShadowNode; using facebook::react::LegacyViewManagerInteropShadowNode = facebook::react::ConcreteViewShadowNode; using facebook::react::LineMeasureCache = facebook::react::SimpleThreadSafeCache; using facebook::react::LinesMeasurements = std::vector; @@ -4458,8 +4429,6 @@ facebook::react::RectangleEdges facebook::react::operator+(const facebook::re template facebook::react::RectangleEdges facebook::react::operator-(const facebook::react::RectangleEdges& lhs, const facebook::react::RectangleEdges& rhs) noexcept; JSI_EXPORT const char facebook::react::ActivityIndicatorViewComponentName[]; -JSI_EXPORT const char facebook::react::AndroidDrawerLayoutComponentName[]; -JSI_EXPORT const char facebook::react::AndroidSwipeRefreshLayoutComponentName[]; JSI_EXPORT const char facebook::react::DebuggingOverlayComponentName[]; JSI_EXPORT const char facebook::react::PullToRefreshViewComponentName[]; JSI_EXPORT const char facebook::react::UnimplementedNativeViewComponentName[]; @@ -4512,139 +4481,6 @@ class facebook::react::AdditionAnimatedNode : public facebook::react::OperatorAn public virtual void update() override; } -class facebook::react::AndroidDrawerLayoutEventEmitter : public facebook::react::BaseViewEventEmitter { - public void onDrawerClose(facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerClose value) const; - public void onDrawerOpen(facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerOpen value) const; - public void onDrawerSlide(facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerSlide value) const; - public void onDrawerStateChanged(facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerStateChanged value) const; -} - -struct facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerClose { -} - -struct facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerOpen { -} - -struct facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerSlide { - public facebook::react::Float offset; -} - -struct facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerStateChanged { - public int drawerState; -} - -class facebook::react::AndroidDrawerLayoutProps : public facebook::react::HostPlatformViewProps { - public AndroidDrawerLayoutProps() = default; - public AndroidDrawerLayoutProps(const facebook::react::PropsParserContext& context, const facebook::react::AndroidDrawerLayoutProps& sourceProps, const facebook::react::RawProps& rawProps); - public facebook::react::AndroidDrawerLayoutDrawerLockMode drawerLockMode; - public facebook::react::AndroidDrawerLayoutDrawerPosition drawerPosition; - public facebook::react::AndroidDrawerLayoutKeyboardDismissMode keyboardDismissMode; - public facebook::react::Float drawerWidth; - public facebook::react::SharedColor drawerBackgroundColor; - public facebook::react::SharedColor statusBarBackgroundColor; -} - -class facebook::react::AndroidHorizontalScrollContentViewEventEmitter : public facebook::react::BaseViewEventEmitter { -} - -class facebook::react::AndroidHorizontalScrollContentViewProps : public facebook::react::HostPlatformViewProps { - public AndroidHorizontalScrollContentViewProps() = default; - public AndroidHorizontalScrollContentViewProps(const facebook::react::PropsParserContext& context, const facebook::react::AndroidHorizontalScrollContentViewProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool removeClippedSubviews; -} - -class facebook::react::AndroidProgressBarComponentDescriptor : public facebook::react::ConcreteComponentDescriptor { - public AndroidProgressBarComponentDescriptor(const facebook::react::ComponentDescriptorParameters& parameters); - public virtual void adopt(facebook::react::ShadowNode& shadowNode) const override; -} - -class facebook::react::AndroidProgressBarEventEmitter : public facebook::react::BaseViewEventEmitter { -} - -class facebook::react::AndroidProgressBarMeasurementsManager { - public AndroidProgressBarMeasurementsManager(const std::shared_ptr& contextContainer); - public facebook::react::Size measure(facebook::react::SurfaceId surfaceId, const facebook::react::AndroidProgressBarProps& props, facebook::react::LayoutConstraints layoutConstraints) const; -} - -class facebook::react::AndroidProgressBarProps : public facebook::react::HostPlatformViewProps { - public AndroidProgressBarProps() = default; - public AndroidProgressBarProps(const facebook::react::PropsParserContext& context, const facebook::react::AndroidProgressBarProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool animating; - public bool indeterminate; - public double progress; - public facebook::react::SharedColor color; - public std::string styleAttr; - public std::string testID; - public std::string typeAttr; -} - -class facebook::react::AndroidProgressBarShadowNode : public facebook::react::ConcreteViewShadowNode { - public AndroidProgressBarShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); - public AndroidProgressBarShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); - public static facebook::react::ShadowNodeTraits BaseTraits(); - public virtual facebook::react::Size measureContent(const facebook::react::LayoutContext& layoutContext, const facebook::react::LayoutConstraints& layoutConstraints) const override; - public void setAndroidProgressBarMeasurementsManager(const std::shared_ptr& measurementsManager); -} - -class facebook::react::AndroidSwipeRefreshLayoutEventEmitter : public facebook::react::BaseViewEventEmitter { - public void onRefresh(facebook::react::AndroidSwipeRefreshLayoutEventEmitter::OnRefresh value) const; -} - -struct facebook::react::AndroidSwipeRefreshLayoutEventEmitter::OnRefresh { -} - -class facebook::react::AndroidSwipeRefreshLayoutProps : public facebook::react::HostPlatformViewProps { - public AndroidSwipeRefreshLayoutProps() = default; - public AndroidSwipeRefreshLayoutProps(const facebook::react::PropsParserContext& context, const facebook::react::AndroidSwipeRefreshLayoutProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool enabled; - public bool refreshing; - public facebook::react::AndroidSwipeRefreshLayoutSize size; - public facebook::react::Float progressViewOffset; - public facebook::react::SharedColor progressBackgroundColor; - public std::vector colors; -} - -class facebook::react::AndroidSwitchComponentDescriptor : public facebook::react::ConcreteComponentDescriptor { - public AndroidSwitchComponentDescriptor(const facebook::react::ComponentDescriptorParameters& parameters); - public virtual void adopt(facebook::react::ShadowNode& shadowNode) const override; -} - -class facebook::react::AndroidSwitchEventEmitter : public facebook::react::BaseViewEventEmitter { - public void onChange(facebook::react::AndroidSwitchEventEmitter::OnChange value) const; -} - -struct facebook::react::AndroidSwitchEventEmitter::OnChange { - public bool value; - public int target; -} - -class facebook::react::AndroidSwitchMeasurementsManager { - public AndroidSwitchMeasurementsManager(const std::shared_ptr& contextContainer); - public facebook::react::Size measure(facebook::react::SurfaceId surfaceId, facebook::react::LayoutConstraints layoutConstraints) const; -} - -class facebook::react::AndroidSwitchProps : public facebook::react::HostPlatformViewProps { - public AndroidSwitchProps() = default; - public AndroidSwitchProps(const facebook::react::PropsParserContext& context, const facebook::react::AndroidSwitchProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool disabled; - public bool enabled; - public bool on; - public bool value; - public facebook::react::SharedColor thumbColor; - public facebook::react::SharedColor thumbTintColor; - public facebook::react::SharedColor trackColorForFalse; - public facebook::react::SharedColor trackColorForTrue; - public facebook::react::SharedColor trackTintColor; -} - -class facebook::react::AndroidSwitchShadowNode : public facebook::react::ConcreteViewShadowNode { - public AndroidSwitchShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); - public AndroidSwitchShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); - public static facebook::react::ShadowNodeTraits BaseTraits(); - public virtual facebook::react::Size measureContent(const facebook::react::LayoutContext& layoutContext, const facebook::react::LayoutConstraints& layoutConstraints) const override; - public void setAndroidSwitchMeasurementsManager(const std::shared_ptr& measurementsManager); -} - class facebook::react::AnimatedModule : public facebook::react::NativeAnimatedModuleCxxSpec, public facebook::react::TurboModuleWithJSIBindings { public AnimatedModule(std::shared_ptr jsInvoker, std::shared_ptr nodesManagerProvider); public void addAnimatedEventToView(facebook::jsi::Runtime& rt, facebook::react::Tag viewTag, std::string eventName, facebook::jsi::Object eventMapping); @@ -8729,7 +8565,7 @@ class facebook::react::UnimplementedViewProps : public facebook::react::HostPlat public void setComponentName(facebook::react::ComponentName componentName); } -class facebook::react::UnstableLegacyViewManagerAutomaticComponentDescriptor : public facebook::react::ConcreteComponentDescriptor { +class facebook::react::UnstableLegacyViewManagerAutomaticComponentDescriptor : public facebook::react::ConcreteComponentDescriptor { public UnstableLegacyViewManagerAutomaticComponentDescriptor(const facebook::react::ComponentDescriptorParameters& parameters, facebook::react::RawPropsParser&& rawPropsParser = {}); public UnstableLegacyViewManagerAutomaticComponentDescriptor(const facebook::react::ComponentDescriptorParameters& parameters, std::string legacyComponentName); public virtual facebook::react::ComponentHandle getComponentHandle() const override; @@ -8993,27 +8829,6 @@ enum facebook::react::ActivityIndicatorViewSize { Small, } -enum facebook::react::AndroidDrawerLayoutDrawerLockMode { - LockedClosed, - LockedOpen, - Unlocked, -} - -enum facebook::react::AndroidDrawerLayoutDrawerPosition { - Left, - Right, -} - -enum facebook::react::AndroidDrawerLayoutKeyboardDismissMode { - None, - OnDrag, -} - -enum facebook::react::AndroidSwipeRefreshLayoutSize { - Default, - Large, -} - enum facebook::react::AnimatedNodeType { Addition, Color, @@ -11520,23 +11335,6 @@ struct facebook::react::NativePerformanceRawPerformanceEntry { public bool operator==(const facebook::react::NativePerformanceRawPerformanceEntry& other) const; } -template -struct facebook::react::NativePlatformConstantsAndroidPlatformConstantsAndroid { - public P0 isTesting; - public P1 isDisableAnimations; - public P2 reactNativeVersion; - public P3 Version; - public P4 Release; - public P5 Serial; - public P6 Fingerprint; - public P7 Model; - public P8 ServerHost; - public P9 uiMode; - public P10 Brand; - public P11 Manufacturer; - public bool operator==(const facebook::react::NativePlatformConstantsAndroidPlatformConstantsAndroid& other) const; -} - template struct facebook::react::NativeAlertManagerArgs { public P0 title; @@ -11592,18 +11390,6 @@ struct facebook::react::NativePlatformConstantsIOSPlatformConstantsIOS { public bool operator==(const facebook::react::NativePlatformConstantsIOSPlatformConstantsIOS& other) const; } -template -struct facebook::react::NativeDialogManagerAndroidDialogOptions { - public P0 title; - public P1 message; - public P2 buttonPositive; - public P3 buttonNegative; - public P4 buttonNeutral; - public P5 items; - public P6 cancelable; - public bool operator==(const facebook::react::NativeDialogManagerAndroidDialogOptions& other) const; -} - template struct facebook::react::NativeIntersectionObserverNativeIntersectionObserverEntry { public P0 intersectionObserverId; @@ -11627,16 +11413,6 @@ struct facebook::react::NativeIntersectionObserverNativeIntersectionObserverObse public bool operator==(const facebook::react::NativeIntersectionObserverNativeIntersectionObserverObserveOptions& other) const; } -template -struct facebook::react::NativeDeviceInfoDisplayMetricsAndroid { - public P0 width; - public P1 height; - public P2 scale; - public P3 fontScale; - public P4 densityDpi; - public bool operator==(const facebook::react::NativeDeviceInfoDisplayMetricsAndroid& other) const; -} - template struct facebook::react::NativeExceptionsManagerStackFrame { public P0 column; @@ -11693,15 +11469,6 @@ struct facebook::react::NativePerformancePerformanceObserverInit { public bool operator==(const facebook::react::NativePerformancePerformanceObserverInit& other) const; } -template -struct facebook::react::NativePlatformConstantsAndroidReactNativeVersionAndroid { - public P0 major; - public P1 minor; - public P2 patch; - public P3 prerelease; - public bool operator==(const facebook::react::NativePlatformConstantsAndroidReactNativeVersionAndroid& other) const; -} - template struct facebook::react::NativeAnimatedModuleEndResult { public P0 finished; @@ -11778,13 +11545,6 @@ struct facebook::react::NativeIdleCallbacksIdleDeadline { public bool operator==(const facebook::react::NativeIdleCallbacksIdleDeadline& other) const; } -template -struct facebook::react::NativeImageLoaderAndroidImageSize { - public P0 width; - public P1 height; - public bool operator==(const facebook::react::NativeImageLoaderAndroidImageSize& other) const; -} - template struct facebook::react::NativeReactDevToolsRuntimeSettingsModulePartialReloadAndProfileConfig { public P0 shouldReloadAndProfile; @@ -12002,12 +11762,6 @@ class facebook::react::NativeDeviceInfoCxxSpec : public facebook::react::TurboMo public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeDialogManagerAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeDialogManagerAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeExceptionsManagerCxxSpec : public facebook::react::TurboModule { protected NativeExceptionsManagerCxxSpec(std::shared_ptr jsInvoker); @@ -12050,36 +11804,18 @@ class facebook::react::NativeImageEditorCxxSpec : public facebook::react::TurboM public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeImageLoaderAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeImageLoaderAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeImageLoaderIOSCxxSpec : public facebook::react::TurboModule { protected NativeImageLoaderIOSCxxSpec(std::shared_ptr jsInvoker); public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeImageStoreAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeImageStoreAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeImageStoreIOSCxxSpec : public facebook::react::TurboModule { protected NativeImageStoreIOSCxxSpec(std::shared_ptr jsInvoker); public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeIntentAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeIntentAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeIntersectionObserverCxxSpec : public facebook::react::TurboModule { protected NativeIntersectionObserverCxxSpec(std::shared_ptr jsInvoker); @@ -12128,12 +11864,6 @@ class facebook::react::NativeMutationObserverCxxSpec : public facebook::react::T public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeNetworkingAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeNetworkingAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeNetworkingIOSCxxSpec : public facebook::react::TurboModule { protected NativeNetworkingIOSCxxSpec(std::shared_ptr jsInvoker); @@ -12146,18 +11876,6 @@ class facebook::react::NativePerformanceCxxSpec : public facebook::react::TurboM public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativePermissionsAndroidCxxSpec : public facebook::react::TurboModule { - protected NativePermissionsAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - -template -class facebook::react::NativePlatformConstantsAndroidCxxSpec : public facebook::react::TurboModule { - protected NativePlatformConstantsAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativePlatformConstantsIOSCxxSpec : public facebook::react::TurboModule { protected NativePlatformConstantsIOSCxxSpec(std::shared_ptr jsInvoker); @@ -12224,12 +11942,6 @@ class facebook::react::NativeSourceCodeCxxSpec : public facebook::react::TurboMo public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeStatusBarManagerAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeStatusBarManagerAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeStatusBarManagerIOSCxxSpec : public facebook::react::TurboModule { protected NativeStatusBarManagerIOSCxxSpec(std::shared_ptr jsInvoker); @@ -12242,12 +11954,6 @@ class facebook::react::NativeTimingCxxSpec : public facebook::react::TurboModule public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeToastAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeToastAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeVibrationCxxSpec : public facebook::react::TurboModule { protected NativeVibrationCxxSpec(std::shared_ptr jsInvoker); @@ -12409,18 +12115,6 @@ struct facebook::react::NativeDeviceInfoDimensionsPayloadBridging { public static facebook::jsi::Object windowToJs(facebook::jsi::Runtime& rt, decltype(types.window) value); } -template -struct facebook::react::NativeDeviceInfoDisplayMetricsAndroidBridging { - public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); - public static T types; - public static double densityDpiToJs(facebook::jsi::Runtime& rt, decltype(types.densityDpi) value); - public static double fontScaleToJs(facebook::jsi::Runtime& rt, decltype(types.fontScale) value); - public static double heightToJs(facebook::jsi::Runtime& rt, decltype(types.height) value); - public static double scaleToJs(facebook::jsi::Runtime& rt, decltype(types.scale) value); - public static double widthToJs(facebook::jsi::Runtime& rt, decltype(types.width) value); - public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); -} - template struct facebook::react::NativeDeviceInfoDisplayMetricsBridging { public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); @@ -12432,20 +12126,6 @@ struct facebook::react::NativeDeviceInfoDisplayMetricsBridging { public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); } -template -struct facebook::react::NativeDialogManagerAndroidDialogOptionsBridging { - public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); - public static T types; - public static bool cancelableToJs(facebook::jsi::Runtime& rt, decltype(types.cancelable) value); - public static facebook::jsi::Array itemsToJs(facebook::jsi::Runtime& rt, decltype(types.items) value); - public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); - public static facebook::jsi::String buttonNegativeToJs(facebook::jsi::Runtime& rt, decltype(types.buttonNegative) value); - public static facebook::jsi::String buttonNeutralToJs(facebook::jsi::Runtime& rt, decltype(types.buttonNeutral) value); - public static facebook::jsi::String buttonPositiveToJs(facebook::jsi::Runtime& rt, decltype(types.buttonPositive) value); - public static facebook::jsi::String messageToJs(facebook::jsi::Runtime& rt, decltype(types.message) value); - public static facebook::jsi::String titleToJs(facebook::jsi::Runtime& rt, decltype(types.title) value); -} - template struct facebook::react::NativeExceptionsManagerExceptionDataBridging { public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); @@ -12512,15 +12192,6 @@ struct facebook::react::NativeImageEditorOptionsBridging { public static std::optional resizeModeToJs(facebook::jsi::Runtime& rt, decltype(types.resizeMode) value); } -template -struct facebook::react::NativeImageLoaderAndroidImageSizeBridging { - public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); - public static T types; - public static double heightToJs(facebook::jsi::Runtime& rt, decltype(types.height) value); - public static double widthToJs(facebook::jsi::Runtime& rt, decltype(types.width) value); - public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); -} - template struct facebook::react::NativeIntersectionObserverNativeIntersectionObserverEntryBridging { public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); @@ -12604,36 +12275,6 @@ struct facebook::react::NativePerformanceRawPerformanceEntryBridging { public static facebook::jsi::String nameToJs(facebook::jsi::Runtime& rt, decltype(types.name) value); } -template -struct facebook::react::NativePlatformConstantsAndroidPlatformConstantsAndroidBridging { - public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); - public static T types; - public static bool isDisableAnimationsToJs(facebook::jsi::Runtime& rt, decltype(types.isDisableAnimations) value); - public static bool isTestingToJs(facebook::jsi::Runtime& rt, decltype(types.isTesting) value); - public static double VersionToJs(facebook::jsi::Runtime& rt, decltype(types.Version) value); - public static facebook::jsi::Object reactNativeVersionToJs(facebook::jsi::Runtime& rt, decltype(types.reactNativeVersion) value); - public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); - public static facebook::jsi::String BrandToJs(facebook::jsi::Runtime& rt, decltype(types.Brand) value); - public static facebook::jsi::String FingerprintToJs(facebook::jsi::Runtime& rt, decltype(types.Fingerprint) value); - public static facebook::jsi::String ManufacturerToJs(facebook::jsi::Runtime& rt, decltype(types.Manufacturer) value); - public static facebook::jsi::String ModelToJs(facebook::jsi::Runtime& rt, decltype(types.Model) value); - public static facebook::jsi::String ReleaseToJs(facebook::jsi::Runtime& rt, decltype(types.Release) value); - public static facebook::jsi::String SerialToJs(facebook::jsi::Runtime& rt, decltype(types.Serial) value); - public static facebook::jsi::String ServerHostToJs(facebook::jsi::Runtime& rt, decltype(types.ServerHost) value); - public static facebook::jsi::String uiModeToJs(facebook::jsi::Runtime& rt, decltype(types.uiMode) value); -} - -template -struct facebook::react::NativePlatformConstantsAndroidReactNativeVersionAndroidBridging { - public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); - public static T types; - public static double majorToJs(facebook::jsi::Runtime& rt, decltype(types.major) value); - public static double minorToJs(facebook::jsi::Runtime& rt, decltype(types.minor) value); - public static double patchToJs(facebook::jsi::Runtime& rt, decltype(types.patch) value); - public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); - public static std::optional prereleaseToJs(facebook::jsi::Runtime& rt, decltype(types.prerelease) value); -} - template struct facebook::react::NativePlatformConstantsIOSPlatformConstantsIOSBridging { public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); @@ -16786,26 +16427,6 @@ struct JS::NativeDeviceInfo::DisplayMetrics::Builder::Input { protected RCTRequired width; } -struct JS::NativeDeviceInfo::DisplayMetricsAndroid { - protected NSDictionary* unsafeRawValue() const; - protected static JS::NativeDeviceInfo::DisplayMetricsAndroid fromUnsafeRawValue(NSDictionary* const v); -} - -struct JS::NativeDeviceInfo::DisplayMetricsAndroid::Builder { - protected Builder(JS::NativeDeviceInfo::DisplayMetricsAndroid i); - protected Builder(const JS::NativeDeviceInfo::DisplayMetricsAndroid::Builder::Input i); - protected NSDictionary* buildUnsafeRawValue() const; - protected using ResultT = JS::NativeDeviceInfo::DisplayMetricsAndroid; -} - -struct JS::NativeDeviceInfo::DisplayMetricsAndroid::Builder::Input { - protected RCTRequired densityDpi; - protected RCTRequired fontScale; - protected RCTRequired height; - protected RCTRequired scale; - protected RCTRequired width; -} - struct JS::NativeExceptionsManager::ExceptionData { protected ExceptionData(NSDictionary* const v); diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index c01285585db..fbe2ed535ec 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -2946,25 +2946,6 @@ protocol NativeWebSocketModuleSpec : public NSObjectRCTBridgeModule, public RCTT protocol RCTActivityIndicatorViewViewProtocol : public NSObject { } -protocol RCTAndroidDrawerLayoutViewProtocol : public NSObject { - public virtual void closeDrawer(); - public virtual void openDrawer(); -} - -protocol RCTAndroidHorizontalScrollContentViewViewProtocol : public NSObject { -} - -protocol RCTAndroidProgressBarViewProtocol : public NSObject { -} - -protocol RCTAndroidSwipeRefreshLayoutViewProtocol : public NSObject { - public virtual void setNativeRefreshing:(BOOL value); -} - -protocol RCTAndroidSwitchViewProtocol : public NSObject { - public virtual void setNativeValue:(BOOL value); -} - protocol RCTAnimatedImage : public NSObject { public @property (assign, readonly) NSUInteger animatedImageFrameCount; public @property (assign, readonly) NSUInteger animatedImageLoopCount; @@ -3806,13 +3787,10 @@ class facebook::hermes::IHermesSHUnit : public facebook::jsi::ICast { } -const char facebook::react::AndroidProgressBarComponentName[]; -const char facebook::react::AndroidSwitchComponentName[]; const char facebook::react::AppleSwitchComponentName[]; const char facebook::react::ImageComponentName[]; const char facebook::react::ImageManagerKey[]; const char facebook::react::InputAccessoryComponentName[]; -const char facebook::react::LegacyViewManagerAndroidInteropComponentName[]; const char facebook::react::LegacyViewManagerInteropComponentName[]; const char facebook::react::ModalHostViewComponentName[]; const char facebook::react::ParagraphComponentName[]; @@ -3869,12 +3847,6 @@ using facebook::react::ActivePointerRegistry = std::unordered_map; using facebook::react::ActivityIndicatorViewShadowNode = facebook::react::ConcreteViewShadowNode; using facebook::react::ActivityIndicatorViewState = facebook::react::StateData; -using facebook::react::AndroidDrawerLayoutComponentDescriptor = facebook::react::ConcreteComponentDescriptor; -using facebook::react::AndroidDrawerLayoutShadowNode = facebook::react::ConcreteViewShadowNode; -using facebook::react::AndroidDrawerLayoutState = facebook::react::StateData; -using facebook::react::AndroidSwipeRefreshLayoutComponentDescriptor = facebook::react::ConcreteComponentDescriptor; -using facebook::react::AndroidSwipeRefreshLayoutShadowNode = facebook::react::ConcreteViewShadowNode; -using facebook::react::AndroidSwipeRefreshLayoutState = facebook::react::StateData; using facebook::react::AnimationEndCallback = facebook::react::AsyncCallback; using facebook::react::AnimationTimestamp = std::chrono::duration; using facebook::react::BackgroundExecutor = std::function&& callback)>; @@ -3938,7 +3910,6 @@ using facebook::react::InteractionTypesMap = std::unordered_map& invokee, std::function errorMessageProducer)>; using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; -using facebook::react::LegacyViewManagerAndroidInteropShadowNode = facebook::react::ConcreteViewShadowNode; using facebook::react::LegacyViewManagerInteropShadowNode = facebook::react::ConcreteViewShadowNode; using facebook::react::LineMeasureCache = facebook::react::SimpleThreadSafeCache; using facebook::react::LinesMeasurements = std::vector; @@ -4458,8 +4429,6 @@ facebook::react::RectangleEdges facebook::react::operator+(const facebook::re template facebook::react::RectangleEdges facebook::react::operator-(const facebook::react::RectangleEdges& lhs, const facebook::react::RectangleEdges& rhs) noexcept; JSI_EXPORT const char facebook::react::ActivityIndicatorViewComponentName[]; -JSI_EXPORT const char facebook::react::AndroidDrawerLayoutComponentName[]; -JSI_EXPORT const char facebook::react::AndroidSwipeRefreshLayoutComponentName[]; JSI_EXPORT const char facebook::react::DebuggingOverlayComponentName[]; JSI_EXPORT const char facebook::react::PullToRefreshViewComponentName[]; JSI_EXPORT const char facebook::react::UnimplementedNativeViewComponentName[]; @@ -4512,139 +4481,6 @@ class facebook::react::AdditionAnimatedNode : public facebook::react::OperatorAn public virtual void update() override; } -class facebook::react::AndroidDrawerLayoutEventEmitter : public facebook::react::BaseViewEventEmitter { - public void onDrawerClose(facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerClose value) const; - public void onDrawerOpen(facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerOpen value) const; - public void onDrawerSlide(facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerSlide value) const; - public void onDrawerStateChanged(facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerStateChanged value) const; -} - -struct facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerClose { -} - -struct facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerOpen { -} - -struct facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerSlide { - public facebook::react::Float offset; -} - -struct facebook::react::AndroidDrawerLayoutEventEmitter::OnDrawerStateChanged { - public int drawerState; -} - -class facebook::react::AndroidDrawerLayoutProps : public facebook::react::HostPlatformViewProps { - public AndroidDrawerLayoutProps() = default; - public AndroidDrawerLayoutProps(const facebook::react::PropsParserContext& context, const facebook::react::AndroidDrawerLayoutProps& sourceProps, const facebook::react::RawProps& rawProps); - public facebook::react::AndroidDrawerLayoutDrawerLockMode drawerLockMode; - public facebook::react::AndroidDrawerLayoutDrawerPosition drawerPosition; - public facebook::react::AndroidDrawerLayoutKeyboardDismissMode keyboardDismissMode; - public facebook::react::Float drawerWidth; - public facebook::react::SharedColor drawerBackgroundColor; - public facebook::react::SharedColor statusBarBackgroundColor; -} - -class facebook::react::AndroidHorizontalScrollContentViewEventEmitter : public facebook::react::BaseViewEventEmitter { -} - -class facebook::react::AndroidHorizontalScrollContentViewProps : public facebook::react::HostPlatformViewProps { - public AndroidHorizontalScrollContentViewProps() = default; - public AndroidHorizontalScrollContentViewProps(const facebook::react::PropsParserContext& context, const facebook::react::AndroidHorizontalScrollContentViewProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool removeClippedSubviews; -} - -class facebook::react::AndroidProgressBarComponentDescriptor : public facebook::react::ConcreteComponentDescriptor { - public AndroidProgressBarComponentDescriptor(const facebook::react::ComponentDescriptorParameters& parameters); - public virtual void adopt(facebook::react::ShadowNode& shadowNode) const override; -} - -class facebook::react::AndroidProgressBarEventEmitter : public facebook::react::BaseViewEventEmitter { -} - -class facebook::react::AndroidProgressBarMeasurementsManager { - public AndroidProgressBarMeasurementsManager(const std::shared_ptr& contextContainer); - public facebook::react::Size measure(facebook::react::SurfaceId surfaceId, const facebook::react::AndroidProgressBarProps& props, facebook::react::LayoutConstraints layoutConstraints) const; -} - -class facebook::react::AndroidProgressBarProps : public facebook::react::HostPlatformViewProps { - public AndroidProgressBarProps() = default; - public AndroidProgressBarProps(const facebook::react::PropsParserContext& context, const facebook::react::AndroidProgressBarProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool animating; - public bool indeterminate; - public double progress; - public facebook::react::SharedColor color; - public std::string styleAttr; - public std::string testID; - public std::string typeAttr; -} - -class facebook::react::AndroidProgressBarShadowNode : public facebook::react::ConcreteViewShadowNode { - public AndroidProgressBarShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); - public AndroidProgressBarShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); - public static facebook::react::ShadowNodeTraits BaseTraits(); - public virtual facebook::react::Size measureContent(const facebook::react::LayoutContext& layoutContext, const facebook::react::LayoutConstraints& layoutConstraints) const override; - public void setAndroidProgressBarMeasurementsManager(const std::shared_ptr& measurementsManager); -} - -class facebook::react::AndroidSwipeRefreshLayoutEventEmitter : public facebook::react::BaseViewEventEmitter { - public void onRefresh(facebook::react::AndroidSwipeRefreshLayoutEventEmitter::OnRefresh value) const; -} - -struct facebook::react::AndroidSwipeRefreshLayoutEventEmitter::OnRefresh { -} - -class facebook::react::AndroidSwipeRefreshLayoutProps : public facebook::react::HostPlatformViewProps { - public AndroidSwipeRefreshLayoutProps() = default; - public AndroidSwipeRefreshLayoutProps(const facebook::react::PropsParserContext& context, const facebook::react::AndroidSwipeRefreshLayoutProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool enabled; - public bool refreshing; - public facebook::react::AndroidSwipeRefreshLayoutSize size; - public facebook::react::Float progressViewOffset; - public facebook::react::SharedColor progressBackgroundColor; - public std::vector colors; -} - -class facebook::react::AndroidSwitchComponentDescriptor : public facebook::react::ConcreteComponentDescriptor { - public AndroidSwitchComponentDescriptor(const facebook::react::ComponentDescriptorParameters& parameters); - public virtual void adopt(facebook::react::ShadowNode& shadowNode) const override; -} - -class facebook::react::AndroidSwitchEventEmitter : public facebook::react::BaseViewEventEmitter { - public void onChange(facebook::react::AndroidSwitchEventEmitter::OnChange value) const; -} - -struct facebook::react::AndroidSwitchEventEmitter::OnChange { - public bool value; - public int target; -} - -class facebook::react::AndroidSwitchMeasurementsManager { - public AndroidSwitchMeasurementsManager(const std::shared_ptr& contextContainer); - public facebook::react::Size measure(facebook::react::SurfaceId surfaceId, facebook::react::LayoutConstraints layoutConstraints) const; -} - -class facebook::react::AndroidSwitchProps : public facebook::react::HostPlatformViewProps { - public AndroidSwitchProps() = default; - public AndroidSwitchProps(const facebook::react::PropsParserContext& context, const facebook::react::AndroidSwitchProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool disabled; - public bool enabled; - public bool on; - public bool value; - public facebook::react::SharedColor thumbColor; - public facebook::react::SharedColor thumbTintColor; - public facebook::react::SharedColor trackColorForFalse; - public facebook::react::SharedColor trackColorForTrue; - public facebook::react::SharedColor trackTintColor; -} - -class facebook::react::AndroidSwitchShadowNode : public facebook::react::ConcreteViewShadowNode { - public AndroidSwitchShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment); - public AndroidSwitchShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits); - public static facebook::react::ShadowNodeTraits BaseTraits(); - public virtual facebook::react::Size measureContent(const facebook::react::LayoutContext& layoutContext, const facebook::react::LayoutConstraints& layoutConstraints) const override; - public void setAndroidSwitchMeasurementsManager(const std::shared_ptr& measurementsManager); -} - class facebook::react::AnimatedModule : public facebook::react::NativeAnimatedModuleCxxSpec, public facebook::react::TurboModuleWithJSIBindings { public AnimatedModule(std::shared_ptr jsInvoker, std::shared_ptr nodesManagerProvider); public void addAnimatedEventToView(facebook::jsi::Runtime& rt, facebook::react::Tag viewTag, std::string eventName, facebook::jsi::Object eventMapping); @@ -8720,7 +8556,7 @@ class facebook::react::UnimplementedViewProps : public facebook::react::HostPlat public void setComponentName(facebook::react::ComponentName componentName); } -class facebook::react::UnstableLegacyViewManagerAutomaticComponentDescriptor : public facebook::react::ConcreteComponentDescriptor { +class facebook::react::UnstableLegacyViewManagerAutomaticComponentDescriptor : public facebook::react::ConcreteComponentDescriptor { public UnstableLegacyViewManagerAutomaticComponentDescriptor(const facebook::react::ComponentDescriptorParameters& parameters, facebook::react::RawPropsParser&& rawPropsParser = {}); public UnstableLegacyViewManagerAutomaticComponentDescriptor(const facebook::react::ComponentDescriptorParameters& parameters, std::string legacyComponentName); public virtual facebook::react::ComponentHandle getComponentHandle() const override; @@ -8984,27 +8820,6 @@ enum facebook::react::ActivityIndicatorViewSize { Small, } -enum facebook::react::AndroidDrawerLayoutDrawerLockMode { - LockedClosed, - LockedOpen, - Unlocked, -} - -enum facebook::react::AndroidDrawerLayoutDrawerPosition { - Left, - Right, -} - -enum facebook::react::AndroidDrawerLayoutKeyboardDismissMode { - None, - OnDrag, -} - -enum facebook::react::AndroidSwipeRefreshLayoutSize { - Default, - Large, -} - enum facebook::react::AnimatedNodeType { Addition, Color, @@ -11511,23 +11326,6 @@ struct facebook::react::NativePerformanceRawPerformanceEntry { public bool operator==(const facebook::react::NativePerformanceRawPerformanceEntry& other) const; } -template -struct facebook::react::NativePlatformConstantsAndroidPlatformConstantsAndroid { - public P0 isTesting; - public P1 isDisableAnimations; - public P2 reactNativeVersion; - public P3 Version; - public P4 Release; - public P5 Serial; - public P6 Fingerprint; - public P7 Model; - public P8 ServerHost; - public P9 uiMode; - public P10 Brand; - public P11 Manufacturer; - public bool operator==(const facebook::react::NativePlatformConstantsAndroidPlatformConstantsAndroid& other) const; -} - template struct facebook::react::NativeAlertManagerArgs { public P0 title; @@ -11583,18 +11381,6 @@ struct facebook::react::NativePlatformConstantsIOSPlatformConstantsIOS { public bool operator==(const facebook::react::NativePlatformConstantsIOSPlatformConstantsIOS& other) const; } -template -struct facebook::react::NativeDialogManagerAndroidDialogOptions { - public P0 title; - public P1 message; - public P2 buttonPositive; - public P3 buttonNegative; - public P4 buttonNeutral; - public P5 items; - public P6 cancelable; - public bool operator==(const facebook::react::NativeDialogManagerAndroidDialogOptions& other) const; -} - template struct facebook::react::NativeIntersectionObserverNativeIntersectionObserverEntry { public P0 intersectionObserverId; @@ -11618,16 +11404,6 @@ struct facebook::react::NativeIntersectionObserverNativeIntersectionObserverObse public bool operator==(const facebook::react::NativeIntersectionObserverNativeIntersectionObserverObserveOptions& other) const; } -template -struct facebook::react::NativeDeviceInfoDisplayMetricsAndroid { - public P0 width; - public P1 height; - public P2 scale; - public P3 fontScale; - public P4 densityDpi; - public bool operator==(const facebook::react::NativeDeviceInfoDisplayMetricsAndroid& other) const; -} - template struct facebook::react::NativeExceptionsManagerStackFrame { public P0 column; @@ -11684,15 +11460,6 @@ struct facebook::react::NativePerformancePerformanceObserverInit { public bool operator==(const facebook::react::NativePerformancePerformanceObserverInit& other) const; } -template -struct facebook::react::NativePlatformConstantsAndroidReactNativeVersionAndroid { - public P0 major; - public P1 minor; - public P2 patch; - public P3 prerelease; - public bool operator==(const facebook::react::NativePlatformConstantsAndroidReactNativeVersionAndroid& other) const; -} - template struct facebook::react::NativeAnimatedModuleEndResult { public P0 finished; @@ -11769,13 +11536,6 @@ struct facebook::react::NativeIdleCallbacksIdleDeadline { public bool operator==(const facebook::react::NativeIdleCallbacksIdleDeadline& other) const; } -template -struct facebook::react::NativeImageLoaderAndroidImageSize { - public P0 width; - public P1 height; - public bool operator==(const facebook::react::NativeImageLoaderAndroidImageSize& other) const; -} - template struct facebook::react::NativeReactDevToolsRuntimeSettingsModulePartialReloadAndProfileConfig { public P0 shouldReloadAndProfile; @@ -11993,12 +11753,6 @@ class facebook::react::NativeDeviceInfoCxxSpec : public facebook::react::TurboMo public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeDialogManagerAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeDialogManagerAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeExceptionsManagerCxxSpec : public facebook::react::TurboModule { protected NativeExceptionsManagerCxxSpec(std::shared_ptr jsInvoker); @@ -12041,36 +11795,18 @@ class facebook::react::NativeImageEditorCxxSpec : public facebook::react::TurboM public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeImageLoaderAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeImageLoaderAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeImageLoaderIOSCxxSpec : public facebook::react::TurboModule { protected NativeImageLoaderIOSCxxSpec(std::shared_ptr jsInvoker); public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeImageStoreAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeImageStoreAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeImageStoreIOSCxxSpec : public facebook::react::TurboModule { protected NativeImageStoreIOSCxxSpec(std::shared_ptr jsInvoker); public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeIntentAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeIntentAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeIntersectionObserverCxxSpec : public facebook::react::TurboModule { protected NativeIntersectionObserverCxxSpec(std::shared_ptr jsInvoker); @@ -12119,12 +11855,6 @@ class facebook::react::NativeMutationObserverCxxSpec : public facebook::react::T public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeNetworkingAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeNetworkingAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeNetworkingIOSCxxSpec : public facebook::react::TurboModule { protected NativeNetworkingIOSCxxSpec(std::shared_ptr jsInvoker); @@ -12137,18 +11867,6 @@ class facebook::react::NativePerformanceCxxSpec : public facebook::react::TurboM public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativePermissionsAndroidCxxSpec : public facebook::react::TurboModule { - protected NativePermissionsAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - -template -class facebook::react::NativePlatformConstantsAndroidCxxSpec : public facebook::react::TurboModule { - protected NativePlatformConstantsAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativePlatformConstantsIOSCxxSpec : public facebook::react::TurboModule { protected NativePlatformConstantsIOSCxxSpec(std::shared_ptr jsInvoker); @@ -12215,12 +11933,6 @@ class facebook::react::NativeSourceCodeCxxSpec : public facebook::react::TurboMo public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeStatusBarManagerAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeStatusBarManagerAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeStatusBarManagerIOSCxxSpec : public facebook::react::TurboModule { protected NativeStatusBarManagerIOSCxxSpec(std::shared_ptr jsInvoker); @@ -12233,12 +11945,6 @@ class facebook::react::NativeTimingCxxSpec : public facebook::react::TurboModule public static constexpr std::string_view kModuleName; } -template -class facebook::react::NativeToastAndroidCxxSpec : public facebook::react::TurboModule { - protected NativeToastAndroidCxxSpec(std::shared_ptr jsInvoker); - public static constexpr std::string_view kModuleName; -} - template class facebook::react::NativeVibrationCxxSpec : public facebook::react::TurboModule { protected NativeVibrationCxxSpec(std::shared_ptr jsInvoker); @@ -12369,13 +12075,6 @@ struct facebook::react::NativeDeviceInfoDimensionsPayloadBridging { public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); } -template -struct facebook::react::NativeDeviceInfoDisplayMetricsAndroidBridging { - public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); - public static T types; - public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); -} - template struct facebook::react::NativeDeviceInfoDisplayMetricsBridging { public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); @@ -12383,13 +12082,6 @@ struct facebook::react::NativeDeviceInfoDisplayMetricsBridging { public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); } -template -struct facebook::react::NativeDialogManagerAndroidDialogOptionsBridging { - public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); - public static T types; - public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); -} - template struct facebook::react::NativeExceptionsManagerExceptionDataBridging { public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); @@ -12432,13 +12124,6 @@ struct facebook::react::NativeImageEditorOptionsBridging { public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); } -template -struct facebook::react::NativeImageLoaderAndroidImageSizeBridging { - public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); - public static T types; - public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); -} - template struct facebook::react::NativeIntersectionObserverNativeIntersectionObserverEntryBridging { public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); @@ -12481,20 +12166,6 @@ struct facebook::react::NativePerformanceRawPerformanceEntryBridging { public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); } -template -struct facebook::react::NativePlatformConstantsAndroidPlatformConstantsAndroidBridging { - public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); - public static T types; - public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); -} - -template -struct facebook::react::NativePlatformConstantsAndroidReactNativeVersionAndroidBridging { - public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); - public static T types; - public static facebook::jsi::Object toJs(facebook::jsi::Runtime& rt, const T& value, const std::shared_ptr& jsInvoker); -} - template struct facebook::react::NativePlatformConstantsIOSPlatformConstantsIOSBridging { public static T fromJs(facebook::jsi::Runtime& rt, const facebook::jsi::Object& value, const std::shared_ptr& jsInvoker); @@ -16622,26 +16293,6 @@ struct JS::NativeDeviceInfo::DisplayMetrics::Builder::Input { protected RCTRequired width; } -struct JS::NativeDeviceInfo::DisplayMetricsAndroid { - protected NSDictionary* unsafeRawValue() const; - protected static JS::NativeDeviceInfo::DisplayMetricsAndroid fromUnsafeRawValue(NSDictionary* const v); -} - -struct JS::NativeDeviceInfo::DisplayMetricsAndroid::Builder { - protected Builder(JS::NativeDeviceInfo::DisplayMetricsAndroid i); - protected Builder(const JS::NativeDeviceInfo::DisplayMetricsAndroid::Builder::Input i); - protected NSDictionary* buildUnsafeRawValue() const; - protected using ResultT = JS::NativeDeviceInfo::DisplayMetricsAndroid; -} - -struct JS::NativeDeviceInfo::DisplayMetricsAndroid::Builder::Input { - protected RCTRequired densityDpi; - protected RCTRequired fontScale; - protected RCTRequired height; - protected RCTRequired scale; - protected RCTRequired width; -} - struct JS::NativeExceptionsManager::ExceptionData { protected ExceptionData(NSDictionary* const v); diff --git a/scripts/cxx-api/config.yml b/scripts/cxx-api/config.yml index 6195b80823a..d84b15ec30d 100644 --- a/scripts/cxx-api/config.yml +++ b/scripts/cxx-api/config.yml @@ -73,6 +73,10 @@ platforms: - "*+Internal.h" - "*/scripts/*" - "*/templates/*" + - "*/components/progressbar/android/*" + - "*/components/switch/androidswitch/*" + exclude_symbols: + - "Android" input_filter: true definitions: __cplusplus: 1 diff --git a/scripts/cxx-api/parser/config.py b/scripts/cxx-api/parser/config.py index 9b351b968ba..972d1556850 100644 --- a/scripts/cxx-api/parser/config.py +++ b/scripts/cxx-api/parser/config.py @@ -87,6 +87,15 @@ def parse_config( seen.add(pattern) exclude_patterns = merged_patterns + platform_exclude_symbols = view_config.get("exclude_symbols") or [] + seen_symbols: set[str] = set() + merged_symbols: list[str] = [] + for symbol in global_exclude_symbols + platform_exclude_symbols: + if symbol not in seen_symbols: + merged_symbols.append(symbol) + seen_symbols.add(symbol) + exclude_symbols = merged_symbols + raw_variants = view_config.get("variants") or {} variants = [ ApiViewVariant( @@ -105,7 +114,7 @@ def parse_config( definitions=base_definitions, codegen_platform=codegen_platform, input_filter=input_filter, - exclude_symbols=global_exclude_symbols, + exclude_symbols=exclude_symbols, ) ) else: @@ -120,7 +129,7 @@ def parse_config( definitions=merged_definitions, codegen_platform=codegen_platform, input_filter=input_filter, - exclude_symbols=global_exclude_symbols, + exclude_symbols=exclude_symbols, ) ) diff --git a/scripts/cxx-api/tests/test_config.py b/scripts/cxx-api/tests/test_config.py index c02ac412380..56396307819 100644 --- a/scripts/cxx-api/tests/test_config.py +++ b/scripts/cxx-api/tests/test_config.py @@ -567,6 +567,64 @@ class TestParseConfig(unittest.TestCase): for r in result: self.assertEqual(r.exclude_symbols, ["Fantom"]) + def test_per_platform_exclude_symbols(self): + """Per-platform exclude_symbols are merged with global ones""" + config = { + "exclude_symbols": ["Fantom"], + "platforms": { + "ReactApple": { + "inputs": [], + "exclude_symbols": ["Android"], + }, + "ReactAndroid": { + "inputs": [], + }, + }, + } + result = parse_config(config, "/base/dir") + + apple = next(r for r in result if r.snapshot_name == "ReactApple") + self.assertEqual(apple.exclude_symbols, ["Fantom", "Android"]) + + android = next(r for r in result if r.snapshot_name == "ReactAndroid") + self.assertEqual(android.exclude_symbols, ["Fantom"]) + + def test_per_platform_exclude_symbols_deduplicated(self): + """Duplicate symbols between global and per-platform are deduplicated""" + config = { + "exclude_symbols": ["Fantom", "Android"], + "platforms": { + "TestView": { + "inputs": [], + "exclude_symbols": ["Fantom", "Detail"], + }, + }, + } + result = parse_config(config, "/base/dir") + + self.assertEqual(result[0].exclude_symbols, ["Fantom", "Android", "Detail"]) + + def test_per_platform_exclude_symbols_propagated_to_variants(self): + """Per-platform exclude_symbols are propagated to all variant configs""" + config = { + "exclude_symbols": ["Fantom"], + "platforms": { + "ReactApple": { + "inputs": [], + "exclude_symbols": ["Android"], + "variants": { + "debug": {"definitions": {"DEBUG": 1}}, + "release": {"definitions": {"NDEBUG": 1}}, + }, + }, + }, + } + result = parse_config(config, "/base/dir") + + self.assertEqual(len(result), 2) + for r in result: + self.assertEqual(r.exclude_symbols, ["Fantom", "Android"]) + # ========================================================================= # Variant naming # =========================================================================