Merge pull request #42127 from bernhardoj/fix/41855-footer-button-mov…

…es-up-down Fix footer moves down and up a bit when keyboard show/close
Expensify · May 14, 2024 · 1344b08 · 1344b08
2 parents ce4939c + eff393a
commit 1344b08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/components/FixedFooter.tsx b/src/components/FixedFooter.tsx
@@ -2,7 +2,6 @@ import type {ReactNode} from 'react';
 import React from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
-import useKeyboardState from '@hooks/useKeyboardState';
 import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -15,15 +14,14 @@ type FixedFooterProps = {
 };
 
 function FixedFooter({style, children}: FixedFooterProps) {
-    const {isKeyboardShown} = useKeyboardState();
     const insets = useSafeAreaInsets();
     const styles = useThemeStyles();
 
     if (!children) {
         return null;
     }
 
-    const shouldAddBottomPadding = isKeyboardShown || !insets.bottom;
+    const shouldAddBottomPadding = !insets.bottom;
 
     return <View style={[styles.ph5, shouldAddBottomPadding && styles.pb5, styles.flexShrink0, style]}>{children}</View>;
 }

diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
@@ -515,7 +515,7 @@ function BaseSelectionList<TItem extends ListItem>(
     return (
         <SafeAreaConsumer>
             {({safeAreaPaddingBottomStyle}) => (
-                <View style={[styles.flex1, !isKeyboardShown && safeAreaPaddingBottomStyle, containerStyle]}>
+                <View style={[styles.flex1, (!isKeyboardShown || !!footerContent || showConfirmButton) && safeAreaPaddingBottomStyle, containerStyle]}>
                     {shouldShowTextInput && (
                         <View style={[styles.ph4, styles.pb3]}>
                             <TextInput