Skip to content

Migrate Popover modals to use react-native-reanimated #67748

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 9 commits into from
Aug 11, 2025
Merged

Migrate Popover modals to use react-native-reanimated #67748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0c61d6
Migrate POPOVER modals to use the Reanimated modal
mhawryluk Aug 4, 2025
5513e40
Merge branch 'main' into feat/reanimated-popovers
mhawryluk Aug 5, 2025
a31fb62
Fix style regression for other modal types
mhawryluk Aug 5, 2025
28d15a3
Merge branch 'main' into feat/reanimated-popovers
mhawryluk Aug 6, 2025
06c212e
More review fixes
mhawryluk Aug 6, 2025
7d64f1c
Fix SearchRouterModal position with help panel open on wide web view
mhawryluk Aug 7, 2025
a142c37
Merge branch 'main' into feat/reanimated-popovers
mhawryluk Aug 7, 2025
e975ed2
Merge branch 'main' into feat/reanimated-popovers
mhawryluk Aug 8, 2025
8012d78
Merge branch 'main' into feat/reanimated-popovers
jmusial Aug 11, 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
10 changes: 6 additions & 4 deletions src/components/Modal/BaseModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import type ReanimatedModalProps from './ReanimatedModal/types';
import type BaseModalProps from './types';
import type {FocusTrapOptions} from './types';

const REANIMATED_MODAL_TYPES: Array<ValueOf<typeof CONST.MODAL.MODAL_TYPE>> = [CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED, CONST.MODAL.MODAL_TYPE.FULLSCREEN];
const REANIMATED_MODAL_TYPES: Array<ValueOf<typeof CONST.MODAL.MODAL_TYPE>> = [CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED, CONST.MODAL.MODAL_TYPE.FULLSCREEN, CONST.MODAL.MODAL_TYPE.POPOVER];

type ModalComponentProps = (ReactNativeModalProps | ReanimatedModalProps) & {
type?: ValueOf<typeof CONST.MODAL.MODAL_TYPE>;
Expand Down Expand Up @@ -165,8 +165,10 @@ function BaseModal(

const {sidePanelOffset} = useSidePanel();
const sidePanelStyle = !shouldUseReanimatedModal && shouldApplySidePanelOffset && !isSmallScreenWidth ? {paddingRight: sidePanelOffset.current} : undefined;
const sidePanelReanimatedStyle =
shouldUseReanimatedModal && shouldApplySidePanelOffset && !isSmallScreenWidth ? {transform: [{translateX: Animated.multiply(sidePanelOffset.current, -1)}]} : undefined;
const sidePanelAnimatedStyle =
(shouldUseReanimatedModal || type === CONST.MODAL.MODAL_TYPE.POPOVER) && shouldApplySidePanelOffset && !isSmallScreenWidth
? {transform: [{translateX: Animated.multiply(sidePanelOffset.current, -1)}]}
: undefined;
const keyboardStateContextValue = useKeyboardState();

const [modalOverlapsWithTopSafeArea, setModalOverlapsWithTopSafeArea] = useState(false);
Expand Down Expand Up @@ -459,7 +461,7 @@ function BaseModal(
>
<Animated.View
onLayout={onViewLayout}
style={[styles.defaultModalContainer, modalContainerStyle, modalPaddingStyles, !isVisible && styles.pointerEventsNone, sidePanelReanimatedStyle]}
style={[styles.defaultModalContainer, modalContainerStyle, modalPaddingStyles, !isVisible && styles.pointerEventsNone, sidePanelAnimatedStyle]}
ref={ref}
>
<ColorSchemeWrapper>{children}</ColorSchemeWrapper>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/ReanimatedModal/Container/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function Container({

return (
<View
style={[style, styles.modalContainer]}
style={style}
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/ReanimatedModal/Container/index.web.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function Container({

return (
<Animated.View
style={[style, styles.modalContainer, type !== CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED && styles.modalAnimatedContainer, animatedStyles, {zIndex: 1}]}
style={[style, type !== CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED && type !== CONST.MODAL.MODAL_TYPE.POPOVER && styles.modalAnimatedContainer, animatedStyles, {zIndex: 1}]}
exiting={Exiting}
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
Expand Down
2 changes: 0 additions & 2 deletions src/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2687,8 +2687,6 @@ const styles = (theme: ThemeColors) =>
borderColor: theme.transparent,
},

modalContainer: {height: '100%'},

modalAnimatedContainer: {width: '100%'},

modalContainerBox: {
Expand Down
57 changes: 24 additions & 33 deletions src/styles/utils/generators/ModalStyleUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,9 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
// and can be dismissed by clicking outside of the modal.
modalStyle = {
...modalStyle,
...{
justifyContent: 'center',
alignItems: 'center',
},
justifyContent: 'center',
alignItems: 'center',
height: '100%',
};
modalContainerStyle = {
boxShadow: theme.shadow,
Expand All @@ -118,9 +117,8 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
// viewed on a smaller device (e.g. mobile or mobile web).
modalStyle = {
...modalStyle,
...{
alignItems: 'center',
},
alignItems: 'center',
height: '100%',
};
modalContainerStyle = {
boxShadow: theme.shadow,
Expand Down Expand Up @@ -148,9 +146,8 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
// viewed on a smaller device (e.g. mobile or mobile web).
modalStyle = {
...modalStyle,
...{
alignItems: 'center',
},
alignItems: 'center',
height: '100%',
};
modalContainerStyle = {
boxShadow: theme.shadow,
Expand All @@ -175,10 +172,9 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
// A centered modal that cannot be dismissed with a swipe.
modalStyle = {
...modalStyle,
...{
alignItems: 'center',
justifyContent: 'center',
},
alignItems: 'center',
justifyContent: 'center',
height: '100%',
};
modalContainerStyle = {
boxShadow: theme.shadow,
Expand All @@ -201,9 +197,8 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
// A centered modal that takes up the minimum possible screen space on all devices
modalStyle = {
...modalStyle,
...{
alignItems: 'center',
},
alignItems: 'center',
height: '100%',
};
modalContainerStyle = {
boxShadow: theme.shadow,
Expand All @@ -225,10 +220,9 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
case CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED:
modalStyle = {
...modalStyle,
...{
alignItems: 'center',
justifyContent: 'flex-end',
},
alignItems: 'center',
justifyContent: 'flex-end',
height: '100%',
};
modalContainerStyle = {
width: '100%',
Expand Down Expand Up @@ -258,11 +252,9 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
modalStyle = {
...modalStyle,
...popoverAnchorPosition,
...{
position: 'absolute',
alignItems: 'center',
justifyContent: 'flex-end',
},
position: 'absolute',
alignItems: 'center',
justifyContent: 'flex-end',
};
modalContainerStyle = {
borderRadius: variables.componentBorderRadiusLarge,
Expand All @@ -281,12 +273,11 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
case CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED:
modalStyle = {
...modalStyle,
...{
marginLeft: isSmallScreenWidth ? 0 : windowWidth - variables.sideBarWidth,
width: isSmallScreenWidth ? '100%' : variables.sideBarWidth,
flexDirection: 'row',
justifyContent: 'flex-end',
},
marginLeft: isSmallScreenWidth ? 0 : windowWidth - variables.sideBarWidth,
width: isSmallScreenWidth ? '100%' : variables.sideBarWidth,
flexDirection: 'row',
justifyContent: 'flex-end',
height: '100%',
};
modalContainerStyle = {
width: isSmallScreenWidth ? '100%' : variables.sideBarWidth,
Expand Down Expand Up @@ -321,7 +312,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
shouldAddTopSafeAreaPadding = true;
break;
default:
modalStyle = {};
modalStyle = {height: '100%'};
modalContainerStyle = {};
swipeDirection = 'down';
animationIn = 'slideInUp';
Expand Down
Loading