Make textField padding and text inset an editable variable in chipField

PiperOrigin-RevId: 652493790

Author: Nobody

components/Chips/src/MDCChipField.h

@@ -135,6 +135,19 @@ typedef NS_OPTIONS(NSUInteger, MDCChipFieldDelimiter) {
  */
 @property(nonatomic, assign) UIEdgeInsets contentEdgeInsets;
 
+/**
+ * The padding before the leading edge of the text field when there are chips. This is not applied
+ * when there are no chips.
+ * Default is 0.
+ */
+@property(nonatomic, assign) CGFloat textFieldLeadingPaddingWhenChipIsAdded;
+
+/**
+ * The insets of the text rect. Flipping for RTL is handled internally.
+ * Default is 4.
+ */
+@property(nonatomic, assign) UIEdgeInsets textFieldTextInsets;
+
 /**
  The image used in the MDCChipViewDeleteButton.
  Defaults to a bezier-drawn image declared in `MDCChipViewDeleteButton`.

components/Chips/src/MDCChipField.m

@@ -36,6 +36,7 @@
 static const CGFloat MDCChipFieldVerticalInset = 8;
 static const CGFloat MDCChipFieldHorizontalMargin = 8;
 static const CGFloat MDCChipFieldVerticalMargin = 8;
+static const UIEdgeInsets MDCChipFieldTextFieldTextInsetsDefault = {16, 4, 16, 0};
 static const UIKeyboardType MDCChipFieldDefaultKeyboardType = UIKeyboardTypeEmailAddress;
 
 const CGFloat MDCChipFieldDefaultMinTextFieldWidth = 44;
@@ -53,20 +54,20 @@ @interface MDCChipFieldTextField : UITextField
 
 @property(nonatomic, weak) id<MDCChipFieldTextFieldDelegate> deletionDelegate;
 
+@property(nonatomic) UIEdgeInsets textFieldTextInsets;
+
 @end
 
 @implementation MDCChipFieldTextField
 
-const UIEdgeInsets MDCChipFieldTextFieldRTLEdgeInsets = {16, 0, 16, 4};
-
-const UIEdgeInsets MDCChipFieldTextFieldLTREdgeInsets = {16, 4, 16, 0};
-
 - (BOOL)isRTL {
   return self.effectiveUserInterfaceLayoutDirection == UIUserInterfaceLayoutDirectionRightToLeft;
 }
 
 - (UIEdgeInsets)textEdgeInsets {
-  return [self isRTL] ? MDCChipFieldTextFieldRTLEdgeInsets : MDCChipFieldTextFieldLTREdgeInsets;
+  return [self isRTL] ? UIEdgeInsetsMake(_textFieldTextInsets.top, _textFieldTextInsets.right,
+                                         _textFieldTextInsets.bottom, _textFieldTextInsets.left)
+                      : _textFieldTextInsets;
 }
 
 - (CGRect)textRectForBounds:(CGRect)bounds {
@@ -149,6 +150,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
     chipFieldTextField.autocorrectionType = UITextAutocorrectionTypeNo;
     chipFieldTextField.autocapitalizationType = UITextAutocapitalizationTypeNone;
     chipFieldTextField.keyboardType = MDCChipFieldDefaultKeyboardType;
+    chipFieldTextField.textFieldTextInsets = MDCChipFieldTextFieldTextInsetsDefault;
     // Listen for notifications posted when the text field is the first responder.
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(textFieldDidChange)
@@ -182,6 +184,8 @@ - (void)commonMDCChipFieldInit {
   _contentEdgeInsets = MDCChipFieldDefaultContentEdgeInsets;
   _showPlaceholderWithChips = YES;
   _chipHeight = 32;
+  _textFieldLeadingPaddingWhenChipIsAdded = 0;
+  _textFieldTextInsets = MDCChipFieldTextFieldTextInsetsDefault;
 
   [self configureLocalizedAccessibilityActionName];
 }
@@ -289,6 +293,13 @@ - (void)setPlaceholderAttributes:(NSDictionary<NSAttributedStringKey, id> *)plac
   [self updateTextFieldPlaceholderText];
 }
 
+- (void)setTextFieldTextInsets:(UIEdgeInsets)textFieldTextInsets {
+  _textFieldTextInsets = textFieldTextInsets;
+  if ([_textField isKindOfClass:[MDCChipFieldTextField class]]) {
+    ((MDCChipFieldTextField *)self.textField).textFieldTextInsets = _textFieldTextInsets;
+  }
+}
+
 - (CGSize)sizeThatFits:(CGSize)size {
   NSArray *chipFrames = [self chipFramesForSize:size];
   CGRect lastChipFrame = [chipFrames.lastObject CGRectValue];
@@ -720,7 +731,8 @@ - (CGRect)frameForTextFieldForLastChipFrame:(CGRect)lastChipFrame
         chipFieldSize.width - self.contentEdgeInsets.left - self.contentEdgeInsets.right;
   } else {
     // The text field fits on the line with chips
-    originX += CGRectGetMaxX(lastChipFrame) + MDCChipFieldHorizontalMargin;
+    originX += CGRectGetMaxX(lastChipFrame) + MDCChipFieldHorizontalMargin +
+               _textFieldLeadingPaddingWhenChipIsAdded;
     textFieldWidth = availableWidth;
   }
 

components/Chips/tests/snapshot/MDCChipFieldSnapshotTests.m

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import <UIKit/UIKit.h>
 #import "MaterialChips.h"
 #import "MaterialSnapshot.h"
 
@@ -123,6 +124,32 @@ - (void)testEmptyPlaceholderSizeDoesNotAccountForContentInsets {
   [self snapshotVerifyView:self.chipField];
 }
 
+- (void)testTextFieldLeadingPaddingWhenChipIsAdded {
+  // Given
+  self.chipField.textField.text = @"This is a chip field.";
+  self.chipField.textFieldLeadingPaddingWhenChipIsAdded = 50.0;
+
+  // When
+  [self.chipField addChip:[self chipViewWithTitle:@"Chip"]];
+
+  // Then
+  [self.chipField sizeToFit];
+  [self snapshotVerifyView:self.chipField];
+}
+
+- (void)testTextFieldTextLeadingInset {
+  // Given
+  self.chipField.textField.text = @"This is a chip field.";
+  self.chipField.textFieldTextInsets = UIEdgeInsetsMake(16, 50, 16, 0);
+
+  // When
+  [self.chipField addChip:[self chipViewWithTitle:@"Chip"]];
+
+  // Then
+  [self.chipField sizeToFit];
+  [self snapshotVerifyView:self.chipField];
+}
+
 #pragma mark - Helpers
 
 - (MDCChipView *)chipViewWithTitle:(NSString *)title {