[iOS] Keep placeholder attributes sync with text input text's attributes

[iOS] Keep placeholder attributes sync with text input text's attributes Add nil check for placeholder
facebook · Mar 4, 2019 · 37445f2 · 37445f2
1 parent d451c03
commit 37445f2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
@@ -82,7 +82,7 @@ - (NSString *)accessibilityLabel
 - (void)setPlaceholder:(NSString *)placeholder
 {
  _placeholder = placeholder;
- _placeholderView.text = _placeholder;
+ _placeholderView.attributedText = [[NSAttributedString alloc] initWithString:_placeholder ?: @"" attributes:[self placeholderEffectiveTextAttributes]];
 }
 
 - (void)setPlaceholderColor:(UIColor *)placeholderColor
@@ -98,7 +98,8 @@ - (void)setReactTextAttributes:(RCTTextAttributes *)reactTextAttributes
  }
  self.typingAttributes = reactTextAttributes.effectiveTextAttributes;
  _reactTextAttributes = reactTextAttributes;
- _placeholderView.font = self.font ?: defaultPlaceholderFont();
+ // Update placeholder text attributes
+ [self setPlaceholder:_placeholder];
 }
 
 - (RCTTextAttributes *)reactTextAttributes
@@ -249,6 +250,17 @@ - (void)invalidatePlaceholderVisibility
  _placeholderView.hidden = !isVisible;
 }
 
+- (NSDictionary<NSAttributedStringKey, id> *)placeholderEffectiveTextAttributes
+{
+ NSDictionary<NSAttributedStringKey, id> *effectiveTextAttributes = @{
+ NSFontAttributeName: _reactTextAttributes.effectiveFont ?: defaultPlaceholderFont(),
+ NSForegroundColorAttributeName: self.placeholderColor ?: defaultPlaceholderColor(),
+ NSKernAttributeName:isnan(_reactTextAttributes.letterSpacing) ? @0 : @(_reactTextAttributes.letterSpacing)
+ };
+
+ return effectiveTextAttributes;
+}
+
 #pragma mark - Utility Methods
 
 - (void)copyTextAttributesFrom:(NSAttributedString *)sourceString

diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
@@ -70,6 +70,7 @@ - (void)setReactTextAttributes:(RCTTextAttributes *)reactTextAttributes
  }
  self.defaultTextAttributes = reactTextAttributes.effectiveTextAttributes;
  _reactTextAttributes = reactTextAttributes;
+ [self _updatePlaceholder];
 }
 
 - (RCTTextAttributes *)reactTextAttributes
@@ -87,6 +88,10 @@ - (void)_updatePlaceholder
  if (_placeholderColor) {
  [attributes setObject:_placeholderColor forKey:NSForegroundColorAttributeName];
  }
+ // Kerning
+ if (!isnan(_reactTextAttributes.letterSpacing)) {
+ attributes[NSKernAttributeName] = @(_reactTextAttributes.letterSpacing);
+ }
 
  self.attributedPlaceholder = [[NSAttributedString alloc] initWithString:self.placeholder
  attributes:attributes];