diff --git a/packages/react-native/Libraries/Text/RCTTextAttributes.m b/packages/react-native/Libraries/Text/RCTTextAttributes.m index c8323388ce684b..cd0098b28bdbb0 100644 --- a/packages/react-native/Libraries/Text/RCTTextAttributes.m +++ b/packages/react-native/Libraries/Text/RCTTextAttributes.m @@ -130,9 +130,13 @@ - (NSParagraphStyle *)effectiveParagraphStyle if (!isnan(_lineHeight)) { CGFloat lineHeight = _lineHeight * self.effectiveFontSizeMultiplier; - paragraphStyle.minimumLineHeight = lineHeight; - paragraphStyle.maximumLineHeight = lineHeight; - isParagraphStyleUsed = YES; + + // Text with lineHeight lower than font.lineHeight does not correctly vertically align. + if (lineHeight > self.effectiveFont.lineHeight) { + paragraphStyle.minimumLineHeight = lineHeight; + paragraphStyle.maximumLineHeight = lineHeight; + isParagraphStyleUsed = YES; + } } if (isParagraphStyleUsed) { @@ -172,6 +176,12 @@ - (NSParagraphStyle *)effectiveParagraphStyle NSParagraphStyle *paragraphStyle = [self effectiveParagraphStyle]; if (paragraphStyle) { attributes[NSParagraphStyleAttributeName] = paragraphStyle; + + // The baseline aligns the text vertically in the line height (_UITextLayoutFragmentView). + if (!isnan(paragraphStyle.maximumLineHeight) && paragraphStyle.maximumLineHeight >= font.lineHeight) { + CGFloat baseLineOffset = (paragraphStyle.maximumLineHeight - font.lineHeight) / 2.0; + attributes[NSBaselineOffsetAttributeName] = @(baseLineOffset); + } } // Decoration diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.h b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.h index 205f9943262add..b02d7964f76a5d 100644 --- a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.h +++ b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.h @@ -27,6 +27,9 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign, readonly) BOOL dictationRecognizing; @property (nonatomic, copy, nullable) NSString *placeholder; @property (nonatomic, strong, nullable) UIColor *placeholderColor; +@property (nonatomic, assign) CGRect fragmentViewContainerBounds; +@property (nonatomic, assign) UIEdgeInsets textBorderInsets; +@property (nonatomic, assign) UIControlContentVerticalAlignment contentVerticalAlignment; @property (nonatomic, assign) CGFloat preferredMaxLayoutWidth; diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.m index c6a98e65205b66..08770872727852 100644 --- a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.m +++ b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.m @@ -169,6 +169,15 @@ - (void)paste:(id)sender [super paste:sender]; } +- (void)setTextBorderInsetsAndFrame:(CGRect)bounds textBorderInsets:(UIEdgeInsets)textBorderInsets +{ + _textBorderInsets = textBorderInsets; + + // We apply `borderInsets` as the `RCTUITextView` layout offset. + self.frame = UIEdgeInsetsInsetRect(bounds, textBorderInsets); + [self setNeedsLayout]; +} + // Turn off scroll animation to fix flaky scrolling. // This is only necessary for iOS <= 14. #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < 140000 diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h b/packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h index a8719ecd4d0165..55b8946c0f664b 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h +++ b/packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h @@ -35,6 +35,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign, readonly) CGFloat zoomScale; @property (nonatomic, assign, readonly) CGPoint contentOffset; @property (nonatomic, assign, readonly) UIEdgeInsets contentInset; +@property (nonatomic, assign) CGRect fragmentViewContainerBounds; +@property (nonatomic, assign) UIControlContentVerticalAlignment contentVerticalAlignment; // This protocol disallows direct access to `selectedTextRange` property because // unwise usage of it can break the `delegate` behavior. So, we always have to @@ -43,6 +45,7 @@ NS_ASSUME_NONNULL_BEGIN // If the change was a result of user actions (like typing or touches), we MUST notify the delegate. - (void)setSelectedTextRange:(nullable UITextRange *)selectedTextRange NS_UNAVAILABLE; - (void)setSelectedTextRange:(nullable UITextRange *)selectedTextRange notifyDelegate:(BOOL)notifyDelegate; +- (void)setTextBorderInsetsAndFrame:(CGRect)bounds textBorderInsets:(UIEdgeInsets)textBorderInsets; // This protocol disallows direct access to `text` property because // unwise usage of it can break the `attributeText` behavior. diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m index 04d2446f86d9b3..1096221486efdb 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m +++ b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m @@ -177,6 +177,27 @@ - (void)uiManagerWillPerformMounting baseTextInputView.textAttributes = textAttributes; baseTextInputView.reactBorderInsets = borderInsets; + + // The CALayer _UITextLayoutFragmentView does not align correctly + // when adding paragraphStyle.maximumLineHeight to an iOS UITextField (issue #28012). + if (!isnan(textAttributes.lineHeight) && !isnan(textAttributes.effectiveFont.lineHeight)) { + CGFloat effectiveLineHeight = textAttributes.lineHeight * textAttributes.effectiveFontSizeMultiplier; + CGFloat fontLineHeight = textAttributes.effectiveFont.lineHeight; + if (effectiveLineHeight >= fontLineHeight * 2.0) { + CGFloat height = self.layoutMetrics.frame.size.height; + CGFloat width = self.layoutMetrics.frame.size.width; + + // Setting contentVerticalAlignment to UIControlContentVerticalAlignmentTop aligns + // _UITextLayoutFragmentView and UITextField on the same ordinate (y coordinate). + baseTextInputView.contentVerticalAlignment = UIControlContentVerticalAlignmentTop; + + // Align vertically _UITextLayoutFragmentView in the center of the UITextField (TextInput). + CGFloat padding = (height - effectiveLineHeight) / 2.0; + baseTextInputView.fragmentViewContainerBounds = CGRectMake(0, padding, width, effectiveLineHeight); + } + } else { + baseTextInputView.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter; + } baseTextInputView.reactPaddingInsets = paddingInsets; if (newAttributedText) { diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h index 209947de9b4aaa..7258c36e1d8b8f 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h +++ b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h @@ -31,6 +31,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, strong, nullable) RCTTextAttributes *textAttributes; @property (nonatomic, assign) UIEdgeInsets reactPaddingInsets; @property (nonatomic, assign) UIEdgeInsets reactBorderInsets; +@property (nonatomic, assign) CGRect fragmentViewContainerBounds; +@property (nonatomic, assign) UIControlContentVerticalAlignment contentVerticalAlignment; @property (nonatomic, copy, nullable) RCTDirectEventBlock onContentSizeChange; @property (nonatomic, copy, nullable) RCTDirectEventBlock onSelectionChange; diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.m b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.m index 9da656c5b0fb95..c5b1e871f53f66 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.m +++ b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.m @@ -76,6 +76,22 @@ - (void)enforceTextAttributesIfNeeded backedTextInputView.defaultTextAttributes = textAttributes; } +// Fixes iOS alignment issue caused by adding paragraphStyle.maximumLineHeight to an iOS UITextField +// and vertically aligns _UITextLayoutFragmentView with the parent view UITextField. +- (void)setContentVerticalAlignment:(UIControlContentVerticalAlignment)contentVerticalAlignment +{ + _contentVerticalAlignment = contentVerticalAlignment; + self.backedTextInputView.contentVerticalAlignment = contentVerticalAlignment; +} + +// Custom bounds used to control vertical position of CALayer _UITextLayoutFragmentView. +// _UITextLayoutFragmentView is the CALayer of UITextField. +- (void)setFragmentViewContainerBounds:(CGRect)fragmentViewContainerBounds +{ + _fragmentViewContainerBounds = fragmentViewContainerBounds; + self.backedTextInputView.fragmentViewContainerBounds = fragmentViewContainerBounds; +} + - (void)setReactPaddingInsets:(UIEdgeInsets)reactPaddingInsets { _reactPaddingInsets = reactPaddingInsets; @@ -87,9 +103,8 @@ - (void)setReactPaddingInsets:(UIEdgeInsets)reactPaddingInsets - (void)setReactBorderInsets:(UIEdgeInsets)reactBorderInsets { _reactBorderInsets = reactBorderInsets; - // We apply `borderInsets` as `backedTextInputView` layout offset. - self.backedTextInputView.frame = UIEdgeInsetsInsetRect(self.bounds, reactBorderInsets); - [self setNeedsLayout]; + // Borders are added using insets (UITextField textRectForBound, UITextView setFrame). + [self.backedTextInputView setTextBorderInsetsAndFrame:self.bounds textBorderInsets:reactBorderInsets]; } - (NSAttributedString *)attributedText diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.h b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.h index 91f8eb087acf87..b581589f1dfcb1 100644 --- a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.h +++ b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.h @@ -27,6 +27,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign, readonly) BOOL dictationRecognizing; @property (nonatomic, strong, nullable) UIColor *placeholderColor; @property (nonatomic, assign) UIEdgeInsets textContainerInset; +@property (nonatomic, assign) CGRect fragmentViewContainerBounds; +@property (nonatomic, assign) UIEdgeInsets textBorderInsets; @property (nonatomic, assign, getter=isEditable) BOOL editable; @property (nonatomic, getter=isScrollEnabled) BOOL scrollEnabled; @property (nonatomic, strong, nullable) NSString *inputAccessoryViewID; diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.m index 4d0afd97ae682a..beb15a535a3269 100644 --- a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.m +++ b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.m @@ -55,6 +55,13 @@ - (void)setTextContainerInset:(UIEdgeInsets)textContainerInset [self setNeedsLayout]; } +- (void)setTextBorderInsetsAndFrame:(CGRect)bounds textBorderInsets:(UIEdgeInsets)textBorderInsets +{ + _textBorderInsets = textBorderInsets; + [self setNeedsLayout]; +} + + - (void)setPlaceholder:(NSString *)placeholder { [super setPlaceholder:placeholder]; @@ -170,7 +177,15 @@ - (CGRect)caretRectForPosition:(UITextPosition *)position - (CGRect)textRectForBounds:(CGRect)bounds { - return UIEdgeInsetsInsetRect([super textRectForBounds:bounds], _textContainerInset); + // Text is vertically aligned to the center. + CGFloat leftPadding = _textContainerInset.left + _textBorderInsets.left; + CGFloat rightPadding = _textContainerInset.right + _textBorderInsets.right; + UIEdgeInsets borderAndPaddingInsets = UIEdgeInsetsMake(_textContainerInset.top, leftPadding, _textContainerInset.bottom, rightPadding); + + // The fragmentViewContainerBounds set the correct y coordinates for + // _UITextLayoutFragmentView to fix an iOS UITextField issue with lineHeight. + CGRect updatedBounds = self.fragmentViewContainerBounds.size.height > 0 ? self.fragmentViewContainerBounds : bounds; + return UIEdgeInsetsInsetRect([super textRectForBounds:updatedBounds], borderAndPaddingInsets); } - (CGRect)editingRectForBounds:(CGRect)bounds