draft cpp configs - they trigger runtime

Author: fabOnReact

ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java

@@ -11,7 +11,6 @@
 import android.text.Layout;
 import android.text.TextUtils;
 import android.util.LayoutDirection;
-import android.util.Log;
 import android.view.Gravity;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
@@ -105,7 +104,7 @@ public class TextAttributeProps {
   protected @Nullable ReactAccessibilityDelegate.AccessibilityRole mAccessibilityRole = null;
   protected boolean mIsAccessibilityRoleSet = false;
   protected boolean mIsAccessibilityUnitSet = false;
-  protected String mAccessibilityUnit = null;
+  protected String mAccessibilityUnit = "";
   protected boolean mIsAccessibilityLink = false;
 
   protected int mFontStyle = UNSET;
@@ -147,7 +146,6 @@ public static TextAttributeProps fromMapBuffer(MapBuffer props) {
 
     // TODO T83483191: Review constants that are not being set!
     Iterator<MapBuffer.Entry> iterator = props.iterator();
-    Log.w("TESTING::TextAttributeProps", "props: " + (props));
     while (iterator.hasNext()) {
       MapBuffer.Entry entry = iterator.next();
       switch (entry.getKey()) {
@@ -609,7 +607,6 @@ private void setTextTransform(@Nullable String textTransform) {
   }
 
   private void setAccessibilityUnit(@Nullable String accessibilityUnit) {
-    Log.w("TESTING::TextAttributeProps", "accessibilityUnit: " + (accessibilityUnit));
     if (accessibilityUnit != null) {
       mIsAccessibilityUnitSet = true;
       mAccessibilityUnit = accessibilityUnit;

ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java

@@ -19,6 +19,7 @@
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.util.LayoutDirection;
+import android.util.Log;
 import android.util.LruCache;
 import android.view.View;
 import androidx.annotation.NonNull;
@@ -100,6 +101,7 @@ private static void buildSpannableFromFragment(
       ReadableArray fragments,
       SpannableStringBuilder sb,
       List<SetSpanOperation> ops) {
+    Log.w("TESTING::TextLayoutManager", "buildSpannableFromFragment");
 
     for (int i = 0, length = fragments.size(); i < length; i++) {
       ReadableMap fragment = fragments.getMap(i);
@@ -208,6 +210,7 @@ private static Spannable createSpannableFromAttributedString(
     // a new spannable will be wiped out
     List<SetSpanOperation> ops = new ArrayList<>();
 
+    Log.w("TESTING::TextLayoutManager", "attributedString: " + (attributedString));
     buildSpannableFromFragment(context, attributedString.getArray("fragments"), sb, ops);
 
     // TODO T31905686: add support for inline Images

ReactCommon/react/renderer/attributedstring/TextAttributes.cpp

@@ -98,6 +98,9 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   accessibilityRole = textAttributes.accessibilityRole.has_value()
       ? textAttributes.accessibilityRole
       : accessibilityRole;
+  accessibilityUnit = textAttributes.accessibilityUnit.has_value()
+      ? "first value"
+      : "second value";
 }
 
 #pragma mark - Operators
@@ -122,6 +125,7 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const {
              isHighlighted,
              layoutDirection,
              accessibilityRole,
+             accessibilityUnit,
              textTransform) ==
       std::tie(
              rhs.foregroundColor,
@@ -142,6 +146,7 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const {
              rhs.isHighlighted,
              rhs.layoutDirection,
              rhs.accessibilityRole,
+             rhs.accessibilityUnit,
              rhs.textTransform) &&
       floatEquality(opacity, rhs.opacity) &&
       floatEquality(fontSize, rhs.fontSize) &&
@@ -209,6 +214,7 @@ SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
       debugStringConvertibleItem("isHighlighted", isHighlighted),
       debugStringConvertibleItem("layoutDirection", layoutDirection),
       debugStringConvertibleItem("accessibilityRole", accessibilityRole),
+      debugStringConvertibleItem("accessibilityUnit", accessibilityUnit),
   };
 }
 #endif

ReactCommon/react/renderer/attributedstring/TextAttributes.h

@@ -79,6 +79,7 @@ class TextAttributes : public DebugStringConvertible {
   // construction.
   std::optional<LayoutDirection> layoutDirection{};
   std::optional<AccessibilityRole> accessibilityRole{};
+  std::optional<std::string> accessibilityUnit{""};
 
 #pragma mark - Operations
 

ReactCommon/react/renderer/attributedstring/conversions.h

@@ -959,6 +959,10 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
     _textAttributes(
         "accessibilityRole", toString(*textAttributes.accessibilityRole));
   }
+  if (textAttributes.accessibilityUnit.has_value()) {
+    _textAttributes(
+        "accessibilityUnit", "random value");
+  }
   return _textAttributes;
 }
 
@@ -1033,6 +1037,7 @@ constexpr static MapBuffer::Key TA_KEY_IS_HIGHLIGHTED = 20;
 constexpr static MapBuffer::Key TA_KEY_LAYOUT_DIRECTION = 21;
 constexpr static MapBuffer::Key TA_KEY_ACCESSIBILITY_ROLE = 22;
 constexpr static MapBuffer::Key TA_KEY_LINE_BREAK_STRATEGY = 23;
+constexpr static MapBuffer::Key TA_KEY_ACCESSIBILITY_UNIT = 24;
 
 // constants for ParagraphAttributes serialization
 constexpr static MapBuffer::Key PA_KEY_MAX_NUMBER_OF_LINES = 0;
@@ -1179,6 +1184,10 @@ inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) {
     builder.putString(
         TA_KEY_ACCESSIBILITY_ROLE, toString(*textAttributes.accessibilityRole));
   }
+  if (textAttributes.accessibilityUnit.has_value()) {
+    builder.putString(
+        TA_KEY_ACCESSIBILITY_UNIT, "random string value");
+  }
   return builder.build();
 }
 

ReactCommon/react/renderer/components/text/BaseTextProps.cpp

@@ -177,6 +177,13 @@ static TextAttributes convertRawProp(
       sourceTextAttributes.accessibilityRole,
       defaultTextAttributes.accessibilityRole);
 
+  textAttributes.accessibilityUnit = convertRawProp(
+      context,
+      rawProps,
+      "accessibilityUnit",
+      sourceTextAttributes.accessibilityUnit,
+      defaultTextAttributes.accessibilityUnit);
+
   // Color (accessed in this order by ViewProps)
   textAttributes.opacity = convertRawProp(
       context,
@@ -287,6 +294,12 @@ void BaseTextProps::setProp(
         textAttributes,
         accessibilityRole,
         "accessibilityRole");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults,
+        value,
+        textAttributes,
+        accessibilityUnit,
+        "accessibilityUnit");
     REBUILD_FIELD_SWITCH_CASE(
         defaults, value, textAttributes, opacity, "opacity");
     REBUILD_FIELD_SWITCH_CASE(

ReactCommon/react/renderer/components/view/AccessibilityProps.cpp

@@ -224,6 +224,7 @@ void AccessibilityProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityMagicTap, {});
     RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityEscape, {});
     RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityAction, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityUnit, {});
     RAW_SET_PROP_SWITCH_CASE_BASIC(
         importantForAccessibility, ImportantForAccessibility::Auto);
     RAW_SET_PROP_SWITCH_CASE(testId, "testID", std::string{""});

ReactCommon/react/renderer/components/view/AccessibilityProps.h

@@ -45,6 +45,7 @@ class AccessibilityProps {
       AccessibilityLiveRegion::None};
   AccessibilityTraits accessibilityTraits{AccessibilityTraits::None};
   std::string accessibilityRole{""};
+  std::string accessibilityUnit{""};
   std::string accessibilityHint{""};
   std::string accessibilityLanguage{""};
   AccessibilityValue accessibilityValue;

ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp

@@ -127,6 +127,10 @@ void AccessibilityProps::propsDiffMapBuffer(
     builder.putString(AP_ACCESSIBILITY_ROLE, newProps.accessibilityRole);
   }
 
+  if (oldProps.accessibilityUnit != newProps.accessibilityUnit) {
+    builder.putString(AP_ACCESSIBILITY_UNIT, newProps.accessibilityUnit);
+  }
+
   if (oldProps.accessibilityState != newProps.accessibilityState) {
     builder.putMapBuffer(
         AP_ACCESSIBILITY_STATE,

ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.h

@@ -23,6 +23,7 @@ constexpr MapBuffer::Key AP_ACCESSIBILITY_STATE = 6;
 constexpr MapBuffer::Key AP_ACCESSIBILITY_VALUE = 7;
 constexpr MapBuffer::Key AP_ACCESSIBLE = 8;
 constexpr MapBuffer::Key AP_IMPORTANT_FOR_ACCESSIBILITY = 19;
+constexpr MapBuffer::Key AP_ACCESSIBILITY_UNIT = 20;
 
 // AccessibilityAction values
 constexpr MapBuffer::Key ACCESSIBILITY_ACTION_NAME = 0;