Skip to content

Add numberOfLines, lineHeight options; create flatSizes; increase accuracy #37

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Add numberOfLines, lineHeight options; create flatSizes; increase accuracy #37

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4472a07
Add numberOfLines parameter to limit number of lines
hsource Mar 30, 2022
748f86b
Add support for lineHeight
hsource Mar 30, 2022
981ab97
Add missing config change on Android for lineHeight support
hsource Mar 30, 2022
d2e2dd5
Scale lineHeight
Apr 5, 2022
7372b98
Fix default scaling epsilon
Apr 5, 2022
6f6d712
Add comments to epsilon enabling
Apr 5, 2022
15d7e8f
Add ceilToClosestPixel option; refactor duplicate code on Android
hsource Apr 12, 2022
a8a2ff4
Remove incorrect _Nullable and add const to options arguments
hsource Apr 12, 2022
7f495d1
Fix adjustMeasuredSize to return correct output
hsource Apr 13, 2022
0e161a9
Create flatSizes function that also retrieves widths
hsource May 1, 2022
41332e4
Fix NSRangeException when adding widths
hsource May 16, 2022
e6baa37
Change flatHeights on Android to account for when text gets truncated…
hsource Apr 3, 2025
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
Prev Previous commit
Next Next commit
Add comments to epsilon enabling
  • Loading branch information
Tony Du committed Apr 5, 2022
commit 6f6d712bb878a9c719d254aed58cb07622972251
15 changes: 10 additions & 5 deletions ios/RNTextSize.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#import <React/RCTUtils.h>
#else
#import "React/RCTConvert.h" // Required when used as a Pod in a Swift project
#import <React/RCTFont.h>
#import <React/RCTUtils.h>
#import "React/RCTFont.h"
#import "React/RCTUtils.h"
#endif

#import <CoreText/CoreText.h>
Expand Down Expand Up @@ -179,8 +179,9 @@ - (dispatch_queue_t)methodQueue {

NSMutableArray<NSNumber *> *result = [[NSMutableArray alloc] initWithCapacity:texts.count];

const CGFloat scaleMultiplier = _bridge ? _bridge.accessibilityManager.multiplier : 1.0;
const CGFloat epsilon = scaleMultiplier != 1.0 ? 0.001 : 0;
// When there's no font scaling, adding epsilon offsets the calculation
// by a bit, and when there is, it's required. This was tested empirically.
const CGFloat epsilon = [self fontScaleMultiplier] != 1.0 ? 0.001 : 0;

for (int ix = 0; ix < texts.count; ix++) {
NSString *text = texts[ix];
Expand Down Expand Up @@ -618,7 +619,7 @@ - (NSTextContainer *)textContainerFromOptions:(NSDictionary * _Nullable)options
const CGFloat lineHeight = CGFloatValueFrom(options[@"lineHeight"]);
if (!isnan(lineHeight)) {
NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
const CGFloat scaleMultiplier = _bridge ? _bridge.accessibilityManager.multiplier : 1.0;
const CGFloat scaleMultiplier = [self fontScaleMultiplier];
[style setMinimumLineHeight:lineHeight * scaleMultiplier];
[style setMaximumLineHeight:lineHeight * scaleMultiplier];
[attributes setObject:style forKey:NSParagraphStyleAttributeName];
Expand All @@ -627,4 +628,8 @@ - (NSTextContainer *)textContainerFromOptions:(NSDictionary * _Nullable)options
return attributes;
}

- (CGFloat)fontScaleMultiplier {
return _bridge ? _bridge.accessibilityManager.multiplier : 1.0;
}

@end