Align TextInput props diffing with native defaults (#59679)

Summary:
Pull Request resolved: #59679

With props diffing, a prop whose value equals its C++ default is not sent when the view is created, so the C++ default has to match the state of a newly created native view. Several `AndroidTextInputProps` fields did not:

- `showSoftInputOnFocus` and `allowFontScaling` defaulted to `false` in C++ but are `true` natively, so setting them to `false` from JS had no effect.
- `autoCorrect` was a plain `bool` defaulting to `false`, while the native setter has three states (on, off, unset). `autoCorrect={false}` was never sent and removing the prop could not restore the platform default. It is now `std::optional<bool>` and is sent as `null` when unset.
- `numberOfLines`, `textBreakStrategy` and `includeFontPadding` were each emitted twice, once from the paragraph attributes and once from a duplicate flat field, with the later one overwriting the earlier. The flat `includeFontPadding` defaulted to `false` while the native default is `true`, so removing `includeFontPadding={true}` sent `false`. These keys are now only emitted from the paragraph attributes.

The flat fields are not used for layout, which reads the paragraph and text attributes, so only the props sent to the native view change.

Changelog:
[Android][Fixed] - Fix `TextInput` props `showSoftInputOnFocus`, `allowFontScaling`, `autoCorrect` and `includeFontPadding` being ignored or reset incorrectly when props diffing is enabled

Differential Revision: D128594780

Author: coado

packages/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp

@@ -75,15 +75,15 @@ AndroidTextInputProps::AndroidTextInputProps(
       showSoftInputOnFocus(convertRawProp(context, rawProps,
           "showSoftInputOnFocus",
           sourceProps.showSoftInputOnFocus,
-          {false})),
+          {true})),
       autoCorrect(convertRawProp(context, rawProps,
           "autoCorrect",
           sourceProps.autoCorrect,
-          {false})),
+          {})),
       allowFontScaling(convertRawProp(context, rawProps,
           "allowFontScaling",
           sourceProps.allowFontScaling,
-          {false})),
+          {true})),
       maxFontSizeMultiplier(convertRawProp(context, rawProps,
           "maxFontSizeMultiplier",
           sourceProps.maxFontSizeMultiplier,
@@ -290,7 +290,8 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["importantForAutofill"] = importantForAutofill;
   props["showSoftInputOnFocus"] = showSoftInputOnFocus;
   props["autoCapitalize"] = autoCapitalize;
-  props["autoCorrect"] = autoCorrect;
+  props["autoCorrect"] =
+      autoCorrect.has_value() ? folly::dynamic(*autoCorrect) : nullptr;
   props["autoFocus"] = autoFocus;
   props["allowFontScaling"] = allowFontScaling;
   props["maxFontSizeMultiplier"] = maxFontSizeMultiplier;
@@ -500,18 +501,10 @@ folly::dynamic AndroidTextInputProps::getDiffProps(
     result["returnKeyLabel"] = returnKeyLabel;
   }
 
-  if (numberOfLines != oldProps->numberOfLines) {
-    result["numberOfLines"] = numberOfLines;
-  }
-
   if (disableFullscreenUI != oldProps->disableFullscreenUI) {
     result["disableFullscreenUI"] = disableFullscreenUI;
   }
 
-  if (textBreakStrategy != oldProps->textBreakStrategy) {
-    result["textBreakStrategy"] = textBreakStrategy;
-  }
-
   if (inlineImageLeft != oldProps->inlineImageLeft) {
     result["inlineImageLeft"] = inlineImageLeft;
   }
@@ -529,7 +522,8 @@ folly::dynamic AndroidTextInputProps::getDiffProps(
   }
 
   if (autoCorrect != oldProps->autoCorrect) {
-    result["autoCorrect"] = autoCorrect;
+    result["autoCorrect"] =
+        autoCorrect.has_value() ? folly::dynamic(*autoCorrect) : nullptr;
   }
 
   if (allowFontScaling != oldProps->allowFontScaling) {
@@ -608,10 +602,6 @@ folly::dynamic AndroidTextInputProps::getDiffProps(
     result["textAlign"] = textAlign;
   }
 
-  if (includeFontPadding != oldProps->includeFontPadding) {
-    result["includeFontPadding"] = includeFontPadding;
-  }
-
   if (fontWeight != oldProps->fontWeight) {
     result["fontWeight"] = fontWeight;
   }

packages/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputProps.h

@@ -16,6 +16,7 @@
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/components/textinput/BaseTextInputProps.h>
 #include <react/renderer/components/textinput/basePrimitives.h>
+#include <optional>
 #include <unordered_map>
 
 namespace facebook::react {
@@ -83,9 +84,9 @@ class AndroidTextInputProps final : public BaseTextInputProps {
   std::string inlineImageLeft{};
   int inlineImagePadding{0};
   std::string importantForAutofill{};
-  bool showSoftInputOnFocus{false};
-  bool autoCorrect{false};
-  bool allowFontScaling{false};
+  bool showSoftInputOnFocus{true};
+  std::optional<bool> autoCorrect{};
+  bool allowFontScaling{true};
   Float maxFontSizeMultiplier{0.0};
   std::string keyboardType{};
   std::string returnKeyType{};

packages/react-native/ReactCommon/react/renderer/components/textinput/tests/AndroidTextInputPropsTest.cpp

@@ -20,6 +20,46 @@ TEST(AndroidTextInputPropsTest, diffPropsTargetMatchesComponentName) {
       AndroidTextInputShadowNode::Name());
 }
 
+// Values equal to the C++ default are not sent on creation, so the C++ default
+// has to match the state of a newly created native view.
+TEST(AndroidTextInputPropsTest, diffSendsValuesThatDifferFromNativeDefaults) {
+  AndroidTextInputProps props;
+  props.showSoftInputOnFocus = false;
+  props.allowFontScaling = false;
+  props.autoCorrect = false;
+
+  auto diff = props.getDiffProps(nullptr);
+
+  EXPECT_EQ(diff["showSoftInputOnFocus"], false);
+  EXPECT_EQ(diff["allowFontScaling"], false);
+  EXPECT_EQ(diff["autoCorrect"], false);
+}
+
+TEST(AndroidTextInputPropsTest, diffOfDefaultPropsIsEmpty) {
+  EXPECT_TRUE(AndroidTextInputProps().getDiffProps(nullptr).empty());
+}
+
+TEST(AndroidTextInputPropsTest, removedAutoCorrectIsSentAsNull) {
+  AndroidTextInputProps oldProps;
+  oldProps.autoCorrect = false;
+
+  auto diff = AndroidTextInputProps().getDiffProps(&oldProps);
+
+  ASSERT_EQ(diff.count("autoCorrect"), 1);
+  EXPECT_TRUE(diff["autoCorrect"].isNull());
+}
+
+// `includeFontPadding` is sent from the paragraph attributes only, whose
+// default matches the native default.
+TEST(AndroidTextInputPropsTest, removedIncludeFontPaddingIsNotSentAsFalse) {
+  AndroidTextInputProps oldProps;
+  oldProps.includeFontPadding = true;
+
+  auto diff = AndroidTextInputProps().getDiffProps(&oldProps);
+
+  EXPECT_EQ(diff.count("includeFontPadding"), 0);
+}
+
 } // namespace facebook::react
 
 #endif