Skip to content

Name the no-tag sentinel and use it for the hardcoded -1 tags #58531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
janicduplessis wants to merge 1 commit into from
Closed

Name the no-tag sentinel and use it for the hardcoded -1 tags #58531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ CppMountItem CppMountItem::UpdateEventEmitterMountItem(
const ShadowView& shadowView) {
return {
.type = CppMountItem::Type::UpdateEventEmitter,
.parentTag = -1,
.parentTag = kNoTag,
.oldChildShadowView = {},
.newChildShadowView = shadowView,
.index = -1};
Expand All @@ -88,7 +88,7 @@ CppMountItem CppMountItem::UpdatePaddingMountItem(
const ShadowView& shadowView) {
return {
.type = CppMountItem::Type::UpdatePadding,
.parentTag = -1,
.parentTag = kNoTag,
.oldChildShadowView = {},
.newChildShadowView = shadowView,
.index = -1};
Expand All @@ -97,7 +97,7 @@ CppMountItem CppMountItem::UpdateOverflowInsetMountItem(
const ShadowView& shadowView) {
return {
.type = CppMountItem::Type::UpdateOverflowInset,
.parentTag = -1,
.parentTag = kNoTag,
.oldChildShadowView = {},
.newChildShadowView = shadowView,
.index = -1};
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand Down
5 changes: 5 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/core/ReactPrimitives.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -131,7 +131,7 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
mutation.newChildShadowView,
options)}
: DebugStringConvertibleObject{},
mutation.parentTag != -1
mutation.parentTag != kNoTag
? DebugStringConvertibleObject{"parent",
getDebugDescription(
mutation.parentTag,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

namespace facebook::react {

static const int NO_VIEW_TAG = -1;

class StubView final {
public:
using Shared = std::shared_ptr<StubView>;
Expand All @@ -42,7 +40,7 @@ class StubView final {
LayoutMetrics layoutMetrics;
State::Shared state;
std::vector<StubView::Shared> children;
Tag parentTag{NO_VIEW_TAG};
Tag parentTag{kNoTag};
};

bool operator==(const StubView &lhs, const StubView &rhs);
Expand Down
8 changes: 4 additions & 4 deletions packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubViewTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<StubView>();
Expand Down Expand Up @@ -81,7 +81,7 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) {
<< "] ##"
<< std::hash<ShadowView>{}(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));
Expand Down Expand Up @@ -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() >=
Expand Down Expand Up @@ -182,7 +182,7 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) {
static_cast<size_t>(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);
}
Expand Down
5 changes: 3 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class UIManagerViewTransitionDelegate {
Float y{0};
Float width{0};
Float height{0};
Tag nativeTag{-1};
Tag nativeTag{kNoTag};
};

virtual std::optional<ViewTransitionInstance> getViewTransitionInstance(
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading