Skip to content

Fix capitalize Text style on IOS #32774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MaeIg wants to merge 4 commits into from
Closed

Fix capitalize Text style on IOS #32774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0356f65
add examples in rn-tester
MaeIg Dec 8, 2021
6022d82
don't capitalize words starting by a number
MaeIg Dec 8, 2021
66605d6
fix: check if the word can be empty
MaeIg Dec 16, 2021
3fb165a
make capitalizeText a C-function
MaeIg Dec 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion Libraries/Text/RCTTextAttributes.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,23 @@ - (UIColor *)effectiveBackgroundColor
return effectiveBackgroundColor ?: [UIColor clearColor];
}

static NSString *capitalizeText(NSString *text)
{
NSArray *words = [text componentsSeparatedByString:@" "];
NSMutableArray *newWords = [NSMutableArray new];
NSNumberFormatter *num = [NSNumberFormatter new];
for (NSString *item in words) {
NSString *word;
if ([item length] > 0 && [num numberFromString:[item substringWithRange:NSMakeRange(0, 1)]] == nil) {
word = [item capitalizedString];
} else {
word = [item lowercaseString];
}
[newWords addObject:word];
}
return [newWords componentsJoinedByString:@" "];
}

- (NSString *)applyTextAttributesToText:(NSString *)text
{
switch (_textTransform) {
Expand All @@ -248,7 +265,7 @@ - (NSString *)applyTextAttributesToText:(NSString *)text
case RCTTextTransformUppercase:
return [text uppercaseString];
case RCTTextTransformCapitalize:
return [text capitalizedString];
return capitalizeText(text);
}
}

Expand Down
12 changes: 12 additions & 0 deletions packages/rn-tester/js/examples/Text/TextExample.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,18 @@ class TextExample extends React.Component<{...}> {
<Text style={{textTransform: 'capitalize'}}>
This text should be CAPITALIZED.
</Text>
<Text>
Capitalize a date:
<Text style={{textTransform: 'capitalize'}}>
the 9th of november, 1998
</Text>
</Text>
Comment on lines 801 to 806

@philIip philIip Dec 17, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's add one for 2 digit dates as well

@MaeIg MaeIg Dec 19, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!
It still works:

<Text>
Capitalize a 2 digit date:
<Text style={{textTransform: 'capitalize'}}>
the 25th of december
</Text>
</Text>
<Text style={{textTransform: 'capitalize'}}>
Mixed: <Text style={{textTransform: 'uppercase'}}>uppercase </Text>
<Text style={{textTransform: 'lowercase'}}>LoWeRcAsE </Text>
Expand Down
12 changes: 12 additions & 0 deletions packages/rn-tester/js/examples/Text/TextExample.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,6 +1160,18 @@ exports.examples = [
<Text style={{textTransform: 'capitalize'}}>
This text should be CAPITALIZED.
</Text>
<Text>
Capitalize a date:
<Text style={{textTransform: 'capitalize'}}>
the 9th of november, 1998
</Text>
</Text>
<Text>
Capitalize a 2 digit date:
<Text style={{textTransform: 'capitalize'}}>
the 25th of december
</Text>
</Text>
<Text style={{textTransform: 'capitalize'}}>
Mixed: <Text style={{textTransform: 'uppercase'}}>uppercase </Text>
<Text style={{textTransform: 'lowercase'}}>LoWeRcAsE </Text>
Expand Down