AndroidTextInput: don't override text with default/placeholder text e…

…xcept for measurement

Summary:
In C++ we return default/placeholder text instead of text in `getAttributedString` so that measurement is correct. This is fine but we shouldn't actually set the attributedString on the ReactEditText view.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D18672369

fbshipit-source-id: 1bb5cddda3cf78f2cff6f805e67c8994ab32ee7c

ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputShadowNode.cpp

@@ -30,15 +30,16 @@ void AndroidTextInputShadowNode::setContextContainer(
   contextContainer_ = contextContainer;
 }
 
-AttributedString AndroidTextInputShadowNode::getAttributedString() const {
+AttributedString AndroidTextInputShadowNode::getAttributedString(
+    bool usePlaceholders) const {
   auto textAttributes = TextAttributes::defaultTextAttributes();
   textAttributes.apply(getProps()->textAttributes);
 
   // Use BaseTextShadowNode to get attributed string from children
   {
     auto const &attributedString =
         BaseTextShadowNode::getAttributedString(textAttributes, *this);
-    if (!attributedString.isEmpty()) {
+    if (!attributedString.isEmpty() || !usePlaceholders) {
       return attributedString;
     }
   }
@@ -69,7 +70,7 @@ void AndroidTextInputShadowNode::setTextLayoutManager(
 void AndroidTextInputShadowNode::updateStateIfNeeded() {
   ensureUnsealed();
 
-  auto attributedString = getAttributedString();
+  auto attributedString = getAttributedString(false);
   auto const &state = getStateData();
 
   assert(textLayoutManager_);
@@ -92,7 +93,7 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
 
 Size AndroidTextInputShadowNode::measure(
     LayoutConstraints layoutConstraints) const {
-  AttributedString attributedString = getAttributedString();
+  AttributedString attributedString = getAttributedString(true);
 
   if (attributedString.isEmpty()) {
     return {0, 0};

ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputShadowNode.h

@@ -37,7 +37,7 @@ class AndroidTextInputShadowNode : public ConcreteViewShadowNode<
   /*
    * Returns a `AttributedString` which represents text content of the node.
    */
-  AttributedString getAttributedString() const;
+  AttributedString getAttributedString(bool usePlaceholders) const;
 
   /*
    * Associates a shared TextLayoutManager with the node.