Skip to content

Commit ee45234

Browse files
j-piaseckifacebook-github-bot
j-piasecki
authored and
facebook-github-bot
committed
Make core Dynamic* and ReactRootViewTagGenerator headers for-frameworks (#58884)
Summary: `DynamicEventPayload.h`, `DynamicPointerEvent.h`, `DynamicPropsUtilities.h` and `ReactRootViewTagGenerator.h` are used by React Native's own sources and by platform and host integrations, not by component code, so they move from the public to the "for frameworks" tier of the C++ stable API and leave the `<React/RendererCore.h>` umbrella. Consumers that opt into `RN_STRICT_API` get a warning if they include these headers directly, which they can acknowledge with `RN_ALLOW_FRAMEWORKS`; without that flag the guards are inert. Changelog: [Internal] Reviewed By: javache Differential Revision: D123610705
1 parent 8d658f4 commit ee45234

14 files changed

Lines changed: 4 additions & 206 deletions

‎packages/react-native/ReactCommon/react/renderer/core/DynamicEventPayload.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <folly/dynamic.h>
1313
#include <react/renderer/core/EventPayload.h>

‎packages/react-native/ReactCommon/react/renderer/core/DynamicPointerEvent.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <folly/dynamic.h>
1313
#include <react/renderer/core/DynamicEventPayload.h>

‎packages/react-native/ReactCommon/react/renderer/core/DynamicPropsUtilities.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <folly/dynamic.h>
1313
#include <react/renderer/core/RawProps.h>

‎packages/react-native/ReactCommon/react/renderer/core/React/RendererCore.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
#include <react/renderer/core/ConcreteComponentDescriptor.h>
3939
#include <react/renderer/core/ConcreteShadowNode.h>
4040
#include <react/renderer/core/ConcreteState.h>
41-
#include <react/renderer/core/DynamicEventPayload.h>
42-
#include <react/renderer/core/DynamicPointerEvent.h>
43-
#include <react/renderer/core/DynamicPropsUtilities.h>
4441
#include <react/renderer/core/EventBeat.h>
4542
#include <react/renderer/core/EventDispatcher.h>
4643
#include <react/renderer/core/EventEmitter.h>
@@ -67,7 +64,6 @@
6764
#include <react/renderer/core/RawPropsParser.h>
6865
#include <react/renderer/core/ReactEventPriority.h>
6966
#include <react/renderer/core/ReactPrimitives.h>
70-
#include <react/renderer/core/ReactRootViewTagGenerator.h>
7167
#include <react/renderer/core/Sealable.h>
7268
#include <react/renderer/core/ShadowNode.h>
7369
#include <react/renderer/core/ShadowNodeFamily.h>

‎packages/react-native/ReactCommon/react/renderer/core/ReactRootViewTagGenerator.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <react/renderer/core/ReactPrimitives.h>
1313

‎scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,6 @@ facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g
520520
facebook::react::SharedColor facebook::react::parsePlatformColor(const facebook::react::ContextContainer& contextContainer, int32_t surfaceId, const facebook::react::RawValue& value);
521521
facebook::react::SharedColor facebook::react::whiteColor();
522522
facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
523-
facebook::react::SurfaceId facebook::react::getNextRootViewTag() noexcept;
524523
facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);
525524
facebook::react::ValueUnit facebook::react::toValueUnit(const facebook::react::RawValue& value);
526525
facebook::yoga::FloatOptional facebook::react::convertAspectRatio(const facebook::react::PropsParserContext&, const facebook::react::RawValue& value);
@@ -530,8 +529,6 @@ float facebook::react::blueFromHostPlatformColor(facebook::react::Color color);
530529
float facebook::react::greenFromHostPlatformColor(facebook::react::Color color);
531530
float facebook::react::redFromHostPlatformColor(facebook::react::Color color);
532531
float facebook::react::yogaFloatFromFloat(facebook::react::Float value);
533-
folly::dynamic facebook::react::diffDynamicProps(const folly::dynamic& oldProps, const folly::dynamic& newProps);
534-
folly::dynamic facebook::react::mergeDynamicProps(const folly::dynamic& source, const folly::dynamic& patch, facebook::react::NullValueStrategy nullValueStrategy);
535532
folly::dynamic facebook::react::toDynamic(const YGValue& dimension);
536533
folly::dynamic facebook::react::toDynamic(const facebook::react::BackgroundImage& backgroundImage);
537534
folly::dynamic facebook::react::toDynamic(const facebook::react::BoxShadow& boxShadow);
@@ -2927,11 +2924,6 @@ enum facebook::react::ModalHostViewSupportedOrientations : facebook::react::Moda
29272924
PortraitUpsideDown,
29282925
}
29292926

2930-
enum facebook::react::NullValueStrategy {
2931-
Ignore,
2932-
Override,
2933-
}
2934-
29352927
enum facebook::react::OutlineStyle : uint8_t {
29362928
Dashed,
29372929
Dotted,
@@ -3289,20 +3281,6 @@ struct facebook::react::DropShadowParams {
32893281
public folly::dynamic toDynamic() const;
32903282
}
32913283

3292-
struct facebook::react::DynamicEventPayload : public facebook::react::EventPayload {
3293-
protected folly::dynamic payload_;
3294-
public DynamicEventPayload(folly::dynamic&& payload);
3295-
public static facebook::react::SharedEventPayload create(folly::dynamic&& payload);
3296-
public virtual facebook::jsi::Value asJSIValue(facebook::jsi::Runtime& runtime) const override;
3297-
public virtual facebook::react::EventPayloadType getType() const override;
3298-
public virtual std::optional<double> extractValue(const std::vector<std::string>&) const override;
3299-
}
3300-
3301-
struct facebook::react::DynamicPointerEvent : public facebook::react::DynamicEventPayload {
3302-
public DynamicPointerEvent(folly::dynamic&& payload);
3303-
public const std::optional<std::vector<facebook::react::Tag>>& getHitPathForEventListener() const;
3304-
}
3305-
33063284
struct facebook::react::EventPayload {
33073285
public EventPayload() = default;
33083286
public EventPayload(const facebook::react::EventPayload&) = default;

‎scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,6 @@ facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g
520520
facebook::react::SharedColor facebook::react::parsePlatformColor(const facebook::react::ContextContainer& contextContainer, int32_t surfaceId, const facebook::react::RawValue& value);
521521
facebook::react::SharedColor facebook::react::whiteColor();
522522
facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
523-
facebook::react::SurfaceId facebook::react::getNextRootViewTag() noexcept;
524523
facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);
525524
facebook::react::ValueUnit facebook::react::toValueUnit(const facebook::react::RawValue& value);
526525
facebook::yoga::FloatOptional facebook::react::convertAspectRatio(const facebook::react::PropsParserContext&, const facebook::react::RawValue& value);
@@ -530,8 +529,6 @@ float facebook::react::blueFromHostPlatformColor(facebook::react::Color color);
530529
float facebook::react::greenFromHostPlatformColor(facebook::react::Color color);
531530
float facebook::react::redFromHostPlatformColor(facebook::react::Color color);
532531
float facebook::react::yogaFloatFromFloat(facebook::react::Float value);
533-
folly::dynamic facebook::react::diffDynamicProps(const folly::dynamic& oldProps, const folly::dynamic& newProps);
534-
folly::dynamic facebook::react::mergeDynamicProps(const folly::dynamic& source, const folly::dynamic& patch, facebook::react::NullValueStrategy nullValueStrategy);
535532
folly::dynamic facebook::react::toDynamic(const YGValue& dimension);
536533
folly::dynamic facebook::react::toDynamic(const facebook::react::BackgroundImage& backgroundImage);
537534
folly::dynamic facebook::react::toDynamic(const facebook::react::BoxShadow& boxShadow);
@@ -2920,11 +2917,6 @@ enum facebook::react::ModalHostViewSupportedOrientations : facebook::react::Moda
29202917
PortraitUpsideDown,
29212918
}
29222919

2923-
enum facebook::react::NullValueStrategy {
2924-
Ignore,
2925-
Override,
2926-
}
2927-
29282920
enum facebook::react::OutlineStyle : uint8_t {
29292921
Dashed,
29302922
Dotted,
@@ -3282,20 +3274,6 @@ struct facebook::react::DropShadowParams {
32823274
public folly::dynamic toDynamic() const;
32833275
}
32843276

3285-
struct facebook::react::DynamicEventPayload : public facebook::react::EventPayload {
3286-
protected folly::dynamic payload_;
3287-
public DynamicEventPayload(folly::dynamic&& payload);
3288-
public static facebook::react::SharedEventPayload create(folly::dynamic&& payload);
3289-
public virtual facebook::jsi::Value asJSIValue(facebook::jsi::Runtime& runtime) const override;
3290-
public virtual facebook::react::EventPayloadType getType() const override;
3291-
public virtual std::optional<double> extractValue(const std::vector<std::string>&) const override;
3292-
}
3293-
3294-
struct facebook::react::DynamicPointerEvent : public facebook::react::DynamicEventPayload {
3295-
public DynamicPointerEvent(folly::dynamic&& payload);
3296-
public const std::optional<std::vector<facebook::react::Tag>>& getHitPathForEventListener() const;
3297-
}
3298-
32993277
struct facebook::react::EventPayload {
33003278
public EventPayload() = default;
33013279
public EventPayload(const facebook::react::EventPayload&) = default;

‎scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,6 @@ facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g
520520
facebook::react::SharedColor facebook::react::parsePlatformColor(const facebook::react::ContextContainer& contextContainer, int32_t surfaceId, const facebook::react::RawValue& value);
521521
facebook::react::SharedColor facebook::react::whiteColor();
522522
facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
523-
facebook::react::SurfaceId facebook::react::getNextRootViewTag() noexcept;
524523
facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);
525524
facebook::react::ValueUnit facebook::react::toValueUnit(const facebook::react::RawValue& value);
526525
facebook::yoga::FloatOptional facebook::react::convertAspectRatio(const facebook::react::PropsParserContext&, const facebook::react::RawValue& value);
@@ -530,8 +529,6 @@ float facebook::react::blueFromHostPlatformColor(facebook::react::Color color);
530529
float facebook::react::greenFromHostPlatformColor(facebook::react::Color color);
531530
float facebook::react::redFromHostPlatformColor(facebook::react::Color color);
532531
float facebook::react::yogaFloatFromFloat(facebook::react::Float value);
533-
folly::dynamic facebook::react::diffDynamicProps(const folly::dynamic& oldProps, const folly::dynamic& newProps);
534-
folly::dynamic facebook::react::mergeDynamicProps(const folly::dynamic& source, const folly::dynamic& patch, facebook::react::NullValueStrategy nullValueStrategy);
535532
folly::dynamic facebook::react::toDynamic(const YGValue& dimension);
536533
folly::dynamic facebook::react::toDynamic(const facebook::react::BackgroundImage& backgroundImage);
537534
folly::dynamic facebook::react::toDynamic(const facebook::react::BoxShadow& boxShadow);
@@ -2920,11 +2917,6 @@ enum facebook::react::ModalHostViewSupportedOrientations : facebook::react::Moda
29202917
PortraitUpsideDown,
29212918
}
29222919

2923-
enum facebook::react::NullValueStrategy {
2924-
Ignore,
2925-
Override,
2926-
}
2927-
29282920
enum facebook::react::OutlineStyle : uint8_t {
29292921
Dashed,
29302922
Dotted,
@@ -3282,20 +3274,6 @@ struct facebook::react::DropShadowParams {
32823274
public folly::dynamic toDynamic() const;
32833275
}
32843276

3285-
struct facebook::react::DynamicEventPayload : public facebook::react::EventPayload {
3286-
protected folly::dynamic payload_;
3287-
public DynamicEventPayload(folly::dynamic&& payload);
3288-
public static facebook::react::SharedEventPayload create(folly::dynamic&& payload);
3289-
public virtual facebook::jsi::Value asJSIValue(facebook::jsi::Runtime& runtime) const override;
3290-
public virtual facebook::react::EventPayloadType getType() const override;
3291-
public virtual std::optional<double> extractValue(const std::vector<std::string>&) const override;
3292-
}
3293-
3294-
struct facebook::react::DynamicPointerEvent : public facebook::react::DynamicEventPayload {
3295-
public DynamicPointerEvent(folly::dynamic&& payload);
3296-
public const std::optional<std::vector<facebook::react::Tag>>& getHitPathForEventListener() const;
3297-
}
3298-
32993277
struct facebook::react::EventPayload {
33003278
public EventPayload() = default;
33013279
public EventPayload(const facebook::react::EventPayload&) = default;

‎scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3311,7 +3311,6 @@ facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g
33113311
facebook::react::SharedColor facebook::react::parsePlatformColor(const facebook::react::ContextContainer& contextContainer, int32_t surfaceId, const facebook::react::RawValue& value);
33123312
facebook::react::SharedColor facebook::react::whiteColor();
33133313
facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
3314-
facebook::react::SurfaceId facebook::react::getNextRootViewTag() noexcept;
33153314
facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);
33163315
facebook::react::ValueUnit facebook::react::toValueUnit(const facebook::react::RawValue& value);
33173316
facebook::yoga::FloatOptional facebook::react::convertAspectRatio(const facebook::react::PropsParserContext&, const facebook::react::RawValue& value);
@@ -3322,8 +3321,6 @@ float facebook::react::greenFromHostPlatformColor(facebook::react::Color color);
33223321
float facebook::react::redFromHostPlatformColor(facebook::react::Color color);
33233322
float facebook::react::yogaFloatFromFloat(facebook::react::Float value);
33243323
folly::dynamic facebook::react::convertIdToFollyDynamic(id json);
3325-
folly::dynamic facebook::react::diffDynamicProps(const folly::dynamic& oldProps, const folly::dynamic& newProps);
3326-
folly::dynamic facebook::react::mergeDynamicProps(const folly::dynamic& source, const folly::dynamic& patch, facebook::react::NullValueStrategy nullValueStrategy);
33273324
id facebook::react::convertFollyDynamicToId(const folly::dynamic& dyn);
33283325
int facebook::react::toInt(const facebook::react::DisplayType& displayType);
33293326
int facebook::react::toInt(const facebook::react::LayoutDirection& layoutDirection);
@@ -5125,11 +5122,6 @@ enum facebook::react::ModalHostViewSupportedOrientations : facebook::react::Moda
51255122
PortraitUpsideDown,
51265123
}
51275124

5128-
enum facebook::react::NullValueStrategy {
5129-
Ignore,
5130-
Override,
5131-
}
5132-
51335125
enum facebook::react::OutlineStyle : uint8_t {
51345126
Dashed,
51355127
Dotted,
@@ -5461,20 +5453,6 @@ struct facebook::react::DynamicColor {
54615453
public int32_t lightColor;
54625454
}
54635455

5464-
struct facebook::react::DynamicEventPayload : public facebook::react::EventPayload {
5465-
protected folly::dynamic payload_;
5466-
public DynamicEventPayload(folly::dynamic&& payload);
5467-
public static facebook::react::SharedEventPayload create(folly::dynamic&& payload);
5468-
public virtual facebook::jsi::Value asJSIValue(facebook::jsi::Runtime& runtime) const override;
5469-
public virtual facebook::react::EventPayloadType getType() const override;
5470-
public virtual std::optional<double> extractValue(const std::vector<std::string>& path) const override;
5471-
}
5472-
5473-
struct facebook::react::DynamicPointerEvent : public facebook::react::DynamicEventPayload {
5474-
public DynamicPointerEvent(folly::dynamic&& payload);
5475-
public const std::optional<std::vector<facebook::react::Tag>>& getHitPathForEventListener() const;
5476-
}
5477-
54785456
struct facebook::react::EventPayload {
54795457
public EventPayload() = default;
54805458
public EventPayload(const facebook::react::EventPayload&) = default;

‎scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3303,7 +3303,6 @@ facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g
33033303
facebook::react::SharedColor facebook::react::parsePlatformColor(const facebook::react::ContextContainer& contextContainer, int32_t surfaceId, const facebook::react::RawValue& value);
33043304
facebook::react::SharedColor facebook::react::whiteColor();
33053305
facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
3306-
facebook::react::SurfaceId facebook::react::getNextRootViewTag() noexcept;
33073306
facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);
33083307
facebook::react::ValueUnit facebook::react::toValueUnit(const facebook::react::RawValue& value);
33093308
facebook::yoga::FloatOptional facebook::react::convertAspectRatio(const facebook::react::PropsParserContext&, const facebook::react::RawValue& value);
@@ -3314,8 +3313,6 @@ float facebook::react::greenFromHostPlatformColor(facebook::react::Color color);
33143313
float facebook::react::redFromHostPlatformColor(facebook::react::Color color);
33153314
float facebook::react::yogaFloatFromFloat(facebook::react::Float value);
33163315
folly::dynamic facebook::react::convertIdToFollyDynamic(id json);
3317-
folly::dynamic facebook::react::diffDynamicProps(const folly::dynamic& oldProps, const folly::dynamic& newProps);
3318-
folly::dynamic facebook::react::mergeDynamicProps(const folly::dynamic& source, const folly::dynamic& patch, facebook::react::NullValueStrategy nullValueStrategy);
33193316
id facebook::react::convertFollyDynamicToId(const folly::dynamic& dyn);
33203317
int facebook::react::toInt(const facebook::react::DisplayType& displayType);
33213318
int facebook::react::toInt(const facebook::react::LayoutDirection& layoutDirection);
@@ -5110,11 +5107,6 @@ enum facebook::react::ModalHostViewSupportedOrientations : facebook::react::Moda
51105107
PortraitUpsideDown,
51115108
}
51125109

5113-
enum facebook::react::NullValueStrategy {
5114-
Ignore,
5115-
Override,
5116-
}
5117-
51185110
enum facebook::react::OutlineStyle : uint8_t {
51195111
Dashed,
51205112
Dotted,
@@ -5446,20 +5438,6 @@ struct facebook::react::DynamicColor {
54465438
public int32_t lightColor;
54475439
}
54485440

5449-
struct facebook::react::DynamicEventPayload : public facebook::react::EventPayload {
5450-
protected folly::dynamic payload_;
5451-
public DynamicEventPayload(folly::dynamic&& payload);
5452-
public static facebook::react::SharedEventPayload create(folly::dynamic&& payload);
5453-
public virtual facebook::jsi::Value asJSIValue(facebook::jsi::Runtime& runtime) const override;
5454-
public virtual facebook::react::EventPayloadType getType() const override;
5455-
public virtual std::optional<double> extractValue(const std::vector<std::string>& path) const override;
5456-
}
5457-
5458-
struct facebook::react::DynamicPointerEvent : public facebook::react::DynamicEventPayload {
5459-
public DynamicPointerEvent(folly::dynamic&& payload);
5460-
public const std::optional<std::vector<facebook::react::Tag>>& getHitPathForEventListener() const;
5461-
}
5462-
54635441
struct facebook::react::EventPayload {
54645442
public EventPayload() = default;
54655443
public EventPayload(const facebook::react::EventPayload&) = default;

0 commit comments

Comments
 (0)