Skip to content

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

Migrate collection header caption styles from Emotion to Mantine (#80331)

Andersone86c35cd4dc3
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.module.css b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.module.css
new file mode 100644
index 00000000000..1a514ffc722
--- /dev/null
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.module.css
@@ -0,0 +1,17 @@
+.description {
+ opacity: 0;
+ transition: opacity 400ms ease 1s;
+}
+
+.description.visible,
+.root:hover .description,
+.root:focus-within .description {
+ opacity: 1;
+ transition-delay: 0s;
+}
+
+@media (prefers-reduced-motion) {
+ .description {
+ transition: none;
+ }
+}
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.styled.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.styled.tsx
deleted file mode 100644
index 4de766a9b27..00000000000
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.styled.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { EditableDescription } from "metabase/common/components/EditableDescription";
-import { EditableText } from "metabase/common/components/EditableText";
-
-export const CaptionTitleContainer = styled.div`
- display: flex;
- align-items: center;
- gap: 0.5rem;
-`;
-
-export const CaptionTitle = styled(EditableText)`
- font-size: 1.75rem;
- font-weight: 900;
-`;
-
-interface CaptionDescriptionProps {
- isVisible: boolean;
-}
-
-export const CaptionDescription = styled(
- EditableDescription,
-)<CaptionDescriptionProps>`
- opacity: ${(props) => (props.isVisible ? 1 : 0)};
- max-width: 25rem;
- transition: opacity 400ms ease 1s;
-
- @media (prefers-reduced-motion) {
- transition: none;
- }
-`;
-
-export const CaptionRoot = styled.div`
- &:hover,
- &:focus-within {
- ${CaptionDescription} {
- opacity: 1;
- transition-delay: 0s;
- }
- }
-`;
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx
index c84bc31d9c0..c2aa53f11bd 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx
@@ -1,3 +1,4 @@
+import cx from "classnames";
import { useCallback } from "react";
import { t } from "ttag";
@@ -6,21 +7,18 @@ import {
isInstanceAnalyticsCollection,
isRootTrashCollection,
} from "metabase/common/collections/utils";
+import { EditableDescription } from "metabase/common/components/EditableDescription";
+import { EditableText } from "metabase/common/components/EditableText";
import { getIsTenantUser, getUser } from "metabase/current-user";
import {
PLUGIN_COLLECTIONS,
PLUGIN_COLLECTION_COMPONENTS,
} from "metabase/plugins";
import { useSelector } from "metabase/redux";
-import { Icon } from "metabase/ui";
+import { Box, Flex, Icon, rem } from "metabase/ui";
import type { Collection } from "metabase-types/api";
-import {
- CaptionDescription,
- CaptionRoot,
- CaptionTitle,
- CaptionTitleContainer,
-} from "./CollectionCaption.styled";
+import S from "./CollectionCaption.module.css";
interface CollectionCaptionProps {
collection: Collection;
@@ -50,10 +48,10 @@ export const CollectionCaption = ({
);
return (
- <CaptionRoot data-testid="collection-caption">
- <CaptionTitleContainer>
+ <Box className={S.root} data-testid="collection-caption">
+ <Flex align="center" gap="sm">
<CollectionCaptionIcon collection={collection} />
- <CaptionTitle
+ <EditableText
key={collection.id}
initialValue={collection.name}
placeholder={t`Add title`}
@@ -61,27 +59,32 @@ export const CollectionCaption = ({
data-testid="collection-name-heading"
onChange={handleChangeName}
maxLength={100}
+ fz={rem(28)}
+ fw={900}
/>
- </CaptionTitleContainer>
+ </Flex>
{(isEditable || hasDescription) && (
- <CaptionDescription
+ <EditableDescription
key={
// Including the description in the key prevents a stale value from
// being stored in the state of EditableText if the collection's
// description is modified in another component
`${collection.id}-${collection.description}`
}
+ className={cx(S.description, {
+ [S.visible]: Boolean(collection.description),
+ })}
description={collection.description}
placeholder={t`Add description`}
- isVisible={Boolean(collection.description)}
canWrite={isEditable}
onChange={handleChangeDescription}
data-testid="collection-description-in-caption"
left={0}
+ maw={rem(400)}
maxLength={255}
/>
)}
- </CaptionRoot>
+ </Box>
);
};
diff --git a/frontend/src/metabase/common/components/EditableDescription/EditableDescription.tsx b/frontend/src/metabase/common/components/EditableDescription/EditableDescription.tsx
index 20e6091e365..189478c978a 100644
--- a/frontend/src/metabase/common/components/EditableDescription/EditableDescription.tsx
+++ b/frontend/src/metabase/common/components/EditableDescription/EditableDescription.tsx
@@ -11,14 +11,12 @@ export interface EditableDescriptionProps
description: string | null;
canWrite: boolean;
onChange: (newDescription: string) => void;
- key?: string | number;
}
export const EditableDescription = ({
description,
canWrite,
onChange,
- key,
...props
}: EditableDescriptionProps) => {
return (
@@ -33,7 +31,6 @@ export const EditableDescription = ({
isOptional
isMultiline
isMarkdown
- key={key}
lh={1.57}
{...props}
/>