Skip to content

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

Migrate the action form creator off Emotion (#83608)

Andrei Chernykh7c5b77e801d5
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.styled.tsx
deleted file mode 100644
index b8914bc7133..00000000000
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.styled.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-export const InfoText = styled.div`
- color: var(--mb-color-text-secondary);
-`;
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsx
index 6ac40793121..fd2e5cfb0f0 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsx
@@ -4,8 +4,7 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useSelector } from "metabase/redux";
import { getDocsUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
-
-import { InfoText } from "./Description.styled";
+import { Text } from "metabase/ui";
export function Description() {
const docsLink = useSelector((state) =>
@@ -14,7 +13,7 @@ export function Description() {
const showMetabaseLinks = useSelector(getShowMetabaseLinks);
return (
- <InfoText>
+ <Text c="text-secondary" lh="md">
{jt`Configure your parameters' types and properties here. The values for these parameters can come from user input, or from a dashboard filter.`}
{showMetabaseLinks && (
<>
@@ -25,6 +24,6 @@ export function Description() {
>{t`Learn more`}</ExternalLink>
</>
)}
- </InfoText>
+ </Text>
);
}
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.module.css b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.module.css
new file mode 100644
index 00000000000..f59e6eefa5a
--- /dev/null
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.module.css
@@ -0,0 +1,22 @@
+.iconContainer {
+ position: relative;
+ display: inline-block;
+ align-self: center;
+ padding: 1.25rem;
+ color: var(--mb-color-core-brand);
+}
+
+.list {
+ margin-left: 1.5rem;
+ list-style-type: disc;
+}
+
+.link {
+ margin-top: 1rem;
+ font-weight: bold;
+ color: var(--mb-color-core-brand);
+
+ &:hover {
+ color: var(--mb-color-core-brand-hover);
+ }
+}
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.styled.tsx
deleted file mode 100644
index 870482cf572..00000000000
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.styled.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { Icon } from "metabase/ui";
-import { lighten } from "metabase/ui/colors";
-
-export const EmptyFormPlaceholderWrapper = styled.div`
- display: flex;
- flex-direction: column;
- justify-content: center;
- height: 100%;
- padding: 3rem;
-`;
-
-export const ExplainerTitle = styled.h3`
- margin-bottom: var(--mantine-spacing-sm);
-`;
-
-export const ExplainerText = styled.div`
- font-weight: 400;
- line-height: 1.5rem;
- color: var(--mb-color-text-secondary);
- margin: var(--mantine-spacing-sm) 0 0 0;
-`;
-
-export const ExplainerList = styled.ul`
- list-style-type: disc;
- margin-left: 1.5rem;
-
- li {
- font-weight: 400;
- line-height: 24px;
- color: var(--mb-color-text-secondary);
- margin: 0;
- }
-`;
-
-export const ExplainerLink = styled(ExternalLink)`
- font-weight: 700;
- margin-top: var(--mantine-spacing-lg);
- color: var(--mb-color-core-brand);
-
- &:hover {
- color: ${() => lighten("core-brand", 0.1)};
- }
-`;
-
-export const IconContainer = styled.div`
- display: inline-block;
- padding: 1.25rem;
- position: relative;
- color: var(--mb-color-core-brand);
- align-self: center;
-`;
-
-export const TopRightIcon = styled(Icon)`
- position: absolute;
- top: 0;
- right: 0;
-`;
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.tsx
index 86e4555dbd7..2bf16e39abc 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.tsx
@@ -1,42 +1,39 @@
import { t } from "ttag";
+import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDocsUrl } from "metabase/common/hooks";
-import { Icon } from "metabase/ui";
+import { Box, Icon, Stack, Text, Title } from "metabase/ui";
-import {
- EmptyFormPlaceholderWrapper,
- ExplainerLink,
- ExplainerList,
- ExplainerText,
- ExplainerTitle,
- IconContainer,
- TopRightIcon,
-} from "./EmptyFormPlaceholder.styled";
+import S from "./EmptyFormPlaceholder.module.css";
export const EmptyFormPlaceholder = () => {
const { url, showMetabaseLinks } = useDocsUrl("actions/custom");
return (
- <EmptyFormPlaceholderWrapper>
- <IconContainer>
+ <Stack justify="center" h="100%" p="3rem" gap={0}>
+ <Box className={S.iconContainer}>
<Icon name="sql" size={62} />
- <TopRightIcon name="insight" size={24} />
- </IconContainer>
- <ExplainerTitle>{t`Build custom forms and business logic.`}</ExplainerTitle>
- <ExplainerText>
+ <Icon name="insight" size={24} pos="absolute" top={0} right={0} />
+ </Box>
+ <Title order={3} size="h4" mb="sm">
+ {t`Build custom forms and business logic.`}
+ </Title>
+ <Text c="text-secondary" mt="sm">
{t`Actions let you write parameterized SQL that writes back to your database. Actions can be attached to buttons on dashboards to create custom workflows. You can even publicly share the parameterized forms they generate to collect data.`}
- </ExplainerText>
- <ExplainerText>
+ </Text>
+ <Text c="text-secondary" mt="sm">
{t`Here are a few ideas for what you can do with actions`}
- <ExplainerList>
+ <Box component="ul" className={S.list}>
<li>{t`Create a customer feedback form and embed it on your website.`}</li>
<li>{t`Mark the customer you’re viewing in a dashboard as a VIP.`}</li>
<li>{t`Let team members remove redundant data.`}</li>
- </ExplainerList>
- </ExplainerText>
+ </Box>
+ </Text>
{showMetabaseLinks && (
- <ExplainerLink href={url}>{t`See an example`}</ExplainerLink>
+ <ExternalLink className={S.link} href={url}>
+ {t`See an example`}
+ </ExternalLink>
)}
- </EmptyFormPlaceholderWrapper>
+ </Stack>
);
};
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsButtons.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsButtons.tsx
index 52d49d68276..ae31dd88d29 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsButtons.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsButtons.tsx
@@ -1,7 +1,7 @@
+import { Flex } from "metabase/ui";
import type { FieldSettings } from "metabase-types/api";
import { FieldSettingsPopover } from "./FieldSettingsPopover";
-import { FieldSettingsButtonsContainer } from "./FormCreator.styled";
import { OptionPopover } from "./OptionEditor";
export function FieldSettingsButtons({
@@ -26,7 +26,7 @@ export function FieldSettingsButtons({
fieldSettings.inputType === "select" || fieldSettings.inputType === "radio";
return (
- <FieldSettingsButtonsContainer>
+ <Flex align="center" gap="sm">
{hasOptions && (
<OptionPopover
fieldType={fieldSettings.fieldType}
@@ -35,6 +35,6 @@ export function FieldSettingsButtons({
/>
)}
<FieldSettingsPopover fieldSettings={fieldSettings} onChange={onChange} />
- </FieldSettingsButtonsContainer>
+ </Flex>
);
}
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx
deleted file mode 100644
index 80a998ac2e9..00000000000
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import { Icon } from "metabase/ui";
-
-export const SettingsPopoverBody = styled.div`
- padding: var(--mantine-spacing-xxl);
-`;
-
-export const RequiredToggleLabel = styled.label`
- font-weight: bold;
-`;
-
-export const Divider = styled.div`
- border-bottom: 1px solid var(--mb-color-border-neutral);
- margin: var(--mantine-spacing-lg) 0;
-`;
-
-export const ToggleContainer = styled.div`
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-bottom: var(--mantine-spacing-sm);
-`;
-
-export const SettingsTriggerIcon = styled(Icon)`
- color: var(--mb-color-text-primary);
-
- &:hover {
- color: var(--mb-color-core-brand);
- }
-`;
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsx
index e12504fb279..428143f5ac5 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.tsx
@@ -1,11 +1,23 @@
import { useDisclosure } from "@mantine/hooks";
+import cx from "classnames";
import type { ChangeEvent } from "react";
import { useMemo } from "react";
import { t } from "ttag";
import { getInputTypes } from "metabase/actions/constants";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
-import { Popover, Radio, Stack, Switch, UnstyledButton } from "metabase/ui";
+import CS from "metabase/css/core/index.css";
+import {
+ Divider,
+ Flex,
+ Icon,
+ Popover,
+ Radio,
+ Stack,
+ Switch,
+ Text,
+ UnstyledButton,
+} from "metabase/ui";
import { TextInput } from "metabase/ui/components/inputs/TextInput";
import type {
FieldSettings,
@@ -13,13 +25,6 @@ import type {
InputSettingType,
} from "metabase-types/api";
-import {
- Divider,
- RequiredToggleLabel,
- SettingsPopoverBody,
- SettingsTriggerIcon,
- ToggleContainer,
-} from "./FieldSettingsPopover.styled";
import { getDefaultValueInputType } from "./utils";
export interface FieldSettingsPopoverProps {
@@ -42,7 +47,8 @@ export function FieldSettingsPopover({
>
<Popover.Target>
<UnstyledButton onClick={toggle}>
- <SettingsTriggerIcon
+ <Icon
+ className={cx(CS.textPrimary, CS.textBrandHover)}
name="gear"
size={16}
tooltip={t`Change field settings`}
@@ -98,7 +104,7 @@ export function FormCreatorPopoverBody({
fieldSettings.fieldType !== "date" && fieldSettings.inputType !== "radio";
return (
- <SettingsPopoverBody data-testid="field-settings-popover">
+ <Stack p="xxl" gap="lg" data-testid="field-settings-popover">
<InputTypeSelect
value={fieldSettings.inputType}
fieldType={fieldSettings.fieldType}
@@ -119,7 +125,7 @@ export function FormCreatorPopoverBody({
onChangeRequired={handleUpdateRequired}
onChangeDefaultValue={handleUpdateDefaultValue}
/>
- </SettingsPopoverBody>
+ </Stack>
);
}
@@ -198,16 +204,16 @@ function RequiredInput({
return (
<div>
- <ToggleContainer>
- <RequiredToggleLabel
- htmlFor={`${id}-required`}
- >{t`Required`}</RequiredToggleLabel>
+ <Flex align="center" justify="space-between" mb="sm">
+ <Text component="label" fw="bold" lh="md" htmlFor={`${id}-required`}>
+ {t`Required`}
+ </Text>
<Switch
id={`${id}-required`}
checked={required}
onChange={(e) => onChangeRequired(e.currentTarget.checked)}
/>
- </ToggleContainer>
+ </Flex>
{required && (
<>
<TextInput
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.module.css b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.module.css
new file mode 100644
index 00000000000..45bf14cc61f
--- /dev/null
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.module.css
@@ -0,0 +1,4 @@
+.warningBorder {
+ border: 1px solid var(--mb-color-feedback-warning);
+ border-radius: 0.5rem;
+}
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx
deleted file mode 100644
index 46bc8486895..00000000000
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import { alpha } from "metabase/ui/colors";
-
-export const FormContainer = styled.div`
- display: flex;
- gap: var(--mantine-spacing-lg);
- padding: 0 1.5rem 1rem;
- transition: flex 500ms ease-in-out;
- background-color: var(--mb-color-background_page-primary);
- flex-direction: column;
-`;
-
-export const FormFieldEditorDragContainer = styled.div`
- margin-bottom: var(--mantine-spacing-sm);
-`;
-
-export const FieldSettingsButtonsContainer = styled.div`
- display: flex;
- align-items: center;
- gap: var(--mantine-spacing-sm);
-`;
-
-export const WarningBanner = styled.div`
- padding: var(--mantine-spacing-lg);
- border: 1px solid var(--mb-color-feedback-warning);
- border-radius: var(--mantine-spacing-sm);
- background: ${() => alpha("feedback-warning", 0.1)};
- line-height: 1.25rem;
-`;
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsx
index 6d7d3d70342..e306972d213 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsx
@@ -9,8 +9,9 @@ import type {
RenderItemProps,
} from "metabase/common/components/Sortable";
import { Sortable, SortableList } from "metabase/common/components/Sortable";
+import CS from "metabase/css/core/index.css";
import { Form, FormProvider } from "metabase/forms";
-import { Flex, Icon, UnstyledButton } from "metabase/ui";
+import { Box, Flex, Icon, Stack, UnstyledButton } from "metabase/ui";
import type {
ActionFormSettings,
FieldSettings,
@@ -27,12 +28,8 @@ import { syncFieldsWithParameters } from "../utils";
import { Description } from "./Description";
import { EmptyFormPlaceholder } from "./EmptyFormPlaceholder";
-import {
- FormContainer,
- FormFieldEditorDragContainer,
- WarningBanner,
-} from "./FormCreator.styled";
-import FormFieldEditor from "./FormFieldEditor";
+import S from "./FormCreator.module.css";
+import { FormFieldEditor } from "./FormFieldEditor";
import { reorderFields } from "./utils";
// FormEditor's can't be submitted as it serves as a form preview
@@ -142,7 +139,7 @@ export function FormCreator({
key={id}
id={id}
disabled={!isEditable}
- as={FormFieldEditorDragContainer}
+ className={CS.mb1}
draggingStyle={{ opacity: 0.5 }}
>
{({ dragHandleRef, dragHandleListeners }) => (
@@ -161,7 +158,7 @@ export function FormCreator({
if (!parameters.length) {
return (
<SidebarContent>
- <FormContainer>
+ <Stack gap="lg" px="xl" pb="lg" bg="background_page-primary">
{onClose && (
/* We want to avoid absolute positioning, so we use margin with z-index since
it's covered by the next element with padding */
@@ -177,7 +174,7 @@ export function FormCreator({
</Flex>
)}
<EmptyFormPlaceholder />
- </FormContainer>
+ </Stack>
</SidebarContent>
);
}
@@ -204,13 +201,18 @@ export function FormCreator({
return (
<SidebarContent title={t`Action parameters`} onClose={onClose}>
- <FormContainer>
+ <Stack gap="lg" px="xl" pb="lg" bg="background_page-primary">
<Description />
{showWarning && (
- <WarningBanner>
+ <Box
+ className={S.warningBorder}
+ p="lg"
+ bg="background_surface-warning"
+ lh="lg"
+ >
<b>{t`Heads up.`}</b>{" "}
{t`Your action has a hidden required field with no default value. There's a good chance this will cause the action to fail.`}
- </WarningBanner>
+ </Box>
)}
<FormProvider
enableReinitialize
@@ -227,7 +229,7 @@ export function FormCreator({
/>
</Form>
</FormProvider>
- </FormContainer>
+ </Stack>
</SidebarContent>
);
}
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.module.css b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.module.css
new file mode 100644
index 00000000000..40a84cee72c
--- /dev/null
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.module.css
@@ -0,0 +1,17 @@
+.border {
+ border: 1px solid var(--mb-color-border-neutral);
+ border-radius: 0.5rem;
+}
+
+.borderTop {
+ border-top: 1px solid var(--mb-color-border-neutral);
+}
+
+/* FormSelectWidget still renders the Emotion FormField, so its root margin and label color are reset here */
+.previewField > div {
+ margin-bottom: 0;
+}
+
+.previewField label {
+ color: var(--mb-color-text-primary);
+}
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx
deleted file mode 100644
index 09f4882b98d..00000000000
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-import { FormField } from "metabase/common/components/FormField";
-import { darken } from "metabase/ui/colors";
-
-export const FormFieldContainer = styled.div`
- background-color: var(--mb-color-background_page-primary);
- border: 1px solid var(--mb-color-border-neutral);
- border-radius: var(--mantine-spacing-sm);
- overflow: hidden;
-`;
-
-const ContentContainer = styled.div`
- display: flex;
- gap: var(--mantine-spacing-sm);
-`;
-
-export const EditorContainer = styled(ContentContainer)`
- display: flex;
- padding: 1rem 1rem 0.85rem 0.85rem;
- gap: var(--mantine-spacing-sm);
-`;
-
-export const Column = styled.div<{ full?: boolean }>`
- display: flex;
- flex-direction: column;
- flex: ${(props) => (props.full ? 1 : "unset")};
-`;
-
-export const Header = styled.div`
- display: flex;
- justify-content: space-between;
- align-items: center;
-`;
-
-export const Title = styled.div`
- color: var(--mb-color-text-primary);
- font-weight: 700;
-`;
-
-export const Subtitle = styled.div`
- color: var(--mb-color-text-secondary);
- font-size: 0.85rem;
- font-weight: 700;
- margin-top: 1.2rem;
-`;
-
-export const PreviewContainer = styled(ContentContainer)`
- background-color: var(--mb-color-background_page-secondary);
- border-top: 1px solid ${() => darken("background_page-secondary", 0.1)};
- padding: 1rem 1rem 2rem 1rem;
-
- ${FormField.Root} {
- margin-bottom: 0;
- }
-
- ${FormField.Label} {
- color: var(--mb-color-text-primary);
- }
-`;
-
-export const InputContainer = styled.div`
- flex: 1 0 1;
-`;
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx
index 901060957bb..2ef7daf9127 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx
@@ -1,4 +1,5 @@
import type { SyntheticListenerMap } from "@dnd-kit/core/dist/hooks/utilities";
+import cx from "classnames";
import type { MutableRefObject } from "react";
import { useMemo } from "react";
import { t } from "ttag";
@@ -7,7 +8,8 @@ import { ActionFormFieldWidget } from "metabase/actions/components/ActionFormFie
import { getFieldTypes, getInputTypes } from "metabase/actions/constants";
import type { ActionFormFieldProps } from "metabase/actions/types";
import { inputTypeHasOptions } from "metabase/actions/utils";
-import { Checkbox, Group, Radio } from "metabase/ui";
+import CS from "metabase/css/core/index.css";
+import { Box, Checkbox, Flex, Group, Radio, Stack, Text } from "metabase/ui";
import { isNotNull } from "metabase/utils/types";
import type {
FieldSettings,
@@ -18,16 +20,7 @@ import type {
import { FieldSettingsButtons } from "../FieldSettingsButtons";
import { DragHandle } from "./DragHandle";
-import {
- Column,
- EditorContainer,
- FormFieldContainer,
- Header,
- InputContainer,
- PreviewContainer,
- Subtitle,
- Title,
-} from "./FormFieldEditor.styled";
+import S from "./FormFieldEditor.module.css";
export interface FormFieldEditorProps {
field: ActionFormFieldProps;
@@ -60,7 +53,7 @@ function cleanOptionValues(values: FieldValueOptions, fieldType: FieldType) {
.filter(isNotNull);
}
-function FormFieldEditor({
+export function FormFieldEditor({
field,
fieldSettings,
isEditable,
@@ -103,26 +96,32 @@ function FormFieldEditor({
};
return (
- <FormFieldContainer data-testid="form-field-container">
- <EditorContainer>
- <Column>
+ <Box
+ className={cx(CS.overflowHidden, S.border)}
+ bg="background_page-primary"
+ data-testid="form-field-container"
+ >
+ <Flex gap="sm" p="lg" pb="md" pl="md">
+ <Stack gap={0}>
{isEditable && (
<DragHandle
ref={dragHandleRef}
dragHandleListeners={dragHandleListeners}
/>
)}
- </Column>
- <Column full>
- <Header>
- <Title>{field.title}</Title>
+ </Stack>
+ <Stack gap={0} flex={1}>
+ <Flex justify="space-between" align="center">
+ <Text c="text-primary" fw="bold" lh="md">
+ {field.title}
+ </Text>
{isEditable && (
<FieldSettingsButtons
fieldSettings={fieldSettings}
onChange={onChange}
/>
)}
- </Header>
+ </Flex>
{isEditable && fieldSettings && (
<Radio.Group
label={<Subtitle>{t`Field type`}</Subtitle>}
@@ -142,40 +141,51 @@ function FormFieldEditor({
</Radio.Group>
)}
<Subtitle>{t`Appearance`}</Subtitle>
- </Column>
- </EditorContainer>
- <PreviewContainer data-testid="preview-container">
- <Column />
- <Column full>
- <InputContainer>
- <ActionFormFieldWidget
- hidden={hidden}
- actions={
- <Checkbox
- styles={{
- label: {
- fontSize: "12px",
- color: "var(--mb-color-text-secondary)",
- },
- }}
- onChange={() => {
- onChange({
- ...fieldSettings,
- hidden: !hidden,
- });
- }}
- checked={!hidden}
- label={t`Show field`}
- />
- }
- formField={field}
+ </Stack>
+ </Flex>
+ <Box
+ className={cx(S.borderTop, S.previewField)}
+ p="lg"
+ pl="xl"
+ pb="xxl"
+ bg="background_page-secondary"
+ data-testid="preview-container"
+ >
+ <ActionFormFieldWidget
+ hidden={hidden}
+ actions={
+ <Checkbox
+ styles={{
+ label: {
+ fontSize: "12px",
+ color: "var(--mb-color-text-secondary)",
+ },
+ }}
+ onChange={() => {
+ onChange({
+ ...fieldSettings,
+ hidden: !hidden,
+ });
+ }}
+ checked={!hidden}
+ label={t`Show field`}
/>
- </InputContainer>
- </Column>
- </PreviewContainer>
- </FormFieldContainer>
+ }
+ formField={field}
+ />
+ </Box>
+ </Box>
);
}
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default FormFieldEditor;
+type SubtitleProps = {
+ children: React.ReactNode;
+};
+
+function Subtitle({ children }: SubtitleProps) {
+ return (
+ <Text c="text-secondary" fz="md" fw="bold" lh="md" mt="1.2rem">
+ {children}
+ </Text>
+ );
+}
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.unit.spec.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.unit.spec.tsx
index 2d9e72f600a..b13250725b2 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.unit.spec.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.unit.spec.tsx
@@ -13,8 +13,7 @@ import { getDefaultFieldSettings } from "metabase/actions/utils";
import { FormProvider } from "metabase/forms";
import type { FieldSettings } from "metabase-types/api";
-import type { FormFieldEditorProps } from "./FormFieldEditor";
-import FormFieldEditor from "./FormFieldEditor";
+import { FormFieldEditor, type FormFieldEditorProps } from "./FormFieldEditor";
const DEFAULT_FIELD: FormFieldEditorProps["field"] = {
name: "uuid",
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/index.ts b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/index.ts
index 9226f6648f3..25431450a7b 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/index.ts
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/index.ts
@@ -1,2 +1 @@
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export { default } from "./FormFieldEditor";
+export { FormFieldEditor } from "./FormFieldEditor";
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.module.css b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.module.css
new file mode 100644
index 00000000000..fdfec073e09
--- /dev/null
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.module.css
@@ -0,0 +1,16 @@
+.textarea {
+ width: 20rem;
+ padding: 0.5rem;
+ border: none;
+ border-radius: 0.5rem;
+ outline: 1px solid var(--mb-color-border-neutral);
+ resize: none;
+}
+
+.addMorePrompt {
+ height: 1.25rem;
+ text-align: center;
+ font-size: 0.875rem;
+ color: var(--mb-color-text-disabled);
+ transition: opacity 0.2s ease-in-out;
+}
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.styled.tsx
deleted file mode 100644
index 6d8fe2185a2..00000000000
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.styled.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-export const OptionEditorContainer = styled.div`
- display: flex;
- flex-direction: column;
- padding: var(--mantine-spacing-lg);
- gap: var(--mantine-spacing-sm);
-`;
-
-export const AddMorePrompt = styled.div<{ isVisible: boolean }>`
- text-align: center;
- font-size: 0.875rem;
- height: 1.25rem;
- color: var(--mb-color-text-disabled);
- transition: opacity 0.2s ease-in-out;
- opacity: ${(props) => (props.isVisible ? 1 : 0)};
-`;
-
-export const ErrorMessage = styled.div`
- text-align: center;
- font-size: 0.875rem;
- color: var(--mb-color-feedback-negative);
-`;
-
-export const TextArea = styled.textarea`
- resize: none;
- border: none;
- outline: 1px solid var(--mb-color-border-neutral);
- width: 20rem;
- border-radius: var(--mantine-spacing-sm);
- padding: var(--mantine-spacing-sm);
-`;
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx
index 7651094f0f8..640906d8f80 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.tsx
@@ -2,15 +2,10 @@ import { useDisclosure } from "@mantine/hooks";
import { useEffect, useState } from "react";
import { t } from "ttag";
-import { Button, Icon, Popover, UnstyledButton } from "metabase/ui";
+import { Box, Button, Icon, Popover, Stack, UnstyledButton } from "metabase/ui";
import type { FieldType, FieldValueOptions } from "metabase-types/api";
-import {
- AddMorePrompt,
- ErrorMessage,
- OptionEditorContainer,
- TextArea,
-} from "./OptionEditor.styled";
+import S from "./OptionEditor.module.css";
const optionsToText = (options: FieldValueOptions) => options.join("\n");
export const textToOptions = (text: string): FieldValueOptions => {
@@ -112,20 +107,25 @@ export const OptionPopover = ({
</UnstyledButton>
</Popover.Target>
<Popover.Dropdown maw={400}>
- <OptionEditorContainer>
- <TextArea
+ <Stack p="lg" gap="sm">
+ <textarea
+ className={S.textarea}
value={text}
onChange={handleTextChange}
placeholder={t`Enter one option per line`}
/>
- <AddMorePrompt isVisible={hasOptions}>
+ <Box className={S.addMorePrompt} opacity={hasOptions ? 1 : 0}>
{t`Press enter to add another option`}
- </AddMorePrompt>
- {hasError && <ErrorMessage>{error}</ErrorMessage>}
+ </Box>
+ {hasError && (
+ <Box ta="center" fz="md" c="feedback-negative">
+ {error}
+ </Box>
+ )}
<Button disabled={!canSave} onClick={handleSave}>
{t`Save`}
</Button>
- </OptionEditorContainer>
+ </Stack>
</Popover.Dropdown>
</Popover>
);