diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.cpp index 48557476cf0c..4b1ff61fe4bc 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.cpp @@ -79,7 +79,7 @@ CppMountItem CppMountItem::UpdateEventEmitterMountItem( const ShadowView& shadowView) { return { .type = CppMountItem::Type::UpdateEventEmitter, - .parentTag = -1, + .parentTag = kNoTag, .oldChildShadowView = {}, .newChildShadowView = shadowView, .index = -1}; @@ -88,7 +88,7 @@ CppMountItem CppMountItem::UpdatePaddingMountItem( const ShadowView& shadowView) { return { .type = CppMountItem::Type::UpdatePadding, - .parentTag = -1, + .parentTag = kNoTag, .oldChildShadowView = {}, .newChildShadowView = shadowView, .index = -1}; @@ -97,7 +97,7 @@ CppMountItem CppMountItem::UpdateOverflowInsetMountItem( const ShadowView& shadowView) { return { .type = CppMountItem::Type::UpdateOverflowInset, - .parentTag = -1, + .parentTag = kNoTag, .oldChildShadowView = {}, .newChildShadowView = shadowView, .index = -1}; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.h index 3384e4df3b4c..0901de24f001 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.h @@ -59,7 +59,7 @@ struct CppMountItem final { #pragma mark - Fields Type type = {Create}; - Tag parentTag = -1; + Tag parentTag = kNoTag; ShadowView oldChildShadowView = {}; ShadowView newChildShadowView = {}; int index = {}; diff --git a/packages/react-native/ReactCommon/react/renderer/core/ReactPrimitives.h b/packages/react-native/ReactCommon/react/renderer/core/ReactPrimitives.h index bedbbad08c73..8df3a9c8b247 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ReactPrimitives.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ReactPrimitives.h @@ -18,6 +18,11 @@ namespace facebook::react { */ using Tag = int32_t; +/* + * Value representing an unset tag. + */ +constexpr Tag kNoTag = -1; + /* * An id of a running Surface instance that is used to refer to the instance. */ diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp index 25318623afda..bd146530fb27 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp @@ -14,7 +14,7 @@ namespace facebook::react { ShadowViewMutation ShadowViewMutation::CreateMutation(ShadowView shadowView) { return { /* .type = */ Create, - /* .parentTag = */ -1, + /* .parentTag = */ kNoTag, /* .oldChildShadowView = */ {}, /* .newChildShadowView = */ std::move(shadowView), /* .index = */ -1, @@ -24,7 +24,7 @@ ShadowViewMutation ShadowViewMutation::CreateMutation(ShadowView shadowView) { ShadowViewMutation ShadowViewMutation::DeleteMutation(ShadowView shadowView) { return { /* .type = */ Delete, - /* .parentTag = */ -1, + /* .parentTag = */ kNoTag, /* .oldChildShadowView = */ std::move(shadowView), /* .newChildShadowView = */ {}, /* .index = */ -1, @@ -131,7 +131,7 @@ std::vector getDebugProps( mutation.newChildShadowView, options)} : DebugStringConvertibleObject{}, - mutation.parentTag != -1 + mutation.parentTag != kNoTag ? DebugStringConvertibleObject{"parent", getDebugDescription( mutation.parentTag, diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.h index f74bf8551d08..7782a5a7ef2d 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.h @@ -94,7 +94,7 @@ struct ShadowViewMutation final { #pragma mark - Fields Type type = {Create}; - Tag parentTag = -1; + Tag parentTag = kNoTag; ShadowView oldChildShadowView = {}; ShadowView newChildShadowView = {}; int index = -1; diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h index 2d34fb112bd1..ffd166a0b0dc 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h @@ -19,8 +19,6 @@ namespace facebook::react { -static const int NO_VIEW_TAG = -1; - class StubView final { public: using Shared = std::shared_ptr; @@ -42,7 +40,7 @@ class StubView final { LayoutMetrics layoutMetrics; State::Shared state; std::vector children; - Tag parentTag{NO_VIEW_TAG}; + Tag parentTag{kNoTag}; }; bool operator==(const StubView &lhs, const StubView &rhs); diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubViewTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubViewTree.cpp index 24e19640bf39..53c2e40a242b 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubViewTree.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubViewTree.cpp @@ -51,7 +51,7 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) { for (const auto& mutation : mutations) { switch (mutation.type) { case ShadowViewMutation::Create: { - react_native_assert(mutation.parentTag == -1); + react_native_assert(mutation.parentTag == kNoTag); react_native_assert(mutation.oldChildShadowView == ShadowView{}); react_native_assert(mutation.newChildShadowView.props); auto stubView = std::make_shared(); @@ -81,7 +81,7 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) { << "] ##" << std::hash{}(mutation.oldChildShadowView); }); - react_native_assert(mutation.parentTag == -1); + react_native_assert(mutation.parentTag == kNoTag); react_native_assert(mutation.newChildShadowView == ShadowView{}); auto tag = mutation.oldChildShadowView.tag; react_native_assert(hasTag(tag)); @@ -118,7 +118,7 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) { << parentTag << "] @" << mutation.index << "(" << parentStubView->children.size() << " children)"; }); - react_native_assert(childStubView->parentTag == NO_VIEW_TAG); + react_native_assert(childStubView->parentTag == kNoTag); react_native_assert( mutation.index >= 0 && parentStubView->children.size() >= @@ -182,7 +182,7 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) { static_cast(mutation.index) && parentStubView->children[mutation.index]->tag == childStubView->tag); - childStubView->parentTag = NO_VIEW_TAG; + childStubView->parentTag = kNoTag; parentStubView->children.erase( parentStubView->children.begin() + mutation.index); } diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp index 4dfd3a979e75..1e0626f3080b 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp @@ -389,8 +389,9 @@ void PointerEventsProcessor::processPendingPointerCapture( } auto pendingOverrideTag = - (hasPendingOverride) ? pendingOverride->getTag() : -1; - auto activeOverrideTag = (hasActiveOverride) ? activeOverride->getTag() : -1; + (hasPendingOverride) ? pendingOverride->getTag() : kNoTag; + auto activeOverrideTag = + (hasActiveOverride) ? activeOverride->getTag() : kNoTag; if (hasActiveOverride && activeOverrideTag != pendingOverrideTag) { auto retargeted = retargetPointerEvent(event, *activeOverride, uiManager); diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h index 4c2482875ff4..53f796a808f3 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h @@ -52,7 +52,7 @@ class UIManagerViewTransitionDelegate { Float y{0}; Float width{0}; Float height{0}; - Tag nativeTag{-1}; + Tag nativeTag{kNoTag}; }; virtual std::optional getViewTransitionInstance( diff --git a/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp b/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp index 57edf2878844..e550342b8373 100644 --- a/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp +++ b/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp @@ -554,7 +554,7 @@ ViewTransitionModule::getViewTransitionInstance( auto pseudoElementIt = oldPseudoElementNodes_.find(name); auto nativeTag = pseudoElementIt != oldPseudoElementNodes_.end() ? pseudoElementIt->second->getTag() - : -1; + : kNoTag; return ViewTransitionInstance{ .x = view.layoutMetrics.originFromRoot.x, .y = view.layoutMetrics.originFromRoot.y, diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index 6ef9e8fdfd6d..63ef62b545f6 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -482,6 +482,7 @@ constexpr char* const facebook::react::TextLayoutManagerKey; constexpr facebook::react::HighResDuration facebook::react::DEFAULT_DURATION_THRESHOLD; constexpr facebook::react::HighResDuration facebook::react::LONG_TASK_DURATION_THRESHOLD; constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion; +constexpr facebook::react::Tag facebook::react::kNoTag; constexpr float facebook::react::kDefaultEpsilon; constexpr size_t facebook::react::EVENT_BUFFER_SIZE; constexpr size_t facebook::react::LONG_TASK_BUFFER_SIZE; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api index 7a94e046a082..a17dd79e89b6 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -482,6 +482,7 @@ constexpr char* const facebook::react::TextLayoutManagerKey; constexpr facebook::react::HighResDuration facebook::react::DEFAULT_DURATION_THRESHOLD; constexpr facebook::react::HighResDuration facebook::react::LONG_TASK_DURATION_THRESHOLD; constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion; +constexpr facebook::react::Tag facebook::react::kNoTag; constexpr float facebook::react::kDefaultEpsilon; constexpr size_t facebook::react::EVENT_BUFFER_SIZE; constexpr size_t facebook::react::LONG_TASK_BUFFER_SIZE; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index 5881ae10d0f9..fefaf2892d66 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -482,6 +482,7 @@ constexpr char* const facebook::react::TextLayoutManagerKey; constexpr facebook::react::HighResDuration facebook::react::DEFAULT_DURATION_THRESHOLD; constexpr facebook::react::HighResDuration facebook::react::LONG_TASK_DURATION_THRESHOLD; constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion; +constexpr facebook::react::Tag facebook::react::kNoTag; constexpr float facebook::react::kDefaultEpsilon; constexpr size_t facebook::react::EVENT_BUFFER_SIZE; constexpr size_t facebook::react::LONG_TASK_BUFFER_SIZE; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index 4cb8f69152e0..891cf3086134 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -3407,6 +3407,7 @@ constexpr char* const facebook::react::TextLayoutManagerKey; constexpr facebook::react::HighResDuration facebook::react::DEFAULT_DURATION_THRESHOLD; constexpr facebook::react::HighResDuration facebook::react::LONG_TASK_DURATION_THRESHOLD; constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion; +constexpr facebook::react::Tag facebook::react::kNoTag; constexpr float facebook::react::kDefaultEpsilon; constexpr size_t facebook::react::EVENT_BUFFER_SIZE; constexpr size_t facebook::react::LONG_TASK_BUFFER_SIZE; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index efcf207217fd..3afba2f024d4 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -3399,6 +3399,7 @@ constexpr char* const facebook::react::TextLayoutManagerKey; constexpr facebook::react::HighResDuration facebook::react::DEFAULT_DURATION_THRESHOLD; constexpr facebook::react::HighResDuration facebook::react::LONG_TASK_DURATION_THRESHOLD; constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion; +constexpr facebook::react::Tag facebook::react::kNoTag; constexpr float facebook::react::kDefaultEpsilon; constexpr size_t facebook::react::EVENT_BUFFER_SIZE; constexpr size_t facebook::react::LONG_TASK_BUFFER_SIZE; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index fe198bfd356b..7dbc2971df75 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -3407,6 +3407,7 @@ constexpr char* const facebook::react::TextLayoutManagerKey; constexpr facebook::react::HighResDuration facebook::react::DEFAULT_DURATION_THRESHOLD; constexpr facebook::react::HighResDuration facebook::react::LONG_TASK_DURATION_THRESHOLD; constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion; +constexpr facebook::react::Tag facebook::react::kNoTag; constexpr float facebook::react::kDefaultEpsilon; constexpr size_t facebook::react::EVENT_BUFFER_SIZE; constexpr size_t facebook::react::LONG_TASK_BUFFER_SIZE; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index e6e84e48c02a..588cc00096be 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -178,6 +178,7 @@ constexpr char* const facebook::react::TextLayoutManagerKey; constexpr facebook::react::HighResDuration facebook::react::DEFAULT_DURATION_THRESHOLD; constexpr facebook::react::HighResDuration facebook::react::LONG_TASK_DURATION_THRESHOLD; constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion; +constexpr facebook::react::Tag facebook::react::kNoTag; constexpr float facebook::react::kDefaultEpsilon; constexpr size_t facebook::react::EVENT_BUFFER_SIZE; constexpr size_t facebook::react::LONG_TASK_BUFFER_SIZE; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api index ca7b7c2e26b2..6b46a6ec25ff 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api @@ -178,6 +178,7 @@ constexpr char* const facebook::react::TextLayoutManagerKey; constexpr facebook::react::HighResDuration facebook::react::DEFAULT_DURATION_THRESHOLD; constexpr facebook::react::HighResDuration facebook::react::LONG_TASK_DURATION_THRESHOLD; constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion; +constexpr facebook::react::Tag facebook::react::kNoTag; constexpr float facebook::react::kDefaultEpsilon; constexpr size_t facebook::react::EVENT_BUFFER_SIZE; constexpr size_t facebook::react::LONG_TASK_BUFFER_SIZE; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index acb87a6fd70f..155dd1cfa9c5 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -178,6 +178,7 @@ constexpr char* const facebook::react::TextLayoutManagerKey; constexpr facebook::react::HighResDuration facebook::react::DEFAULT_DURATION_THRESHOLD; constexpr facebook::react::HighResDuration facebook::react::LONG_TASK_DURATION_THRESHOLD; constexpr facebook::react::ReactNativeVersionType facebook::react::ReactNativeVersion; +constexpr facebook::react::Tag facebook::react::kNoTag; constexpr float facebook::react::kDefaultEpsilon; constexpr size_t facebook::react::EVENT_BUFFER_SIZE; constexpr size_t facebook::react::LONG_TASK_BUFFER_SIZE;