Skip to content

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

Migrate action form and implicit action icon from Emotion to Mantine (#75036)

Andrei Chernykh987b137a2dbb
diff --git a/frontend/src/metabase/actions/components/ActionForm/ActionForm.styled.tsx b/frontend/src/metabase/actions/components/ActionForm/ActionForm.styled.tsx
deleted file mode 100644
index 661c20badf7..00000000000
--- a/frontend/src/metabase/actions/components/ActionForm/ActionForm.styled.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const ActionFormButtonContainer = styled.div`
- display: flex;
- justify-content: flex-end;
- gap: 0.5rem;
-`;
diff --git a/frontend/src/metabase/actions/components/ActionForm/ActionForm.tsx b/frontend/src/metabase/actions/components/ActionForm/ActionForm.tsx
index 01cec397737..5c900c5320a 100644
--- a/frontend/src/metabase/actions/components/ActionForm/ActionForm.tsx
+++ b/frontend/src/metabase/actions/components/ActionForm/ActionForm.tsx
@@ -11,6 +11,7 @@ import { Button } from "metabase/common/components/Button";
import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";
import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";
import { Form, FormProvider } from "metabase/forms";
+import { Flex } from "metabase/ui";
import type {
ActionFormInitialValues,
ParameterId,
@@ -20,8 +21,6 @@ import type {
import { ActionFormFieldWidget } from "../ActionFormFieldWidget";
-import { ActionFormButtonContainer } from "./ActionForm.styled";
-
interface ActionFormProps {
action: WritebackAction;
initialValues?: ActionFormInitialValues;
@@ -86,12 +85,12 @@ function ActionForm({
<ActionFormFieldWidget key={field.name} formField={field} />
))}
- <ActionFormButtonContainer>
+ <Flex justify="flex-end" gap="sm">
{onClose && (
<Button type="button" onClick={onClose}>{t`Cancel`}</Button>
)}
<FormSubmitButton {...submitButtonProps} />
- </ActionFormButtonContainer>
+ </Flex>
<FormErrorMessage />
</Form>
diff --git a/frontend/src/metabase/actions/components/ImplicitActionIcon/ImplicitActionIcon.styled.tsx b/frontend/src/metabase/actions/components/ImplicitActionIcon/ImplicitActionIcon.styled.tsx
deleted file mode 100644
index dcb1a633356..00000000000
--- a/frontend/src/metabase/actions/components/ImplicitActionIcon/ImplicitActionIcon.styled.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const Root = styled.div`
- display: flex;
- flex-direction: column;
- justify-content: center;
-`;
diff --git a/frontend/src/metabase/actions/components/ImplicitActionIcon/ImplicitActionIcon.tsx b/frontend/src/metabase/actions/components/ImplicitActionIcon/ImplicitActionIcon.tsx
index 1c9dc7445be..d452daf9cab 100644
--- a/frontend/src/metabase/actions/components/ImplicitActionIcon/ImplicitActionIcon.tsx
+++ b/frontend/src/metabase/actions/components/ImplicitActionIcon/ImplicitActionIcon.tsx
@@ -1,6 +1,4 @@
-import { Icon } from "metabase/ui";
-
-import { Root } from "./ImplicitActionIcon.styled";
+import { Flex, Icon } from "metabase/ui";
interface ImplicitActionIconProps {
size?: number;
@@ -10,10 +8,10 @@ function ImplicitActionIcon({ size = 14 }: ImplicitActionIconProps) {
const sizeSmall = size * 0.375;
const marginLeft = size * 0.75;
return (
- <Root>
+ <Flex direction="column" justify="center">
<Icon name="insight" size={sizeSmall} style={{ marginLeft }} />
<Icon name="insight" size={size} />
- </Root>
+ </Flex>
);
}