diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 26bb92d18b9e..7eada026c148 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -1461,6 +1461,8 @@ const CONST = { ANIMATION_TIMING: { DEFAULT_IN: 300, DEFAULT_OUT: 200, + DEFAULT_RIGHT_DOCKED_IOS_IN: 500, + DEFAULT_RIGHT_DOCKED_IOS_OUT: 400, FAB_IN: 350, FAB_OUT: 200, }, diff --git a/src/components/Modal/index.ios.tsx b/src/components/Modal/index.ios.tsx index c04b1c0ec54a..5430bb6026c8 100644 --- a/src/components/Modal/index.ios.tsx +++ b/src/components/Modal/index.ios.tsx @@ -1,13 +1,21 @@ import React from 'react'; +import useResponsiveLayout from '@hooks/useResponsiveLayout'; +import CONST from '@src/CONST'; import BaseModal from './BaseModal'; import type BaseModalProps from './types'; function Modal({children, ...rest}: BaseModalProps) { + const {isInNarrowPaneModal} = useResponsiveLayout(); + const animationInTiming = rest.animationInTiming ?? (isInNarrowPaneModal ? CONST.MODAL.ANIMATION_TIMING.DEFAULT_RIGHT_DOCKED_IOS_IN : undefined); + const animationOutTiming = rest.animationOutTiming ?? (isInNarrowPaneModal ? CONST.MODAL.ANIMATION_TIMING.DEFAULT_RIGHT_DOCKED_IOS_OUT : undefined); + return ( {children} diff --git a/src/components/ValidateCodeActionModal/index.tsx b/src/components/ValidateCodeActionModal/index.tsx index 85a953eb2a10..17c54f4bc4b7 100644 --- a/src/components/ValidateCodeActionModal/index.tsx +++ b/src/components/ValidateCodeActionModal/index.tsx @@ -68,10 +68,9 @@ function ValidateCodeActionModal({ onClose={hide} onModalHide={onModalHide ?? hide} onBackdropPress={() => Navigation.dismissModal()} - hideModalContentWhileAnimating - useNativeDriver shouldUseModalPaddingStyle={false} animationInTiming={disableAnimation ? 1 : undefined} + shouldUseReanimatedModal >