Parse accessibilityAction props into object

Summary: Android was using rawProps received from JS, so no updates needed. Updated iOS callsite to use the name of the action. Changelog: [General][Fixed] - Parse accessibilityAction props into object instead of string Reviewed By: mdvacca Differential Revision: D28614407 fbshipit-source-id: 209134f8fac65ca8516039e10ea502e57d52a7a7
facebook · May 24, 2021 · faaeb77 · faaeb77
1 parent dd96555
commit faaeb77
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -630,7 +630,7 @@ - (BOOL)shouldGroupAccessibilityChildren
   NSMutableArray<UIAccessibilityCustomAction *> *customActions = [NSMutableArray array];
   for (auto const &accessibilityAction : accessibilityActions) {
     [customActions
-        addObject:[[UIAccessibilityCustomAction alloc] initWithName:RCTNSStringFromString(accessibilityAction)
+        addObject:[[UIAccessibilityCustomAction alloc] initWithName:RCTNSStringFromString(accessibilityAction.name)
                                                              target:self
                                                            selector:@selector(didActivateAccessibilityCustomAction:)]];
   }

diff --git a/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h b/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h
@@ -7,7 +7,9 @@
 
 #pragma once
 
+#include <better/optional.h>
 #include <cinttypes>
+#include <string>
 
 namespace facebook {
 namespace react {
@@ -45,6 +47,11 @@ constexpr enum AccessibilityTraits operator&(
   return (enum AccessibilityTraits)((uint32_t)lhs & (uint32_t)rhs);
 }
 
+struct AccessibilityAction {
+  std::string name{""};
+  better::optional<std::string> label{};
+};
+
 struct AccessibilityState {
   bool disabled{false};
   bool selected{false};

diff --git a/ReactCommon/react/renderer/components/view/AccessibilityProps.h b/ReactCommon/react/renderer/components/view/AccessibilityProps.h
@@ -29,7 +29,7 @@ class AccessibilityProps {
   AccessibilityState accessibilityState;
   std::string accessibilityLabel{""};
   std::string accessibilityHint{""};
-  std::vector<std::string> accessibilityActions{};
+  std::vector<AccessibilityAction> accessibilityActions{};
   bool accessibilityViewIsModal{false};
   bool accessibilityElementsHidden{false};
   bool accessibilityIgnoresInvertColors{false};

diff --git a/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h b/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h
@@ -192,5 +192,22 @@ inline void fromRawValue(
   }
 }
 
+inline void fromRawValue(const RawValue &value, AccessibilityAction &result) {
+  auto map = (better::map<std::string, RawValue>)value;
+
+  auto name = map.find("name");
+  react_native_assert(name != map.end() && name->second.hasType<std::string>());
+  if (name != map.end()) {
+    fromRawValue(name->second, result.name);
+  }
+
+  auto label = map.find("label");
+  if (label != map.end()) {
+    if (label->second.hasType<std::string>()) {
+      result.label = (std::string)label->second;
+    }
+  }
+}
+
 } // namespace react
 } // namespace facebook