Implement feature flag

Author: j-piasecki

packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -7,6 +7,7 @@
 
 #import "RCTTextInputComponentView.h"
 
+#import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <react/renderer/components/iostextinput/TextInputComponentDescriptor.h>
 #import <react/renderer/textlayoutmanager/RCTAttributedTextUtils.h>
 #import <react/renderer/textlayoutmanager/TextLayoutManager.h>
@@ -128,7 +129,7 @@ - (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection
 {
   [super traitCollectionDidChange:previousTraitCollection];
 
-  if (UITraitCollection.currentTraitCollection.preferredContentSizeCategory !=
+  if (facebook::react::ReactNativeFeatureFlags::enableFontScaleChangesUpdatingLayout() && UITraitCollection.currentTraitCollection.preferredContentSizeCategory !=
       previousTraitCollection.preferredContentSizeCategory) {
     const auto &newTextInputProps = static_cast<const TextInputProps &>(*_props);
     _backedTextInputView.defaultTextAttributes =

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceImpl.java

@@ -26,6 +26,7 @@
 import com.facebook.react.interfaces.TaskInterface;
 import com.facebook.react.interfaces.fabric.ReactSurface;
 import com.facebook.react.interfaces.fabric.SurfaceHandler;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.runtime.internal.bolts.Task;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -248,7 +249,11 @@ private static float getPixelDensity(Context context) {
   }
 
   private static float getFontScale(Context context) {
-    return context.getResources().getConfiguration().fontScale;
+    if (ReactNativeFeatureFlags.enableFontScaleChangesUpdatingLayout()) {
+      return context.getResources().getConfiguration().fontScale;
+    }
+
+    return 1f;
   }
 
   private static boolean isRTL(Context context) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -1084,7 +1084,10 @@ public void onStartTemporaryDetach() {
   @Override
   public void onConfigurationChanged(Configuration newConfig) {
     super.onConfigurationChanged(newConfig);
-    applyTextAttributes();
+
+    if (ReactNativeFeatureFlags.enableBridgelessArchitecture() && ReactNativeFeatureFlags.enableFontScaleChangesUpdatingLayout()) {
+      applyTextAttributes();
+    }
   }
 
   @Override

packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp

@@ -10,6 +10,7 @@
 #include <cmath>
 
 #include <react/debug/react_native_assert.h>
+#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/components/view/ViewShadowNode.h>
 #include <react/renderer/components/view/conversions.h>
@@ -36,8 +37,8 @@ ParagraphShadowNode::ParagraphShadowNode(
 
   if (!fragment.children && !fragment.props &&
       sourceParagraphShadowNode.getIsLayoutClean() &&
-      fontSizeMultiplier_ ==
-          state.attributedString.getBaseTextAttributes().fontSizeMultiplier) {
+      (!ReactNativeFeatureFlags::enableFontScaleChangesUpdatingLayout() || fontSizeMultiplier_ ==
+          state.attributedString.getBaseTextAttributes().fontSizeMultiplier)) {
     // This ParagraphShadowNode was cloned but did not change
     // in a way that affects its layout. Let's mark it clean
     // to stop Yoga from traversing it.

packages/react-native/ReactCommon/react/renderer/components/textinput/BaseTextInputShadowNode.h

@@ -193,7 +193,7 @@ class BaseTextInputShadowNode : public ConcreteViewShadowNode<
       const LayoutContext& layoutContext) const {
     bool meaningfulState = BaseShadowNode::getState() &&
         BaseShadowNode::getState()->getRevision() !=
-            State::initialRevisionValue;
+            State::initialRevisionValue && BaseShadowNode::getStateData().reactTreeAttributedString.getBaseTextAttributes().fontSizeMultiplier == layoutContext.fontSizeMultiplier;
     if (meaningfulState) {
       const auto& stateData = BaseShadowNode::getStateData();
       auto attributedStringBox = stateData.attributedStringBox;

packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp

@@ -9,6 +9,7 @@
 
 #include <cxxreact/TraceSection.h>
 #include <react/debug/react_native_assert.h>
+#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/uimanager/UIManager.h>
 
 namespace facebook::react {
@@ -319,8 +320,8 @@ void SurfaceHandler::constraintLayout(
               propsParserContext, layoutConstraints, layoutContext);
 
           // Dirty all measurable nodes when the fontSizeMultiplier changes to
-          // trigger remeasurement.
-          if (layoutContext.fontSizeMultiplier !=
+          // trigger re-measurement.
+          if (ReactNativeFeatureFlags::enableFontScaleChangesUpdatingLayout() && layoutContext.fontSizeMultiplier !=
               oldRootShadowNode.getConcreteProps()
                   .layoutContext.fontSizeMultiplier) {
             dirtyMeasurableNodes(*newRoot);