Back out "Add fixYogaFlexBasisFitContentInMainAxis flag to avoid unnecessary re-measurement"

Summary:
X-link: facebook/yoga#1912

Original commit changeset: 158715167080

Original Phabricator Diff: D94658492

Differential Revision: D95669495

Author: sammy-SC

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<<55bcfe664afd673f0a9767468a3ca98f>>
+ * @generated SignedSource<<e6da91a25406bc0930e6415da9bdcd55>>
  */
 
 /**
@@ -390,12 +390,6 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun fixTextClippingAndroid15useBoundsForWidth(): Boolean = accessor.fixTextClippingAndroid15useBoundsForWidth()
 
-  /**
-   * When enabled, Yoga will not apply a FitContent constraint in the main axis during flex basis computation for non-measure container nodes. This prevents unnecessary re-measurement and cascading clones when a sibling changes size in a ScrollView.
-   */
-  @JvmStatic
-  public fun fixYogaFlexBasisFitContentInMainAxis(): Boolean = accessor.fixYogaFlexBasisFitContentInMainAxis()
-
   /**
    * Enable system assertion validating that Fusebox is configured with a single host. When set, the CDP backend will dynamically disable features (Perf and Network) in the event that multiple hosts are registered (undefined behaviour), and broadcast this over `ReactNativeApplication.systemStateChanged`.
    */

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<<5ec50a8b4d2627a478ec9633e84ab046>>
+ * @generated SignedSource<<a4c3c9732db567bf8ab9915f731e57ff>>
  */
 
 /**
@@ -80,7 +80,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var fixFindShadowNodeByTagRaceConditionCache: Boolean? = null
   private var fixMappingOfEventPrioritiesBetweenFabricAndReactCache: Boolean? = null
   private var fixTextClippingAndroid15useBoundsForWidthCache: Boolean? = null
-  private var fixYogaFlexBasisFitContentInMainAxisCache: Boolean? = null
   private var fuseboxAssertSingleHostStateCache: Boolean? = null
   private var fuseboxEnabledReleaseCache: Boolean? = null
   private var fuseboxNetworkInspectionEnabledCache: Boolean? = null
@@ -650,15 +649,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
-  override fun fixYogaFlexBasisFitContentInMainAxis(): Boolean {
-    var cached = fixYogaFlexBasisFitContentInMainAxisCache
-    if (cached == null) {
-      cached = ReactNativeFeatureFlagsCxxInterop.fixYogaFlexBasisFitContentInMainAxis()
-      fixYogaFlexBasisFitContentInMainAxisCache = cached
-    }
-    return cached
-  }
-
   override fun fuseboxAssertSingleHostState(): Boolean {
     var cached = fuseboxAssertSingleHostStateCache
     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<<daf8cd270e8f69e6e0c410b4007ee28e>>
+ * @generated SignedSource<<ce1f59ca437f7d8e24bdcbd651e44cc2>>
  */
 
 /**
@@ -148,8 +148,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun fixTextClippingAndroid15useBoundsForWidth(): Boolean
 
-  @DoNotStrip @JvmStatic public external fun fixYogaFlexBasisFitContentInMainAxis(): Boolean
-
   @DoNotStrip @JvmStatic public external fun fuseboxAssertSingleHostState(): Boolean
 
   @DoNotStrip @JvmStatic public external fun fuseboxEnabledRelease(): 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<<0e10c51dcebd6077237c0c0aaff251e8>>
+ * @generated SignedSource<<cd851e80f207b3e141400802917e4981>>
  */
 
 /**
@@ -143,8 +143,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun fixTextClippingAndroid15useBoundsForWidth(): Boolean = false
 
-  override fun fixYogaFlexBasisFitContentInMainAxis(): Boolean = false
-
   override fun fuseboxAssertSingleHostState(): Boolean = true
 
   override fun fuseboxEnabledRelease(): Boolean = false

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<<b1d196c0623e11fbcf59b38143fbe37e>>
+ * @generated SignedSource<<ff9e56efafa98cf4c466c976739a2957>>
  */
 
 /**
@@ -84,7 +84,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var fixFindShadowNodeByTagRaceConditionCache: Boolean? = null
   private var fixMappingOfEventPrioritiesBetweenFabricAndReactCache: Boolean? = null
   private var fixTextClippingAndroid15useBoundsForWidthCache: Boolean? = null
-  private var fixYogaFlexBasisFitContentInMainAxisCache: Boolean? = null
   private var fuseboxAssertSingleHostStateCache: Boolean? = null
   private var fuseboxEnabledReleaseCache: Boolean? = null
   private var fuseboxNetworkInspectionEnabledCache: Boolean? = null
@@ -714,16 +713,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
-  override fun fixYogaFlexBasisFitContentInMainAxis(): Boolean {
-    var cached = fixYogaFlexBasisFitContentInMainAxisCache
-    if (cached == null) {
-      cached = currentProvider.fixYogaFlexBasisFitContentInMainAxis()
-      accessedFeatureFlags.add("fixYogaFlexBasisFitContentInMainAxis")
-      fixYogaFlexBasisFitContentInMainAxisCache = cached
-    }
-    return cached
-  }
-
   override fun fuseboxAssertSingleHostState(): Boolean {
     var cached = fuseboxAssertSingleHostStateCache
     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<<fd463e05fc06ba5bae4f1e0bb99e72b2>>
+ * @generated SignedSource<<39585bb818914cc7a02e18399fe49cbe>>
  */
 
 /**
@@ -143,8 +143,6 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun fixTextClippingAndroid15useBoundsForWidth(): Boolean
 
-  @DoNotStrip public fun fixYogaFlexBasisFitContentInMainAxis(): Boolean
-
   @DoNotStrip public fun fuseboxAssertSingleHostState(): Boolean
 
   @DoNotStrip public fun fuseboxEnabledRelease(): Boolean

packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaErrata.java

@@ -14,7 +14,6 @@ public enum YogaErrata {
   STRETCH_FLEX_BASIS(1),
   ABSOLUTE_POSITION_WITHOUT_INSETS_EXCLUDES_PADDING(2),
   ABSOLUTE_PERCENT_AGAINST_INNER_SIZE(4),
-  FLEX_BASIS_FIT_CONTENT_IN_MAIN_AXIS(8),
   ALL(2147483647),
   CLASSIC(2147483646);
 
@@ -34,7 +33,6 @@ public static YogaErrata fromInt(int value) {
       case 1: return STRETCH_FLEX_BASIS;
       case 2: return ABSOLUTE_POSITION_WITHOUT_INSETS_EXCLUDES_PADDING;
       case 4: return ABSOLUTE_PERCENT_AGAINST_INNER_SIZE;
-      case 8: return FLEX_BASIS_FIT_CONTENT_IN_MAIN_AXIS;
       case 2147483647: return ALL;
       case 2147483646: return CLASSIC;
       default: throw new IllegalArgumentException("Unknown enum value: " + value);

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<<e1d6bbba43ad263257ed723f3a6c2600>>
+ * @generated SignedSource<<0497864a0645d430ac6373047d6d2ea8>>
  */
 
 /**
@@ -399,12 +399,6 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
-  bool fixYogaFlexBasisFitContentInMainAxis() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("fixYogaFlexBasisFitContentInMainAxis");
-    return method(javaProvider_);
-  }
-
   bool fuseboxAssertSingleHostState() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("fuseboxAssertSingleHostState");
@@ -877,11 +871,6 @@ bool JReactNativeFeatureFlagsCxxInterop::fixTextClippingAndroid15useBoundsForWid
   return ReactNativeFeatureFlags::fixTextClippingAndroid15useBoundsForWidth();
 }
 
-bool JReactNativeFeatureFlagsCxxInterop::fixYogaFlexBasisFitContentInMainAxis(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::fixYogaFlexBasisFitContentInMainAxis();
-}
-
 bool JReactNativeFeatureFlagsCxxInterop::fuseboxAssertSingleHostState(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::fuseboxAssertSingleHostState();
@@ -1233,9 +1222,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "fixTextClippingAndroid15useBoundsForWidth",
         JReactNativeFeatureFlagsCxxInterop::fixTextClippingAndroid15useBoundsForWidth),
-      makeNativeMethod(
-        "fixYogaFlexBasisFitContentInMainAxis",
-        JReactNativeFeatureFlagsCxxInterop::fixYogaFlexBasisFitContentInMainAxis),
       makeNativeMethod(
         "fuseboxAssertSingleHostState",
         JReactNativeFeatureFlagsCxxInterop::fuseboxAssertSingleHostState),

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<<c3a280ebf9c5b95d484f3b79fb1ac3e5>>
+ * @generated SignedSource<<9e245713f519765f04c5517c1de47c70>>
  */
 
 /**
@@ -210,9 +210,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool fixTextClippingAndroid15useBoundsForWidth(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool fixYogaFlexBasisFitContentInMainAxis(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool fuseboxAssertSingleHostState(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 

packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.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<<6630f6e51cce8abe8457e6ca17b4db05>>
+ * @generated SignedSource<<10986d98341baa81d1aa3fc90f739367>>
  */
 
 /**
@@ -266,10 +266,6 @@ bool ReactNativeFeatureFlags::fixTextClippingAndroid15useBoundsForWidth() {
   return getAccessor().fixTextClippingAndroid15useBoundsForWidth();
 }
 
-bool ReactNativeFeatureFlags::fixYogaFlexBasisFitContentInMainAxis() {
-  return getAccessor().fixYogaFlexBasisFitContentInMainAxis();
-}
-
 bool ReactNativeFeatureFlags::fuseboxAssertSingleHostState() {
   return getAccessor().fuseboxAssertSingleHostState();
 }