Skip to content

Commit 68ffee4

Browse files
committed
Merge branch 'main' into fix/34120
2 parents 7c9c40f + 7962905 commit 68ffee4

3 files changed

Lines changed: 7 additions & 40 deletions

File tree

docs/articles/expensify-classic/getting-started/approved-accountants/Your-Expensify-Partner-Manager.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/components/TextInput/BaseTextInput/index.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,9 @@ function BaseTextInput(
436436
*/}
437437
{(!!autoGrow || autoGrowHeight) && (
438438
// Add +2 to width on Safari browsers so that text is not cut off due to the cursor or when changing the value
439-
// https://github.com/Expensify/App/issues/8158
440-
// https://github.com/Expensify/App/issues/26628
439+
// Reference: https://github.com/Expensify/App/issues/8158, https://github.com/Expensify/App/issues/26628
440+
// For mobile Chrome, ensure proper display of the text selection handle (blue bubble down).
441+
// Reference: https://github.com/Expensify/App/issues/34921
441442
<Text
442443
style={[
443444
inputStyle,
@@ -447,7 +448,7 @@ function BaseTextInput(
447448
]}
448449
onLayout={(e) => {
449450
let additionalWidth = 0;
450-
if (Browser.isMobileSafari() || Browser.isSafari()) {
451+
if (Browser.isMobileSafari() || Browser.isSafari() || Browser.isMobileChrome()) {
451452
additionalWidth = 2;
452453
}
453454
setTextInputWidth(e.nativeEvent.layout.width + additionalWidth);

src/components/TextInputWithCurrencySymbol/BaseTextInputWithCurrencySymbol.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React from 'react';
22
import AmountTextInput from '@components/AmountTextInput';
33
import CurrencySymbolButton from '@components/CurrencySymbolButton';
44
import useLocalize from '@hooks/useLocalize';
5+
import useThemeStyles from '@hooks/useThemeStyles';
56
import * as CurrencyUtils from '@libs/CurrencyUtils';
67
import * as MoneyRequestUtils from '@libs/MoneyRequestUtils';
78
import * as textInputWithCurrencySymbolPropTypes from './textInputWithCurrencySymbolPropTypes';
@@ -10,6 +11,7 @@ function BaseTextInputWithCurrencySymbol(props) {
1011
const {fromLocaleDigit} = useLocalize();
1112
const currencySymbol = CurrencyUtils.getLocalizedCurrencySymbol(props.selectedCurrencyCode);
1213
const isCurrencySymbolLTR = CurrencyUtils.isCurrencySymbolLTR(props.selectedCurrencyCode);
14+
const styles = useThemeStyles();
1315

1416
const currencySymbolButton = (
1517
<CurrencySymbolButton
@@ -39,6 +41,7 @@ function BaseTextInputWithCurrencySymbol(props) {
3941
props.onSelectionChange(e);
4042
}}
4143
onKeyPress={props.onKeyPress}
44+
style={[styles.pr1]}
4245
/>
4346
);
4447

0 commit comments

Comments
 (0)