Skip to content

Commit 3b16542

Browse files
committed
passing prop accessibilityUnit as string from cpp to java
"Complete draft CPP accessibilityUnit settings: Commit the changes and push Add more clear log statements and further verify value passed to accessibilityUnit Log the value passed from javascript in conversion.h Add changes from PR [#2](https://github.com/fabriziobertoglio1987/react-native/pull/2/files) Change logic in conversion.h to add the value passed from javascript"
1 parent a96ad8a commit 3b16542

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ public static TextAttributeProps fromMapBuffer(MapBuffer props) {
146146

147147
// TODO T83483191: Review constants that are not being set!
148148
Iterator<MapBuffer.Entry> iterator = props.iterator();
149-
Log.w("TESTING::TextAttributeProps", "fromMapBuffer");
150-
Log.w("TESTING::TextAttributeProps", "props: " + (props));
151149
while (iterator.hasNext()) {
152150
MapBuffer.Entry entry = iterator.next();
153151
switch (entry.getKey()) {
@@ -609,8 +607,6 @@ private void setTextTransform(@Nullable String textTransform) {
609607

610608
private void setAccessibilityRole(@Nullable String accessibilityRole) {
611609
if (accessibilityRole != null) {
612-
Log.w("TESTING::TextAttributeProps", "setAccessibilityRole");
613-
Log.w("TESTING::TextAttributeProps", "accessibilityRole: " + (accessibilityRole));
614610
mIsAccessibilityRoleSet = true;
615611
mAccessibilityRole = AccessibilityRole.fromValue(accessibilityRole);
616612
mIsAccessibilityLink = mAccessibilityRole.equals(AccessibilityRole.LINK);

ReactCommon/react/renderer/attributedstring/TextAttributes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class TextAttributes : public DebugStringConvertible {
7979
// construction.
8080
std::optional<LayoutDirection> layoutDirection{};
8181
std::optional<AccessibilityRole> accessibilityRole{};
82-
std::string accessibilityUnit{""};
82+
std::string accessibilityUnit{};
8383

8484
#pragma mark - Operations
8585

ReactCommon/react/renderer/attributedstring/conversions.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,6 +1009,10 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
10091009
_textAttributes(
10101010
"accessibilityRole", toString(*textAttributes.accessibilityRole));
10111011
}
1012+
if (!textAttributes.accessibilityUnit.empty()) {
1013+
_textAttributes(
1014+
"accessibilityUnit", textAttributes.accessibilityUnit);
1015+
}
10121016
return _textAttributes;
10131017
}
10141018

@@ -1228,11 +1232,13 @@ inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) {
12281232
}
12291233
if (textAttributes.accessibilityRole.has_value()) {
12301234

1231-
LOG(ERROR) << "TESTING:: attributedString conversions.h accessibilityRole: " << toString(*textAttributes.accessibilityRole);
12321235
builder.putString(
12331236
TA_KEY_ACCESSIBILITY_ROLE, toString(*textAttributes.accessibilityRole));
1237+
}
1238+
if (!textAttributes.accessibilityUnit.empty()) {
1239+
12341240
builder.putString(
1235-
TA_KEY_ACCESSIBILITY_UNIT, "random unit");
1241+
TA_KEY_ACCESSIBILITY_UNIT, textAttributes.accessibilityUnit);
12361242
}
12371243
return builder.build();
12381244
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,13 @@ static TextAttributes convertRawProp(
177177
sourceTextAttributes.accessibilityRole,
178178
defaultTextAttributes.accessibilityRole);
179179

180+
textAttributes.accessibilityUnit = convertRawProp(
181+
context,
182+
rawProps,
183+
"accessibilityUnit",
184+
sourceTextAttributes.accessibilityUnit,
185+
defaultTextAttributes.accessibilityUnit);
186+
180187
// Color (accessed in this order by ViewProps)
181188
textAttributes.opacity = convertRawProp(
182189
context,
@@ -287,6 +294,12 @@ void BaseTextProps::setProp(
287294
textAttributes,
288295
accessibilityRole,
289296
"accessibilityRole");
297+
REBUILD_FIELD_SWITCH_CASE(
298+
defaults,
299+
value,
300+
textAttributes,
301+
accessibilityRole,
302+
"accessibilityUnit");
290303
REBUILD_FIELD_SWITCH_CASE(
291304
defaults, value, textAttributes, opacity, "opacity");
292305
REBUILD_FIELD_SWITCH_CASE(

0 commit comments

Comments
 (0)