Skip to content

Default fixDifferentiatorParentTagForUnflattenCase to true with MC opt-out #57220

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
javache wants to merge 1 commit into from
Closed

Default fixDifferentiatorParentTagForUnflattenCase to true with MC opt-out #57220

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
4 changes: 2 additions & 2 deletions ...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<061d668cf04041f4d3d2f48f11dc739f>>
* @generated SignedSource<<ad505c0c71fa0c6e665a218606b596da>>
*/

/**
Expand Down Expand Up @@ -127,7 +127,7 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi

override fun enableVirtualViewContainerStateExperimental(): Boolean = false

override fun fixDifferentiatorParentTagForUnflattenCase(): Boolean = false
override fun fixDifferentiatorParentTagForUnflattenCase(): Boolean = true

override fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean = false

Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<8dfc52502bd539e5e43d547f895a6d33>>
* @generated SignedSource<<f1921c6321439d8354f90ff261c15cd5>>
*/

/**
Expand Down Expand Up @@ -236,7 +236,7 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
}

bool fixDifferentiatorParentTagForUnflattenCase() override {
return false;
return true;
}

bool fixMappingOfEventPrioritiesBetweenFabricAndReact() override {
Expand Down
12 changes: 10 additions & 2 deletions ...es/react-native/ReactCommon/react/renderer/mounting/tests/DifferentiatorUnflattenTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,14 @@ namespace {

class TestFlagsWithUnflattenFix : public ReactNativeFeatureFlagsDefaults {
public:
explicit TestFlagsWithUnflattenFix(bool enabled) : enabled_(enabled) {}

bool fixDifferentiatorParentTagForUnflattenCase() override {
return true;
return enabled_;
}

private:
bool enabled_;
};

} // namespace
Expand Down Expand Up @@ -164,6 +169,9 @@ class DifferentiatorUnflattenTest : public ::testing::Test {
TEST_F(
DifferentiatorUnflattenTest,
withoutFix_updateMutationHasWrongParentTag) {
ReactNativeFeatureFlags::dangerouslyForceOverride(
std::make_unique<TestFlagsWithUnflattenFix>(false));

applyUnflattenSetup_();

auto mutations = calculateMutations_();
Expand All @@ -186,7 +194,7 @@ TEST_F(
// as parentTag, and StubViewTree::mutate() succeeds without assertion failure.
TEST_F(DifferentiatorUnflattenTest, withFix_updateMutationHasCorrectParentTag) {
ReactNativeFeatureFlags::dangerouslyForceOverride(
std::make_unique<TestFlagsWithUnflattenFix>());
std::make_unique<TestFlagsWithUnflattenFix>(true));

applyUnflattenSetup_();

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ const definitions: FeatureFlagDefinitions = {
ossReleaseStage: 'none',
},
fixDifferentiatorParentTagForUnflattenCase: {
defaultValue: false,
defaultValue: true,
metadata: {
dateAdded: '2026-04-18',
description:
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<609451fd0a38e0f8eaf685e7cf534e27>>
* @generated SignedSource<<3304b4ee2c718dbf4d56b607ea09054d>>
* @flow strict
* @noformat
*/
Expand Down Expand Up @@ -424,7 +424,7 @@ export const enableVirtualViewContainerStateExperimental: Getter<boolean> = crea
/**
* Fix incorrect parentTag passed as parentTagForUpdate in the unflatten-unflatten branch of calculateShadowViewMutationsFlattener, which causes UPDATE mutations to reference a parent being created in the same batch.
*/
export const fixDifferentiatorParentTagForUnflattenCase: Getter<boolean> = createNativeFlagGetter('fixDifferentiatorParentTagForUnflattenCase', false);
export const fixDifferentiatorParentTagForUnflattenCase: Getter<boolean> = createNativeFlagGetter('fixDifferentiatorParentTagForUnflattenCase', true);
/**
* Uses the default event priority instead of the discreet event priority by default when dispatching events from Fabric to React.
*/
Expand Down
Loading