Skip to content

Commit 45ec47f

Browse files
committed
custom conversion logic for accUnit as done with accRole
1 parent 46c4fb8 commit 45ec47f

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

Libraries/Text/Text.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ const Text: React.AbstractComponent<
226226
accessibilityState={_accessibilityState}
227227
{...eventHandlersForText}
228228
accessibilityLabel={ariaLabel ?? accessibilityLabel}
229-
accessibilityUnit="verbatim"
229+
accessibilityUnit="none"
230230
accessibilityRole={
231231
role ? getAccessibilityRoleFromRole(role) : accessibilityRole
232232
}
@@ -252,6 +252,7 @@ const Text: React.AbstractComponent<
252252
: _accessible
253253
}
254254
accessibilityLabel={ariaLabel ?? accessibilityLabel}
255+
accessibilityUnit="none"
255256
accessibilityState={nativeTextAccessibilityState}
256257
accessibilityRole={
257258
role ? getAccessibilityRoleFromRole(role) : accessibilityRole

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,17 @@ AccessibilityProps::AccessibilityProps(
201201
accessibilityTraits = traits;
202202
accessibilityRole = roleString;
203203
}
204+
if (!CoreFeatures::enablePropIteratorSetter) {
205+
const auto *rawPropValue =
206+
rawProps.at("accessibilityUnit", nullptr, nullptr);
207+
std::string unitString;
208+
if (rawPropValue == nullptr || !rawPropValue->hasValue()) {
209+
unitString = "";
210+
} else {
211+
fromRawValue(context, *rawPropValue, unitString);
212+
}
213+
accessibilityUnit = unitString;
214+
}
204215
}
205216

206217
void AccessibilityProps::setProp(
@@ -224,7 +235,6 @@ void AccessibilityProps::setProp(
224235
RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityMagicTap, {});
225236
RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityEscape, {});
226237
RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityAction, {});
227-
RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityUnit, {});
228238
RAW_SET_PROP_SWITCH_CASE_BASIC(
229239
importantForAccessibility, ImportantForAccessibility::Auto);
230240
RAW_SET_PROP_SWITCH_CASE(testId, "testID", std::string{""});
@@ -240,6 +250,15 @@ void AccessibilityProps::setProp(
240250
accessibilityRole = roleString;
241251
return;
242252
}
253+
case CONSTEXPR_RAW_PROPS_KEY_HASH("accessibilityUnit"): {
254+
std::string unitString;
255+
if (value.hasValue()) {
256+
fromRawValue(context, value, unitString);
257+
}
258+
259+
accessibilityUnit = unitString;
260+
return;
261+
}
243262
}
244263
}
245264

0 commit comments

Comments
 (0)