Skip to content
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

Jump to bottom

WALL-2622/chore: close the modals on escape key by default #11464

Merged
merged 5 commits into from
Nov 16, 2023
Merged

WALL-2622/chore: close the modals on escape key by default #11464

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47d50b0
chore: close the modals on escape key by default
thisyahlen-deriv Nov 16, 2023
8ae2ab7
chore: update comments
thisyahlen-deriv Nov 16, 2023
015dc8a
Merge branch 'master' of github.com:thisyahlen-deriv/deriv-app into t…
thisyahlen-deriv Nov 16, 2023
2ba3d7d
chore: remove prop
thisyahlen-deriv Nov 16, 2023
ac63a49
Merge branch 'master' of github.com:thisyahlen-deriv/deriv-app into t…
thisyahlen-deriv Nov 16, 2023
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
6 changes: 3 additions & 3 deletions packages/wallets/src/components/Base/ModalStepWrapper/ModalStepWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@ import { WalletText } from '../WalletText';
import './ModalStepWrapper.scss';

type TModalStepWrapperProps = {
closeOnEscape?: boolean;
renderFooter?: () => ReactNode;
shouldFixedFooter?: boolean;
shouldHideHeader?: boolean;
shouldPreventCloseOnEscape?: boolean;
title?: string;
};

const ModalStepWrapper: FC<PropsWithChildren<TModalStepWrapperProps>> = ({
children,
closeOnEscape = false,
renderFooter,
shouldFixedFooter = true,
shouldHideHeader = false,
shouldPreventCloseOnEscape = false,
title,
}) => {
const { hide } = useModal();
const hasRenderFooter = typeof renderFooter === 'function';
const fixedFooter = shouldFixedFooter && hasRenderFooter;

useEventListener('keydown', (event: KeyboardEvent) => {
if (closeOnEscape && event.key === 'Escape') {
if (!shouldPreventCloseOnEscape && event.key === 'Escape') {
hide();
}
});
Expand Down
6 changes: 3 additions & 3 deletions packages/wallets/src/components/Base/ModalWrapper/ModalWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ import { useModal } from '../../ModalProvider';
import './ModalWrapper.scss';

type TProps = {
closeOnEscape?: boolean;
hideCloseButton?: boolean;
shouldPreventCloseOnEscape?: boolean;
};

const ModalWrapper: FC<React.PropsWithChildren<TProps>> = ({
children,
closeOnEscape = false,
thisyahlen-deriv marked this conversation as resolved.
Show resolved Hide resolved
hideCloseButton = false,
shouldPreventCloseOnEscape = false,
}) => {
const { hide } = useModal();

useEventListener('keydown', (event: KeyboardEvent) => {
if (closeOnEscape && event.key === 'Escape') {
if (!shouldPreventCloseOnEscape && event.key === 'Escape') {
hide();
}
});
Expand Down
1 change: 0 additions & 1 deletion packages/wallets/src/components/DerivAppsSection/DerivAppsGetAccount.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const DerivAppsGetAccount: React.FC = () => {
const openSuccessModal = useCallback(() => {
show(
<ModalStepWrapper
closeOnEscape
renderFooter={isDesktop ? undefined : () => <DerivAppsSuccessFooter />}
shouldHideHeader={isDesktop}
>
Expand Down
1 change: 0 additions & 1 deletion packages/wallets/src/features/cfd/components/ModalTradeWrapper/ModalTradeWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ const ModalTradeWrapper: FC<PropsWithChildren<TModalTradeWrapper>> = ({ children

return (
<ModalStepWrapper
closeOnEscape
renderFooter={() => {
return (
<div className='wallets-modal-trade-wrapper__footer'>
Expand Down
1 change: 0 additions & 1 deletion packages/wallets/src/features/cfd/modals/JurisdictionModal/JurisdictionModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ const JurisdictionModal = () => {
return (
<DynamicLeverageContext.Provider value={{ isDynamicLeverageVisible, toggleDynamicLeverage }}>
<ModalStepWrapper
closeOnEscape
renderFooter={modalFooter}
shouldHideHeader={isDynamicLeverageVisible}
title={jurisdictionTitle}
Expand Down
1 change: 0 additions & 1 deletion packages/wallets/src/features/cfd/modals/MT5AccountTypeModal/MT5AccountTypeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const MT5AccountTypeModal = () => {

return (
<ModalStepWrapper
closeOnEscape
renderFooter={() => (
<WalletButton
disabled={!selectedMarketType}
Expand Down
2 changes: 1 addition & 1 deletion packages/wallets/src/features/cfd/modals/MT5PasswordModal/MT5PasswordModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ const MT5PasswordModal: React.FC<TProps> = ({ marketType, platform }) => {
}

return (
<ModalWrapper closeOnEscape hideCloseButton={isSuccess}>
<ModalWrapper hideCloseButton={isSuccess}>
{isSuccess && (
<CFDSuccess
description={`You can now start practicing trading with your ${marketTypeTitle} ${
Expand Down
Loading