Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

GDGT-3370: Stop call sites overriding Modal padding (#84549)

Will Fry01552f05c2c5
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.tsx
index 18d34abecf2..9e9275d2c52 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/MetricCachingModal.tsx
@@ -61,7 +61,6 @@ export function MetricCachingModal({
onClose={handleClose}
title={t`Caching`}
size="lg"
- padding="xl"
classNames={{ content: S.content, body: S.body }}
>
<DelayedLoadingAndErrorWrapper loading={isLoading} error={error}>
diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationModal.tsx
index 08ee782804b..07edf369f19 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationModal.tsx
@@ -109,7 +109,6 @@ export const DatabaseReplicationModal = ({
closeOnClickOutside={canCloseModal}
closeOnEscape={canCloseModal}
withCloseButton={canCloseModal}
- padding="2.5rem"
title={
isProgressStep
? undefined
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.module.css b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.module.css
index d8e7b35c826..af027b0627a 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.module.css
@@ -8,7 +8,6 @@
}
.modalBody {
- padding-inline: 0;
flex: 1;
display: flex;
flex-direction: column;
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx
index bc8df2eae5f..dc0a56d5b91 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx
@@ -105,7 +105,6 @@ export const DestinationDatabaseConnectionModal = () => {
}
opened
onClose={handleCloseModal}
- padding="xxl"
classNames={{
content: S.modalRoot,
header: S.modalHeader,
@@ -117,7 +116,6 @@ export const DestinationDatabaseConnectionModal = () => {
<Flex
py="sm"
px="lg"
- mx="xxl"
my="lg"
bg="background_page-secondary"
align="center"
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx
index 067dd41ee4b..a8809ee863d 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx
@@ -22,7 +22,6 @@ export const DestinationDatabasesModal = () => {
opened
title={t`Destination databases`}
onClose={handleCloseModal}
- padding="xxl"
classNames={{
content: S.modalRoot,
header: S.modalHeader,
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx
index 735c83cd404..653bcb6a10c 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx
@@ -81,7 +81,7 @@ const ModalWrapper = ({
children: React.ReactNode;
onClose: () => void;
}) => (
- <Modal opened onClose={onClose} padding="3rem" title={title} size="44rem">
+ <Modal opened onClose={onClose} title={title} size="44rem">
<Flex gap="lg" pt="xxl" direction="column" justify="center">
{children}
</Flex>
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx
index 20e37afde79..ea6d7697e32 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx
@@ -16,7 +16,7 @@ function PausedModal({ onClose }: { onClose: () => void }) {
const isAdmin = useSelector(getUserIsAdmin);
return (
- <Modal opened onClose={onClose} padding="xxl" withCloseButton={false}>
+ <Modal opened onClose={onClose} withCloseButton={false}>
<Stack gap="lg" pt="xl" ta="center">
<Box component={databaseError} mx="auto" />
<Text size="lg" fw="bold">
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSettingUpModal.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSettingUpModal.tsx
index 67c68d26724..2ceb7559f7c 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSettingUpModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotSettingUpModal.tsx
@@ -43,7 +43,6 @@ export function MetabotSettingUpModal({
closeOnEscape={false}
withCloseButton={false}
size="30rem"
- padding="2.5rem"
mah="80%"
>
<Stack align="center" gap="xl" my="4.5rem">
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal.tsx
index c8cdda8b9b5..901c1609467 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal.tsx
@@ -45,7 +45,6 @@ export const TransformsSettingUpModal = ({
closeOnEscape={false}
withCloseButton={false}
size="30rem"
- padding="2.5rem"
mah="80%"
>
<Stack align="center" gap="xl" my="4.5rem">
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx
index e8bc70ff03a..bd787088367 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx
@@ -18,7 +18,6 @@ export const UploadInfoModal = ({
opened
onClose={onClose}
size="30rem"
- padding="2rem"
styles={{ header: { marginBottom: "1rem" } }}
>
<Stack gap="lg" align="center" justify="center">
diff --git a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.tsx b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.tsx
index cff9ebd14f8..8c6ad3d3854 100644
--- a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.tsx
+++ b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.tsx
@@ -40,12 +40,7 @@ export const SaveQuestionModal = ({
initialCollectionId={initialCollectionId}
targetCollection={targetCollection}
>
- <Modal.Root
- density="relaxed"
- padding="xxl"
- {...modalProps}
- onClose={onClose}
- >
+ <Modal.Root density="relaxed" {...modalProps} onClose={onClose}>
<Modal.Overlay />
<Modal.Content data-testid="save-question-modal">
<Modal.Header>
diff --git a/frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx
index 732674de20b..4aaa02de872 100644
--- a/frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/NewActionPage/CreateActionModal/CreateActionModal.tsx
@@ -73,7 +73,7 @@ export function CreateActionModal({
};
return (
- <Modal title={t`Save your action`} opened padding="xxl" onClose={onClose}>
+ <Modal title={t`Save your action`} opened onClose={onClose}>
<FormProvider
initialValues={initialValues}
validationSchema={validationSchema}
diff --git a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormBody.tsx b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormBody.tsx
index 929896f7a22..62a3fc9f32b 100644
--- a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormBody.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormBody.tsx
@@ -64,9 +64,6 @@ export const DatabaseFormBody = ({
[engines, isAdvanced, onEngineChange, setValues],
);
- const px = match(location)
- .with("admin", "embedding_setup", () => "xl")
- .otherwise(() => undefined);
// In the admin modal, `Modal.Footer` brings its own space above the buttons.
const mb = match(location)
.with("admin", () => 0)
@@ -80,7 +77,6 @@ export const DatabaseFormBody = ({
<Box
mah={mah}
mb={mb}
- px={px}
flex={1}
style={mah ? { overflowY: "auto" } : undefined}
>
diff --git a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsx b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsx
index 789f42e83c7..2b8ff7a430f 100644
--- a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsx
@@ -46,7 +46,7 @@ export const DatabaseFormFooter = ({
if (isAdvanced) {
return (
- <FormFooter data-testid="form-footer" px={isFullPage ? undefined : "xxl"}>
+ <FormFooter data-testid="form-footer">
<Flex gap="sm" align="center" mr="auto">
<DatabaseTestConnectionButton />
{isNew && (
diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
index 88748084667..a80dbd32951 100644
--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/modals/NativeQueryModal.tsx
@@ -321,7 +321,6 @@ export const NativeQueryModal = ({
onClose={onClose}
size="95%"
title={t`Edit SQL Query`}
- padding="xl"
classNames={{
content: S.modalContent,
body: S.modalBody,
diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
index dbc43c83d6b..511e9aad743 100644
--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
@@ -312,7 +312,6 @@ export const CreateOrEditQuestionAlertModal = ({
opened
size={rem(680)}
onClose={onClose}
- padding="2.5rem"
title={isEditMode ? t`Edit alert` : t`New alert`}
styles={{
body: {
@@ -322,7 +321,7 @@ export const CreateOrEditQuestionAlertModal = ({
},
}}
>
- <Stack gap="xxl" mt="1.5rem" mb="2rem" px="2.5rem">
+ <Stack gap="xxl" mt="1.5rem" mb="2rem" px="xl">
<AlertModalSettingsBlock
title={t`What do you want to be alerted about?`}
>
@@ -433,7 +432,7 @@ export const CreateOrEditQuestionAlertModal = ({
<Flex
justify="space-between"
align="center"
- px="2.5rem"
+ px="xl"
pt="xl"
className={CS.borderTop}
>
diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx
index 71e468f5f97..8cf09186f86 100644
--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx
+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx
@@ -60,7 +60,6 @@ export const AlertListModal = ({
opened={opened}
size={rem(600)}
onClose={onClose}
- padding="xxl"
title={t`Edit alerts`}
>
<Stack gap="xl" mb="xl" mt="1rem">
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetFormModal/SnippetFormModal.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetFormModal/SnippetFormModal.tsx
index 8f6082eb633..b3d14b17e22 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetFormModal/SnippetFormModal.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetFormModal/SnippetFormModal.tsx
@@ -83,7 +83,7 @@ export function SnippetFormModal({
);
return (
- <Modal.Root padding="xxl" opened onClose={onClose}>
+ <Modal.Root opened onClose={onClose}>
<Modal.Overlay />
<Modal.Content>
<Modal.Header px="xxl">
diff --git a/frontend/src/metabase/ui/components/overlays/Modal/Modal.mdx b/frontend/src/metabase/ui/components/overlays/Modal/Modal.mdx
index ad32e62d004..6202e8be28e 100644
--- a/frontend/src/metabase/ui/components/overlays/Modal/Modal.mdx
+++ b/frontend/src/metabase/ui/components/overlays/Modal/Modal.mdx
@@ -44,6 +44,10 @@ Don't confuse `layout` with Mantine's `centered` prop, which sets the modal's ve
<Canvas of={ModalStories.WithForm} />
+### Padding
+
+The `padding` prop only accepts `0`, for full-bleed modals that lay out their own contents, such as pickers and side sheets. Leave it out to get the standard padding.
+
### Custom layouts
`Modal.Root`, `Modal.Overlay`, `Modal.Content`, `Modal.Header`, `Modal.Title`, `Modal.CloseButton` and `Modal.Body` are an escape hatch for modals that don't fit the standard structure, such as side sheets. Prefer the props above where you can.
diff --git a/frontend/src/metabase/ui/components/overlays/Modal/constants.ts b/frontend/src/metabase/ui/components/overlays/Modal/constants.ts
index e0a2c1f5b06..a4a2b4712d2 100644
--- a/frontend/src/metabase/ui/components/overlays/Modal/constants.ts
+++ b/frontend/src/metabase/ui/components/overlays/Modal/constants.ts
@@ -1,6 +1,9 @@
import type { ModalProps } from "@mantine/core";
-export const NO_ANIMATION_MODAL_PROPS: Partial<ModalProps> = {
+export const NO_ANIMATION_MODAL_PROPS: Pick<
+ ModalProps,
+ "transitionProps" | "styles"
+> = {
transitionProps: { duration: 0 },
styles: {
overlay: { animation: "none" },
diff --git a/frontend/src/metabase/ui/components/overlays/Modal/index.tsx b/frontend/src/metabase/ui/components/overlays/Modal/index.tsx
index b8e6ab0568a..d3a14f6534d 100644
--- a/frontend/src/metabase/ui/components/overlays/Modal/index.tsx
+++ b/frontend/src/metabase/ui/components/overlays/Modal/index.tsx
@@ -30,7 +30,8 @@ export const MODAL_DENSITIES = ["default", "relaxed"] as const;
export type ModalDensity = (typeof MODAL_DENSITIES)[number];
-// Spacing comes from `layout` and `density`, so call sites can't override it.
+// Spacing comes from the theme, `layout` and `density`, so call sites can't
+// override it. `padding` is re-added as `0` only, in `ModalLayoutProps`.
type ForbiddenMantineModalProps =
| "m"
| "mx"
@@ -49,7 +50,8 @@ type ForbiddenMantineModalProps =
| "pl"
| "pr"
| "ps"
- | "pe";
+ | "pe"
+ | "padding";
interface ModalLayoutProps {
/**
@@ -64,6 +66,11 @@ interface ModalLayoutProps {
* is 24px, for bodies with several fields or sections, such as forms.
*/
density?: ModalDensity;
+ /**
+ * Pass `0` for a full-bleed modal that lays out its own contents. Leave it
+ * out to get the standard modal padding.
+ */
+ padding?: 0;
}
export interface ModalProps