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
GDGT-2458: Accordion (#82562)
Anna Tomkabc75a88888f9
diff --git a/.loki/reference/chrome_laptop_Components_Data_display_Accordion_Overview.png b/.loki/reference/chrome_laptop_Components_Data_display_Accordion_Overview.pngnew file mode 100644index 00000000000..4cbd5b8e118Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Data_display_Accordion_Overview.png differdiff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/__snapshots__/DataComplexityCards.unit.spec.tsx.snap b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/__snapshots__/DataComplexityCards.unit.spec.tsx.snapindex a97fbf8efe1..690f34eac3e 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/__snapshots__/DataComplexityCards.unit.spec.tsx.snap+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/__snapshots__/DataComplexityCards.unit.spec.tsx.snap@@ -194,7 +194,7 @@ exports[`DataComplexityCards renders the data complexity cards 2`] = `</div><divdata-accordion="true"- data-variant="default"+ data-variant="separated"><div><button@@ -345,7 +345,7 @@ exports[`DataComplexityCards renders the data complexity cards 2`] = `</div><divdata-accordion="true"- data-variant="default"+ data-variant="separated"><div><buttondiff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncDependencyModal.module.css b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncDependencyModal.module.cssindex d33928c4846..f1d13a61693 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncDependencyModal.module.css+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncDependencyModal.module.css@@ -3,22 +3,16 @@* rules in metabase/ui's Accordion.module.css. The compound selectors are written flat on purpose:* nesting them would make postcss-nesting wrap them in `:is()` and change the specificity math.*/-.accordion .item,-.accordion .item + .item,-.accordion .item[data-active] {- border: 0;- border-radius: 0;-}/* Padding lives on the row around it, which the switch shares. */.accordion .control {+ background-color: transparent;flex: 1;min-width: 0;padding: 0;}.accordion .label {- color: var(--mb-color-text-primary);font-size: inherit;font-weight: normal;line-height: inherit;@@ -26,15 +20,10 @@}.accordion .chevron {- border: 0;color: var(--mb-color-text-secondary);- height: auto;- margin-left: 0;- width: auto;}.accordion .content {- border-top: none;padding-top: 1rem;padding-left: 3rem;}diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncDependencyModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncDependencyModal.tsxindex e01c8ccb041..e36e3489bb4 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncDependencyModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncDependencyModal.tsx@@ -139,7 +139,7 @@ const RequiredSyncItem = ({});return (- <Accordion.Item value={row.key} mt="sm">+ <Accordion.Item value={row.key}>{/* The switch sits outside the control, so flipping it doesn't also toggle the panel. */}<Groupgap="sm"diff --git a/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsxindex 55200a189a6..8fb2d68a1e2 100644--- a/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx+++ b/frontend/src/metabase/admin/ai/MetabotSlackSetup.tsx@@ -255,7 +255,7 @@ export function MetabotSlackSetup() {function ConnectionDetails({ children }: { children: React.ReactNode }) {return (- <Accordion variant="contained" radius="sm">+ <Accordion><Accordion.Item value="connection"><Accordion.Control>{t`View connection details`}</Accordion.Control><Accordion.Panel>diff --git a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx b/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsxindex 7e697c8414d..d0972e85ed6 100644--- a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx+++ b/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx@@ -10,7 +10,6 @@ import {Accordion,Box,Flex,- Icon,List,Stack,Text,@@ -40,10 +39,7 @@ export const DataPermissionsHelp = () => {<Title order={3}>{t`Data permissions`}</Title><Text my="1rem">{t`People can be members of multiple groups, and Metabase grants them the most permissive level of access across all of a person's groups.`}</Text></Box>- <Accordion- chevron={<Icon name="chevrondown" size={12} />}- defaultValue="database-level"- >+ <Accordion defaultValue="database-level"><Accordion.Itemvalue="database-view-data-level"data-testid="database-view-data-level"diff --git a/frontend/src/metabase/home/components/Onboarding/Onboarding.module.css b/frontend/src/metabase/home/components/Onboarding/Onboarding.module.cssindex 6d6f2b4b299..bcc92459416 100644--- a/frontend/src/metabase/home/components/Onboarding/Onboarding.module.css+++ b/frontend/src/metabase/home/components/Onboarding/Onboarding.module.css@@ -35,6 +35,7 @@color: var(--mb-color-text-primary);height: 3rem;padding-inline-start: 0;+ background-color: transparent;}.accordion .control:hover {@@ -65,6 +66,7 @@.accordion .control:hover .icon {background-color: var(--mb-color-background_surface-brand-subtle-hover);+ color: var(--mb-color-core-brand);}.accordion .control[data-active] .icon {diff --git a/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsx b/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsxindex a51f9e65b86..05c1b2fca2c 100644--- a/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsx+++ b/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsx@@ -134,9 +134,7 @@ export function AddDimensionsPanel({>{groups.map(({ group, dimensions }) => (<Accordion.Item key={group.id} value={group.id}>- <Accordion.Control- icon={<Icon name="table" c="text-secondary" />}- >+ <Accordion.Control icon={<Icon name="table" />}>{group.display_name}</Accordion.Control><Accordion.Panel>diff --git a/frontend/src/metabase/settings-components/SettingsSection/SettingsSection.module.css b/frontend/src/metabase/settings-components/SettingsSection/SettingsSection.module.cssindex f38b2bde096..2a3e4250183 100644--- a/frontend/src/metabase/settings-components/SettingsSection/SettingsSection.module.css+++ b/frontend/src/metabase/settings-components/SettingsSection/SettingsSection.module.css@@ -95,6 +95,8 @@/* the card fades as a whole, so the disabled control must not fade a second time */.CollapsibleAccordion .CollapsibleControl:disabled {opacity: 1;+ background-color: transparent;+ color: inherit;}/* a disabled card is a preview rather than a blocked action, so its header shows a plain cursor */diff --git a/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.config.ts b/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.config.tsxsimilarity index 57%rename from frontend/src/metabase/ui/components/data-display/Accordion/Accordion.config.tsrename to frontend/src/metabase/ui/components/data-display/Accordion/Accordion.config.tsxindex aea2504d288..82701362c0e 100644--- a/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.config.ts+++ b/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.config.tsx@@ -1,12 +1,24 @@import { Accordion } from "@mantine/core";+import { Icon } from "../../icons";+import AccordionStyles from "./Accordion.module.css";+const CHEVRON_SIZE = 12;+export const accordionOverrides = {Accordion: Accordion.extend({+ defaultProps: {+ variant: "separated",+ radius: "sm",+ chevron: <Icon name="chevrondown" size={CHEVRON_SIZE} aria-hidden />,+ chevronSize: CHEVRON_SIZE,+ },classNames: {+ root: AccordionStyles.root,control: AccordionStyles.control,label: AccordionStyles.label,+ icon: AccordionStyles.icon,item: AccordionStyles.item,content: AccordionStyles.content,chevron: AccordionStyles.chevron,diff --git a/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.module.css b/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.module.cssindex eb2244c5b4d..abdbe2f0b3c 100644--- a/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.module.css+++ b/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.module.css@@ -1,53 +1,87 @@-.control {- padding-inline: var(--mantine-spacing-lg);- padding-left: 0.875rem;-}--.label {- color: var(--mb-color-core-brand);- font-weight: 700;- padding-top: 1rem;- padding-bottom: 1rem;- font-size: 1rem;- line-height: 1rem;+.root {+ display: flex;+ flex-direction: column;+ gap: var(--mantine-spacing-xxs);}+/* Undo the styling of Mantine's separated variant (item border, active background, 12px spacing) */.item {- border: 1px solid var(--mb-color-border-neutral);- border-radius: var(--mantine-spacing-sm);+ background-color: transparent;+ border: 0;&[data-active] {- border: 1px solid var(--mb-color-border-neutral);+ background-color: transparent;}& + & {- margin-top: 0.75rem;+ margin-top: 0;}+}- /* We need the extra specificity for outline: none */- .control:focus {- outline: none;+.control {+ padding-block: var(--mantine-spacing-md);+ padding-inline: var(--mantine-spacing-lg);+ border-radius: var(--accordion-radius);+ background-color: var(--mb-color-background_surface-secondary);+ color: var(--mb-color-text-primary);+ transition: background-color 150ms ease;++ &:hover {+ background-color: var(--mb-color-background_surface-secondary-hover);+ }++ &:active {+ background-color: var(--mb-color-background_surface-secondary-pressed);+ }++ &:disabled,+ &[data-disabled] {+ background-color: var(--mb-color-background_surface-disabled);+ color: var(--mb-color-text-disabled);+ opacity: 1;}}-.content {- padding: var(--mantine-spacing-lg);- padding-top: calc(var(--mantine-spacing-xxs) / 2);- border-top: 1px solid var(--mb-color-border-neutral);- color: var(--mb-color-text-primary);+.label {+ padding-block: 0;+ font-size: var(--mantine-font-size-md);+ line-height: rem(20px);+ font-weight: 500;}.chevron {- color: var(--mb-color-text-primary);- border: 1px solid var(--mb-color-border-neutral);- border-radius: 100%;- margin-left: 1rem;- height: 1.75rem;- width: 1.75rem;- justify-content: center;+ margin-inline-start: var(--mantine-spacing-xl);++ &[data-position="left"] {+ margin-inline-start: 0;+ margin-inline-end: var(--mantine-spacing-sm);+ }+}++.icon {+ /* from Figma: icon can be shown only if the chevron is on the right */+ &[data-chevron-position="left"] {+ display: none;+ }+}++.control:hover .icon,+.control:active .icon {+ color: var(--mb-color-text-brand-hover);+}++.control:disabled .icon {+ color: inherit;+}++.content {+ padding: var(--mantine-spacing-xxs) var(--mantine-spacing-lg)+ var(--mantine-spacing-lg);+ color: var(--mb-color-text-secondary);+ font-size: var(--mantine-font-size-md);+ line-height: rem(20px);}.panel {word-break: break-word;- line-height: 1rem;}diff --git a/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.stories.tsx b/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.stories.tsxnew file mode 100644index 00000000000..8dae42ec4bd--- /dev/null+++ b/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.stories.tsx@@ -0,0 +1,139 @@+import type { StoryFn } from "@storybook/react";+import { Fragment } from "react";++import { Accordion, type AccordionProps, Box, Icon, Text } from "metabase/ui";+import { StoryJsx, StoryShowcase } from "metabase/ui/stories/showcase";++import S from "./Accordion.module.css";++const PANEL_TEXT =+ "Accordion allows users to expand and collapse sections of content. It helps manage large amounts of information in a limited space by showing only the section headers initially and revealing content on interaction.";++const ITEM_VALUES = ["first", "second", "third"] as const;++const args = {+ chevronPosition: "right",+};++const argTypes = {+ chevronPosition: {+ options: ["right", "left"],+ control: { type: "inline-radio" },+ },+};++export default {+ title: "Components/Data display/Accordion",+ component: Accordion,+ args,+ argTypes,+};++const Template: StoryFn<AccordionProps> = (args) => (+ <Box w={320}>+ <Accordion variant="separated" defaultValue="first" {...args}>+ {ITEM_VALUES.map((value) => (+ <Accordion.Item key={value} value={value}>+ <Accordion.Control icon={<Icon name="model" />}>+ Label+ </Accordion.Control>+ <Accordion.Panel>{PANEL_TEXT}</Accordion.Panel>+ </Accordion.Item>+ ))}+ </Accordion>+ </Box>+);++export const Default = {+ render: Template,+};++const COLUMNS = [+ { id: "right", chevronPosition: "right", withIcon: false },+ { id: "right-icon", chevronPosition: "right", withIcon: true },+ { id: "left", chevronPosition: "left", withIcon: false },+] as const;++const COLUMN_JSX: Record<(typeof COLUMNS)[number]["id"], string> = {+ right: `<Accordion variant="separated" chevronPosition="right" />`,+ "right-icon": `<Accordion.Control icon={<Icon />} />`,+ left: `<Accordion variant="separated" chevronPosition="left" />`,+};++const STATES = [+ { id: "closed", label: "Closed" },+ { id: "closed-hover", label: "Closed, hover" },+ { id: "closed-pressed", label: "Closed, pressed" },+ { id: "open", label: "Open", open: true },+ { id: "open-hover", label: "Open, hover", open: true },+ { id: "open-pressed", label: "Open, pressed", open: true },+ { id: "disabled", label: "Disabled", disabled: true },+ { id: "disabled-hover", label: "Disabled, hover", disabled: true },+] satisfies {+ id: string;+ label: string;+ open?: boolean;+ disabled?: boolean;+}[];++// Hover and pressed live on the control button, not on the item, so the+// pseudo-state selector reaches through the row hook to the control slot.+const controlSelector = (id: string) =>+ `[data-state-row="${id}"] .${S.control}`;++const OverviewTemplate: StoryFn<AccordionProps> = () => (+ <StoryShowcase title="Accordion">+ <Box+ style={{+ display: "grid",+ gridTemplateColumns: `9rem repeat(${COLUMNS.length}, 320px)`,+ columnGap: "2rem",+ rowGap: "0.5rem",+ alignItems: "center",+ }}+ >+ <div />+ {COLUMNS.map((column) => (+ <StoryJsx key={column.id}>{COLUMN_JSX[column.id]}</StoryJsx>+ ))}+ {STATES.map((state) => (+ <Fragment key={state.id}>+ <Text size="sm" c="text-secondary">+ {state.label}+ </Text>+ {COLUMNS.map((column) => (+ <Accordion+ key={`${state.id}-${column.id}`}+ variant="separated"+ chevronPosition={column.chevronPosition}+ defaultValue={state.open ? "item" : null}+ >+ <Accordion.Item value="item" data-state-row={state.id}>+ <Accordion.Control+ icon={column.withIcon ? <Icon name="model" /> : undefined}+ disabled={state.disabled}+ >+ Label+ </Accordion.Control>+ <Accordion.Panel>{PANEL_TEXT}</Accordion.Panel>+ </Accordion.Item>+ </Accordion>+ ))}+ </Fragment>+ ))}+ </Box>+ </StoryShowcase>+);++export const Overview = {+ render: OverviewTemplate,+ parameters: {+ pseudo: {+ hover: ["closed-hover", "open-hover", "disabled-hover"].map(+ controlSelector,+ ),+ active: ["closed-pressed", "open-pressed"].map(controlSelector),+ },+ controls: { include: ["theme"] },+ },+};diff --git a/loki.config.js b/loki.config.jsindex 87e79c47030..23fed4d0d05 100644--- a/loki.config.js+++ b/loki.config.js@@ -31,6 +31,7 @@ module.exports = {"^Components/Data display/KeyboardShortcut Overview","^Components/Table","^Components/Inputs/PasswordInput Overview",+ "^Components/Data display/Accordion Overview","^App/Palette","^viz/GridMapPdfExport","ParameterValueWidget",