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
[UXW-3618] Emotion css -> mantine: chart settings (#82976)
Andrei Chernykhd2b1d250a6cd
diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.module.css b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.module.cssnew file mode 100644index 00000000000..ab79cbfd390--- /dev/null+++ b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.module.css@@ -0,0 +1,7 @@+.sectionContainer {+ border-bottom: 1px solid var(--mb-color-border-neutral);+}++.listContainer {+ overflow: auto;+}diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.styled.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.styled.tsxdeleted file mode 100644index f77e240cb3a..00000000000--- a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.styled.tsx+++ /dev/null@@ -1,15 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const SectionContainer = styled.div`- width: 100%;- padding: 1rem 1.5rem 0;- border-bottom: 1px solid var(--mb-color-border-neutral);-`;--export const ChartSettingsListContainer = styled.div`- position: relative;- padding: 1.5rem 0 0;- flex: 1;- overflow: auto;-`;diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsxindex cdabcc27f80..56947992fae 100644--- a/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsx+++ b/frontend/src/metabase/visualizations/components/ChartSettings/BaseChartSettings/BaseChartSettings.tsx@@ -3,7 +3,7 @@ import { useCallback, useMemo, useState } from "react";import _ from "underscore";import CS from "metabase/css/core/index.css";-import { Stack, Tabs } from "metabase/ui";+import { Box, Stack, Tabs } from "metabase/ui";import {SERIES_SETTING_KEY,type Widget,@@ -19,10 +19,7 @@ import type { DatasetColumn } from "metabase-types/api";import ChartSettingsWidgetList from "../../ChartSettingsWidgetList";import { ChartSettingsWidgetPopover } from "../../ChartSettingsWidgetPopover";-import {- ChartSettingsListContainer,- SectionContainer,-} from "./BaseChartSettings.styled";+import S from "./BaseChartSettings.module.css";import { useChartSettingsSections } from "./hooks";import type { BaseChartSettingsProps } from "./types";@@ -206,7 +203,7 @@ export const BaseChartSettings = ({{...stackProps}>{showSectionPicker && (- <SectionContainer>+ <Box className={S.sectionContainer} w="100%" pt="lg" px="xl"><TabslistBorder={false}value={chartSettingCurrentSection ?? null}@@ -220,14 +217,20 @@ export const BaseChartSettings = ({))}</Tabs.List></Tabs>- </SectionContainer>+ </Box>)}- <ChartSettingsListContainer data-testid="chartsettings-list-container">+ <Box+ className={S.listContainer}+ data-testid="chartsettings-list-container"+ pos="relative"+ pt="xl"+ flex={1}+ ><ChartSettingsWidgetListwidgets={visibleWidgets}extraWidgetProps={extraWidgetProps}/>- </ChartSettingsListContainer>+ </Box></Stack><ChartSettingsWidgetPopover// Unjustified type cast. FIXMEdiff --git a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.module.css b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.module.cssnew file mode 100644index 00000000000..ccbf50a4c88--- /dev/null+++ b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.module.css@@ -0,0 +1,7 @@+.warnings {+ position: absolute;+ top: var(--mantine-spacing-xxl);+ inset-inline-end: var(--mantine-spacing-xxl);+ z-index: 2;+ color: var(--mb-color-accent4);+}diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.styled.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.styled.tsxdeleted file mode 100644index b3548642b60..00000000000--- a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.styled.tsx+++ /dev/null@@ -1,19 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { Warnings } from "metabase/common/components/Warnings";-import { color } from "metabase/ui/colors";--export const SectionWarnings = styled(Warnings)`- color: ${() => color("accent4")};- position: absolute;- top: 2rem;- right: 2rem;- z-index: 2;-`;--export const ChartSettingsVisualizationContainer = styled.div`- position: relative;- margin: 0 2rem;- flex-grow: 1;-`;diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.tsxindex e35c72253e0..3252e54fe37 100644--- a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.tsx+++ b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.tsx@@ -1,15 +1,13 @@import { useState } from "react";+import { Warnings } from "metabase/common/components/Warnings";import CS from "metabase/css/core/index.css";-import { Stack } from "metabase/ui";+import { Box, Stack } from "metabase/ui";import Visualization from "metabase/visualizations/components/Visualization";import { ChartSettingsFooter } from "../ChartSettingsFooter";-import {- ChartSettingsVisualizationContainer,- SectionWarnings,-} from "./ChartSettingsVisualization.styled";+import S from "./ChartSettingsVisualization.module.css";import type { ChartSettingsVisualizationProps } from "./types";export const ChartSettingsVisualization = ({@@ -26,8 +24,8 @@ export const ChartSettingsVisualization = ({return (<Stack pt="lg" {...stackProps}>- <SectionWarnings warnings={warnings} size={20} />- <ChartSettingsVisualizationContainer>+ <Warnings className={S.warnings} warnings={warnings} size={20} />+ <Box pos="relative" mx="xxl" flex="1 1 auto"><VisualizationclassName={CS.spread}rawSeries={rawSeries}@@ -41,7 +39,7 @@ export const ChartSettingsVisualization = ({onUpdateVisualizationSettings={onUpdateVisualizationSettings}onUpdateWarnings={setWarnings}/>- </ChartSettingsVisualizationContainer>+ </Box><ChartSettingsFooteronDone={onDone}onCancel={onCancel}diff --git a/frontend/src/metabase/visualizations/components/ChartSettingsWidgetList.styled.tsx b/frontend/src/metabase/visualizations/components/ChartSettingsWidgetList.styled.tsxdeleted file mode 100644index ab3bdada2b6..00000000000--- a/frontend/src/metabase/visualizations/components/ChartSettingsWidgetList.styled.tsx+++ /dev/null@@ -1,9 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const ChartSettingsWidgetListDivider = styled.div`- background-color: var(--mb-color-border-neutral);- height: 1px;- display: block;- margin-bottom: 1.5rem;-`;diff --git a/frontend/src/metabase/visualizations/components/ChartSettingsWidgetList.tsx b/frontend/src/metabase/visualizations/components/ChartSettingsWidgetList.tsxindex 8c9d9c249df..323a1e2088d 100644--- a/frontend/src/metabase/visualizations/components/ChartSettingsWidgetList.tsx+++ b/frontend/src/metabase/visualizations/components/ChartSettingsWidgetList.tsx@@ -1,9 +1,8 @@import _ from "underscore";-import { Badge } from "metabase/ui";+import { Badge, Box } from "metabase/ui";import ChartSettingsWidget from "./ChartSettingsWidget";-import { ChartSettingsWidgetListDivider } from "./ChartSettingsWidgetList.styled";interface ChartSettingsWidgetListProps {widgets: { id: string; group?: string }[];@@ -47,9 +46,7 @@ const ChartSettingsWidgetList = ({{...extraWidgetProps}/>))}- <ChartSettingsWidgetListDivider- style={lastGroup ? { marginBottom: 0 } : undefined}- />+ <Box h={1} bg="border-neutral" mb={lastGroup ? 0 : "xl"} /></div></div>);diff --git a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeries.module.css b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeries.module.cssnew file mode 100644index 00000000000..f4165a27429--- /dev/null+++ b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeries.module.css@@ -0,0 +1,9 @@+/* The color lives here, not in a style prop: an inline color would beat the hover rule. */+.optionsIcon {+ color: var(--mb-color-text-secondary);+ cursor: pointer;++ &:hover {+ color: var(--mb-color-core-brand);+ }+}diff --git a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeries.styled.tsx b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeries.styled.tsxdeleted file mode 100644index 09ab2babfd1..00000000000--- a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeries.styled.tsx+++ /dev/null@@ -1,17 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { Icon, TextInputBlurChange } from "metabase/ui";--export const OptionsIcon = styled(Icon)`- color: var(--mb-color-text-secondary);- cursor: pointer;-- &:hover {- color: var(--mb-color-core-brand);- }-`;--export const SeriesNameInput = styled(TextInputBlurChange)`- width: auto;-`;diff --git a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.tsx b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.tsxindex cb9c8b86cf0..6381aa7cb30 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.tsx@@ -3,14 +3,11 @@ import { t } from "ttag";import { ColorSelector } from "metabase/common/components/ColorSelector";import CS from "metabase/css/core/index.css";-import { Flex } from "metabase/ui";+import { Flex, Icon, TextInputBlurChange } from "metabase/ui";import { getNamedAccentColors } from "metabase/ui/colors/groups";import type { SingleSeries, VisualizationSettings } from "metabase-types/api";-import {- OptionsIcon,- SeriesNameInput,-} from "./ChartNestedSettingSeries.styled";+import S from "./ChartNestedSettingSeries.module.css";import type { ChartNestedSettingsSeriesSingleProps } from "./ChartNestedSettingSeriesSingle";export interface ChartNestedSettingsSeriesMultipleProps extends ChartNestedSettingsSeriesSingleProps {@@ -74,7 +71,7 @@ export const ChartNestedSettingSeriesMultiple = ({})}/>- <SeriesNameInput+ <TextInputBlurChangeclassName={cx(CS.flexFull, CS.ml1, CS.alignSelfStretch)}// set vertical padding to 0 and use align-self-stretch to match siblingsstyle={{ paddingTop: 0, paddingBottom: 0 }}@@ -97,7 +94,8 @@ export const ChartNestedSettingSeriesMultiple = ({bdrs={6}className={cx(CS.ml1, CS.p1)}>- <OptionsIcon+ <Icon+ className={S.optionsIcon}name={isSelected(single) ? "chevronup" : "chevrondown"}tooltip={isSelected(single) ? t`Hide options` : t`More options`diff --git a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.tsx b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.tsxindex 5cd2f47cc9d..7bbcfeff74c 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.tsx@@ -2,11 +2,10 @@ import cx from "classnames";import { ColorSelector } from "metabase/common/components/ColorSelector";import CS from "metabase/css/core/index.css";+import { TextInputBlurChange } from "metabase/ui";import { getNamedAccentColors } from "metabase/ui/colors/groups";import type { SingleSeries, VisualizationSettings } from "metabase-types/api";-import { SeriesNameInput } from "./ChartNestedSettingSeries.styled";-export interface ChartNestedSettingsSeriesSingleProps {object: SingleSeries;getObjectKey: (object: SingleSeries) => string;@@ -50,7 +49,7 @@ const ChartNestedSettingsSeriesSingle = ({})}/>- <SeriesNameInput+ <TextInputBlurChangeclassName={cx(CS.flexFull, CS.ml1, CS.alignSelfStretch)}resetOnEscvalue={computedSettings.title}diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPicker.styled.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPicker.styled.tsxdeleted file mode 100644index e31776e8a2e..00000000000--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPicker.styled.tsx+++ /dev/null@@ -1,8 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const AddAnotherContainer = styled.div`- margin-top: 1rem;- margin-bottom: 1rem;- padding-bottom: 1rem;-`;diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPicker.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPicker.tsxindex ec70d3abd1e..99d25b1e3d7 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPicker.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPicker.tsx@@ -6,10 +6,10 @@ import { t } from "ttag";import { Sortable, SortableList } from "metabase/common/components/Sortable";import { useDndSensors } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";+import { Box } from "metabase/ui";import { moveElement } from "metabase/utils/arrays";import { ChartSettingFieldPicker } from "./ChartSettingFieldPicker";-import { AddAnotherContainer } from "./ChartSettingFieldsPicker.styled";export const UNDEFINED_ITEM_KEY = "$$UNDEFINED_ITEM_KEY$$";export const NULL_ITEM_KEY = "$$NULL_ITEM_KEY$$";@@ -183,7 +183,7 @@ export const ChartSettingFieldsPicker = ({<span className={CS.textError}>{t`error`}</span>)}{addAnother && (- <AddAnotherContainer>+ <Box my="lg" pb="lg"><aclassName={cx(CS.textBrand, CS.textBold, CS.py1)}onClick={() => {@@ -201,7 +201,7 @@ export const ChartSettingFieldsPicker = ({>{addAnother}</a>- </AddAnotherContainer>+ </Box>)}</div>);diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/SliceNameWidget.styled.tsx b/frontend/src/metabase/visualizations/visualizations/PieChart/SliceNameWidget.styled.tsxdeleted file mode 100644index 3ce05fa5f3d..00000000000--- a/frontend/src/metabase/visualizations/visualizations/PieChart/SliceNameWidget.styled.tsx+++ /dev/null@@ -1,8 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { SeriesNameInput } from "metabase/visualizations/components/settings/ChartNestedSettingSeries.styled";--export const SliceNameInput = styled(SeriesNameInput)`- width: 100%;-`;diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/SliceNameWidget.tsx b/frontend/src/metabase/visualizations/visualizations/PieChart/SliceNameWidget.tsxindex ce59b8bb31b..b513316eeb4 100644--- a/frontend/src/metabase/visualizations/visualizations/PieChart/SliceNameWidget.tsx+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/SliceNameWidget.tsx@@ -1,8 +1,6 @@-import { Box } from "metabase/ui";+import { Box, TextInputBlurChange } from "metabase/ui";import type { PieRow } from "metabase-types/api";-import { SliceNameInput } from "./SliceNameWidget.styled";-// The widget only reads these fields, so any row shape that carries them works// (PieRow for pie, TreemapRow for treemap).type NameableRow = Pick<PieRow, "key" | "name" | "originalName">;@@ -31,7 +29,8 @@ export function SliceNameWidget({// Bottom padding is needed since the popover has 1.5rem top padding, but// only 1rem bottom padding<Box w="100%" pb="0.5rem">- <SliceNameInput+ <TextInputBlurChange+ w="100%"resetOnEscvalue={row.name}description={diff --git a/frontend/src/metabase/visualizer/components/Header/Header.module.css b/frontend/src/metabase/visualizer/components/Header/Header.module.cssindex 3e5a68b2980..542472b0b1e 100644--- a/frontend/src/metabase/visualizer/components/Header/Header.module.css+++ b/frontend/src/metabase/visualizer/components/Header/Header.module.css@@ -1,3 +1,4 @@.title {+ min-width: 0;font-size: 1rem;}diff --git a/frontend/src/metabase/visualizer/components/Header/Header.tsx b/frontend/src/metabase/visualizer/components/Header/Header.tsxindex be064164d67..4da3af16986 100644--- a/frontend/src/metabase/visualizer/components/Header/Header.tsx+++ b/frontend/src/metabase/visualizer/components/Header/Header.tsx@@ -89,7 +89,7 @@ export function Header({{/* Spacer */}<div style={{ flexGrow: 1 }} />- <Button.Group>+ <Button.Group flex="0 0 auto"><Tooltip withinPortal={false} label={t`Undo`}><Buttonaria-label={t`Undo`}@@ -113,6 +113,7 @@ export function Header({</Button.Group><Buttonvariant="filled"+ flex="0 0 auto"disabled={!saveButtonEnabled}onClick={handleSave}>