status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-04 21:53:30 +00:00
Code Issues Projects Releases Wiki Activity

placeholderText was renamed to just placeholder in RCTTextView

Browse Source 
Summary: We have to have RCTTextView and RCTTextInput as much unified as possible, and this is a small step in this direction.

Reviewed By: javache

Differential Revision: D5143877

fbshipit-source-id: ee8fcab6093fe5d994c85110b07ea16e64fed262
This commit is contained in:
Valentin Shergin 2017-06-27 16:05:02 -07:00 committed by Facebook Github Bot
parent 719f0005f6
commit 2bf41672f8
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Libraries/Text/RCTTextView.m
View File

@ -273,23 +273,23 @@ static NSAttributedString *removeReactTagFromString(NSAttributedString *string)
- (NSString *)placeholder - (NSString *)placeholder
{ {
return _textView.placeholderText; return _textView.placeholder;
} }
- (void)setPlaceholder:(NSString *)placeholder - (void)setPlaceholder:(NSString *)placeholder
{ {
_textView.placeholderText = placeholder; _textView.placeholder = placeholder;
[self setNeedsLayout]; [self setNeedsLayout];
} }
- (UIColor *)placeholderTextColor - (UIColor *)placeholderColor
{ {
return _textView.placeholderTextColor; return _textView.placeholderColor;
} }
- (void)setPlaceholderTextColor:(UIColor *)placeholderTextColor - (void)setPlaceholderColor:(UIColor *)placeholderColor
{ {
_textView.placeholderTextColor = placeholderTextColor; _textView.placeholderColor = placeholderColor;
} }
- (void)setAutocorrectionType:(UITextAutocorrectionType)autocorrectionType - (void)setAutocorrectionType:(UITextAutocorrectionType)autocorrectionType

2
Libraries/Text/RCTTextViewManager.m
View File

@ -51,7 +51,7 @@ RCT_EXPORT_VIEW_PROPERTY(onSelectionChange, RCTDirectEventBlock)
RCT_EXPORT_VIEW_PROPERTY(onScroll, RCTDirectEventBlock) RCT_EXPORT_VIEW_PROPERTY(onScroll, RCTDirectEventBlock)
RCT_EXPORT_VIEW_PROPERTY(onTextInput, RCTDirectEventBlock) RCT_EXPORT_VIEW_PROPERTY(onTextInput, RCTDirectEventBlock)
RCT_EXPORT_VIEW_PROPERTY(placeholder, NSString) RCT_EXPORT_VIEW_PROPERTY(placeholder, NSString)
RCT_EXPORT_VIEW_PROPERTY(placeholderTextColor, UIColor) RCT_REMAP_VIEW_PROPERTY(placeholderTextColor, placeholderColor, UIColor)
RCT_REMAP_VIEW_PROPERTY(returnKeyType, textView.returnKeyType, UIReturnKeyType) RCT_REMAP_VIEW_PROPERTY(returnKeyType, textView.returnKeyType, UIReturnKeyType)
RCT_REMAP_VIEW_PROPERTY(secureTextEntry, textView.secureTextEntry, BOOL) RCT_REMAP_VIEW_PROPERTY(secureTextEntry, textView.secureTextEntry, BOOL)
RCT_REMAP_VIEW_PROPERTY(selectionColor, tintColor, UIColor) RCT_REMAP_VIEW_PROPERTY(selectionColor, tintColor, UIColor)

4
Libraries/Text/RCTUITextView.h
View File

@ -20,8 +20,8 @@ NS_ASSUME_NONNULL_BEGIN
- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE; - (instancetype)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE;
@property (nonatomic, assign, readonly) BOOL textWasPasted; @property (nonatomic, assign, readonly) BOOL textWasPasted;
@property (nonatomic, copy, nullable) NSString *placeholderText; @property (nonatomic, copy, nullable) NSString *placeholder;
@property (nonatomic, assign, nullable) UIColor *placeholderTextColor; @property (nonatomic, strong, nullable) UIColor *placeholderColor;
@end @end

26
Libraries/Text/RCTUITextView.m
View File

@ -23,7 +23,7 @@ static UIFont *defaultPlaceholderFont()
return [UIFont systemFontOfSize:17]; return [UIFont systemFontOfSize:17];
} }
static UIColor *defaultPlaceholderTextColor() static UIColor *defaultPlaceholderColor()
{ {
// Default placeholder color from UITextField. // Default placeholder color from UITextField.
return [UIColor colorWithRed:0 green:0 blue:0.0980392 alpha:0.22]; return [UIColor colorWithRed:0 green:0 blue:0.0980392 alpha:0.22];
@ -40,7 +40,7 @@ static UIColor *defaultPlaceholderTextColor()
_placeholderView = [[UILabel alloc] initWithFrame:self.bounds]; _placeholderView = [[UILabel alloc] initWithFrame:self.bounds];
_placeholderView.isAccessibilityElement = NO; _placeholderView.isAccessibilityElement = NO;
_placeholderView.numberOfLines = 0; _placeholderView.numberOfLines = 0;
_placeholderView.textColor = defaultPlaceholderTextColor(); _placeholderView.textColor = defaultPlaceholderColor();
[self addSubview:_placeholderView]; [self addSubview:_placeholderView];
} }
@ -61,11 +61,11 @@ static UIColor *defaultPlaceholderTextColor()
[accessibilityLabel appendString:superAccessibilityLabel]; [accessibilityLabel appendString:superAccessibilityLabel];
} }
if (self.placeholderText.length > 0 && self.text.length == 0) { if (self.placeholder.length > 0 && self.text.length == 0) {
if (accessibilityLabel.length > 0) { if (accessibilityLabel.length > 0) {
[accessibilityLabel appendString:@" "]; [accessibilityLabel appendString:@" "];
} }
[accessibilityLabel appendString:self.placeholderText]; [accessibilityLabel appendString:self.placeholder];
} }
return accessibilityLabel; return accessibilityLabel;
@ -73,16 +73,16 @@ static UIColor *defaultPlaceholderTextColor()
#pragma mark - Properties #pragma mark - Properties
- (void)setPlaceholderText:(NSString *)placeholderText - (void)setPlaceholder:(NSString *)placeholder
{ {
_placeholderText = placeholderText; _placeholder = placeholder;
_placeholderView.text = _placeholderText; _placeholderView.text = _placeholder;
} }
- (void)setPlaceholderTextColor:(UIColor *)placeholderTextColor - (void)setPlaceholderColor:(UIColor *)placeholderColor
{ {
_placeholderTextColor = placeholderTextColor; _placeholderColor = placeholderColor;
_placeholderView.textColor = _placeholderTextColor ?: defaultPlaceholderTextColor(); _placeholderView.textColor = _placeholderColor ?: defaultPlaceholderColor();
} }
- (void)textDidChange - (void)textDidChange
@ -148,8 +148,8 @@ static UIColor *defaultPlaceholderTextColor()
CGSize textSize = [self fixedSizeThatFits:size]; CGSize textSize = [self fixedSizeThatFits:size];
UIEdgeInsets padddingInsets = self.textContainerInset; UIEdgeInsets padddingInsets = self.textContainerInset;
NSString *placeholderText = self.placeholderText ?: @""; NSString *placeholder = self.placeholder ?: @"";
CGSize placeholderSize = [placeholderText sizeWithAttributes:@{NSFontAttributeName: self.font ?: defaultPlaceholderFont()}]; CGSize placeholderSize = [placeholder sizeWithAttributes:@{NSFontAttributeName: self.font ?: defaultPlaceholderFont()}];
placeholderSize = CGSizeMake(RCTCeilPixelValue(placeholderSize.width), RCTCeilPixelValue(placeholderSize.height)); placeholderSize = CGSizeMake(RCTCeilPixelValue(placeholderSize.width), RCTCeilPixelValue(placeholderSize.height));
placeholderSize.width += padddingInsets.left + padddingInsets.right; placeholderSize.width += padddingInsets.left + padddingInsets.right;
placeholderSize.height += padddingInsets.top + padddingInsets.bottom; placeholderSize.height += padddingInsets.top + padddingInsets.bottom;
@ -186,7 +186,7 @@ static UIColor *defaultPlaceholderTextColor()
- (void)invalidatePlaceholderVisibility - (void)invalidatePlaceholderVisibility
{ {
BOOL isVisible = _placeholderText.length != 0 && self.text.length == 0; BOOL isVisible = _placeholder.length != 0 && self.text.length == 0;
_placeholderView.hidden = !isVisible; _placeholderView.hidden = !isVisible;
} }