Skip to content

fix: Keep legacy bottom safe area handling if we don't use one of the new edge-to-edge flags #58600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mountiny merged 2 commits into from
Mar 18, 2025
Merged

fix: Keep legacy bottom safe area handling if we don't use one of the new edge-to-edge flags #58600

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a6fb8f
fix: don't apply legacy bottom safe area if `addBottomSafeAreaPadding…
chrispader Mar 17, 2025
b2fd9de
fix: incorrect condition
chrispader Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/components/Form/FormWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ function FormWrapper({
isSubmitDisabled = false,
isLoading = false,
shouldScrollToEnd = false,
addBottomSafeAreaPadding = true,
shouldSubmitButtonStickToBottom = false,
addBottomSafeAreaPadding,
shouldSubmitButtonStickToBottom: shouldSubmitButtonStickToBottomProp,
}: FormWrapperProps) {
const styles = useThemeStyles();
const formRef = useRef<RNScrollView>(null);
Expand Down Expand Up @@ -110,7 +110,18 @@ function FormWrapper({
focusInput?.focus?.();
}, [errors, formState?.errorFields, inputRefs]);

const {paddingBottom} = useSafeAreaPaddings(true);
// If either of `addBottomSafeAreaPadding` or `shouldSubmitButtonStickToBottom` is explicitly set,
// we expect that the user wants to use the new edge-to-edge bottom safe area padding handling.
// In this case, we want to get and apply the padding unconditionnally.
const enableEdgeToEdgeBottomSafeAreaPadding = addBottomSafeAreaPadding !== undefined || shouldSubmitButtonStickToBottomProp !== undefined;
const shouldSubmitButtonStickToBottom = shouldSubmitButtonStickToBottomProp ?? false;
const {paddingBottom} = useSafeAreaPaddings(enableEdgeToEdgeBottomSafeAreaPadding);

// Same as above, if `addBottomSafeAreaPadding` is explicitly set true, we default to the new edge-to-edge bottom safe area padding handling.
// If the paddingBottom is 0, it has already been applied to a parent component and we don't want to apply the padding again.
const isLegacyBottomSafeAreaPaddingAlreadyApplied = paddingBottom === 0;
const shouldApplyBottomSafeAreaPadding = addBottomSafeAreaPadding ?? !isLegacyBottomSafeAreaPaddingAlreadyApplied;

const SubmitButton = useMemo(
() =>
isSubmitButtonVisible && (
Expand Down Expand Up @@ -180,7 +191,6 @@ function FormWrapper({
<FormElement
key={formID}
ref={formContentRef}
// Note: the paddingBottom is only grater 0 if no parent has applied the inset yet:
style={[style, styles.pb5]}
onLayout={() => {
if (!shouldScrollToEnd) {
Expand Down Expand Up @@ -220,7 +230,7 @@ function FormWrapper({
style={[styles.w100, styles.flex1]}
contentContainerStyle={styles.flexGrow1}
keyboardShouldPersistTaps="handled"
addBottomSafeAreaPadding={addBottomSafeAreaPadding}
addBottomSafeAreaPadding={shouldApplyBottomSafeAreaPadding}
ref={formRef}
>
{scrollViewContent()}
Expand All @@ -230,7 +240,7 @@ function FormWrapper({
style={[styles.w100, styles.flex1]}
contentContainerStyle={styles.flexGrow1}
keyboardShouldPersistTaps="handled"
addBottomSafeAreaPadding={addBottomSafeAreaPadding}
addBottomSafeAreaPadding={shouldApplyBottomSafeAreaPadding}
ref={formRef}
>
{scrollViewContent()}
Expand Down