mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Fix the accessibilityRole crash by updating values in the enum
Summary: Changelog: [Internal][Fixed] - Fix the accessibilityRole crash I only assigned three values that would be used for embedded links inside text (button, link, image). But the accessibilityRole has a lot of values that may be applied in other places. (https://reactnative.dev/docs/accessibility) To avoid this crash, need to add all possible values to the enum. Reviewed By: JoshuaGross, shergin Differential Revision: D22549264 fbshipit-source-id: dbaacf1965624e1d2eabe193b46168c6c8740f46
This commit is contained in:
1 parent
a7818dd754
commit
db365b86b2
5 files changed
+296
-5
No files matched your search
@@ -94,7 +94,7 @@ void TextAttributes::apply(TextAttributes textAttributes) {
|
||||
layoutDirection = textAttributes.layoutDirection.hasValue()
|
||||
? textAttributes.layoutDirection
|
||||
: layoutDirection;
|
||||
accessibilityRole = !textAttributes.accessibilityRole.empty()
|
||||
accessibilityRole = textAttributes.accessibilityRole.hasValue()
|
||||
? textAttributes.accessibilityRole
|
||||
: accessibilityRole;
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ class TextAttributes : public DebugStringConvertible {
|
||||
// Currently, it is intentionally *not* being set as part of BaseTextProps
|
||||
// construction.
|
||||
folly::Optional<LayoutDirection> layoutDirection{};
|
||||
std::string accessibilityRole{""};
|
||||
folly::Optional<AccessibilityRole> accessibilityRole{};
|
||||
|
||||
#pragma mark - Operations
|
||||
|
||||
|
||||
@@ -412,6 +412,178 @@ inline std::string toString(
|
||||
}
|
||||
}
|
||||
|
||||
inline std::string toString(const AccessibilityRole &accessibilityRole) {
|
||||
switch (accessibilityRole) {
|
||||
case AccessibilityRole::None:
|
||||
return "none";
|
||||
case AccessibilityRole::Button:
|
||||
return "button";
|
||||
case AccessibilityRole::Link:
|
||||
return "link";
|
||||
case AccessibilityRole::Search:
|
||||
return "search";
|
||||
case AccessibilityRole::Image:
|
||||
return "image";
|
||||
case AccessibilityRole::Imagebutton:
|
||||
return "imagebutton";
|
||||
case AccessibilityRole::Keyboardkey:
|
||||
return "keyboardkey";
|
||||
case AccessibilityRole::Text:
|
||||
return "text";
|
||||
case AccessibilityRole::Adjustable:
|
||||
return "adjustable";
|
||||
case AccessibilityRole::Summary:
|
||||
return "summary";
|
||||
case AccessibilityRole::Header:
|
||||
return "header";
|
||||
case AccessibilityRole::Alert:
|
||||
return "alert";
|
||||
case AccessibilityRole::Checkbox:
|
||||
return "checkbox";
|
||||
case AccessibilityRole::Combobox:
|
||||
return "combobox";
|
||||
case AccessibilityRole::Menu:
|
||||
return "menu";
|
||||
case AccessibilityRole::Menubar:
|
||||
return "menubar";
|
||||
case AccessibilityRole::Menuitem:
|
||||
return "menuitem";
|
||||
case AccessibilityRole::Progressbar:
|
||||
return "progressbar";
|
||||
case AccessibilityRole::Radio:
|
||||
return "radio";
|
||||
case AccessibilityRole::Radiogroup:
|
||||
return "radiogroup";
|
||||
case AccessibilityRole::Scrollbar:
|
||||
return "scrollbar";
|
||||
case AccessibilityRole::Spinbutton:
|
||||
return "spinbutton";
|
||||
case AccessibilityRole::Switch:
|
||||
return "switch";
|
||||
case AccessibilityRole::Tab:
|
||||
return "tab";
|
||||
case AccessibilityRole::Tablist:
|
||||
return "tablist";
|
||||
case AccessibilityRole::Timer:
|
||||
return "timer";
|
||||
case AccessibilityRole::Toolbar:
|
||||
return "toolbar";
|
||||
}
|
||||
}
|
||||
|
||||
inline void fromRawValue(const RawValue &value, AccessibilityRole &result) {
|
||||
auto string = (std::string)value;
|
||||
if (string == "none") {
|
||||
result = AccessibilityRole::None;
|
||||
return;
|
||||
}
|
||||
if (string == "button") {
|
||||
result = AccessibilityRole::Button;
|
||||
return;
|
||||
}
|
||||
if (string == "link") {
|
||||
result = AccessibilityRole::Link;
|
||||
return;
|
||||
}
|
||||
if (string == "search") {
|
||||
result = AccessibilityRole::Search;
|
||||
return;
|
||||
}
|
||||
if (string == "image") {
|
||||
result = AccessibilityRole::Image;
|
||||
return;
|
||||
}
|
||||
if (string == "imagebutton") {
|
||||
result = AccessibilityRole::Imagebutton;
|
||||
return;
|
||||
}
|
||||
if (string == "keyboardkey") {
|
||||
result = AccessibilityRole::Keyboardkey;
|
||||
return;
|
||||
}
|
||||
if (string == "text") {
|
||||
result = AccessibilityRole::Text;
|
||||
return;
|
||||
}
|
||||
if (string == "adjustable") {
|
||||
result = AccessibilityRole::Adjustable;
|
||||
return;
|
||||
}
|
||||
if (string == "summary") {
|
||||
result = AccessibilityRole::Summary;
|
||||
return;
|
||||
}
|
||||
if (string == "header") {
|
||||
result = AccessibilityRole::Header;
|
||||
return;
|
||||
}
|
||||
if (string == "alert") {
|
||||
result = AccessibilityRole::Alert;
|
||||
return;
|
||||
}
|
||||
if (string == "checkbox") {
|
||||
result = AccessibilityRole::Checkbox;
|
||||
return;
|
||||
}
|
||||
if (string == "combobox") {
|
||||
result = AccessibilityRole::Combobox;
|
||||
return;
|
||||
}
|
||||
if (string == "menu") {
|
||||
result = AccessibilityRole::Menu;
|
||||
return;
|
||||
}
|
||||
if (string == "menubar") {
|
||||
result = AccessibilityRole::Menubar;
|
||||
return;
|
||||
}
|
||||
if (string == "menuitem") {
|
||||
result = AccessibilityRole::Menuitem;
|
||||
return;
|
||||
}
|
||||
if (string == "progressbar") {
|
||||
result = AccessibilityRole::Progressbar;
|
||||
return;
|
||||
}
|
||||
if (string == "radio") {
|
||||
result = AccessibilityRole::Radio;
|
||||
return;
|
||||
}
|
||||
if (string == "radiogroup") {
|
||||
result = AccessibilityRole::Radiogroup;
|
||||
return;
|
||||
}
|
||||
if (string == "scrollbar") {
|
||||
result = AccessibilityRole::Scrollbar;
|
||||
return;
|
||||
}
|
||||
if (string == "spinbutton") {
|
||||
result = AccessibilityRole::Spinbutton;
|
||||
return;
|
||||
}
|
||||
if (string == "switch") {
|
||||
result = AccessibilityRole::Switch;
|
||||
return;
|
||||
}
|
||||
if (string == "tab") {
|
||||
result = AccessibilityRole::Tab;
|
||||
return;
|
||||
}
|
||||
if (string == "tablist") {
|
||||
result = AccessibilityRole::Tablist;
|
||||
return;
|
||||
}
|
||||
if (string == "timer") {
|
||||
result = AccessibilityRole::Timer;
|
||||
return;
|
||||
}
|
||||
if (string == "toolbar") {
|
||||
result = AccessibilityRole::Toolbar;
|
||||
return;
|
||||
}
|
||||
abort();
|
||||
}
|
||||
|
||||
inline ParagraphAttributes convertRawProp(
|
||||
RawProps const &rawProps,
|
||||
ParagraphAttributes const &sourceParagraphAttributes,
|
||||
|
||||
@@ -87,6 +87,36 @@ enum class TextDecorationLinePattern {
|
||||
DashDotDot,
|
||||
};
|
||||
|
||||
enum class AccessibilityRole {
|
||||
None,
|
||||
Button,
|
||||
Link,
|
||||
Search,
|
||||
Image,
|
||||
Imagebutton,
|
||||
Keyboardkey,
|
||||
Text,
|
||||
Adjustable,
|
||||
Summary,
|
||||
Header,
|
||||
Alert,
|
||||
Checkbox,
|
||||
Combobox,
|
||||
Menu,
|
||||
Menubar,
|
||||
Menuitem,
|
||||
Progressbar,
|
||||
Radio,
|
||||
Radiogroup,
|
||||
Scrollbar,
|
||||
Spinbutton,
|
||||
Switch,
|
||||
Tab,
|
||||
Tablist,
|
||||
Timer,
|
||||
Toolbar,
|
||||
};
|
||||
|
||||
} // namespace react
|
||||
} // namespace facebook
|
||||
|
||||
@@ -160,4 +190,11 @@ struct hash<facebook::react::TextBreakStrategy> {
|
||||
return hash<int>()(static_cast<int>(v));
|
||||
}
|
||||
};
|
||||
|
||||
template <>
|
||||
struct hash<facebook::react::AccessibilityRole> {
|
||||
size_t operator()(const facebook::react::AccessibilityRole &v) const {
|
||||
return hash<int>()(static_cast<int>(v));
|
||||
}
|
||||
};
|
||||
} // namespace std
|
||||
@@ -212,9 +212,91 @@ NSDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(T
|
||||
attributes[RCTAttributedStringIsHighlightedAttributeName] = @YES;
|
||||
}
|
||||
|
||||
if (!textAttributes.accessibilityRole.empty()) {
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] =
|
||||
[NSString stringWithCString:textAttributes.accessibilityRole.c_str() encoding:NSUTF8StringEncoding];
|
||||
if (textAttributes.accessibilityRole.hasValue()) {
|
||||
auto accessibilityRole = textAttributes.accessibilityRole.value();
|
||||
switch (accessibilityRole) {
|
||||
case AccessibilityRole::None:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("none");
|
||||
break;
|
||||
case AccessibilityRole::Button:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("button");
|
||||
break;
|
||||
case AccessibilityRole::Link:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("link");
|
||||
break;
|
||||
case AccessibilityRole::Search:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("search");
|
||||
break;
|
||||
case AccessibilityRole::Image:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("image");
|
||||
break;
|
||||
case AccessibilityRole::Imagebutton:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("imagebutton");
|
||||
break;
|
||||
case AccessibilityRole::Keyboardkey:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("keyboardkey");
|
||||
break;
|
||||
case AccessibilityRole::Text:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("text");
|
||||
break;
|
||||
case AccessibilityRole::Adjustable:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("adjustable");
|
||||
break;
|
||||
case AccessibilityRole::Summary:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("summary");
|
||||
break;
|
||||
case AccessibilityRole::Header:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("header");
|
||||
break;
|
||||
case AccessibilityRole::Alert:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("alert");
|
||||
break;
|
||||
case AccessibilityRole::Checkbox:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("checkbox");
|
||||
break;
|
||||
case AccessibilityRole::Combobox:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("combobox");
|
||||
break;
|
||||
case AccessibilityRole::Menu:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("menu");
|
||||
break;
|
||||
case AccessibilityRole::Menubar:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("menubar");
|
||||
break;
|
||||
case AccessibilityRole::Menuitem:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("menuitem");
|
||||
break;
|
||||
case AccessibilityRole::Progressbar:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("progressbar");
|
||||
break;
|
||||
case AccessibilityRole::Radio:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("radio");
|
||||
break;
|
||||
case AccessibilityRole::Radiogroup:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("radiogroup");
|
||||
break;
|
||||
case AccessibilityRole::Scrollbar:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("scrollbar");
|
||||
break;
|
||||
case AccessibilityRole::Spinbutton:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("spinbutton");
|
||||
break;
|
||||
case AccessibilityRole::Switch:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("switch");
|
||||
break;
|
||||
case AccessibilityRole::Tab:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("tab");
|
||||
break;
|
||||
case AccessibilityRole::Tablist:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("tablist");
|
||||
break;
|
||||
case AccessibilityRole::Timer:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("timer");
|
||||
break;
|
||||
case AccessibilityRole::Toolbar:
|
||||
attributes[RCTTextAttributesAccessibilityRoleAttributeName] = @("toolbar");
|
||||
break;
|
||||
};
|
||||
}
|
||||
|
||||
return [attributes copy];
|
||||
|
||||
Reference in new issue
Block a user