Fix margin on DeleteModal overlay (#998)

* Fix margin on DeleteModal overlay

* Update chromatic ci triggers

* Update chromatic ci triggers
This commit is contained in:
Charles Bochet
2023-07-30 13:17:33 -07:00
committed by GitHub
parent be835af48b
commit eafa30a9cf
24 changed files with 388 additions and 335 deletions

View File

@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
import { useAuth } from '@/auth/hooks/useAuth';
import { AppPath } from '@/types/AppPath';
import { ButtonVariant } from '@/ui/button/components/Button';
import { SubSectionTitle } from '@/ui/title/components/SubSectionTitle';
import { H2Title } from '@/ui/title/components/H2Title';
import { useDeleteUserAccountMutation } from '~/generated/graphql';
import { DeleteModal, StyledDeleteButton } from './DeleteModal';
@ -29,7 +29,7 @@ export function DeleteAccount() {
return (
<>
<SubSectionTitle
<H2Title
title="Danger zone"
description="Delete account and all the associated data"
/>

View File

@ -7,6 +7,8 @@ import { currentUserState } from '@/auth/states/currentUserState';
import { Button, ButtonVariant } from '@/ui/button/components/Button';
import { TextInput } from '@/ui/input/components/TextInput';
import { Modal } from '@/ui/modal/components/Modal';
import { Section, SectionAlignment } from '@/ui/section/components/Section';
import { H1Title, H1TitleFontColor } from '@/ui/title/components/H1Title';
import { debounce } from '~/utils/debounce';
interface DeleteModalProps {
@ -18,22 +20,6 @@ interface DeleteModalProps {
deleteButtonText?: string;
}
const StyledTitle = styled.div`
font-size: ${({ theme }) => theme.font.size.lg};
font-weight: ${({ theme }) => theme.font.weight.semiBold};
`;
const StyledSubtitle = styled.div`
text-align: center;
`;
const StyledModal = styled(Modal)`
color: ${({ theme }) => theme.font.color.primary};
> * + * {
margin-top: ${({ theme }) => theme.spacing(8)};
}
`;
const StyledCenteredButton = styled(Button)`
justify-content: center;
`;
@ -77,7 +63,7 @@ export function DeleteModal({
return (
<AnimatePresence mode="wait">
<LayoutGroup>
<StyledModal
<Modal
isOpen={isOpen}
onOutsideClick={() => {
if (isOpen) {
@ -85,15 +71,17 @@ export function DeleteModal({
}
}}
>
<StyledTitle>{title}</StyledTitle>
<StyledSubtitle>{subtitle}</StyledSubtitle>
<TextInput
value={email}
onChange={handleEmailChange}
placeholder={userEmail}
fullWidth
key={'email-' + userEmail}
/>
<H1Title title={title} fontColor={H1TitleFontColor.Primary} />
<Section alignment={SectionAlignment.Center}>{subtitle}</Section>
<Section>
<TextInput
value={email}
onChange={handleEmailChange}
placeholder={userEmail}
fullWidth
key={'email-' + userEmail}
/>
</Section>
<StyledDeleteButton
onClick={handleConfirmDelete}
variant={ButtonVariant.Secondary}
@ -110,7 +98,7 @@ export function DeleteModal({
marginTop: 10,
}}
/>
</StyledModal>
</Modal>
</LayoutGroup>
</AnimatePresence>
);

View File

@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
import { useAuth } from '@/auth/hooks/useAuth';
import { AppPath } from '@/types/AppPath';
import { ButtonVariant } from '@/ui/button/components/Button';
import { SubSectionTitle } from '@/ui/title/components/SubSectionTitle';
import { H2Title } from '@/ui/title/components/H2Title';
import { useDeleteCurrentWorkspaceMutation } from '~/generated/graphql';
import { DeleteModal, StyledDeleteButton } from './DeleteModal';
@ -29,10 +29,7 @@ export function DeleteWorkspace() {
return (
<>
<SubSectionTitle
title="Danger zone"
description="Delete your whole workspace"
/>
<H2Title title="Danger zone" description="Delete your whole workspace" />
<StyledDeleteButton
onClick={() => setIsDeleteWorkSpaceModalOpen(true)}
variant={ButtonVariant.Secondary}