[TextFields] Fix text fields overlapping labels (#2163)

* [TextFields] Removes ambiguous layout. * [TextFields] Better code organization and comment. * [TextFields] Adding a filled in field to the examples. * [TextFields] Correcting placeholder not rising when text is set programatically. Also better naming. * [TextFields] Giving examples of each floating style a set .text. * [TextFields] Adding placeholder float test.
material-components · Oct 13, 2017 · 75cf565 · 75cf565
1 parent d46e3a3
commit 75cf565
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 9 deletions.
diff --git a/components/TextFields/examples/TextFieldExample.swift b/components/TextFields/examples/TextFieldExample.swift
@@ -111,6 +111,7 @@ final class TextFieldSwiftExample: UIViewController {
     scrollView.addSubview(name)
     let nameController = MDCTextInputControllerDefault(textInput: name)
     name.delegate = self
+    name.text = "Grace Hopper"
     nameController.placeholderText = "Name"
     nameController.helperText = "First and Last"
     allTextFieldControllers.append(nameController)

diff --git a/components/TextFields/examples/TextFieldFilledExample.swift b/components/TextFields/examples/TextFieldFilledExample.swift
@@ -111,6 +111,7 @@ final class TextFieldFilledSwiftExample: UIViewController {
     scrollView.addSubview(name)
     let nameController = MDCTextInputControllerFilled(textInput: name)
     name.delegate = self
+    name.text = "Grace Hopper"
     nameController.placeholderText = "Name"
     nameController.helperText = "First and Last"
     allTextFieldControllers.append(nameController)

diff --git a/components/TextFields/examples/TextFieldLegacyExample.swift b/components/TextFields/examples/TextFieldLegacyExample.swift
@@ -109,7 +109,9 @@ final class TextFieldLegacySwiftExample: UIViewController {
     scrollView.addSubview(name)
     let nameController = MDCTextInputControllerLegacyDefault(textInput: name)
     name.delegate = self
+    name.text = "Grace Hopper"
     nameController.placeholderText = "Name"
+    nameController.helperText = "First and Last"
     allTextFieldControllers.append(nameController)
 
     scrollView.addSubview(address)

diff --git a/components/TextFields/examples/TextFieldOutlinedExample.swift b/components/TextFields/examples/TextFieldOutlinedExample.swift
@@ -108,6 +108,7 @@ final class TextFieldOutlinedSwiftExample: UIViewController {
     scrollView.addSubview(name)
     let nameController = MDCTextInputControllerOutlined(textInput: name)
     name.delegate = self
+    name.text = "Grace Hopper"
     nameController.placeholderText = "Name"
     nameController.helperText = "First and Last"
     allTextFieldControllers.append(nameController)

diff --git a/components/TextFields/src/MDCTextInputControllerDefault.m b/components/TextFields/src/MDCTextInputControllerDefault.m
@@ -344,7 +344,7 @@ - (void)commonMDCTextInputControllerDefaultInitialization {
   _underlineViewMode = [self class].underlineViewModeDefault;
   _textInput.hidesPlaceholderOnInput = NO;
 
-  [self updatePlaceholderY];
+  [self forceUpdatePlaceholderY];
 }
 
 - (void)setupInput {
@@ -374,7 +374,7 @@ - (void)setupInput {
 
   [self subscribeForNotifications];
   _textInput.underline.color = [self class].normalColorDefault;
-  [self updatePlaceholderY];
+  [self forceUpdatePlaceholderY];
 }
 
 - (void)subscribeForNotifications {
@@ -507,7 +507,7 @@ - (void)updatePlaceholder {
 //
 // Note that this calls updateLayout inside it so it is the only 'update-' method not included in
 // updateLayout.
-- (void)updatePlaceholderY {
+- (void)forceUpdatePlaceholderY {
   BOOL isDirectionToUp = NO;
   if (self.floatingEnabled) {
     isDirectionToUp = self.textInput.text.length >= 1 || self.textInput.isEditing;
@@ -885,7 +885,7 @@ + (void)setFloatingPlaceholderNormalColorDefault:(UIColor *)floatingPlaceholderN
 - (void)setFloatingEnabled:(BOOL)floatingEnabled {
   if (_floatingEnabled != floatingEnabled) {
     _floatingEnabled = floatingEnabled;
-    [self updatePlaceholderY];
+    [self forceUpdatePlaceholderY];
   }
 }
 
@@ -1312,6 +1312,7 @@ - (void)textInputDidChange:(NSNotification *)note {
     [CATransaction begin];
     [CATransaction setAnimationDuration:0];
     [self updateLayout];
+    [self forceUpdatePlaceholderY];
     [CATransaction commit];
   } else {
     [self updateLayout];

diff --git a/components/TextFields/src/MDCTextInputControllerLegacyDefault.m b/components/TextFields/src/MDCTextInputControllerLegacyDefault.m
@@ -317,7 +317,7 @@ - (void)commonMDCTextInputControllerLegacyDefaultInitialization {
   _underlineViewMode = [self class].underlineViewModeDefault;
   _textInput.hidesPlaceholderOnInput = NO;
 
-  [self updatePlaceholderY];
+  [self forceUpdatePlaceholderY];
 }
 
 - (void)setupInput {
@@ -338,7 +338,7 @@ - (void)setupInput {
 
   [self subscribeForNotifications];
   _textInput.underline.color = [self class].normalColorDefault;
-  [self updatePlaceholderY];
+  [self forceUpdatePlaceholderY];
 }
 
 - (void)setupClearButton {
@@ -481,7 +481,7 @@ - (void)updatePlaceholder {
 //
 // Note that this calls updateLayout inside it so it is the only 'update-' method not included in
 // updateLayout.
-- (void)updatePlaceholderY {
+- (void)forceUpdatePlaceholderY {
   BOOL isDirectionToUp = NO;
   if (self.floatingEnabled) {
     isDirectionToUp = self.textInput.text.length >= 1 || self.textInput.isEditing;
@@ -825,7 +825,7 @@ + (void)setFloatingPlaceholderNormalColorDefault:(UIColor *)floatingPlaceholderN
 - (void)setFloatingEnabled:(BOOL)floatingEnabled {
   if (_floatingEnabled != floatingEnabled) {
     _floatingEnabled = floatingEnabled;
-    [self updatePlaceholderY];
+    [self forceUpdatePlaceholderY];
   }
 }
 
@@ -1205,7 +1205,8 @@ - (void)textInputDidChange:(NSNotification *)note {
   if ([note.name isEqualToString:MDCTextFieldTextDidSetTextNotification]) {
     [CATransaction begin];
     [CATransaction setAnimationDuration:0];
-    [self updatePlaceholderY];
+    [self forceUpdatePlaceholderY];
+    [self updateLayout];
     [CATransaction commit];
   } else {
     [self updateLayout];

diff --git a/components/TextFields/tests/unit/TextFieldControllerLegacyTests.swift b/components/TextFields/tests/unit/TextFieldControllerLegacyTests.swift
@@ -236,6 +236,21 @@ class TextFieldControllerDefaultLegacyTests: XCTestCase {
     XCTAssertNotEqual(.blue, textField.underline?.color)
   }
 
+  func testFloatingPlaceholderLegacyDefault() {
+    let textField = MDCTextField()
+
+    let controller = MDCTextInputControllerLegacyDefault(textInput: textField)
+    textField.sizeToFit()
+
+    controller.placeholderText = "Placeholder"
+    textField.text = "Set Text"
+    textField.setNeedsLayout()
+    textField.layoutIfNeeded()
+
+    let estimatedTextFrame = UIEdgeInsetsInsetRect(textField.bounds, controller.textInsets(UIEdgeInsets()))
+    XCTAssertFalse(textField.placeholderLabel.frame.intersects(estimatedTextFrame))
+  }
+
   func testLabelsLegacyDefault() {
     let textField = MDCTextField()