Share logic in BaseTextInputShadowNode to calculate placeholder string

Summary: As a preparation for facebook#48165 this change aligns the order of methods between: - BaseTextInputShadowNode.h - AndroidTextInputShadowNode.h Differential Revision: D68004218
christophpurrer · Jan 10, 2025 · 45e9205 · 45e9205
1 parent cae8ee6
commit 45e9205
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 36 deletions.
diff --git a/...es/react-native/ReactCommon/react/renderer/components/textinput/BaseTextInputShadowNode.h b/...es/react-native/ReactCommon/react/renderer/components/textinput/BaseTextInputShadowNode.h
@@ -97,13 +97,7 @@ class BaseTextInputShadowNode : public ConcreteViewShadowNode<
     auto attributedString = getAttributedString(layoutContext);
 
     if (attributedString.isEmpty()) {
-      auto placeholderString = !props.placeholder.empty()
-          ? props.placeholder
-          : BaseTextShadowNode::getEmptyPlaceholder();
-      auto textAttributes =
-          props.getEffectiveTextAttributes(layoutContext.fontSizeMultiplier);
-      attributedString.appendFragment(
-          {std::move(placeholderString), textAttributes, {}});
+      attributedString = getPlaceholderAttributedString(layoutContext);
     }
 
     // Yoga expects a baseline relative to the Node's border-box edge instead of
@@ -217,21 +211,31 @@ class BaseTextInputShadowNode : public ConcreteViewShadowNode<
         : getAttributedString(layoutContext);
 
     if (attributedString.isEmpty()) {
-      const auto& props = BaseShadowNode::getConcreteProps();
-      auto placeholder = props.placeholder;
-      // Note: `zero-width space` is insufficient in some cases (e.g. when we
-      // need to measure the "hight" of the font).
-      // TODO T67606511: We will redefine the measurement of empty strings as
-      // part of T67606511
-      auto string = !placeholder.empty()
-          ? placeholder
-          : BaseTextShadowNode::getEmptyPlaceholder();
-      auto textAttributes =
-          props.getEffectiveTextAttributes(layoutContext.fontSizeMultiplier);
-      attributedString.appendFragment({string, textAttributes, {}});
+      attributedString = getPlaceholderAttributedString(layoutContext);
     }
     return AttributedStringBox{attributedString};
   }
+
+  // For measurement purposes, we want to make sure that there's at least a
+  // single character in the string so that the measured height is greater
+  // than zero. Otherwise, empty TextInputs with no placeholder don't
+  // display at all.
+  // TODO T67606511: We will redefine the measurement of empty strings as part
+  // of T67606511
+  AttributedString getPlaceholderAttributedString(
+      const LayoutContext& layoutContext) const {
+    const auto& props = BaseShadowNode::getConcreteProps();
+
+    AttributedString attributedString;
+    auto placeholderString = !props.placeholder.empty()
+        ? props.placeholder
+        : BaseTextShadowNode::getEmptyPlaceholder();
+    auto textAttributes =
+        props.getEffectiveTextAttributes(layoutContext.fontSizeMultiplier);
+    attributedString.appendFragment(
+        {std::move(placeholderString), textAttributes, {}});
+    return attributedString;
+  }
 };
 
 } // namespace facebook::react
diff --git a/...latform/android/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp b/...latform/android/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
@@ -215,25 +215,17 @@ AttributedString AndroidTextInputShadowNode::getMostRecentAttributedString()
 // of T67606511
 AttributedString AndroidTextInputShadowNode::getPlaceholderAttributedString()
     const {
-  // Return placeholder text, since text and children are empty.
-  auto textAttributedString = AttributedString{};
-  auto fragment = AttributedString::Fragment{};
-  fragment.string = getConcreteProps().placeholder;
-
-  if (fragment.string.empty()) {
-    fragment.string = BaseTextShadowNode::getEmptyPlaceholder();
-  }
+  const auto& props = BaseShadowNode::getConcreteProps();
 
+  AttributedString attributedString;
+  auto placeholderString = !props.placeholder.empty()
+      ? props.placeholder
+      : BaseTextShadowNode::getEmptyPlaceholder();
   auto textAttributes = TextAttributes::defaultTextAttributes();
-  textAttributes.apply(getConcreteProps().textAttributes);
-
-  // If there's no text, it's possible that this Fragment isn't actually
-  // appended to the AttributedString (see implementation of appendFragment)
-  fragment.textAttributes = textAttributes;
-  fragment.parentShadowView = ShadowView(*this);
-  textAttributedString.appendFragment(std::move(fragment));
-
-  return textAttributedString;
+  textAttributes.apply(props.textAttributes);
+  attributedString.appendFragment(
+      {std::move(placeholderString), textAttributes, ShadowView(*this)});
+  return attributedString;
 }
 
 } // namespace facebook::react