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
Migrate the SmartScalar comparison settings off Emotion (#83702)
Andrei Chernykh6a9ef40a6fdc
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/AnotherColumnForm.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/AnotherColumnForm.tsxindex b440b35d554..7a7329de791 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/AnotherColumnForm.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/AnotherColumnForm.tsx@@ -2,8 +2,10 @@ import type { ChangeEvent, FormEvent } from "react";import { useMemo, useState } from "react";import { t } from "ttag";+import CS from "metabase/css/core/index.css";import {Box,+ Button,Flex,PopoverBackButton,Select,@@ -17,8 +19,6 @@ import type {import { COMPARISON_TYPES } from "../constants";-import { DoneButton } from "./SmartScalarSettingsWidgets.styled";-interface AnotherColumnFormProps {value?: SmartScalarComparisonAnotherColumn;columns: DatasetColumn[];@@ -93,9 +93,14 @@ export function AnotherColumnForm({onChange={handleChangeLabel}/></Stack>- <DoneButton type="submit" disabled={!canSubmit}>+ <Button+ className={CS.alignSelfEnd}+ type="submit"+ variant="filled"+ disabled={!canSubmit}+ >{t`Done`}- </DoneButton>+ </Button></Flex></Box>);diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/ComparisonPicker.module.css b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/ComparisonPicker.module.cssnew file mode 100644index 00000000000..ccad521de38--- /dev/null+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/ComparisonPicker.module.css@@ -0,0 +1,3 @@+.pickerButton:hover .secondaryText {+ color: var(--mb-color-core-brand);+}diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/ComparisonPicker.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/ComparisonPicker.tsxindex 3152f378a2b..cac09e219c7 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/ComparisonPicker.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/ComparisonPicker.tsx@@ -7,7 +7,7 @@ import _ from "underscore";import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";import CS from "metabase/css/core/index.css";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";-import { Menu, Stack, Text, rem } from "metabase/ui";+import { Button, Icon, Menu, Stack, Text, rem } from "metabase/ui";import type { ComparisonMenuOption } from "metabase/viz-core";import type {DatasetColumn,@@ -18,15 +18,9 @@ import type {import { COMPARISON_TYPES } from "../constants";import { AnotherColumnForm } from "./AnotherColumnForm";+import S from "./ComparisonPicker.module.css";import { MenuItemStyled } from "./MenuItem.styled";import { PeriodsAgoMenuOption } from "./PeriodsAgoMenuOption";-import {- ComparisonPickerButton,- ComparisonPickerSecondaryText,- DragHandleIcon,- ExpandIcon,- RemoveIcon,-} from "./SmartScalarSettingsWidgets.styled";import { StaticNumberForm } from "./StaticNumberForm";type Tab = "anotherColumn" | "staticNumber" | null;@@ -158,16 +152,21 @@ export function ComparisonPicker({})}><Menu.Target>- <ComparisonPickerButton+ <Button+ className={S.pickerButton}disabled={isDisabled}- leftSection={isDraggable && <DragHandleIcon name="grabber" />}+ leftSection={+ isDraggable && (+ <Icon className={CS.cursorGrab} name="grabber" c="text-primary" />+ )+ }rightSection={isRemovable && (<IconButtonWrapperaria-label={t`Remove`}onClick={handleRemoveClick}>- <RemoveIcon name="close" />+ <Icon name="close" c="text-primary" /></IconButtonWrapper>)}@@ -180,12 +179,13 @@ export function ComparisonPicker({}}><DisplayName value={editedValue} option={selectedOption} />- <ExpandIcon+ <IconclassName={cx(CS.inline, CS.verticalAlignMiddle)}name="chevrondown"size={14}+ ml="sm"/>- </ComparisonPickerButton>+ </Button></Menu.Target><Menu.Dropdown miw={rem(344)} data-testid="comparison-picker-dropdown">@@ -281,14 +281,22 @@ function DisplayName({if (value.type === COMPARISON_TYPES.ANOTHER_COLUMN) {const columnName = (- <ComparisonPickerSecondaryText key="column-name">{`(${value.label})`}</ComparisonPickerSecondaryText>+ <Text+ key="column-name"+ className={S.secondaryText}+ component="span"+ >{`(${value.label})`}</Text>);return <span>{jt`Column ${columnName}`}</span>;}if (value.type === COMPARISON_TYPES.STATIC_NUMBER) {const label = (- <ComparisonPickerSecondaryText key="label">{`(${value.label})`}</ComparisonPickerSecondaryText>+ <Text+ key="label"+ className={S.secondaryText}+ component="span"+ >{`(${value.label})`}</Text>);return <span>{jt`Custom value ${label}`}</span>;}diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.module.css b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.module.cssnew file mode 100644index 00000000000..e2bf9f1f5a8--- /dev/null+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.module.css@@ -0,0 +1,5 @@+/* Element-qualified to outrank Mantine's input rule regardless of CSS load order */+input.input {+ padding: 0.25rem;+ text-align: center;+}diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.styled.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.styled.tsxdeleted file mode 100644index 4e3337a0395..00000000000--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.styled.tsx+++ /dev/null@@ -1,11 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--import { NumberInput } from "metabase/ui";--export const NumberInputStyled = styled(NumberInput)`- input {- text-align: center;- padding: 0.25rem;- }-`;diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.tsxindex f20834f749f..8e5dd4eba3d 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.tsx@@ -2,12 +2,12 @@ import type { KeyboardEvent, MouseEvent } from "react";import { useCallback, useRef, useState } from "react";import { t } from "ttag";-import { Box, Group, Text, rem } from "metabase/ui";+import { Box, Group, NumberInput, Text, rem } from "metabase/ui";import type { COMPARISON_TYPES } from "metabase/visualizations/visualizations/SmartScalar/constants";import type { SmartScalarComparisonPeriodsAgo } from "metabase-types/api";import { MenuItemStyled } from "./MenuItem.styled";-import { NumberInputStyled } from "./PeriodsAgoMenuOption.styled";+import S from "./PeriodsAgoMenuOption.module.css";type PeriodsAgoMenuOptionProps = {"aria-selected": boolean;@@ -96,7 +96,8 @@ export function PeriodsAgoMenuOption({<MenuItemStyled py="xxs" aria-selected={isSelected}><Box px="sm" onClick={() => onChange({ type, value }, true)}><Group gap="sm">- <NumberInputStyled+ <NumberInput+ classNames={{ input: S.input }}allowDecimal={false}value={value}onChange={(value) => handleInputChange(value)}diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.styled.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.styled.tsxdeleted file mode 100644index 4cc44e70055..00000000000--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.styled.tsx+++ /dev/null@@ -1,63 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";-import cx from "classnames";-import type { HTMLAttributes } from "react";--import CS from "metabase/css/core/index.css";-import type { ButtonProps as BaseButtonProps, TextProps } from "metabase/ui";-import { Button, Icon, Text } from "metabase/ui";--type ButtonProps = BaseButtonProps & HTMLAttributes<HTMLButtonElement>;--export const ComparisonList = styled.ul`- li:not(:first-of-type) {- margin-top: 8px;- }-`;--export const AddComparisonButton = styled((props: ButtonProps) => (- <Button {...props} variant={props.variant ?? "subtle"} />-))`- align-self: flex-start;-`;--type ComparisonPickerSecondaryTextProps = TextProps &- HTMLAttributes<HTMLSpanElement> & {- component?: "span";- };--export const ComparisonPickerSecondaryText = styled(- (props: ComparisonPickerSecondaryTextProps) => (- <Text {...props} component={props.component ?? "span"} />- ),-)<ComparisonPickerSecondaryTextProps>``;--// Unjustified type cast. FIXME-export const ComparisonPickerButton = styled(Button)<ButtonProps>`- &:hover {- ${ComparisonPickerSecondaryText} {- color: var(--mb-color-core-brand);- }- }-` as unknown as typeof Button;--export const DoneButton = (props: ButtonProps) => (- <Button- {...props}- variant={props.variant ?? "filled"}- className={cx(CS.alignSelfEnd, props.className)}- />-);--export const DragHandleIcon = styled(Icon)`- cursor: grab;- color: var(--mb-color-text-primary);-`;--export const ExpandIcon = styled(Icon)`- margin-left: 8px;-`;--export const RemoveIcon = styled(Icon)`- color: var(--mb-color-text-primary);-`;diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.tsxindex c88800f705a..c05887eb538 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.tsx@@ -14,17 +14,14 @@ import { usePreviousDistinct } from "react-use";import { t } from "ttag";import { Sortable } from "metabase/common/components/Sortable";-import { Stack } from "metabase/ui";+import CS from "metabase/css/core/index.css";+import { Button, Stack } from "metabase/ui";import type { SmartScalarComparisonWidgetProps } from "metabase/viz-core";import type { SmartScalarComparison } from "metabase-types/api";import { getDefaultComparison } from "../utils";import { ComparisonPicker } from "./ComparisonPicker";-import {- AddComparisonButton,- ComparisonList,-} from "./SmartScalarSettingsWidgets.styled";export function SmartScalarComparisonWidget({value,@@ -95,7 +92,7 @@ export function SmartScalarComparisonWidget({disabled={!canSortComparisons}strategy={verticalListSortingStrategy}>- <ComparisonList data-testid="comparison-list">+ <Stack component="ul" gap="sm" data-testid="comparison-list">{value.map((comparison, index) => {const isLast = index === value.length - 1;return (@@ -117,15 +114,16 @@ export function SmartScalarComparisonWidget({</Sortable>);})}- </ComparisonList>+ </Stack></SortableContext></DndContext>- <AddComparisonButton+ <Button+ className={CS.alignSelfStart}variant="transparent"size="compact-md"disabled={!canAddComparison}onClick={handleAddComparison}- >{t`Add comparison`}</AddComparisonButton>+ >{t`Add comparison`}</Button></Stack>);}diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/StaticNumberForm.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/StaticNumberForm.tsxindex c1ab9fb5ca1..9fda091588d 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/StaticNumberForm.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/StaticNumberForm.tsx@@ -2,8 +2,10 @@ import type { ChangeEvent, FormEvent } from "react";import { useState } from "react";import { t } from "ttag";+import CS from "metabase/css/core/index.css";import {Box,+ Button,NumberInput,PopoverBackButton,Stack,@@ -13,8 +15,6 @@ import type { SmartScalarComparisonStaticNumber } from "metabase-types/api";import { COMPARISON_TYPES } from "../constants";-import { DoneButton } from "./SmartScalarSettingsWidgets.styled";-interface StaticNumberFormProps {value?: SmartScalarComparisonStaticNumber;onChange: (value: Omit<SmartScalarComparisonStaticNumber, "id">) => void;@@ -69,7 +69,12 @@ export function StaticNumberForm({data-autofocus/></Stack>- <DoneButton type="submit" disabled={!canSubmit}>{t`Done`}</DoneButton>+ <Button+ className={CS.alignSelfEnd}+ type="submit"+ variant="filled"+ disabled={!canSubmit}+ >{t`Done`}</Button></Stack></Box>);