Skip to content

Commit 81409e2

Browse files
j-piaseckifacebook-github-bot
authored andcommitted
Use public feature flags entry point in exported headers
Summary: Exported headers that read feature flags inline now go through the generated `ReactNativePublicFeatureFlags.h` instead of `ReactNativeFeatureFlags.h`. Sources that relied on the transitive include now include `ReactNativeFeatureFlags.h` directly. Changelog: [Internal] Differential Revision: D122353873
1 parent 9e1efcb commit 81409e2

9 files changed

Lines changed: 23 additions & 20 deletions

File tree

‎packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <react/debug/react_native_expect.h>
13-
#include <react/featureflags/ReactNativeFeatureFlags.h>
13+
#include <react/featureflags/ReactNativePublicFeatureFlags.h>
1414
#include <react/renderer/attributedstring/AttributedString.h>
1515
#include <react/renderer/attributedstring/ParagraphAttributes.h>
1616
#include <react/renderer/attributedstring/TextAttributes.h>
@@ -517,7 +517,7 @@ inline void parseUnprocessedFontVariant(const PropsParserContext &context, const
517517

518518
inline void fromRawValue(const PropsParserContext &context, const RawValue &value, FontVariant &result)
519519
{
520-
if (ReactNativeFeatureFlags::enableNativeCSSParsing()) {
520+
if (ReactNativeFeatureFlags_DO_NOT_USE::enableNativeCSSParsing()) {
521521
parseUnprocessedFontVariant(context, value, result);
522522
} else {
523523
parseProcessedFontVariant(context, value, result);

‎packages/react-native/ReactCommon/react/renderer/components/view/BackgroundImagePropsConversions.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <react/cxxstableapi/UmbrellaGuard.h>
1111

12-
#include <react/featureflags/ReactNativeFeatureFlags.h>
12+
#include <react/featureflags/ReactNativePublicFeatureFlags.h>
1313
#include <react/renderer/core/PropsParserContext.h>
1414
#include <react/renderer/core/RawProps.h>
1515
#include <react/renderer/graphics/BackgroundImage.h>
@@ -30,7 +30,7 @@ void parseUnprocessedBackgroundImageString(const std::string &value, std::vector
3030

3131
inline void fromRawValue(const PropsParserContext &context, const RawValue &value, std::vector<BackgroundImage> &result)
3232
{
33-
if (ReactNativeFeatureFlags::enableNativeCSSParsing()) {
33+
if (ReactNativeFeatureFlags_DO_NOT_USE::enableNativeCSSParsing()) {
3434
if (value.hasType<std::string>()) {
3535
parseUnprocessedBackgroundImageString((std::string)value, result);
3636
} else if (value.hasType<std::vector<RawValue>>()) {

‎packages/react-native/ReactCommon/react/renderer/components/view/BoxShadowPropsConversions.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <glog/logging.h>
1313
#include <react/debug/react_native_expect.h>
14-
#include <react/featureflags/ReactNativeFeatureFlags.h>
14+
#include <react/featureflags/ReactNativePublicFeatureFlags.h>
1515
#include <react/renderer/components/view/CSSConversions.h>
1616
#include <react/renderer/core/PropsParserContext.h>
1717
#include <react/renderer/core/RawProps.h>
@@ -255,7 +255,7 @@ parseUnprocessedBoxShadow(const PropsParserContext &context, const RawValue &val
255255

256256
inline void fromRawValue(const PropsParserContext &context, const RawValue &value, std::vector<BoxShadow> &result)
257257
{
258-
if (ReactNativeFeatureFlags::enableNativeCSSParsing()) {
258+
if (ReactNativeFeatureFlags_DO_NOT_USE::enableNativeCSSParsing()) {
259259
parseUnprocessedBoxShadow(context, value, result);
260260
} else {
261261
parseProcessedBoxShadow(context, value, result);

‎packages/react-native/ReactCommon/react/renderer/components/view/FilterPropsConversions.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <glog/logging.h>
1313
#include <react/debug/react_native_expect.h>
14-
#include <react/featureflags/ReactNativeFeatureFlags.h>
14+
#include <react/featureflags/ReactNativePublicFeatureFlags.h>
1515
#include <react/renderer/components/view/CSSConversions.h>
1616
#include <react/renderer/core/PropsParserContext.h>
1717
#include <react/renderer/core/RawProps.h>
@@ -358,7 +358,7 @@ parseUnprocessedFilter(const PropsParserContext &context, const RawValue &value,
358358

359359
inline void fromRawValue(const PropsParserContext &context, const RawValue &value, std::vector<FilterFunction> &result)
360360
{
361-
if (ReactNativeFeatureFlags::enableNativeCSSParsing()) {
361+
if (ReactNativeFeatureFlags_DO_NOT_USE::enableNativeCSSParsing()) {
362362
parseUnprocessedFilter(context, value, result);
363363
} else {
364364
parseProcessedFilter(context, value, result);

‎packages/react-native/ReactCommon/react/renderer/components/view/conversions.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <glog/logging.h>
1313
#include <react/debug/react_native_expect.h>
14-
#include <react/featureflags/ReactNativeFeatureFlags.h>
14+
#include <react/featureflags/ReactNativePublicFeatureFlags.h>
1515
#include <react/renderer/components/view/primitives.h>
1616
#include <react/renderer/core/LayoutMetrics.h>
1717
#include <react/renderer/core/PropsParserContext.h>
@@ -520,7 +520,7 @@ inline yoga::FloatOptional convertAspectRatio(const PropsParserContext & /*conte
520520
if (value.hasType<float>()) {
521521
return yoga::FloatOptional((float)value);
522522
}
523-
if (ReactNativeFeatureFlags::enableNativeCSSParsing() && value.hasType<std::string>()) {
523+
if (ReactNativeFeatureFlags_DO_NOT_USE::enableNativeCSSParsing() && value.hasType<std::string>()) {
524524
auto ratio = parseCSSProperty<CSSRatio>((std::string)value);
525525
if (std::holds_alternative<CSSRatio>(ratio)) {
526526
auto r = std::get<CSSRatio>(ratio);
@@ -995,7 +995,7 @@ inline void parseUnprocessedTransform(const PropsParserContext &context, const R
995995

996996
inline void fromRawValue(const PropsParserContext &context, const RawValue &value, Transform &result)
997997
{
998-
if (ReactNativeFeatureFlags::enableNativeCSSParsing()) {
998+
if (ReactNativeFeatureFlags_DO_NOT_USE::enableNativeCSSParsing()) {
999999
parseUnprocessedTransform(context, value, result);
10001000
} else {
10011001
parseProcessedTransform(context, value, result);
@@ -1079,7 +1079,7 @@ parseUnprocessedTransformOrigin(const PropsParserContext &context, const RawValu
10791079

10801080
inline void fromRawValue(const PropsParserContext &context, const RawValue &value, TransformOrigin &result)
10811081
{
1082-
if (ReactNativeFeatureFlags::enableNativeCSSParsing()) {
1082+
if (ReactNativeFeatureFlags_DO_NOT_USE::enableNativeCSSParsing()) {
10831083
parseUnprocessedTransformOrigin(context, value, result);
10841084
} else {
10851085
parseProcessedTransformOrigin(context, value, result);

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <vector>
1414

1515
#include <react/debug/react_native_assert.h>
16-
#include <react/featureflags/ReactNativeFeatureFlags.h>
16+
#include <react/featureflags/ReactNativePublicFeatureFlags.h>
1717
#include <react/renderer/core/ComponentDescriptor.h>
1818
#include <react/renderer/core/EventDispatcher.h>
1919
#include <react/renderer/core/Props.h>
@@ -56,7 +56,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
5656
// iterator-setter path and the runtime flag is on, `parse()` is never
5757
// called, so the O(n²) preparation here is wasted. Skip it.
5858
if constexpr (HasIteratorSetterCtor<ConcreteProps>) {
59-
if (!ReactNativeFeatureFlags::enableCppPropsIteratorSetter()) {
59+
if (!ReactNativeFeatureFlags_DO_NOT_USE::enableCppPropsIteratorSetter()) {
6060
rawPropsParser_.prepare<ConcreteProps>();
6161
}
6262
} else {
@@ -136,7 +136,8 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
136136
// and the only path when the flag is off): parse + per-field
137137
// `convertRawProp` via the 3-arg ctor.
138138
constexpr bool kSupportsIteratorSetter = HasIteratorSetterCtor<ConcreteProps>;
139-
const bool useIteratorSetter = kSupportsIteratorSetter && ReactNativeFeatureFlags::enableCppPropsIteratorSetter();
139+
const bool useIteratorSetter =
140+
kSupportsIteratorSetter && ReactNativeFeatureFlags_DO_NOT_USE::enableCppPropsIteratorSetter();
140141

141142
std::shared_ptr<ConcreteProps> shadowNodeProps;
142143
if constexpr (kSupportsIteratorSetter) {
@@ -151,11 +152,11 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
151152

152153
#ifdef RN_SERIALIZABLE_STATE
153154
bool fallbackToDynamicRawPropsAccumulation = true;
154-
if (ReactNativeFeatureFlags::enableExclusivePropsUpdateAndroid() &&
155-
ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid()) {
155+
if (ReactNativeFeatureFlags_DO_NOT_USE::enableExclusivePropsUpdateAndroid() &&
156+
ReactNativeFeatureFlags_DO_NOT_USE::enableAccumulatedUpdatesInRawPropsAndroid()) {
156157
// When exclusive props update is enabled, we only apply Props 1.5 processing
157158
// (raw props merging) when Props 2.0 is not available.
158-
if (ReactNativeFeatureFlags::enablePropsUpdateReconciliationAndroid()) {
159+
if (ReactNativeFeatureFlags_DO_NOT_USE::enablePropsUpdateReconciliationAndroid()) {
159160
// Cast to base Props reference to safely call virtual method
160161
const auto &baseProps = static_cast<const Props &>(*shadowNodeProps);
161162
if (strcmp(ShadowNodeT::Name(), baseProps.getDiffPropsImplementationTarget()) == 0) {

‎packages/react-native/ReactCommon/react/renderer/graphics/fromRawValueShared.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <react/cxxstableapi/UmbrellaGuard.h>
1111
#include <react/debug/react_native_expect.h>
12-
#include <react/featureflags/ReactNativeFeatureFlags.h>
12+
#include <react/featureflags/ReactNativePublicFeatureFlags.h>
1313
#include <react/renderer/core/RawValue.h>
1414
#include <react/renderer/css/CSSColor.h>
1515
#include <react/renderer/css/CSSValueParser.h>
@@ -28,7 +28,7 @@ inline void fromRawValueShared(
2828
{
2929
ColorComponents colorComponents = {0, 0, 0, 0};
3030

31-
if (ReactNativeFeatureFlags::enableNativeCSSParsing() && value.hasType<std::string>()) {
31+
if (ReactNativeFeatureFlags_DO_NOT_USE::enableNativeCSSParsing() && value.hasType<std::string>()) {
3232
auto cssColor = parseCSSProperty<CSSColor>((std::string)value);
3333
if (std::holds_alternative<CSSColor>(cssColor)) {
3434
auto c = std::get<CSSColor>(cssColor);

‎packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <cxxreact/TraceSection.h>
1111
#include <jsinspector-modern/tracing/PerformanceTracerSection.h>
1212
#include <react/debug/react_native_assert.h>
13+
#include <react/featureflags/ReactNativeFeatureFlags.h>
1314
#include <react/renderer/components/root/RootComponentDescriptor.h>
1415
#include <react/renderer/core/LayoutContext.h>
1516
#include <react/renderer/core/LayoutPrimitives.h>

‎packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include <gtest/gtest.h>
1111

12+
#include <react/featureflags/ReactNativeFeatureFlags.h>
1213
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
1314
#include <react/renderer/components/root/RootComponentDescriptor.h>
1415
#include <react/renderer/components/scrollview/ScrollViewComponentDescriptor.h>

0 commit comments

Comments
 (0)