Fix both floating & inline placeholders being shown when text is cleared

Fixes #20
stephsharp · Jul 15, 2018 · 425e208 · 425e208
1 parent 383be4f
commit 425e208
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/MaterialTextField/MFTextField.m b/MaterialTextField/MFTextField.m
@@ -336,12 +336,9 @@ - (void)layoutPlaceholderLabelAnimated:(BOOL)animated
 {
     if (self.shouldShowPlaceholder) {
         [self updatePlaceholderColor];
-
-        if (self.placeholderIsHidden) {
-            [self showPlaceholderLabelAnimated:animated];
-        }
+        [self showPlaceholderLabelAnimated:animated];
     }
-    else if (!self.placeholderIsHidden) {
+    else {
         [self hidePlaceholderLabelAnimated:animated];
     }
 }
@@ -423,6 +420,10 @@ - (void)showPlaceholderLabelAnimated:(BOOL)animated
         // Call setPlaceholder on super so placeholderAttributedString is not set to nil
         [super setPlaceholder:nil];
     }
+
+    if (!self.placeholderIsHidden) {
+        return;
+    }
 
     if (animated && !self.placeholderIsAnimating) {
         [self.superview layoutIfNeeded];
@@ -452,6 +453,10 @@ - (void)showPlaceholderLabelAnimated:(BOOL)animated
 
 - (void)hidePlaceholderLabelAnimated:(BOOL)animated
 {
+    if (self.placeholderIsHidden) {
+        return;
+    }
+
     CGFloat finalDistanceFromTop = CGRectGetMinY(self.textRect) / 2.0f;
 
     if (self.placeholderAnimatesOnFocus) {