Merge pull request #41392 from tienifr/fix/regression-38497

Save button does not move above the keyboard when keyboard is up

src/components/TextPicker/TextSelectorModal.tsx

@@ -7,18 +7,17 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
-import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 import type {TextSelectorModalProps} from './types';
+import usePaddingStyle from './usePaddingStyle';
 
 function TextSelectorModal({value, description = '', onValueSelected, isVisible, onClose, ...rest}: TextSelectorModalProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
     const [currentValue, setValue] = useState(value);
-
-    const {paddingTop, paddingBottom} = useStyledSafeAreaInsets();
+    const paddingStyle = usePaddingStyle();
 
     return (
         <Modal
@@ -35,7 +34,7 @@ function TextSelectorModal({value, description = '', onValueSelected, isVisible,
                 includeSafeAreaPaddingBottom={false}
                 testID={TextSelectorModal.displayName}
                 shouldEnableMaxHeight
-                style={{paddingTop, paddingBottom}}
+                style={paddingStyle}
             >
                 <HeaderWithBackButton
                     title={description}

src/components/TextPicker/usePaddingStyle/index.android.tsx

@@ -0,0 +1,9 @@
+import useKeyboardState from '@hooks/useKeyboardState';
+import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
+
+export default function usePaddingStyle() {
+    const {keyboardHeight} = useKeyboardState();
+    const {paddingTop} = useStyledSafeAreaInsets();
+
+    return {paddingTop, paddingBottom: keyboardHeight};
+}

src/components/TextPicker/usePaddingStyle/index.tsx

@@ -0,0 +1,6 @@
+import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
+
+export default function usePaddingStyle() {
+    const {paddingTop, paddingBottom} = useStyledSafeAreaInsets();
+    return {paddingTop, paddingBottom};
+}