From c2071c216ea4dd765fd4d04c2a2f5ea70b2fc689 Mon Sep 17 00:00:00 2001 From: zhongwuzw Date: Wed, 27 Feb 2019 21:52:40 -0800 Subject: [PATCH] Fixed wrong contentSize calculation when placeholder is hidden in multiline text input (#23683) Summary: Currently, we pick the max size of text view's contentSize and placeholder's size, actually, if placeholder is be hidden, we should only return text view's contentSize. [iOS] [Fixed] - Fixed wrong contentSize calculation when placeholder is hidden in multiline text input Pull Request resolved: https://github.com/facebook/react-native/pull/23683 Differential Revision: D14255915 Pulled By: cpojer fbshipit-source-id: 198faa7e1c5657371eb920973345194aedf72e41 --- Libraries/Text/TextInput/Multiline/RCTUITextView.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m index 384b81a01..e5679a137 100644 --- a/Libraries/Text/TextInput/Multiline/RCTUITextView.m +++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.m @@ -195,7 +195,7 @@ static UIColor *defaultPlaceholderColor() - (CGSize)contentSize { CGSize contentSize = super.contentSize; - CGSize placeholderSize = self.placeholderSize; + CGSize placeholderSize = _placeholderView.isHidden ? CGSizeZero : self.placeholderSize; // When a text input is empty, it actually displays a placehoder. // So, we have to consider `placeholderSize` as a minimum `contentSize`. // Returning size DOES contain `textContainerInset` (aka `padding`).