remove accessibilityUnit prop from cpp

Author: fabOnReact

ReactCommon/react/renderer/attributedstring/TextAttributes.cpp

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

ReactCommon/react/renderer/attributedstring/TextAttributes.h

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

ReactCommon/react/renderer/attributedstring/conversions.h

@@ -22,7 +22,6 @@
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/Geometry.h>
 #include <react/renderer/graphics/conversions.h>
-#include <sys/errno.h>
 #include <cmath>
 
 #ifdef ANDROID
@@ -566,18 +565,6 @@ inline std::string toString(const TextDecorationStyle &textDecorationStyle) {
   return "solid";
 }
 
-inline std::string toString(const AccessibilityUnit &accessibilityUnit) {
-  switch (accessibilityUnit) {
-    case AccessibilityUnit::None:
-      return "none";
-    case AccessibilityUnit::Verbatim:
-      return "verbatim";
-  }
-  LOG(ERROR) << "Unsupported AccessibilityUnit value";
-  react_native_assert(false);
-  return "none";
-}
-
 inline std::string toString(const AccessibilityRole &accessibilityRole) {
   switch (accessibilityRole) {
     case AccessibilityRole::None:
@@ -644,32 +631,6 @@ inline std::string toString(const AccessibilityRole &accessibilityRole) {
   return "none";
 }
 
-inline void fromRawValue(
-    const PropsParserContext &context,
-    const RawValue &value,
-    AccessibilityUnit &result) {
-  react_native_assert(value.hasType<std::string>());
-  if (value.hasType<std::string>()) {
-    auto string = (std::string)value;
-    if (string == "none") {
-      result = AccessibilityUnit::None;
-    } else if (string == "verbatim") {
-      result = AccessibilityUnit::Verbatim;
-    } else {
-      LOG(ERROR) << "Unsupported AccessibilityUnit value: " << string;
-      react_native_assert(false);
-      // sane default for prod
-      result = AccessibilityUnit::None;
-    }
-    return;
-  }
-
-  LOG(ERROR) << "Unsupported AccessibilityUnit type";
-  react_native_assert(false);
-  // sane default for prod
-  result = AccessibilityUnit::None;
-}
-
 inline void fromRawValue(
     const PropsParserContext &context,
     const RawValue &value,
@@ -998,10 +959,6 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
     _textAttributes(
         "accessibilityRole", toString(*textAttributes.accessibilityRole));
   }
-  if (textAttributes.accessibilityUnit.has_value()) {
-    _textAttributes(
-        "accessibilityUnit", toString(*textAttributes.accessibilityUnit));
-  }
   return _textAttributes;
 }
 
@@ -1076,7 +1033,6 @@ 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 = 89;
 
 // constants for ParagraphAttributes serialization
 constexpr static MapBuffer::Key PA_KEY_MAX_NUMBER_OF_LINES = 0;
@@ -1223,10 +1179,6 @@ 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, toString(*textAttributes.accessibilityUnit));
-  }
   return builder.build();
 }
 

ReactCommon/react/renderer/attributedstring/primitives.h

@@ -92,11 +92,6 @@ enum class TextDecorationLineType {
 
 enum class TextDecorationStyle { Solid, Double, Dotted, Dashed };
 
-enum class AccessibilityUnit {
-  None,
-  Verbatim,
-};
-
 enum class AccessibilityRole {
   None,
   Button,
@@ -216,13 +211,6 @@ struct hash<facebook::react::AccessibilityRole> {
   }
 };
 
-template <>
-struct hash<facebook::react::AccessibilityUnit> {
-  size_t operator()(const facebook::react::AccessibilityUnit &v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
 template <>
 struct hash<facebook::react::TextTransform> {
   size_t operator()(const facebook::react::TextTransform &v) const {

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

@@ -177,13 +177,6 @@ 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,
@@ -294,12 +287,6 @@ 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

@@ -201,17 +201,6 @@ AccessibilityProps::AccessibilityProps(
     accessibilityTraits = traits;
     accessibilityRole = roleString;
   }
-  if (!CoreFeatures::enablePropIteratorSetter) {
-    const auto *rawPropValue =
-        rawProps.at("accessibilityUnit", nullptr, nullptr);
-    std::string unitString;
-    if (rawPropValue == nullptr || !rawPropValue->hasValue()) {
-      unitString = "";
-    } else {
-      fromRawValue(context, *rawPropValue, unitString);
-    }
-    accessibilityUnit = unitString;
-  }
 }
 
 void AccessibilityProps::setProp(
@@ -250,15 +239,6 @@ void AccessibilityProps::setProp(
       accessibilityRole = roleString;
       return;
     }
-    case CONSTEXPR_RAW_PROPS_KEY_HASH("accessibilityUnit"): {
-      std::string unitString;
-      if (value.hasValue()) {
-        fromRawValue(context, value, unitString);
-      }
-
-      accessibilityUnit = unitString;
-      return;
-    }
   }
 }
 

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

@@ -45,7 +45,6 @@ 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

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