cpp mapbuffer configs before rebase

Author: fabOnReact

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

@@ -104,7 +104,8 @@ public class TextAttributeProps {
   protected @Nullable ReactAccessibilityDelegate.AccessibilityRole mAccessibilityRole = null;
   protected boolean mIsAccessibilityRoleSet = false;
   protected boolean mIsAccessibilityUnitSet = false;
-  protected @Nullable ReactAccessibilityDelegate.AccessibilityUnit mAccessibilityUnit = "";
+  protected @Nullable ReactAccessibilityDelegate.AccessibilityUnit mAccessibilityUnit =
+      ReactAccessibilityDelegate.AccessibilityUnit.NONE;
   protected boolean mIsAccessibilityLink = false;
 
   protected int mFontStyle = UNSET;

ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt

@@ -6,7 +6,7 @@
  */
 
 package com.facebook.react.views.view
-
+import android.util.Log;
 import android.graphics.Color
 import android.graphics.Rect
 import androidx.core.view.ViewCompat
@@ -64,6 +64,7 @@ object ReactMapBufferPropSetter {
   private const val VP_POINTER_OVER_CAPTURE = 44
   private const val VP_BORDER_CURVES = 45 // iOS only
   private const val VP_FG_COLOR = 46 // iOS only?
+  private const val VP_ACCESSIBILITY_UNIT = 99
 
   // Yoga values
   private const val YG_BORDER_WIDTH = 100
@@ -108,6 +109,7 @@ object ReactMapBufferPropSetter {
 
   fun setProps(view: ReactViewGroup, viewManager: ReactViewManager, props: MapBuffer) {
     for (entry in props) {
+      Log.w("TESTING::ReactMapBufferPropSetter", "entry.key: " + ( entry.key ));
       when (entry.key) {
         VP_ACCESSIBILITY_ACTIONS -> {
           viewManager.accessibilityActions(view, entry.mapBufferValue)
@@ -240,6 +242,9 @@ object ReactMapBufferPropSetter {
         VP_ZINDEX -> {
           viewManager.setZIndex(view, entry.intValue.toFloat())
         }
+        VP_ACCESSIBILITY_UNIT -> {
+          viewManager.setAccessibilityUnit(view, entry.stringValue.takeIf { it.isNotEmpty() })
+        }
         YG_BORDER_WIDTH -> {
           viewManager.borderWidth(view, entry.mapBufferValue)
         }

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

@@ -127,10 +127,6 @@ 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,
@@ -165,6 +161,9 @@ void AccessibilityProps::propsDiffMapBuffer(
     }
     builder.putInt(AP_IMPORTANT_FOR_ACCESSIBILITY, value);
   }
+  if (oldProps.accessibilityUnit != newProps.accessibilityUnit) {
+    builder.putString(AP_ACCESSIBILITY_UNIT, newProps.accessibilityUnit);
+  }
 }
 #endif
 

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

@@ -23,7 +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;
+constexpr MapBuffer::Key AP_ACCESSIBILITY_UNIT = 99;
 
 // AccessibilityAction values
 constexpr MapBuffer::Key ACCESSIBILITY_ACTION_NAME = 0;