The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Restyle Pill component to match Figma design (#77086)
Oleh K8e45662740d0
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.cssindex 31402ec1ea1..0dd744db405 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css@@ -18,9 +18,6 @@}.pill {- color: var(--mb-color-text-primary);- background-color: var(--mb-color-background_page-tertiary);-&:hover,&.selected {color: var(--mb-color-core-white);diff --git a/frontend/src/metabase/admin/people/components/AddMemberRow.tsx b/frontend/src/metabase/admin/people/components/AddMemberRow.tsxindex 86e4f8625ff..7a49386ae6d 100644--- a/frontend/src/metabase/admin/people/components/AddMemberRow.tsx+++ b/frontend/src/metabase/admin/people/components/AddMemberRow.tsx@@ -94,9 +94,7 @@ export function AddMemberRow({{Array.from(selectedUsersById.values()).map((user, index) => (<Pillkey={user.id}- size="xl"- bg="background_page-tertiary"- c="text-primary"+ size="md"ms={index > 0 ? "sm" : ""}withRemoveButtononRemove={() => handleRemoveUser(user)}diff --git a/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.module.css b/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.module.cssindex 9e7d39679cc..f703fecf8d1 100644--- a/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.module.css+++ b/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.module.css@@ -22,14 +22,7 @@.pill {display: flex;flex: 0 0 auto;- padding-inline: 0.5rem;- height: 100%;- background: var(--mb-color-background_page-primary);- border: 1px solid var(--mb-color-border-neutral);- border-radius: var(--mantine-radius-xl);cursor: pointer;- color: var(--mb-color-text-primary);- font-weight: bold;min-width: 4rem;text-overflow: ellipsis;overflow: hidden;diff --git a/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.tsx b/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.tsxindex bb0d2f4fd0e..4a04e144aa8 100644--- a/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.tsx+++ b/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.tsx@@ -55,14 +55,12 @@ export function SortablePill({onRemove,containerId,style,- size,}: {id: string;label: string;onRemove?: () => void;containerId?: string;style?: CSSProperties;- size?: MantineSize;}) {const {attributes,@@ -89,7 +87,7 @@ export function SortablePill({return (<Pill- size={size}+ size="md"ref={setNodeRef}className={cx(S.pill, { [S.dragging]: isDragging })}withRemoveButton@@ -99,16 +97,6 @@ export function SortablePill({{...attributes}{...listeners}style={combinedStyle}- styles={{- label: {- display: "flex",- alignItems: "center",- },- remove: {- marginRight: 0,- },- }}- radius="xl"draggableonDragStart={(e) => {e.dataTransfer.setData("text/plain", id);@@ -274,7 +262,6 @@ export function ReorderableTagsInput({return (<SortablePill- size={size}key={v}id={v}label={data.find((o) => o.value === v)?.label ?? v}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.module.css b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.module.cssindex 3e36fdee838..dfaa0c96f65 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.module.css+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.module.css@@ -4,6 +4,7 @@border-radius: var(--default-border-radius);cursor: pointer;transition: background-color 150ms ease;+ box-shadow: none;}.metricPill:hover {diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsxindex 7efb253b8ef..6fd80e63e26 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx@@ -124,7 +124,7 @@ export function MetricPill({<PillclassName={S.metricPill}c="text-primary"- h="2rem"+ fz="md"px="sm"py="xs"fw={600}diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.module.css b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.module.cssindex cc09f638fdf..b0798cb3c16 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.module.css+++ b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.module.css@@ -2,6 +2,7 @@background-color: var(--mb-color-background_page-primary);border: 1px solid var(--mb-color-border-filter);border-radius: 0.75rem;+ box-shadow: none;}.root:hover {diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.tsxindex f03ff734dd4..d55cba96b5b 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPill.tsx@@ -31,7 +31,6 @@ export const MetricsFilterPill = forwardRef(function MetricsFilterPill({...props}ref={ref}className={cx(S.root, !!onClick && S.clickable)}- size="xs"h="lg"px="sm"fw="normal"@@ -46,13 +45,13 @@ export const MetricsFilterPill = forwardRef(function MetricsFilterPill(c: "text-filter",}}>- <Flex align="center" gap="xs" h="1.25rem">+ <Flex align="center" gap="xs"><SourceColorIndicatorcolors={colors}fallbackIcon={fallbackIcon}size={12}/>- <Text c="text-filter" fz="sm">+ <Text c="text-filter" fz="sm" lh="1">{children}</Text></Flex>diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPillPopover.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPillPopover.tsxindex 816380be3d6..65e489fbf0f 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPillPopover.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricsFilterPills/MetricsFilterPillPopover.tsx@@ -69,7 +69,7 @@ export function MetricsFilterPillPopover({<Flex align="center" gap="xs">{metricName && (<Flex align="center">- <Text component="span" fw={700} c="inherit" fz="inherit">+ <Text component="span" fw={700} c="inherit" fz="inherit" lh="1">{metricName}</Text>{(metricCount ?? 0) > 1 && (@@ -84,14 +84,14 @@ export function MetricsFilterPillPopover({{metricCount}</Badge>)}- <Text component="span" fw={700} c="inherit" fz="inherit">+ <Text component="span" fw={700} c="inherit" fz="inherit" lh="1">{", "}</Text></Flex>)}{displayParts.label}{displayParts.value && (- <Text component="span" fw={700} c="inherit" fz="inherit">+ <Text component="span" fw={700} c="inherit" fz="inherit" lh="1">{" "}{displayParts.value}</Text>diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunTable/TagList/TagList.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/TagList/TagList.tsxindex 67b3d6c6751..ebd295c6484 100644--- a/frontend/src/metabase/transforms/pages/RunListPage/RunTable/TagList/TagList.tsx+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunTable/TagList/TagList.tsx@@ -9,9 +9,7 @@ export function TagList({ tags }: TagListProps) {return (<Group gap="sm">{tags.map((tag) => (- <Pill key={tag.id} c="text-primary" bg="background_page-secondary">- {tag.name}- </Pill>+ <Pill key={tag.id}>{tag.name}</Pill>))}</Group>);diff --git a/frontend/src/metabase/ui/components/inputs/Pill/Pill.config.ts b/frontend/src/metabase/ui/components/inputs/Pill/Pill.config.tsindex 4ba6d881d6e..6d2e639c234 100644--- a/frontend/src/metabase/ui/components/inputs/Pill/Pill.config.ts+++ b/frontend/src/metabase/ui/components/inputs/Pill/Pill.config.ts@@ -4,8 +4,12 @@ import S from "./Pill.module.css";export const pillOverrides: MantineThemeOverride["components"] = {Pill: Pill.extend({+ defaultProps: {+ size: "sm",+ },classNames: {root: S.root,+ label: S.label,remove: S.remove,},}),diff --git a/frontend/src/metabase/ui/components/inputs/Pill/Pill.module.css b/frontend/src/metabase/ui/components/inputs/Pill/Pill.module.cssindex 2f970fd1848..922fff02a1a 100644--- a/frontend/src/metabase/ui/components/inputs/Pill/Pill.module.css+++ b/frontend/src/metabase/ui/components/inputs/Pill/Pill.module.css@@ -1,26 +1,53 @@.root {height: unset;- padding: 1px var(--mantine-spacing-sm);- font-weight: bold;+ padding: 0.125rem var(--mantine-spacing-sm);+ gap: var(--mantine-spacing-xs);+ font-weight: 500;+ font-size: var(--mantine-font-size-sm);+ line-height: 1rem;+ border-radius: 999px;+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-background-primary);+ box-shadow: var(--mantine-shadow-xs);+}++.root[data-with-remove] {+ padding-inline-end: 0.375rem;+}++.root[data-size="md"] {+ padding: 0.375rem 0.75rem;+ gap: 0.375rem;font-size: var(--mantine-font-size-md);- border-radius: var(--mantine-radius-xs);- color: var(--mb-color-text-selected);- background-color: var(--mb-color-background_surface-brand-subtle);+}++.root[data-size="md"][data-with-remove] {+ padding-inline-end: var(--mantine-spacing-sm);+}++.root[data-disabled] {+ color: var(--mb-color-text-disabled);+}++.label {+ display: flex;+ align-items: center;+ line-height: 1rem;}.remove {- --cb-size: 1rem;+ --cb-size: 0.75rem;--cb-icon-size: 0.75rem;+ display: flex;+ align-items: center;padding: 0;border: none;min-width: var(--cb-size);min-height: var(--cb-size);+ opacity: 0.5;+}- [dir="ltr"] &,- [dir="rtl"] & {- padding: 0;- margin-left: var(--mantine-spacing-xs);- margin-right: var(--mantine-spacing-xs);- }+.root:hover .remove {+ opacity: 1;}diff --git a/frontend/src/metabase/ui/components/inputs/Pill/Pill.stories.tsx b/frontend/src/metabase/ui/components/inputs/Pill/Pill.stories.tsxnew file mode 100644index 00000000000..d77353efe89--- /dev/null+++ b/frontend/src/metabase/ui/components/inputs/Pill/Pill.stories.tsx@@ -0,0 +1,98 @@+import type { StoryFn } from "@storybook/react";+import { Fragment } from "react";++import { Box, Pill, type PillProps, Text } from "metabase/ui";+import { StoryJsx, StoryShowcase } from "metabase/ui/stories/showcase";++const argTypes = {+ children: { control: { type: "text" } },+ size: { control: { type: "inline-radio" }, options: ["sm", "md"] },+ withRemoveButton: { control: { type: "boolean" } },+ disabled: { control: { type: "boolean" } },+};++export default {+ title: "Components/Inputs/Pill",+ component: Pill,+ args: {+ children: "Pill",+ },+ argTypes,+};++const Template: StoryFn<PillProps> = (args) => <Pill {...args} />;++export const Default = {+ render: Template,+};++const COLUMNS = [+ { size: "sm", withRemoveButton: false, jsx: '<Pill size="sm" />' },+ {+ size: "sm",+ withRemoveButton: true,+ jsx: '<Pill size="sm" withRemoveButton />',+ },+ { size: "md", withRemoveButton: false, jsx: '<Pill size="md" />' },+ {+ size: "md",+ withRemoveButton: true,+ jsx: '<Pill size="md" withRemoveButton />',+ },+] as const;++const STATES = [+ { id: "default", label: "Default" },+ { id: "hover", label: "Hover" },+ { id: "disabled", label: "Disabled", disabled: true },+];++const Overview: StoryFn<PillProps> = ({ children }) => (+ <StoryShowcase title="Pill">+ <Box+ style={{+ display: "grid",+ gridTemplateColumns: `7rem repeat(${COLUMNS.length}, max-content)`,+ columnGap: "2rem",+ rowGap: "1rem",+ alignItems: "center",+ }}+ >+ <div />+ {COLUMNS.map(({ jsx }) => (+ <StoryJsx key={jsx}>{jsx}</StoryJsx>+ ))}+ {STATES.map((state) => (+ <Fragment key={state.id}>+ <Text size="sm" c="text-secondary">+ {state.label}+ </Text>+ {COLUMNS.map(({ size, withRemoveButton }) => (+ <Box+ key={`${size}-${String(withRemoveButton)}`}+ style={{ width: "max-content" }}+ >+ <Pill+ data-state-row={state.id}+ size={size}+ withRemoveButton={withRemoveButton}+ disabled={state.disabled ?? false}+ onRemove={() => {}}+ >+ {children}+ </Pill>+ </Box>+ ))}+ </Fragment>+ ))}+ </Box>+ </StoryShowcase>+);++export const OverviewStory = {+ render: Overview,+ parameters: {+ pseudo: { hover: '[data-state-row="hover"]' },+ controls: { include: ["children", "theme"] },+ },+};diff --git a/frontend/src/metabase/ui/components/inputs/Pill/index.ts b/frontend/src/metabase/ui/components/inputs/Pill/index.tsindex 798464a4469..c1eec5ec53f 100644--- a/frontend/src/metabase/ui/components/inputs/Pill/index.ts+++ b/frontend/src/metabase/ui/components/inputs/Pill/index.ts@@ -1,2 +1,2 @@-export { Pill } from "@mantine/core";+export { Pill, type PillProps } from "@mantine/core";export { pillOverrides } from "./Pill.config";diff --git a/frontend/src/metabase/ui/theme.ts b/frontend/src/metabase/ui/theme.tsindex d0a9f9ecf4e..d7f617e2c0c 100644--- a/frontend/src/metabase/ui/theme.ts+++ b/frontend/src/metabase/ui/theme.ts@@ -86,7 +86,8 @@ export const getThemeOverrides = (colorScheme,},shadows: {- xs: "0 0 0 0.5px var(--mb-color-border-neutral), 0 1px 2px 0 var(--mb-color-shadow-default)",+ // eslint-disable-next-line metabase/no-color-literals+ xs: "0 0 0 0.5px rgba(0, 0, 0, 0.07), 0 1px 3px 0 rgba(0, 0, 0, 0.07)",// eslint-disable-next-line metabase/no-color-literalssm: "0px 1px 4px 2px rgba(0, 0, 0, 0.08)",// eslint-disable-next-line metabase/no-color-literals