status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-26 16:10:58 +00:00
Code Issues Projects Releases Wiki Activity

[React Native] Fix RCTText crashes

Browse Source
This commit is contained in:
Alex Akers 2015-04-09 07:40:18 -07:00
parent 17ab4f2fb3
commit fcc87916d2
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Libraries/Text/RCTText.m
View File

@ -38,34 +38,53 @@
- (void)setAttributedText:(NSAttributedString *)attributedText - (void)setAttributedText:(NSAttributedString *)attributedText
{ {
[_textStorage setAttributedString:attributedText]; for (NSLayoutManager *existingLayoutManager in _textStorage.layoutManagers) {
[_textStorage removeLayoutManager:existingLayoutManager];
}
_textStorage = [[NSTextStorage alloc] initWithAttributedString:attributedText];
if (_layoutManager) {
[_textStorage addLayoutManager:_layoutManager];
}
[self setNeedsDisplay]; [self setNeedsDisplay];
} }
- (void)setTextContainer:(NSTextContainer *)textContainer - (void)setTextContainer:(NSTextContainer *)textContainer
{ {
if ([_textContainer isEqual:textContainer]) return; if ([_textContainer isEqual:textContainer]) {
return;
}
_textContainer = textContainer; _textContainer = textContainer;
for (NSInteger i = _layoutManager.textContainers.count - 1; i >= 0; i--) { for (NSInteger i = _layoutManager.textContainers.count - 1; i >= 0; i--) {
[_layoutManager removeTextContainerAtIndex:i]; [_layoutManager removeTextContainerAtIndex:i];
} }
[_layoutManager addTextContainer:_textContainer];
if (_textContainer) {
[_layoutManager addTextContainer:_textContainer];
}
[self setNeedsDisplay]; [self setNeedsDisplay];
} }
- (void)setLayoutManager:(NSLayoutManager *)layoutManager - (void)setLayoutManager:(NSLayoutManager *)layoutManager
{ {
if ([_layoutManager isEqual:layoutManager]) return; if ([_layoutManager isEqual:layoutManager]) {
return;
}
_layoutManager = layoutManager; _layoutManager = layoutManager;
for (NSLayoutManager *existingLayoutManager in _textStorage.layoutManagers) { for (NSLayoutManager *existingLayoutManager in _textStorage.layoutManagers) {
[_textStorage removeLayoutManager:existingLayoutManager]; [_textStorage removeLayoutManager:existingLayoutManager];
} }
[_textStorage addLayoutManager:_layoutManager];
if (_layoutManager) {
[_textStorage addLayoutManager:_layoutManager];
}
[self setNeedsDisplay]; [self setNeedsDisplay];
} }