Add separate flags for recycling View, Text components (#49211)

Summary: Pull Request resolved: #49211 Add more control over view recycling behavior by splitting out each component that currently supports it. Changelog:[Android][Added] Feature flags for recycling View, Text components separately Reviewed By: sammy-SC, mdvacca Differential Revision: D69190841 fbshipit-source-id: 6d85fee7103bf928e4f5bf6946bab3ff4cae4053

Author: Thomas Nardone

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

@@ -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<<5d3aa805cfedaf97ef3e6229046dc288>>
+ * @generated SignedSource<<d7e150b5b7f7b62f347bc417f542f2ba>>
  */
 
 /**
@@ -172,6 +172,18 @@ public object ReactNativeFeatureFlags {
  @JvmStatic
  public fun enableViewRecycling(): Boolean = accessor.enableViewRecycling()
 
+ /**
+ * Enables View Recycling for <Text> via ReactTextView/ReactTextViewManager.
+ */
+ @JvmStatic
+ public fun enableViewRecyclingForText(): Boolean = accessor.enableViewRecyclingForText()
+
+ /**
+ * Enables View Recycling for <View> via ReactViewGroup/ReactViewManager.
+ */
+ @JvmStatic
+ public fun enableViewRecyclingForView(): Boolean = accessor.enableViewRecyclingForView()
+
  /**
  * When enabled, rawProps in Props will not include Yoga specific props.
  */

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

@@ -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<<001f61b20e3bacb67e4145a257cb92b1>>
+ * @generated SignedSource<<ae7503526759f8b9f1ef56207ee1cab5>>
  */
 
 /**
@@ -44,6 +44,8 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
  private var enableSynchronousStateUpdatesCache: Boolean? = null
  private var enableUIConsistencyCache: Boolean? = null
  private var enableViewRecyclingCache: Boolean? = null
+ private var enableViewRecyclingForTextCache: Boolean? = null
+ private var enableViewRecyclingForViewCache: Boolean? = null
  private var excludeYogaFromRawPropsCache: Boolean? = null
  private var fixDifferentiatorEmittingUpdatesWithWrongParentTagCache: Boolean? = null
  private var fixMappingOfEventPrioritiesBetweenFabricAndReactCache: Boolean? = null
@@ -278,6 +280,24 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
  return cached
  }
 
+ override fun enableViewRecyclingForText(): Boolean {
+ var cached = enableViewRecyclingForTextCache
+ if (cached == null) {
+ cached = ReactNativeFeatureFlagsCxxInterop.enableViewRecyclingForText()
+ enableViewRecyclingForTextCache = cached
+ }
+ return cached
+ }
+
+ override fun enableViewRecyclingForView(): Boolean {
+ var cached = enableViewRecyclingForViewCache
+ if (cached == null) {
+ cached = ReactNativeFeatureFlagsCxxInterop.enableViewRecyclingForView()
+ enableViewRecyclingForViewCache = cached
+ }
+ return cached
+ }
+
  override fun excludeYogaFromRawProps(): Boolean {
  var cached = excludeYogaFromRawPropsCache
  if (cached == null) {

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

@@ -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<<745b574df700a813a49fed3c88aada66>>
+ * @generated SignedSource<<5292a5f705fc3587ee9d81cc83a79c05>>
  */
 
 /**
@@ -76,6 +76,10 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
  @DoNotStrip @JvmStatic public external fun enableViewRecycling(): Boolean
 
+ @DoNotStrip @JvmStatic public external fun enableViewRecyclingForText(): Boolean
+
+ @DoNotStrip @JvmStatic public external fun enableViewRecyclingForView(): Boolean
+
  @DoNotStrip @JvmStatic public external fun excludeYogaFromRawProps(): Boolean
 
  @DoNotStrip @JvmStatic public external fun fixDifferentiatorEmittingUpdatesWithWrongParentTag(): Boolean

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

@@ -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<<86207e36abfecc310dbd28b8d61c5fbf>>
+ * @generated SignedSource<<d904f548576348ea7a6eb58fa306faea>>
  */
 
 /**
@@ -71,6 +71,10 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
  override fun enableViewRecycling(): Boolean = false
 
+ override fun enableViewRecyclingForText(): Boolean = true
+
+ override fun enableViewRecyclingForView(): Boolean = true
+
  override fun excludeYogaFromRawProps(): Boolean = false
 
  override fun fixDifferentiatorEmittingUpdatesWithWrongParentTag(): Boolean = true

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

@@ -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<<c2ee44bcc04c2ab7fdb14c66980c7d73>>
+ * @generated SignedSource<<f2440756231f770d7240112ed2a460d8>>
  */
 
 /**
@@ -48,6 +48,8 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
  private var enableSynchronousStateUpdatesCache: Boolean? = null
  private var enableUIConsistencyCache: Boolean? = null
  private var enableViewRecyclingCache: Boolean? = null
+ private var enableViewRecyclingForTextCache: Boolean? = null
+ private var enableViewRecyclingForViewCache: Boolean? = null
  private var excludeYogaFromRawPropsCache: Boolean? = null
  private var fixDifferentiatorEmittingUpdatesWithWrongParentTagCache: Boolean? = null
  private var fixMappingOfEventPrioritiesBetweenFabricAndReactCache: Boolean? = null
@@ -306,6 +308,26 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
  return cached
  }
 
+ override fun enableViewRecyclingForText(): Boolean {
+ var cached = enableViewRecyclingForTextCache
+ if (cached == null) {
+ cached = currentProvider.enableViewRecyclingForText()
+ accessedFeatureFlags.add("enableViewRecyclingForText")
+ enableViewRecyclingForTextCache = cached
+ }
+ return cached
+ }
+
+ override fun enableViewRecyclingForView(): Boolean {
+ var cached = enableViewRecyclingForViewCache
+ if (cached == null) {
+ cached = currentProvider.enableViewRecyclingForView()
+ accessedFeatureFlags.add("enableViewRecyclingForView")
+ enableViewRecyclingForViewCache = cached
+ }
+ return cached
+ }
+
  override fun excludeYogaFromRawProps(): Boolean {
  var cached = excludeYogaFromRawPropsCache
  if (cached == null) {

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

@@ -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<<e592fe3140fb310638240a84bd3f3e8f>>
+ * @generated SignedSource<<3bb3618781161c0b6beaffcfabf0288c>>
  */
 
 /**
@@ -71,6 +71,10 @@ public interface ReactNativeFeatureFlagsProvider {
 
  @DoNotStrip public fun enableViewRecycling(): Boolean
 
+ @DoNotStrip public fun enableViewRecyclingForText(): Boolean
+
+ @DoNotStrip public fun enableViewRecyclingForView(): Boolean
+
  @DoNotStrip public fun excludeYogaFromRawProps(): Boolean
 
  @DoNotStrip public fun fixDifferentiatorEmittingUpdatesWithWrongParentTag(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java

@@ -18,6 +18,7 @@
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.common.mapbuffer.MapBuffer;
 import com.facebook.react.internal.SystraceSection;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.IViewManagerWithChildren;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate;
@@ -58,7 +59,9 @@ public ReactTextViewManager() {
 
  public ReactTextViewManager(@Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
  mReactTextViewManagerCallback = reactTextViewManagerCallback;
- setupViewRecycling();
+ if (ReactNativeFeatureFlags.enableViewRecyclingForText()) {
+ setupViewRecycling();
+ }
  }
 
  @Override

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt

@@ -18,6 +18,7 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.ReactConstants
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.BackgroundStyleApplicator
 import com.facebook.react.uimanager.LengthPercentage
@@ -63,7 +64,9 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
  }
 
  init {
- setupViewRecycling()
+ if (ReactNativeFeatureFlags.enableViewRecyclingForView()) {
+ setupViewRecycling()
+ }
  }
 
  override fun prepareToRecycleView(

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

@@ -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<<89691e6748ef791ca022f1289304046d>>
+ * @generated SignedSource<<b04123b022b1f120895d027f8bc12a4e>>
  */
 
 /**
@@ -183,6 +183,18 @@ class ReactNativeFeatureFlagsProviderHolder
  return method(javaProvider_);
  }
 
+ bool enableViewRecyclingForText() override {
+ static const auto method =
+ getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableViewRecyclingForText");
+ return method(javaProvider_);
+ }
+
+ bool enableViewRecyclingForView() override {
+ static const auto method =
+ getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableViewRecyclingForView");
+ return method(javaProvider_);
+ }
+
  bool excludeYogaFromRawProps() override {
  static const auto method =
  getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("excludeYogaFromRawProps");
@@ -409,6 +421,16 @@ bool JReactNativeFeatureFlagsCxxInterop::enableViewRecycling(
  return ReactNativeFeatureFlags::enableViewRecycling();
 }
 
+bool JReactNativeFeatureFlagsCxxInterop::enableViewRecyclingForText(
+ facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+ return ReactNativeFeatureFlags::enableViewRecyclingForText();
+}
+
+bool JReactNativeFeatureFlagsCxxInterop::enableViewRecyclingForView(
+ facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+ return ReactNativeFeatureFlags::enableViewRecyclingForView();
+}
+
 bool JReactNativeFeatureFlagsCxxInterop::excludeYogaFromRawProps(
  facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
  return ReactNativeFeatureFlags::excludeYogaFromRawProps();
@@ -597,6 +619,12 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
  makeNativeMethod(
  "enableViewRecycling",
  JReactNativeFeatureFlagsCxxInterop::enableViewRecycling),
+ makeNativeMethod(
+ "enableViewRecyclingForText",
+ JReactNativeFeatureFlagsCxxInterop::enableViewRecyclingForText),
+ makeNativeMethod(
+ "enableViewRecyclingForView",
+ JReactNativeFeatureFlagsCxxInterop::enableViewRecyclingForView),
  makeNativeMethod(
  "excludeYogaFromRawProps",
  JReactNativeFeatureFlagsCxxInterop::excludeYogaFromRawProps),

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

@@ -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<<00ecf4fa0d9e7286d2ddb824970fb392>>
+ * @generated SignedSource<<141e3b288582658dac52d18b9f8fe273>>
  */
 
 /**
@@ -102,6 +102,12 @@ class JReactNativeFeatureFlagsCxxInterop
  static bool enableViewRecycling(
  facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+ static bool enableViewRecyclingForText(
+ facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
+ static bool enableViewRecyclingForView(
+ facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
  static bool excludeYogaFromRawProps(
  facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);