passing textAlignVert from js NestedText to Java

fabOnReact · fabOnReact · commit 7d147decce71 · 2022-12-22T20:28:09.000+01:00
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java
@@ -54,7 +54,7 @@ public class TextAttributeProps {
   public static final short TA_KEY_IS_HIGHLIGHTED = 20;
   public static final short TA_KEY_LAYOUT_DIRECTION = 21;
   public static final short TA_KEY_ACCESSIBILITY_ROLE = 22;
-  public static final short TA_KEY_VERTICAL_ALIGN = 23;
+  public static final short TA_KEY_ALIGN_VERTICAL = 24;
 
   public static final int UNSET = -1;
 
@@ -208,8 +208,8 @@ public static TextAttributeProps fromMapBuffer(MapBuffer props) {
         case TA_KEY_ACCESSIBILITY_ROLE:
           result.setAccessibilityRole(entry.getStringValue());
           break;
-        case TA_KEY_VERTICAL_ALIGN:
-          result.setVerticalAlign(entry.getStringValue());
+        case TA_KEY_ALIGN_VERTICAL:
+          result.setTextAlignVertical(entry.getStringValue());
           break;
       }
     }
@@ -615,9 +615,9 @@ private void setAccessibilityRole(@Nullable String accessibilityRole) {
     }
   }
 
-  private void setVerticalAlign(@Nullable String verticalAlign) {
-    FLog.w("React::", "verticalAlign: " + (verticalAlign));
+  private void setTextAlignVertical(@Nullable String verticalAlign) {
     if (verticalAlign != null) {
+      FLog.w("React::", "verticalAlign: " + (verticalAlign));
       mVerticalAlign = verticalAlign;
     }
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
@@ -144,7 +144,7 @@ private static void buildSpannableFromFragment(
           ops.add(new SetSpanOperation(start, end, new ReactSuperscriptSpan()));
         }
         if (textAttributes.mIsAccessibilityLink) {
-          ops.add(new SetSpanOperation(start, end, new ReactClickableSpan(reactTag)));
+          ops.add(new SetSpanOperation(start, end, new ReactSuperscriptSpan()));
         }
         if (textAttributes.mIsColorSet) {
           ops.add(
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
@@ -101,7 +101,7 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   accessibilityRole = textAttributes.accessibilityRole.has_value()
       ? textAttributes.accessibilityRole
       : accessibilityRole;
-  textVerticalAlign = !textAttributes.textVerticalAlign.empty() ? textAttributes.textVerticalAlign : textVerticalAlign;
+  textAlignVertical = !textAttributes.textAlignVertical.empty() ? textAttributes.textAlignVertical : textAlignVertical;
 }
 
 #pragma mark - Operators
@@ -127,7 +127,7 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const {
              isHighlighted,
              layoutDirection,
              accessibilityRole,
-             textVerticalAlign,
+             textAlignVertical,
              textTransform) ==
       std::tie(
              rhs.foregroundColor,
@@ -149,7 +149,7 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const {
              rhs.isHighlighted,
              rhs.layoutDirection,
              rhs.accessibilityRole,
-             rhs.textVerticalAlign,
+             rhs.textAlignVertical,
              rhs.textTransform) &&
       floatEquality(opacity, rhs.opacity) &&
       floatEquality(fontSize, rhs.fontSize) &&
@@ -218,7 +218,7 @@ SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
       debugStringConvertibleItem("isHighlighted", isHighlighted),
       debugStringConvertibleItem("layoutDirection", layoutDirection),
       debugStringConvertibleItem("accessibilityRole", accessibilityRole),
-      debugStringConvertibleItem("textVerticalAlign", textVerticalAlign),
+      debugStringConvertibleItem("textAlignVertical", textAlignVertical),
   };
 }
 #endif
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.h b/ReactCommon/react/renderer/attributedstring/TextAttributes.h
@@ -81,7 +81,7 @@ class TextAttributes : public DebugStringConvertible {
   // construction.
   std::optional<LayoutDirection> layoutDirection{};
   std::optional<AccessibilityRole> accessibilityRole{};
-  std::string textVerticalAlign{""};
+  std::string textAlignVertical{};
 
 #pragma mark - Operations
 
diff --git a/ReactCommon/react/renderer/attributedstring/conversions.h b/ReactCommon/react/renderer/attributedstring/conversions.h
@@ -1036,9 +1036,9 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
     _textAttributes(
         "accessibilityRole", toString(*textAttributes.accessibilityRole));
   }
-  if (!textAttributes.textVerticalAlign.empty()) {
+  if (!textAttributes.textAlignVertical.empty()) {
     _textAttributes(
-                    "textVerticalAlign", textAttributes.textVerticalAlign);
+                    "textAlignVertical", textAttributes.textAlignVertical);
   }
   return _textAttributes;
 }
@@ -1261,9 +1261,9 @@ inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) {
     builder.putString(
         TA_KEY_ACCESSIBILITY_ROLE, toString(*textAttributes.accessibilityRole));
   }
-  if (textAttributes.textVerticalAlign.empty()) {
+  if (!textAttributes.textAlignVertical.empty()) {
     builder.putString(
-                      TA_KEY_VERTICAL_ALIGN, textAttributes.textVerticalAlign);
+                      TA_KEY_VERTICAL_ALIGN, textAttributes.textAlignVertical);
   }
   return builder.build();
 }
diff --git a/ReactCommon/react/renderer/components/text/BaseTextProps.cpp b/ReactCommon/react/renderer/components/text/BaseTextProps.cpp
@@ -197,12 +197,12 @@ static TextAttributes convertRawProp(
       sourceTextAttributes.backgroundColor,
       defaultTextAttributes.backgroundColor);
   
-  textAttributes.textVerticalAlign = convertRawProp(
+  textAttributes.textAlignVertical = convertRawProp(
                                                   context,
                                                   rawProps,
-                                                  "textVerticalAlign",
-                                                  sourceTextAttributes.textVerticalAlign,
-                                                  defaultTextAttributes.textVerticalAlign);
+                                                  "textAlignVertical",
+                                                  sourceTextAttributes.textAlignVertical,
+                                                  defaultTextAttributes.textAlignVertical);
 
   return textAttributes;
 }
@@ -305,7 +305,7 @@ void BaseTextProps::setProp(
     REBUILD_FIELD_SWITCH_CASE(
         defaults, value, textAttributes, backgroundColor, "backgroundColor");
       REBUILD_FIELD_SWITCH_CASE(
-                                defaults, value, textAttributes, backgroundColor, "textVerticalAlign");
+                                defaults, value, textAttributes, backgroundColor, "textAlignVertical");
   }
 }
 
diff --git a/ReactCommon/react/renderer/components/view/ViewProps.cpp b/ReactCommon/react/renderer/components/view/ViewProps.cpp
@@ -51,14 +51,14 @@ ViewProps::ViewProps(
                     "backgroundColor",
                     sourceProps.backgroundColor,
                     {})),
-  textVerticalAlign(
+  textAlignVertical(
                   CoreFeatures::enablePropIteratorSetter
-                  ? sourceProps.textVerticalAlign
+                  ? sourceProps.textAlignVertical
                   : convertRawProp(
                                    context,
                                    rawProps,
-                                   "textVerticalAlign",
-                                   sourceProps.textVerticalAlign,
+                                   "textAlignVertical",
+                                   sourceProps.textAlignVertical,
                                    {})),
       borderRadii(
           CoreFeatures::enablePropIteratorSetter ? sourceProps.borderRadii
@@ -302,7 +302,7 @@ void ViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(opacity, (Float)1.0);
     RAW_SET_PROP_SWITCH_CASE_BASIC(foregroundColor, {});
     RAW_SET_PROP_SWITCH_CASE_BASIC(backgroundColor, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(textVerticalAlign, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textAlignVertical, {});
     RAW_SET_PROP_SWITCH_CASE_BASIC(shadowColor, {});
     RAW_SET_PROP_SWITCH_CASE_BASIC(shadowOffset, {});
     RAW_SET_PROP_SWITCH_CASE_BASIC(shadowOpacity, {});
diff --git a/ReactCommon/react/renderer/components/view/ViewProps.h b/ReactCommon/react/renderer/components/view/ViewProps.h
@@ -51,7 +51,7 @@ class ViewProps : public YogaStylableProps, public AccessibilityProps {
   Float opacity{1.0};
   SharedColor foregroundColor{};
   SharedColor backgroundColor{};
-  std::string textVerticalAlign{""};
+  std::string textAlignVertical{""};
 
   // Borders
   CascadedBorderRadii borderRadii{};
diff --git a/ReactCommon/react/renderer/components/view/ViewPropsMapBuffer.cpp b/ReactCommon/react/renderer/components/view/ViewPropsMapBuffer.cpp
@@ -60,8 +60,8 @@ void ViewProps::propsDiffMapBuffer(
     builder.putInt(VP_FG_COLOR, toAndroidRepr(newProps.foregroundColor));
   }
 
-  if (oldProps.textVerticalAlign != newProps.textVerticalAlign) {
-    builder.putString(VP_TEXT_VERTICAL_ALIGN, newProps.textVerticalAlign);
+  if (oldProps.textAlignVertical != newProps.textAlignVertical) {
+    builder.putString(VP_TEXT_VERTICAL_ALIGN, newProps.textAlignVertical);
   }
       
   if (oldProps.borderCurves != newProps.borderCurves) {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public class TextAttributeProps {`
`54`	`54`	`public static final short TA_KEY_IS_HIGHLIGHTED = 20;`
`55`	`55`	`public static final short TA_KEY_LAYOUT_DIRECTION = 21;`
`56`	`56`	`public static final short TA_KEY_ACCESSIBILITY_ROLE = 22;`
`57`		`- public static final short TA_KEY_VERTICAL_ALIGN = 23;`
	`57`	`+ public static final short TA_KEY_ALIGN_VERTICAL = 24;`
`58`	`58`
`59`	`59`	`public static final int UNSET = -1;`
`60`	`60`
`@@ -208,8 +208,8 @@ public static TextAttributeProps fromMapBuffer(MapBuffer props) {`
`208`	`208`	`case TA_KEY_ACCESSIBILITY_ROLE:`
`209`	`209`	`result.setAccessibilityRole(entry.getStringValue());`
`210`	`210`	`break;`
`211`		`- case TA_KEY_VERTICAL_ALIGN:`
`212`		`- result.setVerticalAlign(entry.getStringValue());`
	`211`	`+ case TA_KEY_ALIGN_VERTICAL:`
	`212`	`+ result.setTextAlignVertical(entry.getStringValue());`
`213`	`213`	`break;`
`214`	`214`	`}`
`215`	`215`	`}`
`@@ -615,9 +615,9 @@ private void setAccessibilityRole(@Nullable String accessibilityRole) {`
`615`	`615`	`}`
`616`	`616`	`}`
`617`	`617`
`618`		`- private void setVerticalAlign(@Nullable String verticalAlign) {`
`619`		`- FLog.w("React::", "verticalAlign: " + (verticalAlign));`
	`618`	`+ private void setTextAlignVertical(@Nullable String verticalAlign) {`
`620`	`619`	`if (verticalAlign != null) {`
	`620`	`+ FLog.w("React::", "verticalAlign: " + (verticalAlign));`
`621`	`621`	`mVerticalAlign = verticalAlign;`
`622`	`622`	`}`
`623`	`623`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ private static void buildSpannableFromFragment(`
`144`	`144`	`ops.add(new SetSpanOperation(start, end, new ReactSuperscriptSpan()));`
`145`	`145`	`}`
`146`	`146`	`if (textAttributes.mIsAccessibilityLink) {`
`147`		`- ops.add(new SetSpanOperation(start, end, new ReactClickableSpan(reactTag)));`
	`147`	`+ ops.add(new SetSpanOperation(start, end, new ReactSuperscriptSpan()));`
`148`	`148`	`}`
`149`	`149`	`if (textAttributes.mIsColorSet) {`
`150`	`150`	`ops.add(`
Original file line number	Diff line number	Diff line change
`@@ -1036,9 +1036,9 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {`
`1036`	`1036`	`_textAttributes(`
`1037`	`1037`	`"accessibilityRole", toString(*textAttributes.accessibilityRole));`
`1038`	`1038`	`}`
`1039`		`- if (!textAttributes.textVerticalAlign.empty()) {`
	`1039`	`+ if (!textAttributes.textAlignVertical.empty()) {`
`1040`	`1040`	`_textAttributes(`
`1041`		`- "textVerticalAlign", textAttributes.textVerticalAlign);`
	`1041`	`+ "textAlignVertical", textAttributes.textAlignVertical);`
`1042`	`1042`	`}`
`1043`	`1043`	`return _textAttributes;`
`1044`	`1044`	`}`
`@@ -1261,9 +1261,9 @@ inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) {`
`1261`	`1261`	`builder.putString(`
`1262`	`1262`	`TA_KEY_ACCESSIBILITY_ROLE, toString(*textAttributes.accessibilityRole));`
`1263`	`1263`	`}`
`1264`		`- if (textAttributes.textVerticalAlign.empty()) {`
	`1264`	`+ if (!textAttributes.textAlignVertical.empty()) {`
`1265`	`1265`	`builder.putString(`
`1266`		`- TA_KEY_VERTICAL_ALIGN, textAttributes.textVerticalAlign);`
	`1266`	`+ TA_KEY_VERTICAL_ALIGN, textAttributes.textAlignVertical);`
`1267`	`1267`	`}`
`1268`	`1268`	`return builder.build();`
`1269`	`1269`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ void ViewProps::propsDiffMapBuffer(`
`60`	`60`	`builder.putInt(VP_FG_COLOR, toAndroidRepr(newProps.foregroundColor));`
`61`	`61`	`}`
`62`	`62`
`63`		`- if (oldProps.textVerticalAlign != newProps.textVerticalAlign) {`
`64`		`- builder.putString(VP_TEXT_VERTICAL_ALIGN, newProps.textVerticalAlign);`
	`63`	`+ if (oldProps.textAlignVertical != newProps.textAlignVertical) {`
	`64`	`+ builder.putString(VP_TEXT_VERTICAL_ALIGN, newProps.textAlignVertical);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (oldProps.borderCurves != newProps.borderCurves) {`