Skip to content

Commit

Permalink
Merge pull request #36463 from bernhardoj/fix/35436-amount-input-sele…
Browse files Browse the repository at this point in the history
…ction-swipe
  • Loading branch information
francoisl authored Feb 17, 2024
2 parents d28f86f + f98c998 commit 2a3c62a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
1 change: 1 addition & 0 deletions src/components/AmountTextInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ function AmountTextInput(
disableKeyboard
autoGrow
hideFocusedState
shouldInterceptSwipe
inputStyle={[styles.iouAmountTextInput, styles.p0, styles.noLeftBorderRadius, styles.noRightBorderRadius, style]}
textInputContainerStyles={[styles.borderNone, styles.noLeftBorderRadius, styles.noRightBorderRadius]}
onChangeText={onChangeAmount}
Expand Down
8 changes: 1 addition & 7 deletions src/components/TextInput/BaseTextInput/index.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
import RNTextInput from '@components/RNTextInput';
import SwipeInterceptPanResponder from '@components/SwipeInterceptPanResponder';
import Text from '@components/Text';
import * as styleConst from '@components/TextInput/styleConst';
import TextInputLabel from '@components/TextInput/TextInputLabel';
Expand Down Expand Up @@ -52,7 +51,6 @@ function BaseTextInput(
onInputChange = () => {},
shouldDelayFocus = false,
multiline = false,
shouldInterceptSwipe = false,
autoCorrect = true,
prefixCharacter = '',
inputID,
Expand Down Expand Up @@ -264,11 +262,7 @@ function BaseTextInput(

return (
<>
<View
style={[containerStyles]}
// eslint-disable-next-line react/jsx-props-no-spreading
{...(shouldInterceptSwipe && SwipeInterceptPanResponder.panHandlers)}
>
<View style={[containerStyles]}>
<PressableWithoutFeedback
role={CONST.ROLE.PRESENTATION}
onPress={onPress}
Expand Down

0 comments on commit 2a3c62a

Please sign in to comment.