Skip to content

[CP Staging] use legacy modal for FeatureTrainingModal #62701

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
marcaaron merged 2 commits into from
May 24, 2025
Merged

[CP Staging] use legacy modal for FeatureTrainingModal #62701

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
fab20ff
use legacy modal for FeatureTrainingModal
s77rt May 23, 2025
cb569fc
keyboardShouldPersistTaps handled
s77rt May 24, 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: 2 additions & 0 deletions src/components/FeatureTrainingModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ function FeatureTrainingModal({

return (
<Modal
id="FeatureTrainingModal"
avoidKeyboard={avoidKeyboard}
isVisible={isModalVisible}
type={onboardingIsMediumOrLargerScreenWidth ? CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE : CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
Expand All @@ -365,6 +366,7 @@ function FeatureTrainingModal({
<Wrapper
style={[styles.mh100, onboardingIsMediumOrLargerScreenWidth && StyleUtils.getWidthStyle(width)]}
contentContainerStyle={shouldUseScrollView ? styles.pb5 : undefined}
keyboardShouldPersistTaps={shouldUseScrollView ? 'handled' : undefined}
fsClass={CONST.FULL_STORY.UNMASK}
testID={CONST.FULL_STORY.UNMASK}
>
Expand Down
4 changes: 3 additions & 1 deletion src/components/Modal/BaseModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type ModalComponentProps = (ReactNativeModalProps | ModalProps) & {
};

function ModalComponent({type, ...props}: ModalComponentProps) {
if (type === CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED) {
if (type === CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED && props.id !== 'FeatureTrainingModal') {
// eslint-disable-next-line react/jsx-props-no-spreading
return <BottomDockedModal {...(props as ModalProps)} />;
}
Expand Down Expand Up @@ -82,6 +82,7 @@ function BaseModal(
shouldPreventScrollOnFocus = false,
enableEdgeToEdgeBottomSafeAreaPadding,
shouldApplySidePanelOffset = type === CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED,
id,
}: BaseModalProps,
ref: React.ForwardedRef<View>,
) {
Expand Down Expand Up @@ -307,6 +308,7 @@ function BaseModal(
avoidKeyboard={avoidKeyboard}
customBackdrop={shouldUseCustomBackdrop ? <Overlay onPress={handleBackdropPress} /> : undefined}
type={type}
id={id}
>
<ModalContent
onModalWillShow={saveFocusState}
Expand Down