Skip to content

Commit e3d7bf0

Browse files
javachemeta-codesync[bot]
javache
authored and
meta-codesync[bot]
committed
Remove differentiator unflatten feature flag
Summary: Make the corrected parent-tag path unconditional and remove obsolete flag plumbing now that the behaviour is fully enabled. Changelog: [Internal] Reviewed By: jehartzog Differential Revision: D121181685
1 parent 900b717 commit e3d7bf0

22 files changed

Lines changed: 57 additions & 242 deletions

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<a5c748863dbb09c323056ca1ec17774b>>
7+
* @generated SignedSource<<ab68be1fe69275aae7e13121d0827f0e>>
88
*/
99

1010
/**
@@ -360,12 +360,6 @@ public object ReactNativeFeatureFlags {
360360
@JvmStatic
361361
public fun enableVirtualViewContainerStateExperimental(): Boolean = accessor.enableVirtualViewContainerStateExperimental()
362362

363-
/**
364-
* 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.
365-
*/
366-
@JvmStatic
367-
public fun fixDifferentiatorParentTagForUnflattenCase(): Boolean = accessor.fixDifferentiatorParentTagForUnflattenCase()
368-
369363
/**
370364
* Uses the default event priority instead of the discreet event priority by default when dispatching events from Fabric to React.
371365
*/

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<e69290c5801d6f796d368c643f9e8072>>
7+
* @generated SignedSource<<00e1e0529cbef727ab81a6a75174c87e>>
88
*/
99

1010
/**
@@ -75,7 +75,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
7575
private var enableViewRecyclingForTextCache: Boolean? = null
7676
private var enableViewRecyclingForViewCache: Boolean? = null
7777
private var enableVirtualViewContainerStateExperimentalCache: Boolean? = null
78-
private var fixDifferentiatorParentTagForUnflattenCaseCache: Boolean? = null
7978
private var fixMappingOfEventPrioritiesBetweenFabricAndReactCache: Boolean? = null
8079
private var fixYogaFlexBasisFitContentInMainAxisCache: Boolean? = null
8180
private var fuseboxAssertSingleHostStateCache: Boolean? = null
@@ -605,15 +604,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
605604
return cached
606605
}
607606

608-
override fun fixDifferentiatorParentTagForUnflattenCase(): Boolean {
609-
var cached = fixDifferentiatorParentTagForUnflattenCaseCache
610-
if (cached == null) {
611-
cached = ReactNativeFeatureFlagsCxxInterop.fixDifferentiatorParentTagForUnflattenCase()
612-
fixDifferentiatorParentTagForUnflattenCaseCache = cached
613-
}
614-
return cached
615-
}
616-
617607
override fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean {
618608
var cached = fixMappingOfEventPrioritiesBetweenFabricAndReactCache
619609
if (cached == null) {

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<b56cf5b92dffb93e08b3f89668b7eb90>>
7+
* @generated SignedSource<<427c98d364e8a0aec3a0834b6a8117c8>>
88
*/
99

1010
/**
@@ -138,8 +138,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
138138

139139
@DoNotStrip @JvmStatic public external fun enableVirtualViewContainerStateExperimental(): Boolean
140140

141-
@DoNotStrip @JvmStatic public external fun fixDifferentiatorParentTagForUnflattenCase(): Boolean
142-
143141
@DoNotStrip @JvmStatic public external fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean
144142

145143
@DoNotStrip @JvmStatic public external fun fixYogaFlexBasisFitContentInMainAxis(): Boolean

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<763e4b3cc142f1d34e7ce656ede0cb96>>
7+
* @generated SignedSource<<b6c47b10d221b493df4038e492482961>>
88
*/
99

1010
/**
@@ -133,8 +133,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
133133

134134
override fun enableVirtualViewContainerStateExperimental(): Boolean = false
135135

136-
override fun fixDifferentiatorParentTagForUnflattenCase(): Boolean = true
137-
138136
override fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean = false
139137

140138
override fun fixYogaFlexBasisFitContentInMainAxis(): Boolean = false

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<50bc14130889050ec9d447626454fe58>>
7+
* @generated SignedSource<<20a908f1ef475bb5f51b631e2d0f2038>>
88
*/
99

1010
/**
@@ -79,7 +79,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
7979
private var enableViewRecyclingForTextCache: Boolean? = null
8080
private var enableViewRecyclingForViewCache: Boolean? = null
8181
private var enableVirtualViewContainerStateExperimentalCache: Boolean? = null
82-
private var fixDifferentiatorParentTagForUnflattenCaseCache: Boolean? = null
8382
private var fixMappingOfEventPrioritiesBetweenFabricAndReactCache: Boolean? = null
8483
private var fixYogaFlexBasisFitContentInMainAxisCache: Boolean? = null
8584
private var fuseboxAssertSingleHostStateCache: Boolean? = null
@@ -664,16 +663,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
664663
return cached
665664
}
666665

667-
override fun fixDifferentiatorParentTagForUnflattenCase(): Boolean {
668-
var cached = fixDifferentiatorParentTagForUnflattenCaseCache
669-
if (cached == null) {
670-
cached = currentProvider.fixDifferentiatorParentTagForUnflattenCase()
671-
accessedFeatureFlags.add("fixDifferentiatorParentTagForUnflattenCase")
672-
fixDifferentiatorParentTagForUnflattenCaseCache = cached
673-
}
674-
return cached
675-
}
676-
677666
override fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean {
678667
var cached = fixMappingOfEventPrioritiesBetweenFabricAndReactCache
679668
if (cached == null) {

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<a9eed3dc15b11bd5708439de0dc46cf9>>
7+
* @generated SignedSource<<ac56780559e180d552086f3c53a1f111>>
88
*/
99

1010
/**
@@ -133,8 +133,6 @@ public interface ReactNativeFeatureFlagsProvider {
133133

134134
@DoNotStrip public fun enableVirtualViewContainerStateExperimental(): Boolean
135135

136-
@DoNotStrip public fun fixDifferentiatorParentTagForUnflattenCase(): Boolean
137-
138136
@DoNotStrip public fun fixMappingOfEventPrioritiesBetweenFabricAndReact(): Boolean
139137

140138
@DoNotStrip public fun fixYogaFlexBasisFitContentInMainAxis(): Boolean

‎packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<faf56e666f2f0aab01e17fa7d6e186c0>>
7+
* @generated SignedSource<<13e3827487eba885b4de3746844f1942>>
88
*/
99

1010
/**
@@ -369,12 +369,6 @@ class ReactNativeFeatureFlagsJavaProvider
369369
return method(javaProvider_);
370370
}
371371

372-
bool fixDifferentiatorParentTagForUnflattenCase() override {
373-
static const auto method =
374-
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("fixDifferentiatorParentTagForUnflattenCase");
375-
return method(javaProvider_);
376-
}
377-
378372
bool fixMappingOfEventPrioritiesBetweenFabricAndReact() override {
379373
static const auto method =
380374
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("fixMappingOfEventPrioritiesBetweenFabricAndReact");
@@ -852,11 +846,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableVirtualViewContainerStateExperime
852846
return ReactNativeFeatureFlags::enableVirtualViewContainerStateExperimental();
853847
}
854848

855-
bool JReactNativeFeatureFlagsCxxInterop::fixDifferentiatorParentTagForUnflattenCase(
856-
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
857-
return ReactNativeFeatureFlags::fixDifferentiatorParentTagForUnflattenCase();
858-
}
859-
860849
bool JReactNativeFeatureFlagsCxxInterop::fixMappingOfEventPrioritiesBetweenFabricAndReact(
861850
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
862851
return ReactNativeFeatureFlags::fixMappingOfEventPrioritiesBetweenFabricAndReact();
@@ -1218,9 +1207,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
12181207
makeNativeMethod(
12191208
"enableVirtualViewContainerStateExperimental",
12201209
JReactNativeFeatureFlagsCxxInterop::enableVirtualViewContainerStateExperimental),
1221-
makeNativeMethod(
1222-
"fixDifferentiatorParentTagForUnflattenCase",
1223-
JReactNativeFeatureFlagsCxxInterop::fixDifferentiatorParentTagForUnflattenCase),
12241210
makeNativeMethod(
12251211
"fixMappingOfEventPrioritiesBetweenFabricAndReact",
12261212
JReactNativeFeatureFlagsCxxInterop::fixMappingOfEventPrioritiesBetweenFabricAndReact),

‎packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<006f29ff357deddc058c69c31528db83>>
7+
* @generated SignedSource<<c26583b78a9872a4918ce98631899c72>>
88
*/
99

1010
/**
@@ -195,9 +195,6 @@ class JReactNativeFeatureFlagsCxxInterop
195195
static bool enableVirtualViewContainerStateExperimental(
196196
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
197197

198-
static bool fixDifferentiatorParentTagForUnflattenCase(
199-
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
200-
201198
static bool fixMappingOfEventPrioritiesBetweenFabricAndReact(
202199
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
203200

‎packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<d61dace8faf4a80d6babbcd72bdbbde9>>
7+
* @generated SignedSource<<32b83f89bbe2015f8e5dc52bbd621921>>
88
*/
99

1010
/**
@@ -246,10 +246,6 @@ bool ReactNativeFeatureFlags::enableVirtualViewContainerStateExperimental() {
246246
return getAccessor().enableVirtualViewContainerStateExperimental();
247247
}
248248

249-
bool ReactNativeFeatureFlags::fixDifferentiatorParentTagForUnflattenCase() {
250-
return getAccessor().fixDifferentiatorParentTagForUnflattenCase();
251-
}
252-
253249
bool ReactNativeFeatureFlags::fixMappingOfEventPrioritiesBetweenFabricAndReact() {
254250
return getAccessor().fixMappingOfEventPrioritiesBetweenFabricAndReact();
255251
}

‎packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<7f1f0374fb5e2ec1b2727d1d2a7fc304>>
7+
* @generated SignedSource<<13ce24473fdf631a2689e2ad89904fcd>>
88
*/
99

1010
/**
@@ -316,11 +316,6 @@ class ReactNativeFeatureFlags {
316316
*/
317317
RN_EXPORT static bool enableVirtualViewContainerStateExperimental();
318318

319-
/**
320-
* 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.
321-
*/
322-
RN_EXPORT static bool fixDifferentiatorParentTagForUnflattenCase();
323-
324319
/**
325320
* Uses the default event priority instead of the discreet event priority by default when dispatching events from Fabric to React.
326321
*/

0 commit comments

Comments
 (0)