Skip to content

Fix inconsistent bottom modal bottom spacing #60549

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
dangrous merged 2 commits into from
Apr 22, 2025
Merged

Fix inconsistent bottom modal bottom spacing #60549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c2744d
fix inconsistent modal bottom padding
bernhardoj Apr 20, 2025
177ef23
remove extra top insets
bernhardoj Apr 20, 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
2 changes: 1 addition & 1 deletion src/components/Modal/BaseModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ function BaseModal(
shouldPreventScroll={shouldPreventScrollOnFocus}
>
<View
style={[styles.defaultModalContainer, modalPaddingStyles, modalContainerStyle, !isVisible && styles.pointerEventsNone]}
style={[styles.defaultModalContainer, modalContainerStyle, modalPaddingStyles, !isVisible && styles.pointerEventsNone]}
Copy link
Contributor Author

@bernhardoj bernhardoj Apr 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to switch this up because modalContainerStyle will override the padding style from modalPaddingStyles. modalPaddingStyles contains the modalContainerStyle padding + safe area.

Copy link
Contributor

@hoangzinh hoangzinh May 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switching these styles will make the modal always have padding, causing a larger blank space in some modals. More details here #60779 (comment)

ref={ref}
>
<ColorSchemeWrapper>{children}</ColorSchemeWrapper>
Expand Down
4 changes: 1 addition & 3 deletions src/components/Search/SearchRouter/SearchRouterModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import FocusTrapForModal from '@components/FocusTrap/FocusTrapForModal';
import KeyboardAvoidingView from '@components/KeyboardAvoidingView';
import Modal from '@components/Modal';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
import useThemeStyles from '@hooks/useThemeStyles';
import useViewportOffsetTop from '@hooks/useViewportOffsetTop';
import useWindowDimensions from '@hooks/useWindowDimensions';
Expand All @@ -20,7 +19,6 @@ function SearchRouterModal() {
const {windowHeight} = useWindowDimensions();
const {isSearchRouterDisplayed, closeSearchRouter} = useSearchRouterContext();
const viewportOffsetTop = useViewportOffsetTop();
const safeAreaInsets = useSafeAreaInsets();

// On mWeb Safari, the input caret stuck for a moment while the modal is animating. So, we hide the caret until the animation is done.
const [shouldHideInputCaret, setShouldHideInputCaret] = useState(isMobileWebSafari);
Expand All @@ -31,7 +29,7 @@ function SearchRouterModal() {
<Modal
type={modalType}
isVisible={isSearchRouterDisplayed}
innerContainerStyle={{paddingTop: safeAreaInsets.top + viewportOffsetTop}}
innerContainerStyle={{paddingTop: viewportOffsetTop}}
Copy link
Contributor Author

@bernhardoj bernhardoj Apr 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the extra top insets after switching the modalPaddingStyles position.

popoverAnchorPosition={{right: 6, top: 6}}
fullscreen
propagateSwipe
Expand Down
1 change: 1 addition & 0 deletions src/styles/utils/generators/ModalStyleUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
borderTopLeftRadius: variables.componentBorderRadiusLarge,
borderTopRightRadius: variables.componentBorderRadiusLarge,
paddingTop: variables.componentBorderRadiusLarge,
paddingBottom: variables.componentBorderRadiusLarge,
justifyContent: 'center',
overflow: 'hidden',
boxShadow: theme.shadow,
Expand Down
2 changes: 1 addition & 1 deletion src/styles/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ function getModalPaddingStyles({
marginTop: getCombinedSpacing(modalContainerStyle.marginTop, safeAreaPaddingTop, shouldAddTopSafeAreaMargin),
marginBottom: getCombinedSpacing(modalContainerStyle.marginBottom, safeAreaPaddingBottomWithFallback, shouldAddBottomSafeAreaMargin),
paddingTop: getCombinedSpacing(modalContainerStyle.paddingTop, safeAreaPaddingTop, shouldAddTopSafeAreaPadding),
paddingBottom: getCombinedSpacing(modalContainerStyle.paddingBottom, safeAreaPaddingBottomWithFallback, shouldAddBottomSafeAreaPadding),
paddingBottom: getCombinedSpacing(modalContainerStyle.paddingBottom, safeAreaPaddingBottom, shouldAddBottomSafeAreaPadding),
paddingLeft: safeAreaPaddingLeft ?? 0,
paddingRight: safeAreaPaddingRight ?? 0,
};
Expand Down
Loading