Skip to content

Commit 38de4ae

Browse files
authored
Merge pull request Expensify#66046 from software-mansion-labs/feat/reanimated-modal-for-validate-code-action-modal
Reanimated modal for validate code action modal
2 parents 3268d4c + f43fad6 commit 38de4ae

3 files changed

Lines changed: 11 additions & 2 deletions

File tree

src/CONST/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,6 +1462,8 @@ const CONST = {
14621462
ANIMATION_TIMING: {
14631463
DEFAULT_IN: 300,
14641464
DEFAULT_OUT: 200,
1465+
DEFAULT_RIGHT_DOCKED_IOS_IN: 500,
1466+
DEFAULT_RIGHT_DOCKED_IOS_OUT: 400,
14651467
FAB_IN: 350,
14661468
FAB_OUT: 200,
14671469
},

src/components/Modal/index.ios.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
import React from 'react';
2+
import useResponsiveLayout from '@hooks/useResponsiveLayout';
3+
import CONST from '@src/CONST';
24
import BaseModal from './BaseModal';
35
import type BaseModalProps from './types';
46

57
function Modal({children, ...rest}: BaseModalProps) {
8+
const {isInNarrowPaneModal} = useResponsiveLayout();
9+
const animationInTiming = rest.animationInTiming ?? (isInNarrowPaneModal ? CONST.MODAL.ANIMATION_TIMING.DEFAULT_RIGHT_DOCKED_IOS_IN : undefined);
10+
const animationOutTiming = rest.animationOutTiming ?? (isInNarrowPaneModal ? CONST.MODAL.ANIMATION_TIMING.DEFAULT_RIGHT_DOCKED_IOS_OUT : undefined);
11+
612
return (
713
<BaseModal
814
useNativeDriver
915
// eslint-disable-next-line react/jsx-props-no-spreading
1016
{...rest}
17+
animationInTiming={animationInTiming}
18+
animationOutTiming={animationOutTiming}
1119
>
1220
{children}
1321
</BaseModal>

src/components/ValidateCodeActionModal/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@ function ValidateCodeActionModal({
6868
onClose={hide}
6969
onModalHide={onModalHide ?? hide}
7070
onBackdropPress={() => Navigation.dismissModal()}
71-
hideModalContentWhileAnimating
72-
useNativeDriver
7371
shouldUseModalPaddingStyle={false}
7472
animationInTiming={disableAnimation ? 1 : undefined}
73+
shouldUseReanimatedModal
7574
>
7675
<ScreenWrapper
7776
includeSafeAreaPaddingBottom

0 commit comments

Comments
 (0)