[TextControls] Make text fields without floating labels shorter

PiperOrigin-RevId: 320432378
material-components · Jul 9, 2020 · 9480bf4 · 9480bf4
1 parent a998a88
commit 9480bf4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/components/TextControls/examples/supplemental/MDCTextControlTextFieldContentViewController.m b/components/TextControls/examples/supplemental/MDCTextControlTextFieldContentViewController.m
@@ -125,8 +125,6 @@ - (void)initializeScrollViewSubviewsArray {
     outlinedTextFieldWithoutFloatingLabel,
     [self createLabelWithText:@"MDCUnderlinedTextField:"],
     [self createMaterialUnderlinedTextField],
-    [self createLabelWithText:@"MDCUnderlinedTextField:"],
-    [self createMaterialUnderlinedTextField],
     [self createLabelWithText:@"MDCUnderlinedTextField without floating label:"],
     underlinedTextFieldWithoutFloatingLabel,
     [self createLabelWithText:@"MDCBaseTextField:"],

diff --git a/components/TextControls/tests/unit/BaseTextFields/MDCBaseTextFieldTests.m b/components/TextControls/tests/unit/BaseTextFields/MDCBaseTextFieldTests.m
@@ -182,7 +182,7 @@ - (void)testClearButtonRectForBounds {
   [textField layoutIfNeeded];
 
   // Then
-  CGRect expectedClearButtonFrame = CGRectMake(99, 20, 19, 19);
+  CGRect expectedClearButtonFrame = CGRectMake(99, 11, 19, 19);
   CGRect actualClearButtonFrame = [textField clearButtonRectForBounds:textFieldFrame];
   XCTAssertTrue(CGRectEqualToRect(actualClearButtonFrame, expectedClearButtonFrame));
 }
@@ -303,7 +303,7 @@ - (void)testSizeThatFits {
 
   // Then
   CGSize newSize = textField.frame.size;
-  CGSize correctSize = CGSizeMake(130, 59);
+  CGSize correctSize = CGSizeMake(130, 41);
   XCTAssertTrue(CGSizeEqualToSize(newSize, correctSize));
 }
 

diff --git a/components/private/TextControlsPrivate/src/TextFields/MDCBaseTextFieldLayout.m b/components/private/TextControlsPrivate/src/TextFields/MDCBaseTextFieldLayout.m
@@ -178,7 +178,15 @@ - (void)calculateLayoutWithTextFieldSize:(CGSize)textFieldSize
     }
   }
 
-  CGFloat textRectMinYNormal = positioningReference.paddingBetweenContainerTopAndNormalLabel;
+  BOOL shouldLayoutForFloatingLabel = MDCTextControlShouldLayoutForFloatingLabelWithLabelPosition(
+      labelPosition, labelBehavior, label.text);
+  CGFloat textRectMinYNormal = 0;
+  if (shouldLayoutForFloatingLabel) {
+    textRectMinYNormal = positioningReference.paddingBetweenContainerTopAndNormalLabel;
+  } else {
+    textRectMinYNormal = positioningReference.paddingAroundTextWhenNoFloatingLabel;
+  }
+
   CGFloat textRectWidth = textRectMaxX - textRectMinX;
   CGFloat textRectHeight = [self textHeightWithFont:font];
   CGRect textRectNormal =
@@ -196,7 +204,10 @@ - (void)calculateLayoutWithTextFieldSize:(CGSize)textFieldSize
   CGRect textRectFloating =
       CGRectMake(textRectMinX, textRectMinYFloatingLabel, textRectWidth, textRectHeight);
 
-  CGFloat containerMidY = (CGFloat)0.5 * positioningReference.containerHeightWithFloatingLabel;
+  CGFloat containerHeight = shouldLayoutForFloatingLabel
+                                ? positioningReference.containerHeightWithFloatingLabel
+                                : positioningReference.containerHeightWithoutFloatingLabel;
+  CGFloat containerMidY = (CGFloat)0.5 * containerHeight;
   BOOL isFloatingLabel = labelPosition == MDCTextControlLabelPositionFloating;
   CGFloat textRectMidY =
       isFloatingLabel ? CGRectGetMidY(textRectFloating) : CGRectGetMidY(textRectNormal);
@@ -242,9 +253,8 @@ - (void)calculateLayoutWithTextFieldSize:(CGSize)textFieldSize
            paddingAboveAssistiveLabels:positioningReference.paddingAboveAssistiveLabels
            paddingBelowAssistiveLabels:positioningReference.paddingBelowAssistiveLabels
                                  isRTL:isRTL];
-  self.assistiveLabelViewFrame =
-      CGRectMake(0, positioningReference.containerHeightWithFloatingLabel, textFieldWidth,
-                 self.assistiveLabelViewLayout.calculatedHeight);
+  self.assistiveLabelViewFrame = CGRectMake(0, containerHeight, textFieldWidth,
+                                            self.assistiveLabelViewLayout.calculatedHeight);
   self.leftViewFrame = leftViewFrame;
   self.rightViewFrame = rightViewFrame;
   self.clearButtonFrame = clearButtonFrame;
@@ -254,7 +264,7 @@ - (void)calculateLayoutWithTextFieldSize:(CGSize)textFieldSize
   self.labelFrameNormal = labelFrameNormal;
   self.leftViewHidden = !displaysLeftView;
   self.rightViewHidden = !displaysRightView;
-  self.containerHeight = positioningReference.containerHeightWithFloatingLabel;
+  self.containerHeight = containerHeight;
 }
 
 - (CGFloat)sideViewMidYWithSideViewAlignment: