fix: autoGrow prop on mobile is handled by native platform #59078
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| function TextInputMeasurement() { | ||
| return null; | ||
| } | ||
|
|
||
| TextInputMeasurement.displayName = 'TextInputMeasurement'; | ||
|
|
||
| export default TextInputMeasurement; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| import React from 'react'; | ||
| import type {ViewStyle} from 'react-native'; | ||
| import {View} from 'react-native'; | ||
| import Text from '@components/Text'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import {isMobileChrome, isMobileSafari, isSafari} from '@libs/Browser'; | ||
| import type TextInputMeasurementProps from './types'; | ||
|
|
||
| function TextInputMeasurement({ | ||
| value, | ||
| placeholder, | ||
| contentWidth, | ||
| autoGrowHeight, | ||
| maxAutoGrowHeight, | ||
| width, | ||
| inputStyle, | ||
| inputPaddingLeft, | ||
| autoGrow, | ||
| isAutoGrowHeightMarkdown, | ||
| onSetTextInputWidth, | ||
| onSetTextInputHeight, | ||
| isPrefixCharacterPaddingCalculated, | ||
| }: TextInputMeasurementProps) { | ||
| const styles = useThemeStyles(); | ||
|
|
||
| return ( | ||
| <> | ||
| {!!contentWidth && isPrefixCharacterPaddingCalculated && ( | ||
| <View | ||
| style={[inputStyle as ViewStyle, styles.hiddenElementOutsideOfWindow, styles.visibilityHidden, styles.wAuto, inputPaddingLeft]} | ||
| onLayout={(e) => { | ||
| if (e.nativeEvent.layout.width === 0 && e.nativeEvent.layout.height === 0) { | ||
| return; | ||
| } | ||
| onSetTextInputWidth(e.nativeEvent.layout.width); | ||
| onSetTextInputHeight(e.nativeEvent.layout.height); | ||
| }} | ||
| > | ||
| <Text | ||
| style={[ | ||
| inputStyle, | ||
| autoGrowHeight && styles.autoGrowHeightHiddenInput(width ?? 0, typeof maxAutoGrowHeight === 'number' ? maxAutoGrowHeight : undefined), | ||
| {width: contentWidth}, | ||
| ]} | ||
| > | ||
| {/* \u200B added to solve the issue of not expanding the text input enough when the value ends with '\n' (https://github.com/Expensify/App/issues/21271) */} | ||
| {value ? `${value}${value.endsWith('\n') ? '\u200B' : ''}` : placeholder} | ||
| </Text> | ||
| </View> | ||
| )} | ||
| {/* | ||
| Text input component doesn't support auto grow by default. | ||
| We're using a hidden text input to achieve that. | ||
| This text view is used to calculate width or height of the input value given textStyle in this component. | ||
| This Text component is intentionally positioned out of the screen. | ||
| */} | ||
| {(!!autoGrow || !!autoGrowHeight) && !isAutoGrowHeightMarkdown && ( | ||
| // Add +2 to width on Safari browsers so that text is not cut off due to the cursor or when changing the value | ||
| // Reference: https://github.com/Expensify/App/issues/8158, https://github.com/Expensify/App/issues/26628 | ||
| // For mobile Chrome, ensure proper display of the text selection handle (blue bubble down). | ||
| // Reference: https://github.com/Expensify/App/issues/34921 | ||
| <Text | ||
| style={[ | ||
|
Contributor
There was a problem hiding this comment. From #76785, the displayed input and hidden measurement text don’t match due to styling differences, so their styles need to be synced |
||
| inputStyle, | ||
| autoGrowHeight && styles.autoGrowHeightHiddenInput(width ?? 0, typeof maxAutoGrowHeight === 'number' ? maxAutoGrowHeight : undefined), | ||
| styles.hiddenElementOutsideOfWindow, | ||
| styles.visibilityHidden, | ||
| ]} | ||
| onLayout={(e) => { | ||
| if (e.nativeEvent.layout.width === 0 && e.nativeEvent.layout.height === 0) { | ||
| return; | ||
| } | ||
| let additionalWidth = 0; | ||
| if (isMobileSafari() || isSafari() || isMobileChrome()) { | ||
| additionalWidth = 2; | ||
| } | ||
|
Comment on lines
73
to
76
Contributor
There was a problem hiding this comment. Previously, we also set additionalWidth = 2 on Android native. Can you confirm if we don't need it for Android anymore?
Contributor
Author
There was a problem hiding this comment. Yes, it was used because of cursor at the end but even without that, cursor is visible (ignore coloured background):
|
||
| onSetTextInputWidth(e.nativeEvent.layout.width + additionalWidth); | ||
| onSetTextInputHeight(e.nativeEvent.layout.height); | ||
| }} | ||
| > | ||
| {/* \u200B added to solve the issue of not expanding the text input enough when the value ends with '\n' (https://github.com/Expensify/App/issues/21271) */} | ||
| {value ? `${value}${value.endsWith('\n') ? '\u200B' : ''}` : placeholder} | ||
| </Text> | ||
| )} | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| TextInputMeasurement.displayName = 'TextInputMeasurement'; | ||
|
|
||
| export default TextInputMeasurement; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import type {StyleProp, TextStyle, ViewStyle} from 'react-native'; | ||
|
|
||
| type TextInputMeasurementProps = { | ||
| /** The value to measure */ | ||
| value?: string; | ||
|
|
||
| /** The placeholder to measure */ | ||
| placeholder?: string; | ||
|
|
||
| /** The width to measure */ | ||
| contentWidth?: number; | ||
|
|
||
| /** Whether to auto grow height */ | ||
| autoGrowHeight?: boolean; | ||
|
|
||
| /** The maximum height for auto grow */ | ||
| maxAutoGrowHeight?: number; | ||
|
|
||
| /** The width of the container */ | ||
| width: number | null; | ||
|
|
||
| /** The input style */ | ||
| inputStyle?: StyleProp<TextStyle>; | ||
|
|
||
| /** The input padding left */ | ||
| inputPaddingLeft?: StyleProp<ViewStyle>; | ||
|
|
||
| /** Whether to auto grow */ | ||
| autoGrow?: boolean; | ||
|
|
||
| /** Whether the input is markdown */ | ||
| isAutoGrowHeightMarkdown?: boolean; | ||
|
|
||
| /** Callback to set the text input width */ | ||
| onSetTextInputWidth: (width: number) => void; | ||
|
|
||
| /** Callback to set the text input height */ | ||
| onSetTextInputHeight: (height: number) => void; | ||
|
|
||
| /** Whether the prefix character padding is calculated */ | ||
| isPrefixCharacterPaddingCalculated: boolean; | ||
| }; | ||
|
|
||
| export default TextInputMeasurementProps; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change caused a bug. Details in #60640