[TextControls] Disable label animation when label is truncated

PiperOrigin-RevId: 367256976

Author: andrewoverton

components/TextControls/src/BaseTextAreas/MDCBaseTextArea.m

@@ -489,6 +489,7 @@ - (void)animateLabel {
                           floatingLabelFrame:self.layout.labelFrameFloating
                                   normalFont:self.normalFont
                                 floatingFont:self.floatingFont
+                    labelTruncationIsPresent:self.layout.labelTruncationIsPresent
                            animationDuration:self.animationDuration
                                   completion:^(BOOL finished) {
                                     if (finished) {

components/TextControls/src/BaseTextAreas/private/MDCBaseTextAreaLayout.h

@@ -43,6 +43,8 @@
 @property(nonatomic, strong, nonnull, readonly) NSArray<NSNumber *> *verticalGradientLocations;
 @property(nonatomic, strong, nonnull, readonly) NSArray<NSNumber *> *horizontalGradientLocations;
 
+@property(nonatomic, assign) BOOL labelTruncationIsPresent;
+
 /**
  Initializing an MDCBaseTextAreaLayout object with this initializer is tantamount to calculating a
  layout for a text area. The  long parameter list includes everything that might impact

components/TextControls/src/BaseTextAreas/private/MDCBaseTextAreaLayout.m

@@ -16,11 +16,10 @@
 
 #import "MDCTextControlAssistiveLabelViewLayout.h"
 #import "MDCTextControlHorizontalPositioning.h"
-#import "MDCTextControlLabelPosition.h"
+#import "MDCTextControlLabelSupport.h"
 #import "MDCTextControlSideViewSupport.h"
 #import "MDCTextControlVerticalPositioningReference.h"
 
-#import <MDFInternationalization/MDFInternationalization.h>
 
 static const CGFloat kGradientBlurLength = (CGFloat)4.0;
 
@@ -155,9 +154,23 @@ - (void)calculateLayoutWithSize:(CGSize)size
   CGFloat textRectMaxX = displaysRightView ? rightViewMinX - horizontalInterItemPadding
                                            : textAreaWidth - rightEdgePadding;
 
+  CGFloat textRectWidth = textRectMaxX - textRectMinX;
+  CGSize labelSizeNormal = MDCTextControlLabelSizeWith(label.text, textRectWidth, font);
+  CGSize labelSizeFloating = MDCTextControlLabelSizeWith(label.text, textRectWidth, floatingFont);
+  BOOL normalLabelWillTruncate = labelSizeNormal.height > font.lineHeight;
+  BOOL floatingLabelWillTruncate = labelSizeFloating.height > floatingFont.lineHeight;
+  if (normalLabelWillTruncate) {
+    labelSizeNormal.height = font.lineHeight;
+    labelSizeNormal.width = textRectWidth;
+  }
+  if (floatingLabelWillTruncate) {
+    labelSizeFloating.height = floatingFont.lineHeight;
+    labelSizeFloating.width = textRectWidth;
+  }
+  self.labelTruncationIsPresent = normalLabelWillTruncate || floatingLabelWillTruncate;
+
   CGRect floatingLabelFrame =
-      [self floatingLabelFrameWithText:label.text
-                                        floatingFont:floatingFont
+      [self floatingLabelFrameWithFloatingLabelSize:labelSizeFloating
                                         textRectMinX:textRectMinX
                                         textRectMaxX:textRectMaxX
           paddingBetweenContainerTopAndFloatingLabel:verticalPositioningReference
@@ -166,8 +179,7 @@ - (void)calculateLayoutWithSize:(CGSize)size
   CGFloat floatingLabelMaxY = CGRectGetMaxY(floatingLabelFrame);
 
   CGRect normalLabelFrame =
-      [self normalLabelFrameWithLabelText:label.text
-                                              font:font
+      [self normalLabelFrameWithNormalLabelSize:labelSizeNormal
                                       textRectMinX:textRectMinX
                                       textRectMaxX:textRectMaxX
           paddingBetweenContainerTopAndNormalLabel:verticalPositioningReference
@@ -197,9 +209,8 @@ - (void)calculateLayoutWithSize:(CGSize)size
     containerHeight = verticalPositioningReference.containerHeightWithoutFloatingLabel;
     normalLabelFrame.origin.y = textViewMinY;
   }
-  CGFloat textViewWidth = textRectMaxX - textRectMinX;
   CGFloat textViewHeight = containerHeight - bottomPadding - textViewMinY;
-  CGRect textViewFrame = CGRectMake(textRectMinX, textViewMinY, textViewWidth, textViewHeight);
+  CGRect textViewFrame = CGRectMake(textRectMinX, textViewMinY, textRectWidth, textViewHeight);
 
   self.placeholderLabelHidden = placeholderLabel.attributedText == nil;
   if (self.placeholderLabelHidden) {
@@ -208,7 +219,7 @@ - (void)calculateLayoutWithSize:(CGSize)size
     CGSize sizeThatFits = [placeholderLabel sizeThatFits:textViewFrame.size];
     CGFloat placeholderLabelMinX = 0;
     if (isRTL) {
-      placeholderLabelMinX = textViewWidth - sizeThatFits.width;
+      placeholderLabelMinX = textRectWidth - sizeThatFits.width;
     }
     self.placeholderLabelFrame =
         CGRectMake(placeholderLabelMinX, 0, sizeThatFits.width, sizeThatFits.height);
@@ -304,14 +315,11 @@ - (CGRect)sideViewFrameWithSideView:(UIView *)sideView
   return CGRectMake(minX, minY, CGRectGetWidth(sideView.bounds), sideViewHeight);
 }
 
-- (CGRect)normalLabelFrameWithLabelText:(NSString *)labelText
-                                        font:(UIFont *)font
-                                textRectMinX:(CGFloat)textRectMinX
-                                textRectMaxX:(CGFloat)textRectMaxX
-    paddingBetweenContainerTopAndNormalLabel:(CGFloat)paddingBetweenContainerTopAndNormalLabel
-                                       isRTL:(BOOL)isRTL {
-  CGFloat maxTextWidth = textRectMaxX - textRectMinX;
-  CGSize normalLabelSize = [self textSizeWithText:labelText font:font maxWidth:maxTextWidth];
+- (CGRect)normalLabelFrameWithNormalLabelSize:(CGSize)normalLabelSize
+                                 textRectMinX:(CGFloat)textRectMinX
+                                 textRectMaxX:(CGFloat)textRectMaxX
+     paddingBetweenContainerTopAndNormalLabel:(CGFloat)paddingBetweenContainerTopAndNormalLabel
+                                        isRTL:(BOOL)isRTL {
   CGFloat normalLabelMinX = textRectMinX;
   if (isRTL) {
     normalLabelMinX = textRectMaxX - normalLabelSize.width;
@@ -321,14 +329,12 @@ - (CGRect)normalLabelFrameWithLabelText:(NSString *)labelText
                     normalLabelSize.height);
 }
 
-- (CGRect)floatingLabelFrameWithText:(NSString *)text
-                                  floatingFont:(UIFont *)floatingFont
-                                  textRectMinX:(CGFloat)textRectMinX
-                                  textRectMaxX:(CGFloat)textRectMaxX
-    paddingBetweenContainerTopAndFloatingLabel:(CGFloat)paddingBetweenContainerTopAndFloatingLabel
-                                         isRTL:(BOOL)isRTL {
-  CGFloat maxTextWidth = textRectMaxX - textRectMinX;
-  CGSize floatingLabelSize = [self textSizeWithText:text font:floatingFont maxWidth:maxTextWidth];
+- (CGRect)floatingLabelFrameWithFloatingLabelSize:(CGSize)floatingLabelSize
+                                     textRectMinX:(CGFloat)textRectMinX
+                                     textRectMaxX:(CGFloat)textRectMaxX
+       paddingBetweenContainerTopAndFloatingLabel:
+           (CGFloat)paddingBetweenContainerTopAndFloatingLabel
+                                            isRTL:(BOOL)isRTL {
   CGFloat textMinY = paddingBetweenContainerTopAndFloatingLabel;
   CGFloat textMinX = textRectMinX;
   if (isRTL) {

components/TextControls/src/BaseTextFields/MDCBaseTextField.m

@@ -581,6 +581,7 @@ - (void)animateLabel {
                           floatingLabelFrame:self.layout.labelFrameFloating
                                   normalFont:self.normalFont
                                 floatingFont:self.floatingFont
+                    labelTruncationIsPresent:self.layout.labelTruncationIsPresent
                            animationDuration:self.animationDuration
                                   completion:^(BOOL finished) {
                                     if (finished) {

components/TextControls/tests/snapshot/MDCBaseTextAreaSnapshotTests.m

@@ -213,6 +213,17 @@ - (void)testDenseTextAreaWithLabelTextAndText {
   [self validateTextArea:textArea];
 }
 
+- (void)testTextAreaWithTruncatingNormalLabel {
+  // Given
+  MDCBaseTextArea *textArea = self.textArea;
+
+  // When
+  textArea.label.text = @"Very long label text withaverylongwordinit";
+
+  // Then
+  [self validateTextArea:textArea];
+}
+
 #pragma mark Helpers
 
 - (UIView *)createSideView {

components/TextControls/tests/snapshot/MDCBaseTextFieldSnapshotTests.m

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "MaterialTextControls+BaseTextFields.h"
 #import "MaterialSnapshot.h"
 
 #import <UIKit/UIKit.h>
@@ -280,4 +281,15 @@ - (void)testEditingDenseTextFieldWithLabelTextAndText {
   [self validateTextField:textField];
 }
 
+- (void)testTextFieldWithTruncatingNormalLabel {
+  // Given
+  MDCBaseTextField *textField = self.textField;
+
+  // When
+  textField.label.text = @"Very long label text withaverylongwordinit";
+
+  // Then
+  [self validateTextField:textField];
+}
+
 @end

components/private/TextControlsPrivate/src/Shared/MDCTextControl.h

@@ -21,7 +21,7 @@
 #import "MDCTextControlColorViewModel.h"
 #import "MDCTextControlHorizontalPositioningReference.h"
 #import "MDCTextControlLabelAnimation.h"
-#import "MDCTextControlLabelPosition.h"
+#import "MDCTextControlLabelSupport.h"
 #import "MDCTextControlVerticalPositioningReference.h"
 
 UIFont *_Nonnull MDCTextControlDefaultUITextFieldFont(void);

components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelAnimation.h

@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "MDCTextControlLabelPosition.h"
+#import "MDCTextControlLabelSupport.h"
 
 /**
  The logic to animate labels is extracted into its own class so that any MDCTextControl can
@@ -31,11 +31,12 @@
  no animation in progress.
  */
 + (void)animateLabel:(nonnull UILabel *)label
-                 state:(MDCTextControlLabelPosition)labelPosition
-      normalLabelFrame:(CGRect)normalLabelFrame
-    floatingLabelFrame:(CGRect)floatingLabelFrame
-            normalFont:(nonnull UIFont *)normalFont
-          floatingFont:(nonnull UIFont *)floatingFont
-     animationDuration:(NSTimeInterval)animationDuration
-            completion:(void (^__nullable)(BOOL))completion;
+                       state:(MDCTextControlLabelPosition)labelPosition
+            normalLabelFrame:(CGRect)normalLabelFrame
+          floatingLabelFrame:(CGRect)floatingLabelFrame
+                  normalFont:(nonnull UIFont *)normalFont
+                floatingFont:(nonnull UIFont *)floatingFont
+    labelTruncationIsPresent:(BOOL)labelTruncationIsPresent
+           animationDuration:(NSTimeInterval)animationDuration
+                  completion:(void (^__nullable)(BOOL))completion;
 @end

components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelAnimation.m

@@ -15,18 +15,19 @@
 #import "MDCTextControlLabelAnimation.h"
 
 #import "MaterialAnimationTiming.h"
-#import "MDCTextControlLabelPosition.h"
+#import "MDCTextControlLabelSupport.h"
 
 @implementation MDCTextControlLabelAnimation
 
 + (void)animateLabel:(nonnull UILabel *)label
-                 state:(MDCTextControlLabelPosition)labelPosition
-      normalLabelFrame:(CGRect)normalLabelFrame
-    floatingLabelFrame:(CGRect)floatingLabelFrame
-            normalFont:(nonnull UIFont *)normalFont
-          floatingFont:(nonnull UIFont *)floatingFont
-     animationDuration:(NSTimeInterval)animationDuration
-            completion:(void (^__nullable)(BOOL))completion {
+                       state:(MDCTextControlLabelPosition)labelPosition
+            normalLabelFrame:(CGRect)normalLabelFrame
+          floatingLabelFrame:(CGRect)floatingLabelFrame
+                  normalFont:(nonnull UIFont *)normalFont
+                floatingFont:(nonnull UIFont *)floatingFont
+    labelTruncationIsPresent:(BOOL)labelTruncationIsPresent
+           animationDuration:(NSTimeInterval)animationDuration
+                  completion:(void (^__nullable)(BOOL))completion {
   BOOL isAnimationInProgress = label.layer.animationKeys.count > 0;
   if (isAnimationInProgress) {
     if (completion) {
@@ -53,7 +54,7 @@ + (void)animateLabel:(nonnull UILabel *)label
   BOOL currentFrameIsCGRectZero = CGRectEqualToRect(currentFrame, CGRectZero);
   BOOL isNormalTransition = willChangeFrame && !currentFrameIsCGRectZero;
   BOOL nonZeroDuration = animationDuration > 0;
-  BOOL shouldPerformAnimation = nonZeroDuration && isNormalTransition;
+  BOOL shouldPerformAnimation = nonZeroDuration && isNormalTransition && !labelTruncationIsPresent;
 
   void (^completionBlock)(BOOL finished) = ^void(BOOL finished) {
     label.transform = CGAffineTransformIdentity;

components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelPosition.h renamed to components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelSupport.h

@@ -15,24 +15,24 @@
 #import <UIKit/UIKit.h>
 
 /**
- This enum represents different states the floating label can be in.
+ This enum represents different positional states the label can be in.
  */
 typedef NS_ENUM(NSUInteger, MDCTextControlLabelPosition) {
   /**
-   The state where the floating label is not visible.
+   The state where the label is not visible.
    */
   MDCTextControlLabelPositionNone,
   /**
-   The state where the floating label is floating.
+   The state where the label is positioned (i.e. floating) above the text rect.
    */
   MDCTextControlLabelPositionFloating,
   /**
-   The state where the floating label is occupying the normal text area.
+   The state where the label is positioned in the normal text area.
    */
   MDCTextControlLabelPositionNormal,
 };
 
-MDCTextControlLabelPosition MDCTextControlLabelPositionWith(BOOL hasLabelText,
-                                                            BOOL hasText,
-                                                            BOOL canLabelFloat,
-                                                            BOOL isEditing);
+MDCTextControlLabelPosition MDCTextControlLabelPositionWith(BOOL hasLabelText, BOOL hasText,
+                                                            BOOL canLabelFloat, BOOL isEditing);
+
+CGSize MDCTextControlLabelSizeWith(NSString *text, CGFloat maxWidth, UIFont *font);