From ff949d43d80b12c91dcf42cb4d08e88c54d74c0b Mon Sep 17 00:00:00 2001 From: jipeng6036-del <241105014+jipeng6036-del@users.noreply.github.com> Date: Fri, 20 Nov 2026 18:11:49 -0800 Subject: [PATCH] fix: exclude tvOS headers from shared and Android C++ API snapshots --- .../api-snapshots/ReactAndroidDebugCxx.api | 1 - .../ReactAndroidFrameworksCxx.api | 1 - .../api-snapshots/ReactAndroidNewarchCxx.api | 1 - .../api-snapshots/ReactAndroidReleaseCxx.api | 1 - .../api-snapshots/ReactCommonDebugCxx.api | 20 ++-------- .../ReactCommonFrameworksCxx.api | 38 ++++++------------- .../api-snapshots/ReactCommonNewarchCxx.api | 20 ++-------- .../api-snapshots/ReactCommonReleaseCxx.api | 20 ++-------- scripts/cxx-api/config.yml | 2 + 9 files changed, 23 insertions(+), 81 deletions(-) diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index f6d983a0272d..6551c2edca21 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -1328,7 +1328,6 @@ class facebook::react::HighResTimeStamp { class facebook::react::HostPlatformViewProps : public facebook::react::BaseViewProps { public HostPlatformViewProps() = default; - public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps); public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public bool focusable; public bool needsOffscreenAlphaCompositing; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api index 6a7f3f69bce1..becfb208ee6c 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api @@ -2062,7 +2062,6 @@ class facebook::react::HostPlatformScrollViewProps : public facebook::react::Bas class facebook::react::HostPlatformViewProps : public facebook::react::BaseViewProps { public HostPlatformViewProps() = default; - public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps); public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public bool focusable; public bool needsOffscreenAlphaCompositing; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api index 7d2118c15877..d07c0a6643b0 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -1327,7 +1327,6 @@ class facebook::react::HighResTimeStamp { class facebook::react::HostPlatformViewProps : public facebook::react::BaseViewProps { public HostPlatformViewProps() = default; - public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps); public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public bool focusable; public bool needsOffscreenAlphaCompositing; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index 7d2118c15877..d07c0a6643b0 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -1327,7 +1327,6 @@ class facebook::react::HighResTimeStamp { class facebook::react::HostPlatformViewProps : public facebook::react::BaseViewProps { public HostPlatformViewProps() = default; - public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps); public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public bool focusable; public bool needsOffscreenAlphaCompositing; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index a86a7e149972..003379502c61 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -104,8 +104,6 @@ using facebook::react::EventPipe = std::function; using facebook::react::EventTag = unsigned int; using facebook::react::GradientDirection = std::variant; -using facebook::react::HostPlatformTouch = facebook::react::BaseTouch; -using facebook::react::HostPlatformViewEventEmitter = facebook::react::BaseViewEventEmitter; using facebook::react::ImageSources = std::vector; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; @@ -128,12 +126,12 @@ using facebook::react::Tag = int32_t; using facebook::react::TelemetryClock = std::chrono::steady_clock; using facebook::react::TelemetryDuration = std::chrono::nanoseconds; using facebook::react::TelemetryTimePoint = facebook::react::TelemetryClock::time_point; -using facebook::react::Touch = facebook::react::HostPlatformTouch; +using facebook::react::Touch = HostPlatformTouch; using facebook::react::Touches = std::unordered_set; using facebook::react::TurboModuleProviderFunctionTypeWithRuntime = std::function(facebook::jsi::Runtime& runtime, const std::string& name)>; using facebook::react::ValueFactory = std::function; -using facebook::react::ViewEventEmitter = facebook::react::HostPlatformViewEventEmitter; -using facebook::react::ViewProps = facebook::react::HostPlatformViewProps; +using facebook::react::ViewEventEmitter = HostPlatformViewEventEmitter; +using facebook::react::ViewProps = HostPlatformViewProps; using facebook::react::ViewShadowNodeProps = facebook::react::ViewProps; using facebook::react::parsePlatformColorFn = facebook::react::SharedColor(*)(const facebook::react::ContextContainer&, int32_t, const facebook::react::RawValue&); template @@ -673,13 +671,6 @@ class facebook::react::HighResTimeStamp { public static void setTimeStampProviderForTesting(std::function&& timeStampProvider); } -class facebook::react::HostPlatformViewProps : public facebook::react::BaseViewProps { - public HostPlatformViewProps() = default; - public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool focusable; - public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); -} - class facebook::react::IAsyncEventEmitter { public IAsyncEventEmitter() noexcept = default; public IAsyncEventEmitter(const facebook::react::IAsyncEventEmitter&) = delete; @@ -2540,11 +2531,6 @@ struct facebook::react::Bridging, std::enable_if_t constexpr bool facebook::react::bridging::supportsToJs(), std::declval(), nullptr))>>; template diff --git a/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api index 4af89d8221d3..46e7d2707d1d 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api @@ -153,8 +153,6 @@ using facebook::react::EventPipe = std::function; using facebook::react::EventTag = unsigned int; using facebook::react::GradientDirection = std::variant; -using facebook::react::HostPlatformTouch = facebook::react::BaseTouch; -using facebook::react::HostPlatformViewEventEmitter = facebook::react::BaseViewEventEmitter; using facebook::react::ImageSources = std::vector; using facebook::react::LayoutConformanceComponentDescriptor = facebook::react::ConcreteComponentDescriptor; using facebook::react::LineMeasureCache = facebook::react::SimpleThreadSafeCache; @@ -205,14 +203,14 @@ using facebook::react::TextMeasureCache = facebook::react::SimpleThreadSafeCache using facebook::react::TimePointFunction = std::chrono::steady_clock::time_point(*)(); using facebook::react::TimerHandle = int; using facebook::react::TimerManagerDelegate = facebook::react::PlatformTimerRegistry; -using facebook::react::Touch = facebook::react::HostPlatformTouch; +using facebook::react::Touch = HostPlatformTouch; using facebook::react::Touches = std::unordered_set; using facebook::react::TraceSectionUnwrapped = facebook::react::DummyTraceSection; using facebook::react::TurboModuleProviderFunctionTypeWithRuntime = std::function(facebook::jsi::Runtime& runtime, const std::string& name)>; using facebook::react::UiTask = std::function; using facebook::react::ValueFactory = std::function; -using facebook::react::ViewEventEmitter = facebook::react::HostPlatformViewEventEmitter; -using facebook::react::ViewProps = facebook::react::HostPlatformViewProps; +using facebook::react::ViewEventEmitter = HostPlatformViewEventEmitter; +using facebook::react::ViewProps = HostPlatformViewProps; using facebook::react::ViewShadowNodeProps = facebook::react::ViewProps; using facebook::react::parsePlatformColorFn = facebook::react::SharedColor(*)(const facebook::react::ContextContainer&, int32_t, const facebook::react::RawValue&); template @@ -732,7 +730,7 @@ enum facebook::react::AttributedStringBox::Mode { Value, } -class facebook::react::BaseParagraphProps : public facebook::react::HostPlatformViewProps, public facebook::react::BaseTextProps { +class facebook::react::BaseParagraphProps : public facebook::react::ViewProps, public facebook::react::BaseTextProps { public BaseParagraphProps() = default; public BaseParagraphProps(const facebook::react::PropsParserContext& context, const facebook::react::BaseParagraphProps& sourceProps, const facebook::react::RawProps& rawProps); public bool isSelectable; @@ -741,7 +739,7 @@ class facebook::react::BaseParagraphProps : public facebook::react::HostPlatform public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); } -class facebook::react::BaseScrollViewProps : public facebook::react::HostPlatformViewProps { +class facebook::react::BaseScrollViewProps : public facebook::react::ViewProps { public BaseScrollViewProps() = default; public BaseScrollViewProps(const facebook::react::PropsParserContext& context, const facebook::react::BaseScrollViewProps& sourceProps, const facebook::react::RawProps& rawProps); public Float decelerationRate; @@ -787,7 +785,7 @@ class facebook::react::BaseScrollViewProps : public facebook::react::HostPlatfor public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); } -class facebook::react::BaseTextInputProps : public facebook::react::HostPlatformViewProps, public facebook::react::BaseTextProps { +class facebook::react::BaseTextInputProps : public facebook::react::ViewProps, public facebook::react::BaseTextProps { public BaseTextInputProps() = default; public BaseTextInputProps(const facebook::react::PropsParserContext& context, const facebook::react::BaseTextInputProps& sourceProps, const facebook::react::RawProps& rawProps); public bool autoFocus; @@ -1235,13 +1233,6 @@ class facebook::react::HighResTimeStamp { public static facebook::react::HighResTimeStamp now() noexcept; } -class facebook::react::HostPlatformViewProps : public facebook::react::BaseViewProps { - public HostPlatformViewProps() = default; - public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool focusable; - public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); -} - class facebook::react::IAsyncEventEmitter { public IAsyncEventEmitter() noexcept = default; public IAsyncEventEmitter(const facebook::react::IAsyncEventEmitter&) = delete; @@ -1263,7 +1254,7 @@ class facebook::react::ImageErrorInfo { public std::vector> httpResponseHeaders; } -class facebook::react::ImageEventEmitter : public facebook::react::BaseViewEventEmitter { +class facebook::react::ImageEventEmitter : public facebook::react::ViewEventEmitter { public void onError(const facebook::react::ImageErrorInfo& error) const; public void onLoad(const facebook::react::ImageSource& source) const; public void onLoadEnd() const; @@ -1283,7 +1274,7 @@ class facebook::react::ImageManager { public virtual ~ImageManager(); } -class facebook::react::ImageProps : public facebook::react::HostPlatformViewProps { +class facebook::react::ImageProps : public facebook::react::ViewProps { public Float blurRadius; public Float resizeMultiplier; public ImageProps() = default; @@ -1826,7 +1817,7 @@ class facebook::react::ParagraphComponentDescriptor : public facebook::react::Ba public ParagraphComponentDescriptor(const facebook::react::ComponentDescriptorParameters& parameters); } -class facebook::react::ParagraphEventEmitter : public facebook::react::BaseViewEventEmitter { +class facebook::react::ParagraphEventEmitter : public facebook::react::ViewEventEmitter { public void onTextLayout(const facebook::react::LinesMeasurements& linesMeasurements) const; } @@ -1984,7 +1975,7 @@ struct facebook::react::ReactInstance::JSRuntimeFlags { public const std::string runtimeDiagnosticFlags; } -class facebook::react::RootProps : public facebook::react::HostPlatformViewProps { +class facebook::react::RootProps : public facebook::react::ViewProps { public RootProps() = default; public RootProps(const facebook::react::PropsParserContext& context, const facebook::react::RootProps& sourceProps, const facebook::react::LayoutConstraints& layoutConstraints, const facebook::react::LayoutContext& layoutContext); public RootProps(const facebook::react::PropsParserContext& context, const facebook::react::RootProps& sourceProps, const facebook::react::RawProps& rawProps); @@ -2163,7 +2154,7 @@ class facebook::react::SchedulerDelegate { public virtual ~SchedulerDelegate() noexcept = default; } -class facebook::react::ScrollViewEventEmitter : public facebook::react::BaseViewEventEmitter { +class facebook::react::ScrollViewEventEmitter : public facebook::react::ViewEventEmitter { public using EndDragMetrics = facebook::react::ScrollEndDragEvent; public using Metrics = facebook::react::ScrollEvent; public void onMomentumScrollBegin(const facebook::react::ScrollEvent& scrollEvent) const; @@ -2500,7 +2491,7 @@ class facebook::react::TextAttributes : public facebook::react::DebugStringConve public void apply(facebook::react::TextAttributes textAttributes); } -class facebook::react::TextInputEventEmitter : public facebook::react::BaseViewEventEmitter { +class facebook::react::TextInputEventEmitter : public facebook::react::ViewEventEmitter { public void onBlur(const facebook::react::TextInputEventEmitter::Metrics& textInputMetrics) const; public void onChange(const facebook::react::TextInputEventEmitter::Metrics& textInputMetrics) const; public void onContentSizeChange(const facebook::react::TextInputEventEmitter::Metrics& textInputMetrics) const; @@ -5602,11 +5593,6 @@ struct facebook::react::Bridging, std::enable_if_t; using facebook::react::EventTag = unsigned int; using facebook::react::GradientDirection = std::variant; -using facebook::react::HostPlatformTouch = facebook::react::BaseTouch; -using facebook::react::HostPlatformViewEventEmitter = facebook::react::BaseViewEventEmitter; using facebook::react::ImageSources = std::vector; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; @@ -128,12 +126,12 @@ using facebook::react::Tag = int32_t; using facebook::react::TelemetryClock = std::chrono::steady_clock; using facebook::react::TelemetryDuration = std::chrono::nanoseconds; using facebook::react::TelemetryTimePoint = facebook::react::TelemetryClock::time_point; -using facebook::react::Touch = facebook::react::HostPlatformTouch; +using facebook::react::Touch = HostPlatformTouch; using facebook::react::Touches = std::unordered_set; using facebook::react::TurboModuleProviderFunctionTypeWithRuntime = std::function(facebook::jsi::Runtime& runtime, const std::string& name)>; using facebook::react::ValueFactory = std::function; -using facebook::react::ViewEventEmitter = facebook::react::HostPlatformViewEventEmitter; -using facebook::react::ViewProps = facebook::react::HostPlatformViewProps; +using facebook::react::ViewEventEmitter = HostPlatformViewEventEmitter; +using facebook::react::ViewProps = HostPlatformViewProps; using facebook::react::ViewShadowNodeProps = facebook::react::ViewProps; using facebook::react::parsePlatformColorFn = facebook::react::SharedColor(*)(const facebook::react::ContextContainer&, int32_t, const facebook::react::RawValue&); template @@ -672,13 +670,6 @@ class facebook::react::HighResTimeStamp { public static facebook::react::HighResTimeStamp now() noexcept; } -class facebook::react::HostPlatformViewProps : public facebook::react::BaseViewProps { - public HostPlatformViewProps() = default; - public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool focusable; - public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); -} - class facebook::react::IAsyncEventEmitter { public IAsyncEventEmitter() noexcept = default; public IAsyncEventEmitter(const facebook::react::IAsyncEventEmitter&) = delete; @@ -2533,11 +2524,6 @@ struct facebook::react::Bridging, std::enable_if_t constexpr bool facebook::react::bridging::supportsToJs(), std::declval(), nullptr))>>; template diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index e2ebd548ac3f..b36e0b32e891 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -104,8 +104,6 @@ using facebook::react::EventPipe = std::function; using facebook::react::EventTag = unsigned int; using facebook::react::GradientDirection = std::variant; -using facebook::react::HostPlatformTouch = facebook::react::BaseTouch; -using facebook::react::HostPlatformViewEventEmitter = facebook::react::BaseViewEventEmitter; using facebook::react::ImageSources = std::vector; using facebook::react::NativeMethodCallFunc = std::function; using facebook::react::PromiseSetupFunctionType = std::function)>; @@ -128,12 +126,12 @@ using facebook::react::Tag = int32_t; using facebook::react::TelemetryClock = std::chrono::steady_clock; using facebook::react::TelemetryDuration = std::chrono::nanoseconds; using facebook::react::TelemetryTimePoint = facebook::react::TelemetryClock::time_point; -using facebook::react::Touch = facebook::react::HostPlatformTouch; +using facebook::react::Touch = HostPlatformTouch; using facebook::react::Touches = std::unordered_set; using facebook::react::TurboModuleProviderFunctionTypeWithRuntime = std::function(facebook::jsi::Runtime& runtime, const std::string& name)>; using facebook::react::ValueFactory = std::function; -using facebook::react::ViewEventEmitter = facebook::react::HostPlatformViewEventEmitter; -using facebook::react::ViewProps = facebook::react::HostPlatformViewProps; +using facebook::react::ViewEventEmitter = HostPlatformViewEventEmitter; +using facebook::react::ViewProps = HostPlatformViewProps; using facebook::react::ViewShadowNodeProps = facebook::react::ViewProps; using facebook::react::parsePlatformColorFn = facebook::react::SharedColor(*)(const facebook::react::ContextContainer&, int32_t, const facebook::react::RawValue&); template @@ -672,13 +670,6 @@ class facebook::react::HighResTimeStamp { public static facebook::react::HighResTimeStamp now() noexcept; } -class facebook::react::HostPlatformViewProps : public facebook::react::BaseViewProps { - public HostPlatformViewProps() = default; - public HostPlatformViewProps(const facebook::react::PropsParserContext& context, const facebook::react::HostPlatformViewProps& sourceProps, const facebook::react::RawProps& rawProps); - public bool focusable; - public void setProp(const facebook::react::PropsParserContext& context, facebook::react::RawPropsPropNameHash hash, const char* propName, const facebook::react::RawValue& value); -} - class facebook::react::IAsyncEventEmitter { public IAsyncEventEmitter() noexcept = default; public IAsyncEventEmitter(const facebook::react::IAsyncEventEmitter&) = delete; @@ -2533,11 +2524,6 @@ struct facebook::react::Bridging, std::enable_if_t constexpr bool facebook::react::bridging::supportsToJs(), std::declval(), nullptr))>>; template diff --git a/scripts/cxx-api/config.yml b/scripts/cxx-api/config.yml index b75ac02eb273..9d03f9167e20 100644 --- a/scripts/cxx-api/config.yml +++ b/scripts/cxx-api/config.yml @@ -30,6 +30,7 @@ platforms: - '*/platform/windows/*' - '*/platform/macos/*' - '*/platform/ios/*' + - '*/platform/tvos/*' - '*/platform/android/*' input_filter: false definitions: @@ -63,6 +64,7 @@ platforms: - '*/platform/windows/*' - '*/platform/macos/*' - '*/platform/ios/*' + - '*/platform/tvos/*' exclude_symbols: - 'InputAccessory' - 'IOS'