[TextControls] Add placeholderColor property

PiperOrigin-RevId: 351648295
material-components · Jan 13, 2021 · 48808bf · 48808bf
1 parent 6b4b029
commit 48808bf
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/components/TextControls/src/BaseTextAreas/MDCBaseTextArea.h b/components/TextControls/src/BaseTextAreas/MDCBaseTextArea.h
@@ -223,4 +223,10 @@ values are allowed.
  */
 @property(nonatomic, strong, nullable) NSString *placeholder;
 
+/**
+ The color of the placeholder. The default value is the color used by the placeholder in @c
+ UITextField.
+ */
+@property(nonatomic, strong, null_resettable) UIColor *placeholderColor;
+
 @end
diff --git a/components/TextControls/src/BaseTextAreas/MDCBaseTextArea.m b/components/TextControls/src/BaseTextAreas/MDCBaseTextArea.m
@@ -21,7 +21,10 @@
 #import "private/MDCBaseTextAreaLayout.h"
 #import "private/MDCBaseTextAreaTextView.h"
 #import "MDCBaseTextAreaDelegate.h"
+#import "MDCTextControlLabelBehavior.h"
+#import "MDCTextControlState.h"
 #import "MaterialTextControlsPrivate+BaseStyle.h"
+#import "MDCTextControlAssistiveLabelDrawPriority.h"
 #import "MaterialTextControlsPrivate+Shared.h"
 
 static char *const kKVOContextMDCBaseTextArea = "kKVOContextMDCBaseTextArea";
@@ -109,6 +112,7 @@ - (void)initializeProperties {
   self.minimumNumberOfVisibleRows = kMDCBaseTextAreaDefaultMinimumNumberOfVisibleLines;
   self.maximumNumberOfVisibleRows = kMDCBaseTextAreaDefaultMaximumNumberOfVisibleLines;
   self.gradientManager = [[MDCTextControlGradientManager alloc] init];
+  self.placeholderColor = [self defaultPlaceholderColor];
 }
 
 - (void)setUpTapGesture {
@@ -418,7 +422,7 @@ - (NSAttributedString *)determineAttributedPlaceholder {
   if ([self shouldPlaceholderBeVisible]) {
     NSDictionary<NSAttributedStringKey, id> *attributes = @{
       NSParagraphStyleAttributeName : [self defaultPlaceholderParagraphStyle],
-      NSForegroundColorAttributeName : [self defaultPlaceholderColor],
+      NSForegroundColorAttributeName : self.placeholderColor,
       NSFontAttributeName : self.normalFont
     };
     return [[NSAttributedString alloc] initWithString:self.placeholder attributes:attributes];
@@ -529,6 +533,10 @@ - (void)setPlaceholder:(NSString *)placeholder {
   [self setNeedsLayout];
 }
 
+- (void)setPlaceholderColor:(UIColor *)placeholderColor {
+  _placeholderColor = placeholderColor ?: [self defaultPlaceholderColor];
+}
+
 #pragma mark MDCTextControl Protocol Accessors
 
 - (void)setLeadingView:(UIView *)leadingView {

diff --git a/components/TextControls/tests/snapshot/MDCBaseTextAreaSnapshotTests.m b/components/TextControls/tests/snapshot/MDCBaseTextAreaSnapshotTests.m
@@ -107,6 +107,20 @@ - (void)testTextAreaWithLabelAndPlaceholderWhileEditing {
   [self validateTextArea:textArea];
 }
 
+- (void)testTextAreaWithLabelAndCustomColorPlaceholderWhileEditing {
+  // Given
+  MDCBaseTextArea *textArea = self.textArea;
+
+  // When
+  textArea.placeholderColor = [UIColor blueColor];
+  textArea.placeholder = @"This is a custom color placeholder.";
+  textArea.label.text = @"This is a floating label";
+  [textArea.textView becomeFirstResponder];
+
+  // Then
+  [self validateTextArea:textArea];
+}
+
 - (void)testTextAreaWithArabigLabelAndPlaceholderWhileEditingRTL {
   // Given
   MDCBaseTextArea *textArea = self.textArea;