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-3240: SegmentedControl (#82657)
Will Fry121fa7febe10
diff --git a/.loki/reference/chrome_laptop_Components_Inputs_SegmentedControl_Overview.png b/.loki/reference/chrome_laptop_Components_Inputs_SegmentedControl_Overview.pngnew file mode 100644index 00000000000..e95732d2db6Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Inputs_SegmentedControl_Overview.png differdiff --git a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png b/.loki/reference/chrome_laptop_Design_System_Colors_Default.pngindex 130f76b7295..db456e30be7 100644Binary files a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png and b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png differdiff --git a/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsx b/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsxindex d4381b9287b..1674bd36c3b 100644--- a/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsx+++ b/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsx@@ -55,13 +55,12 @@ export function FormCollectionAuthorityLevel({data={getOptions().map((option) => ({value: String(option.value),label: (- <Center style={{ gap: 10 }} c={option.selectedColor}>+ <Center style={{ gap: 10 }}><Icon name={option.icon} />{option.label}</Center>),}))}- variant="fill-background"/></FormField>);diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsxindex 8d589a8f27d..165ce15ebc3 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx@@ -97,7 +97,6 @@ function SortOptionsPopover({<SegmentedControlvalue={sortOptions.direction}data={getSortDirectionItems()}- size="sm"fullWidthonChange={handleDirectionChange}/>diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsxindex 3c4729db50d..c2f9719e6a6 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx@@ -137,9 +137,6 @@ function GoogleSheetsConnectModal({<ModalWrapper onClose={onClose} title={t`Import Google Sheets`}><SegmentedControl<UploadType>fullWidth- autoContrast- color="core-brand"- c="text-primary-inverse"value={linkType}onChange={setLinkType}data={diff --git a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsxindex 343e603bf5f..1283209ba0b 100644--- a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx+++ b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx@@ -82,15 +82,10 @@ export const ExportSettingsWidget = ({return (<Stack gap="xl"><SegmentedControl- w="100%"+ fullWidthdata={formatOptions}value={selectedFormat}onChange={onChangeFormat}- styles={{- root: {- backgroundColor: "var(--mb-color-background_page-secondary)",- },- }}/>{canConfigureFormatting ? (diff --git a/frontend/src/metabase/common/components/Schedule/components.tsx b/frontend/src/metabase/common/components/Schedule/components.tsxindex d3bb66afb19..310e19d3e1f 100644--- a/frontend/src/metabase/common/components/Schedule/components.tsx+++ b/frontend/src/metabase/common/components/Schedule/components.tsx@@ -134,8 +134,6 @@ export const SelectTime = ({<Group gap="sm">{isClock12Hour && (<SegmentedControl<AmPm>- lh="1rem"- radius="xs"value={amPm}onChange={(value) => {setPendingAmPm(value);diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.stories.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.stories.tsxindex 26f74b93ba0..d35dfb210de 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.stories.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.stories.tsx@@ -101,7 +101,6 @@ const ControlledParametersEmbedJsPlayground = () => {{STORYBOOK_METABASE_INSTANCE_URL} (logged-in session required).</Text><SegmentedControl- size="xs"value={mode}// Unjustified type cast. FIXMEonChange={(value) => setMode(value as Mode)}diff --git a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsx b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsxindex b4067ee144b..d4aee7896da 100644--- a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsx+++ b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsx@@ -267,8 +267,6 @@ export function ExplorationSidebar({<Box flex={1} miw={0}><SegmentedControl<ExplorationSidebarTab>fullWidth- radius="xl"- bg="background-tertiary"value={selectedSidebarTab}onChange={(value) => {if (diff --git a/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.module.css b/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.module.cssdeleted file mode 100644index e737b577946..00000000000--- a/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.module.css+++ /dev/null@@ -1,19 +0,0 @@-.root {- --sc-background-color: var(- --mantine-color-accent-gray-light-filled- ) !important;-- /**- * We're using :after to apply a border here, to prevent increasing element's height.- */- &:after {- content: "";- position: absolute;- top: 0;- right: 0;- bottom: 0;- left: 0;- border: 1px solid var(--mb-color-border-neutral);- border-radius: inherit;- }-}diff --git a/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.tsx b/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.tsxindex 58ee77d9f4a..3e9235b57ad 100644--- a/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.tsx+++ b/frontend/src/metabase/metadata/components/FieldOrderPicker/FieldOrderPicker.tsx@@ -4,7 +4,6 @@ import { t } from "ttag";import { SegmentedControl, type SegmentedControlProps } from "metabase/ui";import type { TableFieldOrder } from "metabase-types/api";-import S from "./FieldOrderPicker.module.css";import { Label } from "./Label";interface Props extends Omit<@@ -33,9 +32,7 @@ export const FieldOrderPicker = ({ value, onChange, ...props }: Props) => {return (<SegmentedControlaria-label={t`Column order`}- className={S.root}data={data}- size="sm"value={localValue}onChange={handleChange}{...props}diff --git a/frontend/src/metabase/query_builder/components/view/QuestionDisplayToggle/QuestionDisplayToggle.module.css b/frontend/src/metabase/query_builder/components/view/QuestionDisplayToggle/QuestionDisplayToggle.module.cssdeleted file mode 100644index ae60c9ee06d..00000000000--- a/frontend/src/metabase/query_builder/components/view/QuestionDisplayToggle/QuestionDisplayToggle.module.css+++ /dev/null@@ -1,44 +0,0 @@-.Well {- display: flex;- align-items: center;- padding: 4px 6px;- border-radius: 99px;- background-color: var(--mb-color-background_page-tertiary);- transition: background 300ms linear;- cursor: pointer;-- &:hover {- background-color: color-mix(- in srgb,- var(--mb-color-background_page-tertiary),- black 5%- );- }-- &:focus-visible {- outline: 2px solid var(--mb-color-input-focus);- outline-offset: 1px;- }-}--.ToggleIcon {- display: flex;- padding: 4px 8px;- background-color: transparent;- border-radius: 99px;- outline: none;- cursor: pointer;-- &.active {- background-color: var(--mb-color-core-brand);- }-}--.InnerLabel {- color: var(--mb-color-text-secondary);- transition: 300ms;-- &.activeLabel {- color: var(--mb-color-text-primary-inverse);- }-}diff --git a/frontend/src/metabase/query_builder/components/view/QuestionDisplayToggle/QuestionDisplayToggle.tsx b/frontend/src/metabase/query_builder/components/view/QuestionDisplayToggle/QuestionDisplayToggle.tsxindex 4e87e9042ec..f3c1fc2fc1d 100644--- a/frontend/src/metabase/query_builder/components/view/QuestionDisplayToggle/QuestionDisplayToggle.tsx+++ b/frontend/src/metabase/query_builder/components/view/QuestionDisplayToggle/QuestionDisplayToggle.tsx@@ -1,11 +1,8 @@-import cx from "classnames";import { t } from "ttag";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import { Icon, SegmentedControl } from "metabase/ui";-import QuestionDisplayToggleS from "./QuestionDisplayToggle.module.css";-export interface QuestionDisplayToggleProps {className?: string;isShowingRawTable: boolean;@@ -30,51 +27,26 @@ export const QuestionDisplayToggle = ({return (<SegmentedControlclassNames={{- root: cx(QuestionDisplayToggleS.Well, className),- label: QuestionDisplayToggleS.ToggleIcon,- indicator: cx(- QuestionDisplayToggleS.ToggleIcon,- QuestionDisplayToggleS.active,- ),+ root: className,}}- onClick={(e) => {- e.preventDefault();+ onChange={() => {onToggleRawTable(!isShowingRawTable);}}- onKeyDown={(e) => {- if (e.key === "Enter" || e.key === " ") {- e.preventDefault();- onToggleRawTable(!isShowingRawTable);- }- }}- tabIndex={0}value={isShowingRawTable ? "data" : "visualization"}data-testid="query-display-tabular-toggle"data={[{- disabled: true,value: "data",label: (- <Icon- size={16}- name="table2"- className={cx(QuestionDisplayToggleS.InnerLabel, {- [QuestionDisplayToggleS.activeLabel]: isShowingRawTable,- })}- aria-label={t`Switch to data`}- />+ <Icon size={16} name="table2" aria-label={t`Switch to data`} />),},{- disabled: true,value: "visualization",label: (<Iconsize={16}name="lineandbar"- className={cx(QuestionDisplayToggleS.InnerLabel, {- [QuestionDisplayToggleS.activeLabel]: !isShowingRawTable,- })}aria-label={t`Switch to visualization`}/>),diff --git a/frontend/src/metabase/ui/colors/constants/themes/dark.ts b/frontend/src/metabase/ui/colors/constants/themes/dark.tsindex 78e2e24b8a1..9f3761956b1 100644--- a/frontend/src/metabase/ui/colors/constants/themes/dark.ts+++ b/frontend/src/metabase/ui/colors/constants/themes/dark.ts@@ -244,6 +244,9 @@ const getActualColors = (brand: BrandRamp) => ({"navbar-admin": baseColors.octopus[80],"navbar-admin-inverse": baseColors.octopus[60],"navbar-admin-secondary": baseColors.octopus[60],+ "segmented_control-hover": baseColors.orionAlphaInverse[30],+ "segmented_control-pressed": baseColors.orionAlphaInverse[20],+ "segmented_control-selected": baseColors.orionAlphaInverse[20],"shadow-default": ORION_110_ALPHA_20,"switch-checked": brand[30],"switch-disabled": baseColors.orionAlphaInverse[20],diff --git a/frontend/src/metabase/ui/colors/constants/themes/light.ts b/frontend/src/metabase/ui/colors/constants/themes/light.tsindex e04f00aef0d..3290931d456 100644--- a/frontend/src/metabase/ui/colors/constants/themes/light.ts+++ b/frontend/src/metabase/ui/colors/constants/themes/light.ts@@ -250,6 +250,9 @@ const getActualColors = (brand: BrandRamp) => ({"navbar-admin": baseColors.octopus[60],"navbar-admin-inverse": baseColors.octopus[80],"navbar-admin-secondary": baseColors.octopus[40],+ "segmented_control-hover": baseColors.orionAlpha[10],+ "segmented_control-pressed": baseColors.orionAlpha[20],+ "segmented_control-selected": baseColors.white,"shadow-default": baseColors.orionAlpha[20],"switch-checked": brand[60],"switch-disabled": baseColors.orionAlpha[20],diff --git a/frontend/src/metabase/ui/colors/types/color-keys.ts b/frontend/src/metabase/ui/colors/types/color-keys.tsindex 641333baa83..58a8bea2004 100644--- a/frontend/src/metabase/ui/colors/types/color-keys.ts+++ b/frontend/src/metabase/ui/colors/types/color-keys.ts@@ -230,6 +230,9 @@ export type MetabaseColorKey =| "input-background"| "input-focus"| "modal-overlay"+ | "segmented_control-hover"+ | "segmented_control-pressed"+ | "segmented_control-selected"| "shadow-default"| "switch-checked"| "switch-disabled"diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.config.ts b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.config.tsindex d95046b23c0..836198c0181 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.config.ts+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.config.ts@@ -1,8 +1,6 @@import {- type MantineTheme,type MantineThemeOverride,SegmentedControl,- type SegmentedControlProps,rem,} from "@mantine/core";@@ -11,45 +9,16 @@ import S from "./SegmentedControl.module.css";export const segmentedControlOverrides: MantineThemeOverride["components"] = {SegmentedControl: SegmentedControl.extend({defaultProps: {- size: "md",- radius: rem(4),+ size: "sm",+ radius: rem(6),},classNames: {root: S.SegmentedControl,label: S.SegmentedControlLabel,+ innerLabel: S.SegmentedControlInnerLabel,control: S.SegmentedControl_Control,input: S.SegmentedControlInput,+ indicator: S.SegmentedControlIndicator,},- vars: (theme, props) => ({- root: {- "--sc-active-text-color": props.c ?? "var(--mb-color-text-primary)",- "--sc-background-color":- props.bg ?? "var(--mb-color-background_page-tertiary)",- ...(!props.color && {- "--sc-color": "var(--mb-color-background_page-primary)",- }),- "--sc-padding": getPadding(theme, props),- "--sc-font-size": theme.fontSizes.md,- },- }),}),};--function getPadding(- theme: MantineTheme,- { fullWidth, size }: SegmentedControlProps,-): string {- if (fullWidth) {- if (size === "sm") {- return `${theme.spacing.xxs} ${theme.spacing.sm}`;- }-- return `${theme.spacing.sm} ${theme.spacing.lg}`;- }-- if (size === "sm") {- return theme.spacing.xxs;- }-- return theme.spacing.sm;-}diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.mdx b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.mdxindex a1853ae0189..c3897c3686e 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.mdx+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.mdx@@ -1,6 +1,4 @@-import { Canvas, Story, Meta } from "@storybook/blocks";-import { SegmentedControl, Box, Center } from "metabase/ui";-import { Icon } from "metabase/ui";+import { Canvas, Meta } from "@storybook/blocks";import * as SegmentedControlStories from "./SegmentedControl.stories";<Meta of={SegmentedControlStories} />@@ -15,12 +13,22 @@ Our themed wrapper around [Mantine SegmentedControl](https://mantine.dev/core/se## Examples-<Canvas of={SegmentedControlStories.Default} />+### Text only++<Canvas of={SegmentedControlStories.TextOnly} />++### Text + icon++<Canvas of={SegmentedControlStories.TextAndIcon} />++### Icon only++<Canvas of={SegmentedControlStories.IconOnly} />### Full width<Canvas of={SegmentedControlStories.FullWidth} />-## Colors+### Disabled-<Canvas of={SegmentedControlStories.Color} />+<Canvas of={SegmentedControlStories.Disabled} />diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.css b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.cssindex 67b5e0fb9c9..de6ee4705c3 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.css+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.css@@ -1,13 +1,27 @@.SegmentedControl {- background-color: var(--sc-background-color);+ padding: var(--mantine-spacing-xxs);+ border-radius: calc(+ /* inner radius + padding */ var(--mantine-radius-xs) ++ var(--mantine-spacing-xxs)+ );+ background-color: var(--mb-color-background_surface-secondary);+ display: inline-flex;+ gap: var(--mantine-spacing-xxs);++ &[data-full-width] {+ display: flex;+ }}.SegmentedControlLabel {- color: var(--mb-color-text-primary);- line-height: 1;+ color: var(--mb-color-text-secondary);+ font-weight: bold;+ padding: var(--mantine-spacing-xxs) var(--mantine-spacing-md);+ border-radius: var(--mantine-radius-xs);- &:hover {- color: var(--mb-color-core-brand);+ &:hover:not([data-active], [data-disabled]) {+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-segmented_control-hover);}&[data-disabled] {@@ -17,18 +31,27 @@}}+ &:active:not([data-active], [data-disabled]) {+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-segmented_control-pressed);+ }+&[data-active] {- &,- &:hover {- color: var(--sc-active-text-color);- }+ color: var(--mb-color-text-primary);}}-.SegmentedControl_Control {- &:not(:first-of-type) {- border-color: var(--mb-color-border-neutral);- }+.SegmentedControlInnerLabel {+ display: flex;+ align-items: center;+ justify-content: center;+ min-height: 1rem;+}++.SegmentedControlIndicator {+ padding: var(--mantine-spacing-xxs) var(--mantine-spacing-md);+ background-color: var(--mb-color-segmented_control-selected);+ box-shadow: var(--mantine-shadow-xs_outline);}.SegmentedControlInput {diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsx b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsxindex 7a4b7630a8f..3f14776faef 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsx+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsx@@ -1,76 +1,192 @@-import { Box, Center, Icon, SegmentedControl } from "metabase/ui";--const args = {- data: [- {- label: (- <Center>- <Icon name="embed" />- <Box ml="0.5rem">Code</Box>- </Center>- ),- value: "code",- },- {- label: (- <Center>- <Icon name="eye_filled" />- <Box ml="0.5rem">Preview</Box>- </Center>- ),- value: "preview",- },- ],- fullWidth: false,- shouldAnimate: true,-};+import type { StoryFn } from "@storybook/react";+import { Fragment } from "react";++import {+ Box,+ Group,+ Icon,+ SegmentedControl,+ type SegmentedControlItem,+ type SegmentedControlProps,+} from "metabase/ui";+import {+ StoryBoard,+ StoryJsx,+ StoryLabel,+ StorySection,+} from "metabase/ui/stories/showcase";++import S from "./SegmentedControl.module.css";++const TEXT_DATA = [+ { label: "Code", value: "code" },+ { label: "Preview", value: "preview" },+];++const TEXT_AND_ICON_DATA = [+ {+ label: (+ <Group gap="xs" wrap="nowrap">+ <Icon name="embed" />+ Code+ </Group>+ ),+ value: "code",+ },+ {+ label: (+ <Group gap="xs" wrap="nowrap">+ <Icon name="eye_filled" />+ Preview+ </Group>+ ),+ value: "preview",+ },+];++const ICON_DATA = [+ { label: <Icon name="embed" aria-label="Code" />, value: "code" },+ { label: <Icon name="eye_filled" aria-label="Preview" />, value: "preview" },+];export default {title: "Components/Inputs/SegmentedControl",component: SegmentedControl,- args,};-export const Default = {};+export const TextOnly = {+ name: "Text only",+ args: { data: TEXT_DATA },+};++export const TextAndIcon = {+ name: "Text + icon",+ args: { data: TEXT_AND_ICON_DATA },+};++export const IconOnly = {+ name: "Icon only",+ args: { data: ICON_DATA },+};export const FullWidth = {name: "Full width",- args: {- data: [- {- label: "Light",- value: "light",- },- {- label: "Dark",- value: "dark",- },- {- label: "Transparent",- value: "transparent",- },- ],- fullWidth: true,- },+ args: { data: TEXT_AND_ICON_DATA, fullWidth: true },+};++export const Disabled = {+ name: "Disabled (text + icon)",+ args: { data: TEXT_AND_ICON_DATA, disabled: true },+};++const CONTENT_KINDS: {+ id: string;+ label: string;+ data: SegmentedControlItem<string>[];+}[] = [+ { id: "text", label: "Text only", data: TEXT_DATA },+ { id: "text-and-icon", label: "Text + icon", data: TEXT_AND_ICON_DATA },+ { id: "icon", label: "Icon only", data: ICON_DATA },+];++type OverviewState = {+ id: string;+ label: string;+ /** JSX shown in place of the label when the state comes from props. */+ jsx?: string;+ props?: Partial<SegmentedControlProps<string>>;+ disabledItem?: boolean;};-export const Color = {- args: {- data: [- {- label: "Light",- value: "light",- },- {- label: "Dark",- value: "dark",- },- {- label: "Transparent",- value: "transparent",- },- ],- color: "core-brand",- c: "var(--mb-color-text-primary-inverse)",+const OVERVIEW_STATES: OverviewState[] = [+ { id: "default", label: "Default" },+ { id: "hover", label: "Hover" },+ { id: "pressed", label: "Pressed" },+ {+ id: "disabled",+ label: "Disabled",+ jsx: "<SegmentedControl disabled />",+ props: { disabled: true },+ },+ {+ id: "disabled-item",+ label: "Disabled item",+ jsx: '<SegmentedControl data={[…, { value: "preview", disabled: true }]} />',+ disabledItem: true,+ },+];++const withSecondItemDisabled = (data: SegmentedControlItem<string>[]) =>+ data.map((item, index) => (index === 1 ? { ...item, disabled: true } : item));++// The hover/pressed rules sit on the label slot, and exclude the active one,+// so targeting every label in the row forces the unselected segment only.+const labelSelectorFor = (id: string) =>+ `[data-state-row="${id}"] .${S.SegmentedControlLabel}`;++const gridStyle = {+ display: "grid",+ gridTemplateColumns: `9rem repeat(${CONTENT_KINDS.length}, max-content)`,+ columnGap: "1rem",+ rowGap: "1rem",+ alignItems: "center",+} as const;++const OverviewTemplate: StoryFn = () => (+ <StoryBoard title="SegmentedControl" padding="2rem">+ <StorySection title="States">+ <Box style={gridStyle}>+ <div />+ {CONTENT_KINDS.map(({ id, label }) => (+ <StoryLabel key={id}>{label}</StoryLabel>+ ))}+ {OVERVIEW_STATES.map((state) => (+ <Fragment key={state.id}>+ {state.jsx ? (+ <StoryJsx>{state.jsx}</StoryJsx>+ ) : (+ <StoryLabel>{state.label}</StoryLabel>+ )}+ {CONTENT_KINDS.map((kind) => (+ <Box key={kind.id}>+ <SegmentedControl+ data-state-row={state.id}+ data={+ state.disabledItem+ ? withSecondItemDisabled(kind.data)+ : kind.data+ }+ defaultValue="code"+ {...state.props}+ />+ </Box>+ ))}+ </Fragment>+ ))}+ </Box>+ </StorySection>++ <StorySection title="Full width">+ <Box w="24rem">+ <StoryJsx>{"<SegmentedControl fullWidth />"}</StoryJsx>+ <SegmentedControl+ mt="sm"+ data={TEXT_AND_ICON_DATA}+ defaultValue="code"+ fullWidth+ />+ </Box>+ </StorySection>+ </StoryBoard>+);++export const Overview = {+ render: OverviewTemplate,+ parameters: {+ pseudo: {+ hover: [labelSelectorFor("hover")],+ active: [labelSelectorFor("pressed")],+ },+ controls: { disable: true },},};diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/index.tsx b/frontend/src/metabase/ui/components/inputs/SegmentedControl/index.tsxindex 88572579424..4c5767563fc 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/index.tsx+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/index.tsx@@ -14,7 +14,16 @@ export interface SegmentedControlItem<Value extends string> extends Omit<export interface SegmentedControlProps<Value extends string> extends Omit<MantineSegmentedControlProps,- "data" | "value" | "onChange"+ | "data"+ | "value"+ | "onChange"+ | "c"+ | "color"+ | "size"+ | "radius"+ | "bg"+ | "variant"+ | "autoContrast"> {data: SegmentedControlItem<Value>[] | Value[];value?: Value;diff --git a/loki.config.js b/loki.config.jsindex 3f41dee94c3..e3d924b7481 100644--- a/loki.config.js+++ b/loki.config.js@@ -17,6 +17,7 @@ module.exports = {"^Components/Inputs/Checkbox (Overview|Checkbox\\.Card)$","^Components/Inputs/DatePicker Dates range","^Components/Inputs/Radio (Overview|Radio\\.Card)$",+ "^Components/Inputs/SegmentedControl Overview","^Components/Inputs/Switch (Overview|Switch\\.Group)$","^Components/Parameters/DatePicker","^Components/Buttons/Button (Variant|Compact|Sections)",