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
Dev 1662 move libcolors into UI (#70754)
Fraser7e5435f6f1b2
diff --git a/bin/find-never-defined-css-variables/find-never-defined-css-variables.ts b/bin/find-never-defined-css-variables/find-never-defined-css-variables.tsindex ef4d219f7ae..fc5cc1df092 100644--- a/bin/find-never-defined-css-variables/find-never-defined-css-variables.ts+++ b/bin/find-never-defined-css-variables/find-never-defined-css-variables.ts@@ -4,7 +4,7 @@ import { readFileSync } from "fs";import { glob } from "glob";-import { ALL_COLOR_NAMES } from "../../frontend/src/metabase/lib/colors";+import { ALL_COLOR_NAMES } from "../../frontend/src/metabase/ui/colors";/*** This script finds css variables that are used but *never* defined in our codebase.diff --git a/e2e/support/helpers/e2e-visual-tests-helpers.js b/e2e/support/helpers/e2e-visual-tests-helpers.jsindex 4699f665f3d..131bcdc31eb 100644--- a/e2e/support/helpers/e2e-visual-tests-helpers.js+++ b/e2e/support/helpers/e2e-visual-tests-helpers.js@@ -1,5 +1,5 @@import { popover } from "e2e/support/helpers/e2e-ui-elements-helpers";-import { color as getColor } from "metabase/lib/colors";+import { color as getColor } from "metabase/ui/colors";import { Icons } from "metabase/ui/components/icons/Icon/icons";import { GOAL_LINE_DASH } from "metabase/visualizations/echarts/cartesian/option/goal-line.ts";import { TREND_LINE_DASH } from "metabase/visualizations/echarts/cartesian/option/trend-line.ts";diff --git a/e2e/test/scenarios/models/models-list-view.cy.spec.js b/e2e/test/scenarios/models/models-list-view.cy.spec.jsindex 0737634b31f..1f621ac09d9 100644--- a/e2e/test/scenarios/models/models-list-view.cy.spec.js+++ b/e2e/test/scenarios/models/models-list-view.cy.spec.js@@ -1,6 +1,6 @@import Color from "color";-import { colors } from "metabase/lib/colors";+import { colors } from "metabase/ui/colors";const { H } = cy;diff --git a/e2e/test/scenarios/visualizations-tabular/smartscalar-trend.cy.spec.js b/e2e/test/scenarios/visualizations-tabular/smartscalar-trend.cy.spec.jsindex ff1351c540e..2c556999e96 100644--- a/e2e/test/scenarios/visualizations-tabular/smartscalar-trend.cy.spec.js+++ b/e2e/test/scenarios/visualizations-tabular/smartscalar-trend.cy.spec.js@@ -2,7 +2,7 @@ import Color from "color";const { H } = cy;import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";-import { colors } from "metabase/lib/colors";+import { colors } from "metabase/ui/colors";const { ORDERS, ORDERS_ID } = SAMPLE_DATABASE;diff --git a/enterprise/frontend/src/embedding-sdk-package/components/private/Error/Error.tsx b/enterprise/frontend/src/embedding-sdk-package/components/private/Error/Error.tsxindex 3382b4a8891..51ecf856786 100644--- a/enterprise/frontend/src/embedding-sdk-package/components/private/Error/Error.tsx+++ b/enterprise/frontend/src/embedding-sdk-package/components/private/Error/Error.tsx@@ -1,7 +1,7 @@import { useMetabaseProviderPropsStore } from "embedding-sdk-shared/hooks/use-metabase-provider-props-store";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";// eslint-disable-next-line metabase/no-external-references-for-sdk-package-code-import { colors } from "metabase/lib/colors/colors";+import { colors } from "metabase/ui/colors/colors";type Props = {message: string;diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceSection.tsxindex d51574a32ee..9ffa27bf572 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceSection.tsx@@ -8,7 +8,6 @@ import { t } from "ttag";import { ConfirmModal } from "metabase/common/components/ConfirmModal/ConfirmModal";import { ForwardRefLink } from "metabase/common/components/Link";import S from "metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css";-import type { MetabaseColorKey } from "metabase/lib/colors/types";import { useDispatch, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";@@ -29,6 +28,7 @@ import {Tooltip,UnstyledButton,} from "metabase/ui";+import type { MetabaseColorKey } from "metabase/ui/colors/types";import {useArchiveWorkspaceMutation,useCreateWorkspaceMutation,diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/types.tsindex 21192b83a34..7634952376a 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts@@ -1,5 +1,5 @@-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type {AnalysisFindingErrorType,DependencyGroupType,diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsxindex c6907b63ba5..76cc91cdbcc 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsx@@ -3,8 +3,8 @@ import cx from "classnames";import { match } from "ts-pattern";import { t } from "ttag";-import type { ColorName } from "metabase/lib/colors/types";import { Collapse, Flex, Group, Icon, Paper, Stack, Text } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type { MetabotTodoItem } from "metabase-types/api";import S from "./MetabotAgentTodoMessage.module.css";diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsxindex eeb19e668f3..e4f6eecf400 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsx+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsx@@ -1,9 +1,9 @@import { skipToken, useGetUserQuery } from "metabase/api";-import { alpha } from "metabase/lib/colors";import { useSelector } from "metabase/lib/redux";import { getRelativeTime } from "metabase/lib/time-dayjs";import { getUser } from "metabase/selectors/user";import { FixedSizeIcon, Flex, Icon, Text as UIText } from "metabase/ui";+import { alpha } from "metabase/ui/colors";import {getIconForReview,getLatestModerationReview,diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/constants.ts b/enterprise/frontend/src/metabase-enterprise/moderation/constants.tsindex f72e3693b5e..b7fce35e886 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/constants.ts+++ b/enterprise/frontend/src/metabase-enterprise/moderation/constants.ts@@ -1,5 +1,5 @@-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";export const MODERATION_STATUS = {verified: "verified",diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/service.ts b/enterprise/frontend/src/metabase-enterprise/moderation/service.tsindex b1ea870f9ef..6307882e061 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/service.ts+++ b/enterprise/frontend/src/metabase-enterprise/moderation/service.ts@@ -1,9 +1,9 @@import { c, t } from "ttag";import _ from "underscore";-import type { ColorName } from "metabase/lib/colors/types";import { ModerationReviewApi } from "metabase/services";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type Question from "metabase-lib/v1/Question";import type { BaseUser, ModerationReview, User } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/utils.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/utils.tsindex 97bc54da993..391a44fff3f 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/utils.ts@@ -1,7 +1,7 @@import { t } from "ttag";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type { Collection, RemoteSyncEntityStatus } from "metabase-types/api";import type { CollectionPathSegment } from "./displayGroups";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/utils/colors.ts b/enterprise/frontend/src/metabase-enterprise/tenants/utils/colors.tsindex 85b13a4cc33..1153a352658 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/utils/colors.ts+++ b/enterprise/frontend/src/metabase-enterprise/tenants/utils/colors.ts@@ -1,4 +1,4 @@-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import type { Tenant } from "metabase-types/api";const groupColorPalette = [diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.tsxindex ba8c2f7b995..9811f5f1564 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.tsx@@ -5,7 +5,7 @@ import _ from "underscore";import { ColorPicker } from "metabase/common/components/ColorPicker";import { useCurrentRef } from "metabase/common/hooks/use-current-ref";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import {TableBody,diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/utils.ts b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/utils.tsindex c5d96aceff0..1832a15b5b8 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/utils.ts@@ -1,6 +1,6 @@import _ from "underscore";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";export const getAccentColorGroups = (palette: Record<string, string>) => {const groups = [diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsxindex 1f72fb3d936..17a28ad9b8a 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsx@@ -6,8 +6,8 @@ import _ from "underscore";import { ColorPicker } from "metabase/common/components/ColorPicker";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { useCurrentRef } from "metabase/common/hooks/use-current-ref";-import { color } from "metabase/lib/colors";import { Button, Group } from "metabase/ui";+import { color } from "metabase/ui/colors";import {TableBody,diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.unit.spec.tsxindex 88982670fb3..b26c6322a86 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.unit.spec.tsx@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";import Color from "color";import { render, screen } from "__support__/ui";-import { colors, staticVizOverrides } from "metabase/lib/colors/colors";-import { color } from "metabase/lib/colors/palette";+import { colors, staticVizOverrides } from "metabase/ui/colors/colors";+import { color } from "metabase/ui/colors/palette";import { ColorSettings } from "./ColorSettings";diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.unit.spec.tsxindex 0889cdf6b38..43564f56bd5 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.unit.spec.tsx@@ -1,11 +1,11 @@import fetchMock from "fetch-mock";import { renderWithProviders, screen } from "__support__/ui";+import MetabaseSettings from "metabase/lib/settings";import {deriveChartShadeColor,deriveChartTintColor,-} from "metabase/lib/colors/accents";-import MetabaseSettings from "metabase/lib/settings";+} from "metabase/ui/colors/accents";import type { SettingKey } from "metabase-types/api";import { ColorSettingsWidget } from "./ColorSettingsWidget";diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/whitelabel.js b/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/whitelabel.jsindex 3581d2a7448..71a804aa81c 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/whitelabel.js+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/whitelabel.js@@ -1,5 +1,5 @@-import { mutateColors } from "metabase/lib/colors/colors";import MetabaseSettings from "metabase/lib/settings";+import { mutateColors } from "metabase/ui/colors/colors";export function updateColors() {const scheme = MetabaseSettings.get("application-colors") || {};diff --git a/eslint.config.mjs b/eslint.config.mjsindex 62b9dd23476..40baf6075e1 100644--- a/eslint.config.mjs+++ b/eslint.config.mjs@@ -656,7 +656,6 @@ const configs = [{group: ["metabase/lib/*",- "!metabase/lib/colors","!metabase/lib/encoding","!metabase/lib/formatting","!metabase/lib/number",diff --git a/frontend/lint/eslint-plugin-metabase/rules/no-color-literals.js b/frontend/lint/eslint-plugin-metabase/rules/no-color-literals.jsindex 67a58bc6c9f..4f329dc79a9 100755--- a/frontend/lint/eslint-plugin-metabase/rules/no-color-literals.js+++ b/frontend/lint/eslint-plugin-metabase/rules/no-color-literals.js@@ -10,7 +10,7 @@const COLOR_REGEX =/(?:#[a-fA-F0-9]{3}(?:[a-fA-F0-9]{3})?\b|(?:rgb|hsl)a?\(\s*\d+\s*(?:,\s*\d+(?:\.\d+)?%?\s*){2,3}\))/;const LINT_MESSAGE =- "Color literals forbidden. Import colors from 'metabase/lib/colors'.";+ "Color literals forbidden. Import colors from 'metabase/ui/colors'.";module.exports = {meta: {diff --git a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsx b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsxindex da6580be47b..b485e291cff 100644--- a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsx@@ -9,8 +9,8 @@ import { getErrorComponent } from "embedding-sdk-bundle/store/selectors";import type { SdkErrorComponentProps } from "embedding-sdk-bundle/types";import { Alert } from "metabase/common/components/Alert";import { EMBEDDING_SDK_PORTAL_ROOT_ELEMENT_ID } from "metabase/embedding-sdk/config";-import { color } from "metabase/lib/colors";import { Anchor, Box, Center, Code, Flex, Portal } from "metabase/ui";+import { color } from "metabase/ui/colors";export const SdkError = ({message,diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsxindex 008661858f0..72e5d64c267 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx@@ -9,8 +9,8 @@ import { setUsageProblem } from "embedding-sdk-bundle/store/reducer";import type { SdkUsageProblem } from "embedding-sdk-bundle/types/usage-problem";import { ExternalLink } from "metabase/common/components/ExternalLink";import { DefaultLogoIcon } from "metabase/common/components/LogoIcon";-import { originalColors } from "metabase/lib/colors";import { Button, Card, Flex, Icon, Popover, Stack, Text } from "metabase/ui";+import { originalColors } from "metabase/ui/colors";import S from "./SdkUsageProblemBanner.module.css";diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.tsindex fa5a2e45d9b..f6ed9dcb851 100644--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts@@ -11,10 +11,10 @@ import {isEmbeddingThemeV2,} from "metabase/embedding-sdk/theme";import { setGlobalEmbeddingColors } from "metabase/embedding-sdk/theme/embedding-color-palette";-import { deriveFullMetabaseTheme } from "metabase/lib/colors";import { useSelector } from "metabase/lib/redux";import { getFont } from "metabase/styled-components/selectors";import type { MantineThemeOverride } from "metabase/ui";+import { deriveFullMetabaseTheme } from "metabase/ui/colors";import { getColorShades } from "metabase/ui/utils/colors";/**diff --git a/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.ts b/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.tsindex 6709339eea4..ff674e57ce8 100644--- a/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.ts+++ b/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.ts@@ -18,12 +18,12 @@ import {SDK_TO_MAIN_APP_COLORS_MAPPING,SDK_TO_MAIN_APP_TOOLTIP_COLORS_MAPPING,} from "metabase/embedding-sdk/theme/embedding-color-palette";+import type { MantineThemeOverride } from "metabase/ui";import type {MetabaseAccentColorKey,MetabaseColorKey,-} from "metabase/lib/colors";-import { mapChartColorsToAccents } from "metabase/lib/colors/accents";-import type { MantineThemeOverride } from "metabase/ui";+} from "metabase/ui/colors";+import { mapChartColorsToAccents } from "metabase/ui/colors/accents";import type { ColorSettings } from "metabase-types/api";import { colorTuple } from "./color-tuple";diff --git a/frontend/src/embedding-sdk-bundle/test/storybook-themes.ts b/frontend/src/embedding-sdk-bundle/test/storybook-themes.tsindex 3c52de13052..a991f23204c 100644--- a/frontend/src/embedding-sdk-bundle/test/storybook-themes.ts+++ b/frontend/src/embedding-sdk-bundle/test/storybook-themes.ts@@ -2,7 +2,7 @@ import {type MetabaseEmbeddingTheme,defineMetabaseTheme,} from "metabase/embedding-sdk/theme";-import { METABASE_DARK_THEME } from "metabase/lib/colors/constants/themes/dark";+import { METABASE_DARK_THEME } from "metabase/ui/colors/constants/themes/dark";export const darkColors = {primary: "#DF75E9",diff --git a/frontend/src/embedding-sdk-bundle/types/theme.ts b/frontend/src/embedding-sdk-bundle/types/theme.tsindex 676bcfe35c9..c1b115d2ed2 100644--- a/frontend/src/embedding-sdk-bundle/types/theme.ts+++ b/frontend/src/embedding-sdk-bundle/types/theme.ts@@ -8,4 +8,4 @@ export type {ChartColorV2,MetabaseColorKey,ProtectedColorKey,-} from "metabase/lib/colors";+} from "metabase/ui/colors";diff --git a/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.ts b/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.tsindex 8cf0d186b64..69502cc9846 100644--- a/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.ts+++ b/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.ts@@ -7,7 +7,7 @@ import {type MappableSdkColor,SDK_TO_MAIN_APP_COLORS_MAPPING,} from "metabase/embedding-sdk/theme/embedding-color-palette";-import { deriveFullMetabaseTheme } from "metabase/lib/colors";+import { deriveFullMetabaseTheme } from "metabase/ui/colors";const PRESET_SDK_COLORS: MappableSdkColor[] = ["background",diff --git a/frontend/src/metabase-types/api/collection.ts b/frontend/src/metabase-types/api/collection.tsindex d67d89ebb11..b642df1d5c8 100644--- a/frontend/src/metabase-types/api/collection.ts+++ b/frontend/src/metabase-types/api/collection.ts@@ -1,5 +1,5 @@-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type {BaseEntityId,CollectionEssentials,diff --git a/frontend/src/metabase-types/store/undo.ts b/frontend/src/metabase-types/store/undo.tsindex 82f71a6fd43..da925c0d7c2 100644--- a/frontend/src/metabase-types/store/undo.ts+++ b/frontend/src/metabase-types/store/undo.ts@@ -1,7 +1,7 @@import type { ReactNode, RefObject } from "react";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type { DashCardId, DashboardTabId } from "metabase-types/api";export interface Undo {diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.styled.tsxindex ffe555da51d..48abf292b16 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.styled.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.styled.tsx@@ -2,8 +2,8 @@import styled from "@emotion/styled";import { ExternalLink } from "metabase/common/components/ExternalLink";-import { lighten } from "metabase/lib/colors";import { Icon } from "metabase/ui";+import { lighten } from "metabase/ui/colors";export const EmptyFormPlaceholderWrapper = styled.div`display: flex;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsxindex 1d1520709e5..aa46f58e55d 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { alpha } from "metabase/lib/colors";+import { alpha } from "metabase/ui/colors";export const FormContainer = styled.div`display: flex;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsxindex 27abe245a73..44bd6f265cd 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx@@ -3,7 +3,7 @@ import styled from "@emotion/styled";import { FormField } from "metabase/common/components/FormField";import { Radio } from "metabase/common/components/Radio";-import { darken } from "metabase/lib/colors";+import { darken } from "metabase/ui/colors";export const FormFieldContainer = styled.div`background-color: var(--mb-color-background-primary);diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx b/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsxindex fa0bbd17f0f..ba4ff9f5baa 100644--- a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx+++ b/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx@@ -5,8 +5,8 @@ import { t } from "ttag";import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";-import { assignUserColors } from "metabase/lib/formatting";import * as Urls from "metabase/lib/urls";+import { assignUserColors } from "metabase/ui/colors/formatting-colors";import type {Revision as RevisionType,Segment,diff --git a/frontend/src/metabase/admin/people/colors.ts b/frontend/src/metabase/admin/people/colors.tsindex ece104214fd..a11b12163a8 100644--- a/frontend/src/metabase/admin/people/colors.ts+++ b/frontend/src/metabase/admin/people/colors.ts@@ -1,4 +1,4 @@-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import type { GroupId, User } from "metabase-types/api";export const userToColor = (user: User) => {diff --git a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.styled.tsxindex 5a3f3291f92..9d4c6115b43 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";import { color } from "metabase/ui/utils/colors";interface PermissionIconContainerProps {diff --git a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsx b/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsxindex 377f45e2d2c..584c6230337 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsx@@ -1,8 +1,8 @@import type { ReactNode } from "react";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import { Flex, Icon, Text, Title } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import { PermissionIconContainer } from "./PermissionHelpDescription.styled";diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.styled.tsxindex 841a0c338d2..6901554d60b 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { lighten } from "metabase/lib/colors";+import { lighten } from "metabase/ui/colors";export const BreadcrumbsSeparator = styled.div`display: inline-block;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsxindex a474d25a9ee..0a3af295acd 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx@@ -2,8 +2,8 @@import styled from "@emotion/styled";import { forwardRef } from "react";-import { lighten } from "metabase/lib/colors";import { Icon, type IconProps } from "metabase/ui";+import { lighten } from "metabase/ui/colors";import { color } from "metabase/ui/utils/colors";import { PermissionsSelectOption } from "./PermissionsSelectOption";diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsxindex e4171fbbbbd..908fac2c94d 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx@@ -1,8 +1,8 @@import { Fragment, memo, useState } from "react";import { Toggle } from "metabase/common/components/Toggle";-import type { ColorName } from "metabase/lib/colors/types";import { Icon, type IconName, Popover, Tooltip } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type {DataPermissionValue,diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.styled.tsxindex cb685f1f8c3..9eb24a4a825 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";import { color } from "metabase/ui/utils/colors";export const PermissionsSelectOptionRoot = styled.div`diff --git a/frontend/src/metabase/admin/permissions/types.ts b/frontend/src/metabase/admin/permissions/types.tsindex 52cbdf61691..63aa6464fec 100644--- a/frontend/src/metabase/admin/permissions/types.ts+++ b/frontend/src/metabase/admin/permissions/types.ts@@ -1,8 +1,8 @@import type { ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";import type { ReactElement, ReactNode } from "react";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type { GroupId } from "metabase-types/api";import type { State } from "metabase-types/store";diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.styled.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.styled.tsxindex 5ace13bd228..1251078aebc 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.styled.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { alpha } from "metabase/lib/colors";+import { alpha } from "metabase/ui/colors";export const MigrationCard = styled.div`border: 1px solid var(--mb-color-border);diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationCreationError.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationCreationError.tsxindex 58f2ce22fda..9430a6a680c 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationCreationError.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationCreationError.tsx@@ -1,8 +1,8 @@import { c, t } from "ttag";import { Link } from "metabase/common/components/Link";-import { color } from "metabase/lib/colors";import { Box, Flex, Icon, Text } from "metabase/ui";+import { color } from "metabase/ui/colors";import { LargeIconContainer, MigrationCard } from "./CloudPanel.styled";diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsxindex 6675e16a76e..efdf6125d73 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationError.tsx@@ -1,8 +1,8 @@import { c, t } from "ttag";import { Link } from "metabase/common/components/Link";-import { color } from "metabase/lib/colors";import { Box, Flex, Icon, Text } from "metabase/ui";+import { color } from "metabase/ui/colors";import type { CloudMigration } from "metabase-types/api/cloud-migration";import { LargeIconContainer, MigrationCard } from "./CloudPanel.styled";diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsxindex 71f1e0f4277..a2991e09776 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationSuccess.tsx@@ -2,8 +2,8 @@ import { t } from "ttag";import { ExternalLink } from "metabase/common/components/ExternalLink";import type { Plan } from "metabase/common/utils/plan";-import { color } from "metabase/lib/colors";import { Box, Button, Flex, Icon, Text } from "metabase/ui";+import { color } from "metabase/ui/colors";import type { CloudMigration } from "metabase-types/api/cloud-migration";import { LargeIconContainer, MigrationCard } from "./CloudPanel.styled";diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupSelect/GroupSelect.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupSelect/GroupSelect.tsxindex b01209c4861..da25a0dc187 100644--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupSelect/GroupSelect.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupSelect/GroupSelect.tsx@@ -8,15 +8,25 @@ import { Select } from "metabase/common/components/Select";import CS from "metabase/css/core/index.css";import {canEditMembership,- getGroupColor,getGroupNameLocalized,isAdminGroup,isDefaultGroup,} from "metabase/lib/groups";import { isNotNull } from "metabase/lib/types";import { Icon } from "metabase/ui";+import { color } from "metabase/ui/colors";import type { GroupInfo } from "metabase-types/api";+function getGroupColor(group: Pick<GroupInfo, "magic_group_type">) {+ if (isAdminGroup(group)) {+ return color("filter");+ } else if (isDefaultGroup(group)) {+ return color("text-secondary");+ } else {+ return color("brand");+ }+}+type GroupSelectProps = {groups: GroupInfo[];selectedGroupIds: GroupIds;diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.jsindex 0013ed7d05e..6a462a9d003 100644--- a/frontend/src/metabase/app.js+++ b/frontend/src/metabase/app.js@@ -17,7 +17,7 @@ import "metabase/lib/i18n-debug";import "metabase/lib/i18n";// NOTE: why do we need to load this here?-import "metabase/lib/colors";+import "metabase/ui/colors";// NOTE: this loads all builtin pluginsimport "metabase/plugins/builtin";diff --git a/frontend/src/metabase/browse/components/BrowseCard.tsx b/frontend/src/metabase/browse/components/BrowseCard.tsxindex ad7652236d9..16d3cdd1c39 100644--- a/frontend/src/metabase/browse/components/BrowseCard.tsx+++ b/frontend/src/metabase/browse/components/BrowseCard.tsx@@ -3,7 +3,6 @@ import cx from "classnames";import { Ellipsified } from "metabase/common/components/Ellipsified";import { Link } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";-import type { ColorName } from "metabase/lib/colors/types";import {Box,Card,@@ -12,6 +11,7 @@ import {type IconName,Title,} from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";const sizeOptions = {md: {diff --git a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.styled.tsx b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.styled.tsxindex 2dfb60aeef4..6bcb89a3ce9 100644--- a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.styled.tsx+++ b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { alpha } from "metabase/lib/colors";+import { alpha } from "metabase/ui/colors";interface ListCellItemProps {isClickable: boolean;diff --git a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsxindex 7cd30c04129..ab967196f84 100644--- a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx+++ b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx@@ -15,9 +15,9 @@ import { ListSearchField } from "metabase/common/components/ListSearchField";import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";import ListS from "metabase/css/components/list.module.css";import CS from "metabase/css/core/index.css";-import type { ColorName } from "metabase/lib/colors/types";import type { TextInputProps } from "metabase/ui";import { Box, Icon, Text, isValidIconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import { color } from "metabase/ui/utils/colors";import styles from "./AccordionListCell.module.css";diff --git a/frontend/src/metabase/common/components/Banner/Banner.tsx b/frontend/src/metabase/common/components/Banner/Banner.tsxindex 688f4b3fd38..d010bcd5406 100644--- a/frontend/src/metabase/common/components/Banner/Banner.tsx+++ b/frontend/src/metabase/common/components/Banner/Banner.tsx@@ -1,9 +1,9 @@import type { ReactNode } from "react";import CS from "metabase/css/core/index.css";-import type { ColorName } from "metabase/lib/colors/types";import type { FlexProps, IconName } from "metabase/ui";import { Flex, Group, Icon } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";interface BaseBannerProps extends FlexProps {icon?: IconName;diff --git a/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.tsx b/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.tsxindex 5a9dffea28f..d5720ea6842 100644--- a/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.tsx+++ b/frontend/src/metabase/common/components/BucketPickerPopover/BucketPickerPopover.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { Ellipsified } from "metabase/common/components/Ellipsified";import { SelectList } from "metabase/common/components/SelectList";-import type { ColorName } from "metabase/lib/colors/types";import { Button, Icon, Popover } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import { color } from "metabase/ui/utils/colors";import S from "./BucketPickerPopover.module.css";diff --git a/frontend/src/metabase/common/components/Button/Button.tsx b/frontend/src/metabase/common/components/Button/Button.tsxindex 8a297deb9e6..8646e1d87a2 100644--- a/frontend/src/metabase/common/components/Button/Button.tsx+++ b/frontend/src/metabase/common/components/Button/Button.tsx@@ -8,10 +8,10 @@ import _ from "underscore";import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";import SpacingS from "metabase/css/core/spacing.module.css";-import type { ColorName } from "metabase/lib/colors/types";import { isNotNull } from "metabase/lib/types";import type { IconName } from "metabase/ui";import { Icon } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import {ButtonContent,diff --git a/frontend/src/metabase/common/components/CheckBox/CheckBox.tsx b/frontend/src/metabase/common/components/CheckBox/CheckBox.tsxindex 26c944d3a37..52969852f8b 100644--- a/frontend/src/metabase/common/components/CheckBox/CheckBox.tsx+++ b/frontend/src/metabase/common/components/CheckBox/CheckBox.tsx@@ -8,8 +8,8 @@ import type {} from "react";import { forwardRef, isValidElement, useRef } from "react";-import type { ColorName } from "metabase/lib/colors/types";import { Flex, Tooltip } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import {CheckBoxContainer,diff --git a/frontend/src/metabase/common/components/CheckBox/types.ts b/frontend/src/metabase/common/components/CheckBox/types.tsindex 9b6c7c81ba2..1cf58fdd5e5 100644--- a/frontend/src/metabase/common/components/CheckBox/types.ts+++ b/frontend/src/metabase/common/components/CheckBox/types.ts@@ -1,4 +1,4 @@-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";export interface CheckBoxInputProps {size: number;diff --git a/frontend/src/metabase/common/components/ColorPicker/ColorPicker.stories.tsx b/frontend/src/metabase/common/components/ColorPicker/ColorPicker.stories.tsxindex 71f8420fcf8..89af70187ca 100644--- a/frontend/src/metabase/common/components/ColorPicker/ColorPicker.stories.tsx+++ b/frontend/src/metabase/common/components/ColorPicker/ColorPicker.stories.tsx@@ -1,7 +1,7 @@import { useArgs } from "@storybook/preview-api";import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import { ColorPicker } from "./ColorPicker";diff --git a/frontend/src/metabase/common/components/ColorPill/ColorPill.stories.tsx b/frontend/src/metabase/common/components/ColorPill/ColorPill.stories.tsxindex f4c34e67fc6..ecc77fc0cb0 100644--- a/frontend/src/metabase/common/components/ColorPill/ColorPill.stories.tsx+++ b/frontend/src/metabase/common/components/ColorPill/ColorPill.stories.tsx@@ -1,6 +1,6 @@import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import { ColorPill, type ColorPillProps } from "./ColorPill";diff --git a/frontend/src/metabase/common/components/ColorPill/ColorPill.tsx b/frontend/src/metabase/common/components/ColorPill/ColorPill.tsxindex e90c2be876d..97b82c0e0d3 100644--- a/frontend/src/metabase/common/components/ColorPill/ColorPill.tsx+++ b/frontend/src/metabase/common/components/ColorPill/ColorPill.tsx@@ -3,8 +3,8 @@ import type { HTMLAttributes, MouseEvent } from "react";import { useCallback } from "react";import CS from "metabase/css/core/index.css";-import type { ColorName } from "metabase/lib/colors/types";import { Box, Center } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import ColorPillS from "./ColorPill.module.css";import type { PillSize } from "./types";diff --git a/frontend/src/metabase/common/components/ColorRange/ColorRange.stories.tsx b/frontend/src/metabase/common/components/ColorRange/ColorRange.stories.tsxindex 27872bb67cf..6bd194857ec 100644--- a/frontend/src/metabase/common/components/ColorRange/ColorRange.stories.tsx+++ b/frontend/src/metabase/common/components/ColorRange/ColorRange.stories.tsx@@ -1,6 +1,6 @@import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import { ColorRange, type ColorRangeProps } from "./ColorRange";diff --git a/frontend/src/metabase/common/components/ColorRange/ColorRange.tsx b/frontend/src/metabase/common/components/ColorRange/ColorRange.tsxindex 9b5082bbbbc..39636750b75 100644--- a/frontend/src/metabase/common/components/ColorRange/ColorRange.tsx+++ b/frontend/src/metabase/common/components/ColorRange/ColorRange.tsx@@ -4,8 +4,8 @@ import { forwardRef, useCallback, useMemo } from "react";import _ from "underscore";import CS from "metabase/css/core/index.css";-import { getColorScale } from "metabase/lib/colors/scales";import { Box, Flex, type FlexProps } from "metabase/ui";+import { getColorScale } from "metabase/ui/colors/scales";export interface ColorRangeProps extends Omit<FlexProps, "onSelect"> {colors: string[];diff --git a/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeSelector.stories.tsx b/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeSelector.stories.tsxindex 4470037e750..7e3edccec4f 100644--- a/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeSelector.stories.tsx+++ b/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeSelector.stories.tsx@@ -1,7 +1,7 @@import { useArgs } from "@storybook/preview-api";import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import {ColorRangeSelector,diff --git a/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeSelector.unit.spec.tsx b/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeSelector.unit.spec.tsxindex f874a623590..79a5fcf6ef9 100644--- a/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeSelector.unit.spec.tsx+++ b/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeSelector.unit.spec.tsx@@ -1,7 +1,7 @@import Color from "color";import { render, screen } from "__support__/ui";-import { color as libColors } from "metabase/lib/colors";+import { color as libColors } from "metabase/ui/colors";import { ColorRangeSelector } from "./ColorRangeSelector";import { getColorRangeLabel } from "./ColorRangeToggle";diff --git a/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeToggle.unit.spec.tsx b/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeToggle.unit.spec.tsxindex 2a75c8ab47b..341342afda5 100644--- a/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeToggle.unit.spec.tsx+++ b/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeToggle.unit.spec.tsx@@ -1,5 +1,5 @@import { render, screen } from "__support__/ui";-import { getStatusColorRanges } from "metabase/lib/colors/groups";+import { getStatusColorRanges } from "metabase/ui/colors/groups";import { ColorRangeToggle, getColorRangeLabel } from "./ColorRangeToggle";diff --git a/frontend/src/metabase/common/components/ColorSelector/ColorSelector.stories.tsx b/frontend/src/metabase/common/components/ColorSelector/ColorSelector.stories.tsxindex 83a8d5f74cc..45b25c484fd 100644--- a/frontend/src/metabase/common/components/ColorSelector/ColorSelector.stories.tsx+++ b/frontend/src/metabase/common/components/ColorSelector/ColorSelector.stories.tsx@@ -1,7 +1,7 @@import { useArgs } from "@storybook/preview-api";import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import { ColorSelector, type ColorSelectorProps } from "./ColorSelector";diff --git a/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx b/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsxindex 475c8b6b371..370e44ef8c5 100644--- a/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx+++ b/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx@@ -3,9 +3,9 @@ import isPropValid from "@emotion/is-prop-valid";import styled from "@emotion/styled";import ButtonsS from "metabase/css/components/buttons.module.css";-import { alpha } from "metabase/lib/colors";import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";import { Icon } from "metabase/ui";+import { alpha } from "metabase/ui/colors";import { color } from "metabase/ui/utils/colors";export const Root = styled(FullWidthContainer, {diff --git a/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsx b/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsxindex bbf045b68c3..2dbd643a6e8 100644--- a/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsx+++ b/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsx@@ -3,7 +3,7 @@ import styled from "@emotion/styled";import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";-import { darken } from "metabase/lib/colors";+import { darken } from "metabase/ui/colors";import { color } from "metabase/ui/utils/colors";function getPinnedForeground(disabled: boolean) {diff --git a/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.styled.tsx b/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.styled.tsxindex 2cfad1612cd..8affa2fcb38 100644--- a/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.styled.tsx+++ b/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.styled.tsx@@ -3,8 +3,8 @@ import styled from "@emotion/styled";import { Link } from "react-router";import { ExternalLink } from "metabase/common/components/ExternalLink";-import type { ColorName } from "metabase/lib/colors/types";import { Icon } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import { color } from "metabase/ui/utils/colors";interface MenuItemProps {diff --git a/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.tsx b/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.tsxindex 536ee1ca9aa..339bbfb8adc 100644--- a/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.tsx+++ b/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.tsx@@ -1,8 +1,8 @@import type { MouseEvent, ReactNode } from "react";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import { Tooltip } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import {MenuExternalLink,diff --git a/frontend/src/metabase/common/components/Input/Input.styled.tsx b/frontend/src/metabase/common/components/Input/Input.styled.tsxindex 4f955c688ca..56840e86108 100644--- a/frontend/src/metabase/common/components/Input/Input.styled.tsx+++ b/frontend/src/metabase/common/components/Input/Input.styled.tsx@@ -10,8 +10,8 @@ import {inputPadding,inputTypography,} from "metabase/common/style/input";-import type { ColorName } from "metabase/lib/colors/types";import { monospaceFontFamily } from "metabase/styled-components/theme";+import type { ColorName } from "metabase/ui/colors/types";import { color } from "metabase/ui/utils/colors";import type { InputSize } from "../../style/types";diff --git a/frontend/src/metabase/common/components/Markdown/Markdown.tsx b/frontend/src/metabase/common/components/Markdown/Markdown.tsxindex 046baf8f4c5..4c614830aa7 100644--- a/frontend/src/metabase/common/components/Markdown/Markdown.tsx+++ b/frontend/src/metabase/common/components/Markdown/Markdown.tsx@@ -4,7 +4,7 @@ import type ReactMarkdown from "react-markdown";import { defaultUrlTransform } from "react-markdown";import remarkGfm from "remark-gfm";-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";import { MarkdownRoot } from "./Markdown.styled";diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.tsxindex 4406b762095..94bacbf7d40 100644--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.tsx@@ -1,8 +1,8 @@import { t } from "ttag";import { getColumnIcon } from "metabase/common/utils/columns";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type {QueryColumnInfoPopoverProps,diff --git a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsxindex 7133f3b1bde..466ada042bb 100644--- a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx@@ -2,9 +2,9 @@import styled from "@emotion/styled";import { LoadingSpinner as LoadingSpinnerBase } from "metabase/common/components/LoadingSpinner";-import type { ColorName } from "metabase/lib/colors/types";import { isReducedMotionPreferred } from "metabase/lib/dom";import { Icon } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import { color } from "metabase/ui/utils/colors";const TRANSITION_DURATION = () => (isReducedMotionPreferred() ? "0" : "0.25s");diff --git a/frontend/src/metabase/common/components/ModalContent/ModalContent.stories.tsx b/frontend/src/metabase/common/components/ModalContent/ModalContent.stories.tsxindex 4c006dfe0da..0cb7051bde3 100644--- a/frontend/src/metabase/common/components/ModalContent/ModalContent.stories.tsx+++ b/frontend/src/metabase/common/components/ModalContent/ModalContent.stories.tsx@@ -1,7 +1,7 @@import { action } from "@storybook/addon-actions";import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import {ModalContent,diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.tsindex f23a9ccf45a..45db17f8482 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts@@ -1,7 +1,7 @@import _ from "underscore";-import type { ColorName } from "metabase/lib/colors/types";import { type IconData, getIcon } from "metabase/lib/icon";+import type { ColorName } from "metabase/ui/colors/types";import type {CollectionItemModel,CollectionNamespace,diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/types.ts b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/types.tsindex b4a3022a947..7ef032b9293 100644--- a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/types.ts+++ b/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/types.ts@@ -1,4 +1,4 @@-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";import type * as Lib from "metabase-lib";export interface CommonBucketPickerProps {diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsxindex 484fb93f1d6..ecd6e7daf6d 100644--- a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx+++ b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx@@ -13,7 +13,6 @@ import {import { useLocale } from "metabase/common/hooks";import { getColumnGroupIcon } from "metabase/common/utils/column-groups";import { useTranslateContent } from "metabase/i18n/hooks";-import type { ColorName } from "metabase/lib/colors/types";import { isNotNull } from "metabase/lib/types";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";import {@@ -23,6 +22,7 @@ import {} from "metabase/querying/expressions";import type { IconName } from "metabase/ui";import { DelayGroup, Icon } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import { color } from "metabase/ui/utils/colors";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/common/components/Radio/Radio.styled.tsx b/frontend/src/metabase/common/components/Radio/Radio.styled.tsxindex b44263bfa4b..e52432af53c 100644--- a/frontend/src/metabase/common/components/Radio/Radio.styled.tsx+++ b/frontend/src/metabase/common/components/Radio/Radio.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { color, isDark, lighten, tint } from "metabase/lib/colors";+import { color, isDark, lighten, tint } from "metabase/ui/colors";import type { RadioColorScheme, RadioVariant } from "./types";diff --git a/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.styled.tsx b/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.styled.tsxindex c110b9b769a..33822700f7a 100644--- a/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.styled.tsx+++ b/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.styled.tsx@@ -4,9 +4,9 @@ import { css } from "@emotion/react";import styled from "@emotion/styled";import _ from "underscore";-import { alpha, color, darken } from "metabase/lib/colors";import type { IconProps } from "metabase/ui";import { Icon } from "metabase/ui";+import { alpha, color, darken } from "metabase/ui/colors";type SegmentedControlVariant = "fill-text" | "fill-background" | "fill-all";diff --git a/frontend/src/metabase/common/components/Tab/Tab.styled.tsx b/frontend/src/metabase/common/components/Tab/Tab.styled.tsxindex 7e4bef19e8d..d62a137d35c 100644--- a/frontend/src/metabase/common/components/Tab/Tab.styled.tsx+++ b/frontend/src/metabase/common/components/Tab/Tab.styled.tsx@@ -2,8 +2,8 @@import styled from "@emotion/styled";import { focusOutlineStyle } from "metabase/common/style/input";-import { alpha } from "metabase/lib/colors";import { Icon } from "metabase/ui";+import { alpha } from "metabase/ui/colors";import { color } from "metabase/ui/utils/colors";interface TabProps {diff --git a/frontend/src/metabase/common/components/TabRow/TabRow.stories.tsx b/frontend/src/metabase/common/components/TabRow/TabRow.stories.tsxindex f9dfc242f97..fc8d4ac1e15 100644--- a/frontend/src/metabase/common/components/TabRow/TabRow.stories.tsx+++ b/frontend/src/metabase/common/components/TabRow/TabRow.stories.tsx@@ -4,7 +4,7 @@ import { useArgs } from "@storybook/preview-api";import type { StoryFn } from "@storybook/react";import { useState } from "react";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import { Sortable } from "../Sortable";import type { TabButtonMenuAction, TabButtonMenuItem } from "../TabButton";diff --git a/frontend/src/metabase/common/components/TabRow/TabRow.styled.tsx b/frontend/src/metabase/common/components/TabRow/TabRow.styled.tsxindex 6426895e01d..2d5bbc9ae44 100644--- a/frontend/src/metabase/common/components/TabRow/TabRow.styled.tsx+++ b/frontend/src/metabase/common/components/TabRow/TabRow.styled.tsx@@ -2,7 +2,7 @@import styled from "@emotion/styled";import { TabList as BaseTabList } from "metabase/common/components/TabList";-import { alpha } from "metabase/lib/colors";+import { alpha } from "metabase/ui/colors";export const TabList = styled(BaseTabList)`width: 100%;diff --git a/frontend/src/metabase/common/components/Toaster/Toaster.styled.tsx b/frontend/src/metabase/common/components/Toaster/Toaster.styled.tsxindex ae34a265bf3..977b0023fb0 100644--- a/frontend/src/metabase/common/components/Toaster/Toaster.styled.tsx+++ b/frontend/src/metabase/common/components/Toaster/Toaster.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { alpha, lighten } from "metabase/lib/colors";+import { alpha, lighten } from "metabase/ui/colors";interface ToasterContainerProps {show: boolean;diff --git a/frontend/src/metabase/common/components/UndoListing.styled.tsx b/frontend/src/metabase/common/components/UndoListing.styled.tsxindex bf8972ec628..99ca6fcc464 100644--- a/frontend/src/metabase/common/components/UndoListing.styled.tsx+++ b/frontend/src/metabase/common/components/UndoListing.styled.tsx@@ -5,9 +5,9 @@ import styled from "@emotion/styled";import { Card } from "metabase/common/components/Card";import { Link } from "metabase/common/components/Link";-import { alpha } from "metabase/lib/colors";import type { BoxProps } from "metabase/ui";import { Box, Icon } from "metabase/ui";+import { alpha } from "metabase/ui/colors";const LIST_H_MARGINS = "var(--mantine-spacing-md)";diff --git a/frontend/src/metabase/common/components/Unsubscribe.styled.tsx b/frontend/src/metabase/common/components/Unsubscribe.styled.tsxindex 16bcb105d80..f3270ad9296 100644--- a/frontend/src/metabase/common/components/Unsubscribe.styled.tsx+++ b/frontend/src/metabase/common/components/Unsubscribe.styled.tsx@@ -2,9 +2,9 @@import styled from "@emotion/styled";import { MetabotLogo } from "metabase/common/components/MetabotLogo";-import { alpha } from "metabase/lib/colors";import { breakpointMinSmall } from "metabase/styled-components/theme";import { Icon } from "metabase/ui";+import { alpha } from "metabase/ui/colors";export const StyledMetabotLogo = styled(MetabotLogo)`height: 4rem;diff --git a/frontend/src/metabase/common/components/tree/TreeNode.styled.tsx b/frontend/src/metabase/common/components/tree/TreeNode.styled.tsxindex 5e3f2a84b6c..b2586f1b53f 100644--- a/frontend/src/metabase/common/components/tree/TreeNode.styled.tsx+++ b/frontend/src/metabase/common/components/tree/TreeNode.styled.tsx@@ -3,9 +3,9 @@ import { css } from "@emotion/react";// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { lighten } from "metabase/lib/colors";import type { IconProps } from "metabase/ui";import { Icon } from "metabase/ui";+import { lighten } from "metabase/ui/colors";import { color } from "metabase/ui/utils/colors";interface TreeNodeRootProps {diff --git a/frontend/src/metabase/common/hooks/use-palette.ts b/frontend/src/metabase/common/hooks/use-palette.tsindex 80e6bfeee7c..01e6e8bfac2 100644--- a/frontend/src/metabase/common/hooks/use-palette.ts+++ b/frontend/src/metabase/common/hooks/use-palette.ts@@ -1,8 +1,8 @@import { useMemo } from "react";-import { ALL_COLOR_NAMES } from "metabase/lib/colors";-import type { ColorPalette } from "metabase/lib/colors/types";import { useMantineTheme } from "metabase/ui";+import { ALL_COLOR_NAMES } from "metabase/ui/colors";+import type { ColorPalette } from "metabase/ui/colors/types";/*** Allows palettes to be overridden by the user, primarily via the React embedding SDK.diff --git a/frontend/src/metabase/common/style/input.ts b/frontend/src/metabase/common/style/input.tsindex a1a05d44ad0..306c36130b5 100644--- a/frontend/src/metabase/common/style/input.ts+++ b/frontend/src/metabase/common/style/input.ts@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport { css } from "@emotion/react";-import { getFocusColor } from "metabase/lib/colors";+import { getFocusColor } from "metabase/ui/colors";import type { InputSize } from "./types";diff --git a/frontend/src/metabase/css/core/colors.module.css b/frontend/src/metabase/css/core/colors.module.cssindex 6635bc728ca..a5d4562f55b 100644--- a/frontend/src/metabase/css/core/colors.module.css+++ b/frontend/src/metabase/css/core/colors.module.css@@ -1,8 +1,8 @@/* NOTE: DO NOT ADD COLORS WITHOUT EXTREMELY GOOD REASON AND DESIGN REVIEW* NOTE: KEEP SYNCHRONIZED WITH:* frontend/src/metabase/ui/utils/colors.ts- * frontend/src/metabase/lib/colors/palette.ts- * frontend/src/metabase/lib/colors/colors.ts+ * frontend/src/metabase/ui/colors/palette.ts+ * frontend/src/metabase/ui/colors/colors.ts* frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsx* frontend/src/metabase/styled-components/theme/css-variables.ts*/diff --git a/frontend/src/metabase/css/core/colors.stories.tsx b/frontend/src/metabase/css/core/colors.stories.tsxindex ad447f6e02c..42d4278b9a2 100644--- a/frontend/src/metabase/css/core/colors.stories.tsx+++ b/frontend/src/metabase/css/core/colors.stories.tsx@@ -1,5 +1,5 @@-import { colors } from "metabase/lib/colors";import { Card, Flex, Text } from "metabase/ui";+import { colors } from "metabase/ui/colors";export default {title: "Design System/Colors",diff --git a/frontend/src/metabase/data-grid/components/BaseCell/BaseCell.tsx b/frontend/src/metabase/data-grid/components/BaseCell/BaseCell.tsxindex 30243275579..501e6ff14b1 100644--- a/frontend/src/metabase/data-grid/components/BaseCell/BaseCell.tsx+++ b/frontend/src/metabase/data-grid/components/BaseCell/BaseCell.tsx@@ -3,7 +3,7 @@ import type React from "react";import { memo, useMemo } from "react";import type { CellAlign } from "metabase/data-grid/types";-import { isDark } from "metabase/lib/colors/palette";+import { isDark } from "metabase/ui/colors/palette";import styles from "./BaseCell.module.css";diff --git a/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsx b/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsxindex 48957e607f9..77324a7eb50 100644--- a/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsx+++ b/frontend/src/metabase/data-studio/common/components/EntityList/EntityListItem.tsx@@ -1,9 +1,9 @@import { Link } from "react-router";import { Ellipsified } from "metabase/common/components/Ellipsified";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import { Card, Flex, Icon, Stack, Text } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import S from "./EntityListItem.module.css";diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsxindex 13c3587a9db..bb5edcbfadf 100644--- a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx+++ b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx@@ -3,10 +3,10 @@ import { t } from "ttag";import { useListRevisionsQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { assignUserColors } from "metabase/lib/formatting";import { useSelector } from "metabase/lib/redux";import { getUserId } from "metabase/selectors/user";import { Center, Stack, Text, Timeline } from "metabase/ui";+import { assignUserColors } from "metabase/ui/colors/formatting-colors";import type { RevisionEntityType, TableId } from "metabase-types/api";import { RevisionItem } from "./RevisionItem";diff --git a/frontend/src/metabase/documents/components/Editor/shared/MenuComponents.tsx b/frontend/src/metabase/documents/components/Editor/shared/MenuComponents.tsxindex 20ac37238ef..4c04d86546b 100644--- a/frontend/src/metabase/documents/components/Editor/shared/MenuComponents.tsx+++ b/frontend/src/metabase/documents/components/Editor/shared/MenuComponents.tsx@@ -1,7 +1,6 @@import type { DOMAttributes, MouseEvent } from "react";import { t } from "ttag";-import type { ColorName } from "metabase/lib/colors/types";import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";import {Avatar,@@ -12,6 +11,7 @@ import {Text,UnstyledButton,} from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import S from "./MenuItems.module.css";diff --git a/frontend/src/metabase/embedding-sdk/theme/MetabaseTheme.ts b/frontend/src/metabase/embedding-sdk/theme/MetabaseTheme.tsindex fa470cd0209..572c9553f8a 100644--- a/frontend/src/metabase/embedding-sdk/theme/MetabaseTheme.ts+++ b/frontend/src/metabase/embedding-sdk/theme/MetabaseTheme.ts@@ -1,6 +1,6 @@import type { CSSProperties } from "react";-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";import type { DeepPartial } from "../types/utils";diff --git a/frontend/src/metabase/embedding-sdk/theme/MetabaseThemeV2.ts b/frontend/src/metabase/embedding-sdk/theme/MetabaseThemeV2.tsindex bb8d3dda308..5ea41bd67e7 100644--- a/frontend/src/metabase/embedding-sdk/theme/MetabaseThemeV2.ts+++ b/frontend/src/metabase/embedding-sdk/theme/MetabaseThemeV2.ts@@ -2,7 +2,7 @@ import type {ChartColorV2,MetabaseColorKey,ProtectedColorKey,-} from "metabase/lib/colors";+} from "metabase/ui/colors";/*** Color keys available for theming in modular embedding.diff --git a/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars.ts b/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars.tsindex e88f2dad9d5..0064d86b6db 100644--- a/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars.ts+++ b/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars.ts@@ -2,8 +2,8 @@import { css } from "@emotion/react";import Color from "color";-import { isDark, isLight } from "metabase/lib/colors";import type { MantineTheme, MantineThemeOverride } from "metabase/ui";+import { isDark, isLight } from "metabase/ui/colors";import type { ColorOperation } from "../types/private/css-variables";diff --git a/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts b/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.tsindex 2cf69a4597f..b947ca020d8 100644--- a/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts+++ b/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts@@ -3,9 +3,9 @@ import type {MetabaseColors,MetabaseComponentTheme,} from "metabase/embedding-sdk/theme";-import { colors } from "metabase/lib/colors";-import { mapChartColorsToAccents } from "metabase/lib/colors/accents";-import type { ColorName, ColorPalette } from "metabase/lib/colors/types";+import { colors } from "metabase/ui/colors";+import { mapChartColorsToAccents } from "metabase/ui/colors/accents";+import type { ColorName, ColorPalette } from "metabase/ui/colors/types";/*** Define SDK colors that can be mapped 1:1 to the main app colors.@@ -19,7 +19,7 @@ export type MappableSdkColor = Exclude<MetabaseColor, "charts">;/*** Mapping of SDK colors to main app colors.*- * The main app colors are defined in `metabase/lib/colors/colors.ts`.+ * The main app colors are defined in `metabase/ui/colors/colors.ts`.* One SDK theme color can map to multiple main app colors.*/export const SDK_TO_MAIN_APP_COLORS_MAPPING: Record<diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Appearance/ColorCustomizationSection.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Appearance/ColorCustomizationSection.tsxindex f765e4ae692..a6bddba0f04 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Appearance/ColorCustomizationSection.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Appearance/ColorCustomizationSection.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import { ColorPillPicker } from "metabase/common/components/ColorPicker";import { useSetting } from "metabase/common/hooks";import type { MetabaseColors } from "metabase/embedding-sdk/theme";-import { originalColors, staticVizOverrides } from "metabase/lib/colors";import { ActionIcon, Icon, Stack, Text, Tooltip } from "metabase/ui";+import { originalColors, staticVizOverrides } from "metabase/ui/colors";import { getConfigurableThemeColors } from "../../utils/theme-colors";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.tsxindex e14506ed302..d6e03243b8f 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedPreview.tsx@@ -17,8 +17,8 @@ import { setupConfigWatcher } from "metabase/embedding/embedding-iframe-sdk/embeimport type { SdkIframeEmbedBaseSettings } from "metabase/embedding/embedding-iframe-sdk/types/embed";import { buildEmbedAttributes } from "metabase/embedding/embedding-iframe-sdk-setup/utils/build-embed-attributes";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";-import { colors as defaultMetabaseColors } from "metabase/lib/colors";import { Card } from "metabase/ui";+import { colors as defaultMetabaseColors } from "metabase/ui/colors";import { useSdkIframeEmbedSetupContext } from "../context";import { getDerivedDefaultColorsForEmbedFlow } from "../utils/derived-colors-for-embed-flow";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.tsindex 8a5a5741c30..7a4a9543438 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.ts@@ -5,8 +5,8 @@ import type {import type { MetabaseColor } from "metabase/embedding-sdk/theme";import { applyColorOperation } from "metabase/embedding-sdk/theme/dynamic-css-vars";import { SDK_TO_MAIN_APP_COLORS_MAPPING } from "metabase/embedding-sdk/theme/embedding-color-palette";-import { colors, isDark } from "metabase/lib/colors";-import type { ColorName, ColorPalette } from "metabase/lib/colors/types";+import { colors, isDark } from "metabase/ui/colors";+import type { ColorName, ColorPalette } from "metabase/ui/colors/types";import { EMBED_FLOW_DERIVED_COLORS_CONFIG } from "./dynamic-sdk-color-defaults";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/theme-colors.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/theme-colors.tsindex 2d8157a7cd0..f7cba6ac9a4 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/theme-colors.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/theme-colors.ts@@ -1,7 +1,7 @@import { t } from "ttag";import type { MetabaseColors } from "embedding-sdk-bundle/types/ui";-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";export const getConfigurableThemeColors = () =>[diff --git a/frontend/src/metabase/entities/collections/utils.ts b/frontend/src/metabase/entities/collections/utils.tsindex 4d5af8e5dd2..05f2e6ab916 100644--- a/frontend/src/metabase/entities/collections/utils.ts+++ b/frontend/src/metabase/entities/collections/utils.ts@@ -5,11 +5,11 @@ import {isSyncedCollection,} from "metabase/collections/utils";import { getLibraryCollectionType } from "metabase/data-studio/utils";-import { color } from "metabase/lib/colors";-import type { ColorName } from "metabase/lib/colors/types";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { getUserPersonalCollectionId } from "metabase/selectors/user";import type { IconName, IconProps } from "metabase/ui";+import { color } from "metabase/ui/colors";+import type { ColorName } from "metabase/ui/colors/types";import type { Collection, CollectionContentModel } from "metabase-types/api";import type { State } from "metabase-types/store";diff --git a/frontend/src/metabase/entities/dashboards.js b/frontend/src/metabase/entities/dashboards.jsindex 5aaf2a2e605..0229033d563 100644--- a/frontend/src/metabase/entities/dashboards.js+++ b/frontend/src/metabase/entities/dashboards.js@@ -13,7 +13,6 @@ import {getCollectionType,normalizedCollection,} from "metabase/entities/collections/utils";-import { color } from "metabase/lib/colors";import {createEntity,entityCompatibleQuery,@@ -21,6 +20,7 @@ import {} from "metabase/lib/entities";import { compose, withAction, withRequestState } from "metabase/lib/redux";import { addUndo } from "metabase/redux/undo";+import { color } from "metabase/ui/colors";const COPY_ACTION = `metabase/entities/dashboards/COPY`;diff --git a/frontend/src/metabase/entities/databases.js b/frontend/src/metabase/entities/databases.jsindex 5dc08aea3c4..ea3eb95f61a 100644--- a/frontend/src/metabase/entities/databases.js+++ b/frontend/src/metabase/entities/databases.js@@ -8,7 +8,6 @@ import {useGetDatabaseQuery,useListDatabasesQuery,} from "metabase/api";-import { color } from "metabase/lib/colors";import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";import { createThunkAction, fetchData } from "metabase/lib/redux";import { DatabaseSchema } from "metabase/schema";@@ -16,6 +15,7 @@ import {getMetadata,getMetadataUnfiltered,} from "metabase/selectors/metadata";+import { color } from "metabase/ui/colors";import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";// OBJECT ACTIONSdiff --git a/frontend/src/metabase/entities/measures.js b/frontend/src/metabase/entities/measures.jsindex f266135a8ed..7ec98ebcb68 100644--- a/frontend/src/metabase/entities/measures.js+++ b/frontend/src/metabase/entities/measures.js@@ -3,10 +3,10 @@ import {useGetMeasureQuery,useListMeasuresQuery,} from "metabase/api";-import { color } from "metabase/lib/colors";import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";import { MeasureSchema } from "metabase/schema";import { getMetadata } from "metabase/selectors/metadata";+import { color } from "metabase/ui/colors";/*** @deprecated use "metabase/api" insteaddiff --git a/frontend/src/metabase/entities/metrics.js b/frontend/src/metabase/entities/metrics.jsindex 274f42291be..0c291c71dfe 100644--- a/frontend/src/metabase/entities/metrics.js+++ b/frontend/src/metabase/entities/metrics.js@@ -3,10 +3,10 @@ import {useGetMetricQuery,useListMetricsQuery,} from "metabase/api";-import { color } from "metabase/lib/colors";import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";import { MetricSchema } from "metabase/schema";import { getMetadata } from "metabase/selectors/metadata";+import { color } from "metabase/ui/colors";/*** @deprecated use "metabase/api" insteaddiff --git a/frontend/src/metabase/entities/pulses.js b/frontend/src/metabase/entities/pulses.jsindex 05367fa986b..7bc3fc8bb28 100644--- a/frontend/src/metabase/entities/pulses.js+++ b/frontend/src/metabase/entities/pulses.js@@ -6,12 +6,12 @@ import {useListSubscriptionsQuery,} from "metabase/api";import { getCollectionType } from "metabase/entities/collections/utils";-import { color } from "metabase/lib/colors";import {createEntity,entityCompatibleQuery,undo,} from "metabase/lib/entities";+import { color } from "metabase/ui/colors";/*** @deprecated use "metabase/api" instead*/diff --git a/frontend/src/metabase/entities/questions.js b/frontend/src/metabase/entities/questions.jsindex 77094ab11ea..87f3996bc87 100644--- a/frontend/src/metabase/entities/questions.js+++ b/frontend/src/metabase/entities/questions.js@@ -11,7 +11,6 @@ import {getCollectionType,normalizedCollection,} from "metabase/entities/collections";-import { color } from "metabase/lib/colors";import {createEntity,entityCompatibleQuery,@@ -25,6 +24,7 @@ import {getMetadata,getMetadataUnfiltered,} from "metabase/selectors/metadata";+import { color } from "metabase/ui/colors";export const INJECT_RTK_QUERY_QUESTION_VALUE ="metabase/entities/questions/FETCH_ADHOC_METADATA";diff --git a/frontend/src/metabase/entities/segments.js b/frontend/src/metabase/entities/segments.jsindex f88c4a97f93..436d89ed044 100644--- a/frontend/src/metabase/entities/segments.js+++ b/frontend/src/metabase/entities/segments.js@@ -3,10 +3,10 @@ import {useGetSegmentQuery,useListSegmentsQuery,} from "metabase/api";-import { color } from "metabase/lib/colors";import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";import { SegmentSchema } from "metabase/schema";import { getMetadata } from "metabase/selectors/metadata";+import { color } from "metabase/ui/colors";/*** @deprecated use "metabase/api" insteaddiff --git a/frontend/src/metabase/entities/tables.js b/frontend/src/metabase/entities/tables.jsindex f977dfa210d..049ade4c3ee 100644--- a/frontend/src/metabase/entities/tables.js+++ b/frontend/src/metabase/entities/tables.js@@ -18,7 +18,6 @@ import {import { Fields } from "metabase/entities/fields";import { Questions } from "metabase/entities/questions";import { Segments } from "metabase/entities/segments";-import { color } from "metabase/lib/colors";import {createEntity,entityCompatibleQuery,@@ -38,6 +37,7 @@ import {getMetadata,getMetadataUnfiltered,} from "metabase/selectors/metadata";+import { color } from "metabase/ui/colors";import {convertSavedQuestionToVirtualTable,getCollectionVirtualSchemaId,diff --git a/frontend/src/metabase/home/components/HomeCard/HomeCard.styled.tsx b/frontend/src/metabase/home/components/HomeCard/HomeCard.styled.tsxindex 381ea687f35..d34ade18643 100644--- a/frontend/src/metabase/home/components/HomeCard/HomeCard.styled.tsx+++ b/frontend/src/metabase/home/components/HomeCard/HomeCard.styled.tsx@@ -2,11 +2,11 @@import styled from "@emotion/styled";import { Link } from "metabase/common/components/Link";-import { alpha } from "metabase/lib/colors";import {breakpointMinLarge,breakpointMinSmall,} from "metabase/styled-components/theme";+import { alpha } from "metabase/ui/colors";export const CardRoot = styled(Link)`display: flex;diff --git a/frontend/src/metabase/lib/formatting.ts b/frontend/src/metabase/lib/formatting.tsindex 517c2b09335..fd4220f6a82 100644--- a/frontend/src/metabase/lib/formatting.ts+++ b/frontend/src/metabase/lib/formatting.ts@@ -1,4 +1,3 @@-export * from "./formatting/colors";export * from "./formatting/column";export * from "./formatting/currency";export * from "./formatting/date";diff --git a/frontend/src/metabase/lib/groups.ts b/frontend/src/metabase/lib/groups.tsindex 6ae57b8301c..e5968648ee1 100644--- a/frontend/src/metabase/lib/groups.ts+++ b/frontend/src/metabase/lib/groups.ts@@ -1,7 +1,6 @@import { t } from "ttag";import type { SpecialGroupType } from "metabase/admin/permissions/types";-import { color } from "metabase/lib/colors";import { PLUGIN_TENANTS } from "metabase/plugins";import type { GroupInfo } from "metabase-types/api";@@ -52,16 +51,6 @@ export function canEditMembership(group: Pick<GroupInfo, "magic_group_type">) {return !isDefaultGroup(group) && !PLUGIN_TENANTS.isExternalUsersGroup(group);}-export function getGroupColor(group: Pick<GroupInfo, "magic_group_type">) {- if (isAdminGroup(group)) {- return color("filter");- } else if (isDefaultGroup(group)) {- return color("text-secondary");- } else {- return color("brand");- }-}-export function getGroupNameLocalized(group: Pick<GroupInfo, "name">) {return SPECIAL_GROUP_NAMES.get(group.name) ?? group.name;}diff --git a/frontend/src/metabase/lib/icon.ts b/frontend/src/metabase/lib/icon.tsindex 2d4fdbebd5f..b4f4952effa 100644--- a/frontend/src/metabase/lib/icon.ts+++ b/frontend/src/metabase/lib/icon.ts@@ -2,6 +2,7 @@ import { getLibraryCollectionType } from "metabase/data-studio/utils";import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors";import { getIconForVisualizationType } from "metabase/visualizations";import type {CardType,@@ -12,8 +13,6 @@ import type {VisualizationDisplay,} from "metabase-types/api";-import type { ColorName } from "./colors/types";-export type IconModel =| SearchModel| CollectionItemModeldiff --git a/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsx b/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsxindex 849375e6b71..a175cea68d3 100644--- a/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsx+++ b/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsx@@ -16,7 +16,6 @@ import {ReorderableTagsInput,SortablePill,} from "metabase/common/components/ReorderableTagsInput/ReorderableTagsInput";-import type { ColorName } from "metabase/lib/colors/types";import { getColumnExample } from "metabase/query_builder/components/expressions/CombineColumns/util";import {ActionIcon,@@ -33,6 +32,7 @@ import {Switch,Text,} from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type { ComputedVisualizationSettings } from "metabase/visualizations/types";import type * as Lib from "metabase-lib";import type { DatasetColumn, DatasetData, RowValues } from "metabase-types/api";diff --git a/frontend/src/metabase/list-view/components/ListView/styling.ts b/frontend/src/metabase/list-view/components/ListView/styling.tsindex cd27a5a6c5a..b3f6f42c40f 100644--- a/frontend/src/metabase/list-view/components/ListView/styling.ts+++ b/frontend/src/metabase/list-view/components/ListView/styling.ts@@ -1,5 +1,5 @@-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import { color, maybeColor } from "metabase/ui/utils/colors";export const ENTITY_ICONS = {diff --git a/frontend/src/metabase/metrics-viewer/utils/series.ts b/frontend/src/metabase/metrics-viewer/utils/series.tsindex 784cb9a2ac3..1c52a231d88 100644--- a/frontend/src/metabase/metrics-viewer/utils/series.ts+++ b/frontend/src/metabase/metrics-viewer/utils/series.ts@@ -1,9 +1,9 @@import type { DimensionOption } from "metabase/common/components/DimensionPill";-import { getColorsForValues } from "metabase/lib/colors/charts";import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";import { formatValue } from "metabase/lib/formatting";import { isEmpty } from "metabase/lib/validate";import type { DimensionItem } from "metabase/metrics-viewer/components/DimensionPillBar";+import { getColorsForValues } from "metabase/ui/colors/charts";import { getColorplethColorScale } from "metabase/visualizations/components/ChoroplethMap";import { getSeriesVizSettingsKey } from "metabase/visualizations/echarts/cartesian/model/series";import { MAX_SERIES } from "metabase/visualizations/lib/utils";diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.styled.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.styled.tsxindex 572eac2240c..667688558af 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.styled.tsx+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.styled.tsx@@ -3,8 +3,8 @@ import styled from "@emotion/styled";import { Link } from "metabase/common/components/Link";import { doNotForwardProps } from "metabase/common/utils/doNotForwardProps";-import { darken } from "metabase/lib/colors";import { breakpointMaxLarge } from "metabase/styled-components/theme";+import { darken } from "metabase/ui/colors";interface AdminNavLinkProps {to: string;diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.styled.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.styled.tsxindex 82ecf3ada99..fefcb341492 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.styled.tsx+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.styled.tsx@@ -2,11 +2,11 @@import styled from "@emotion/styled";import { Link } from "metabase/common/components/Link";-import { alpha, darken } from "metabase/lib/colors";import {breakpointMaxLarge,breakpointMaxMedium,} from "metabase/styled-components/theme";+import { alpha, darken } from "metabase/ui/colors";import { color } from "metabase/ui/utils/colors";import { ADMIN_NAVBAR_HEIGHT } from "../../constants";diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsxindex 02bd08d68ba..73ef08a11b8 100644--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx@@ -14,7 +14,6 @@ import {getCanAccessOnboardingPage,getIsNewInstance,} from "metabase/home/selectors";-import type { ColorName } from "metabase/lib/colors/types";import { useDispatch, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { openDiagnostics } from "metabase/redux/app";@@ -33,6 +32,7 @@ import {Stack,Text,} from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import { AboutModal } from "../AboutModal/AboutModal";diff --git a/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsx b/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsxindex 9cd9c74b24f..46aa4481836 100644--- a/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsx+++ b/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsx@@ -2,8 +2,8 @@import styled from "@emotion/styled";import { ExternalLink } from "metabase/common/components/ExternalLink";-import { darken } from "metabase/lib/colors";import { Icon } from "metabase/ui";+import { darken } from "metabase/ui/colors";export const StoreIconRoot = styled(ExternalLink)`margin-right: var(--mantine-spacing-sm);diff --git a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarItems.styled.tsx b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarItems.styled.tsxindex 15d17608094..ebb14e3b71d 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarItems.styled.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarItems.styled.tsx@@ -7,11 +7,11 @@ import { forwardRef } from "react";import { Link } from "metabase/common/components/Link";import { TreeNode } from "metabase/common/components/tree/TreeNode";-import { alpha } from "metabase/lib/colors";-import type { ColorName } from "metabase/lib/colors/types";import { NAV_SIDEBAR_WIDTH } from "metabase/nav/constants";import type { IconProps } from "metabase/ui";import { Icon, Tooltip } from "metabase/ui";+import { alpha } from "metabase/ui/colors";+import type { ColorName } from "metabase/ui/colors/types";import { color } from "metabase/ui/utils/colors";export const SidebarIcon = styled(diff --git a/frontend/src/metabase/palette/types.ts b/frontend/src/metabase/palette/types.tsindex 54032effc44..d4a4571370a 100644--- a/frontend/src/metabase/palette/types.ts+++ b/frontend/src/metabase/palette/types.ts@@ -2,8 +2,8 @@ import type { LocationDescriptor } from "history";import type { Action, ActionImpl } from "kbar";import type React from "react";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type { ModerationReviewStatus } from "metabase-types/api";import type { GROUP_LABELS } from "./constants";diff --git a/frontend/src/metabase/palette/utils.ts b/frontend/src/metabase/palette/utils.tsindex 621cc93e7f2..22bfce6f3b2 100644--- a/frontend/src/metabase/palette/utils.ts+++ b/frontend/src/metabase/palette/utils.ts@@ -3,8 +3,8 @@ import type { MouseEvent } from "react";import { t } from "ttag";import _ from "underscore";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type { RecentItem } from "metabase-types/api";import { BASIC_ACTION_ORDER } from "./hooks/useCommandPaletteBasicActions";diff --git a/frontend/src/metabase/plugins/oss/moderation.ts b/frontend/src/metabase/plugins/oss/moderation.tsindex 5a629e74b93..4d7fde98c17 100644--- a/frontend/src/metabase/plugins/oss/moderation.ts+++ b/frontend/src/metabase/plugins/oss/moderation.ts@@ -1,6 +1,6 @@-import type { ColorName } from "metabase/lib/colors/types";import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";import type { IconName, IconProps } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type Question from "metabase-lib/v1/Question";import type { BaseUser, Card, Dashboard } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsxindex 88b8c0b9fa2..fbf784fecf7 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx@@ -15,10 +15,10 @@ import {FormTextInput,FormTextarea,} from "metabase/forms";-import { color } from "metabase/lib/colors";import { FIELD_VISIBILITY_TYPES } from "metabase/lib/core";import { SidebarContent } from "metabase/query_builder/components/SidebarContent";import { Box, Radio, Stack, Tabs } from "metabase/ui";+import { color } from "metabase/ui/colors";import {ColumnSettings,hasColumnSettingsWidgets,diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetNotebook/DatasetNotebook.jsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetNotebook/DatasetNotebook.jsxindex 499bfe5f494..b8006b18f21 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetNotebook/DatasetNotebook.jsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetNotebook/DatasetNotebook.jsx@@ -5,9 +5,9 @@ import { forwardRef } from "react";import { ResizableBox } from "react-resizable";import CS from "metabase/css/core/index.css";-import { darken } from "metabase/lib/colors";import { Notebook } from "metabase/querying/notebook/components/Notebook";import { Box, Flex, rem } from "metabase/ui";+import { darken } from "metabase/ui/colors";const propTypes = {question: PropTypes.object.isRequired,diff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx b/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsxindex 53394e762bd..f22b8c8dda8 100644--- a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx+++ b/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx@@ -4,8 +4,8 @@ import { useMemo, useRef, useState } from "react";import { t } from "ttag";import { QueryColumnPicker } from "metabase/common/components/QueryColumnPicker";-import { color } from "metabase/lib/colors";import { Button, FocusTrap, Icon, Input, Popover } from "metabase/ui";+import { color } from "metabase/ui/colors";import { getThemeOverrides } from "metabase/ui/theme";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsxindex 587b6798ac9..e11ba231ef2 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsx@@ -7,8 +7,8 @@ import {} from "react";import { Badge } from "metabase/common/components/Badge";-import type { ColorName } from "metabase/lib/colors/types";import { Box, Flex } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type { DataSourcePart } from "../QuestionDataSource/utils";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/DatasetManagementSection/DatasetMetadataStrengthIndicator/DatasetMetadataStrengthIndicator.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/DatasetManagementSection/DatasetMetadataStrengthIndicator/DatasetMetadataStrengthIndicator.tsxindex 66e97075162..99c661774fe 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/DatasetManagementSection/DatasetMetadataStrengthIndicator/DatasetMetadataStrengthIndicator.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/DatasetManagementSection/DatasetMetadataStrengthIndicator/DatasetMetadataStrengthIndicator.tsx@@ -3,8 +3,8 @@ import { useHoverDirty } from "react-use";import { t } from "ttag";import CS from "metabase/css/core/index.css";-import type { ColorName } from "metabase/lib/colors/types";import { Box, Tooltip } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type Question from "metabase-lib/v1/Question";import { getDatasetMetadataCompletenessPercentage } from "metabase-lib/v1/metadata/utils/models";diff --git a/frontend/src/metabase/querying/notebook/components/ClauseStep/ClauseStep.tsx b/frontend/src/metabase/querying/notebook/components/ClauseStep/ClauseStep.tsxindex 553352f9686..e21d9e867f6 100644--- a/frontend/src/metabase/querying/notebook/components/ClauseStep/ClauseStep.tsx+++ b/frontend/src/metabase/querying/notebook/components/ClauseStep/ClauseStep.tsx@@ -7,8 +7,8 @@ import { useMergedRef } from "@mantine/hooks";import type { ReactNode, Ref } from "react";import { forwardRef, useCallback } from "react";-import type { ColorName } from "metabase/lib/colors/types";import { Icon } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import {NotebookCell,diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/Join/Join.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/Join/Join.tsxindex 702d81bcddb..88872e2d3c3 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/Join/Join.tsx+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/Join/Join.tsx@@ -1,6 +1,6 @@import { useMemo, useState } from "react";-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";import * as Lib from "metabase-lib";import { JoinComplete } from "../JoinComplete";diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsxindex 787bcdee522..bb5f3bdf145 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx@@ -2,8 +2,8 @@ import { useMemo, useState } from "react";import { t } from "ttag";import { useTranslateContent } from "metabase/i18n/hooks";-import type { ColorName } from "metabase/lib/colors/types";import { Flex, Text, rem } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import * as Lib from "metabase-lib";import {diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsxindex 25354757639..b82eaff8fae 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx@@ -3,8 +3,8 @@ import { useLatest } from "react-use";import { t } from "ttag";import { useTranslateContent } from "metabase/i18n/hooks";-import type { ColorName } from "metabase/lib/colors/types";import { Flex, Text, rem } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import * as Lib from "metabase-lib";import { NotebookCell, NotebookCellItem } from "../../NotebookCell";diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsxindex ecd04855514..2db7d9c7cf6 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx@@ -5,8 +5,8 @@ import { t } from "ttag";import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";import { isEmbedding } from "metabase/embedding/config";import { METAKEY } from "metabase/lib/browser";-import type { ColorName } from "metabase/lib/colors/types";import { Box, Icon, Popover, Tooltip } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type * as Lib from "metabase-lib";import { NotebookCellItem } from "../../NotebookCell";diff --git a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.tsx b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.tsxindex e16c9a7f680..edc74a8b719 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.tsx@@ -2,9 +2,9 @@ import cx from "classnames";import type { CSSProperties } from "react";import { Button } from "metabase/common/components/Button";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import { Tooltip } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import S from "./NotebookActionButton.module.css";diff --git a/frontend/src/metabase/querying/notebook/components/NotebookStep/utils.ts b/frontend/src/metabase/querying/notebook/components/NotebookStep/utils.tsindex 0b06ade5c2f..bc7e57ef5b1 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookStep/utils.ts+++ b/frontend/src/metabase/querying/notebook/components/NotebookStep/utils.ts@@ -1,8 +1,8 @@import type { ComponentType } from "react";import { t } from "ttag";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type {NotebookStepHeaderProps,diff --git a/frontend/src/metabase/querying/notebook/types.ts b/frontend/src/metabase/querying/notebook/types.tsindex ef242a29d4e..3fe7936b37f 100644--- a/frontend/src/metabase/querying/notebook/types.ts+++ b/frontend/src/metabase/querying/notebook/types.ts@@ -1,4 +1,4 @@-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";import type * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/reference/segments/SegmentRevisions.jsx b/frontend/src/metabase/reference/segments/SegmentRevisions.jsxindex c522293e872..42a0afcc7de 100644--- a/frontend/src/metabase/reference/segments/SegmentRevisions.jsx+++ b/frontend/src/metabase/reference/segments/SegmentRevisions.jsx@@ -9,10 +9,10 @@ import { EmptyState } from "metabase/common/components/EmptyState";import S from "metabase/common/components/List/List.module.css";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";-import { assignUserColors } from "metabase/lib/formatting";import { connect } from "metabase/lib/redux";import * as metadataActions from "metabase/redux/metadata";import { getShallowTables as getTables } from "metabase/selectors/metadata";+import { assignUserColors } from "metabase/ui/colors/formatting-colors";import ReferenceHeader from "../components/ReferenceHeader";import {diff --git a/frontend/src/metabase/search/components/SearchResult/components/ItemIcon.styled.tsx b/frontend/src/metabase/search/components/SearchResult/components/ItemIcon.styled.tsxindex 101ce4dfba0..1cbfcc5f1a5 100644--- a/frontend/src/metabase/search/components/SearchResult/components/ItemIcon.styled.tsx+++ b/frontend/src/metabase/search/components/SearchResult/components/ItemIcon.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { lighten } from "metabase/lib/colors";+import { lighten } from "metabase/ui/colors";import { color } from "metabase/ui/utils/colors";import type { SearchModel } from "metabase-types/api";diff --git a/frontend/src/metabase/static-viz/components/BoxPlotChart/BoxPlotChart.stories.tsx b/frontend/src/metabase/static-viz/components/BoxPlotChart/BoxPlotChart.stories.tsxindex f1ed5db2c8a..da9fdd3cb1c 100644--- a/frontend/src/metabase/static-viz/components/BoxPlotChart/BoxPlotChart.stories.tsx+++ b/frontend/src/metabase/static-viz/components/BoxPlotChart/BoxPlotChart.stories.tsx@@ -1,10 +1,10 @@import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";import {measureTextHeight,measureTextWidth,} from "metabase/static-viz/lib/text";+import { color } from "metabase/ui/colors";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.stories.tsx b/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.stories.tsxindex cec45154c1d..ef7d8025bcc 100644--- a/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.stories.tsx+++ b/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.stories.tsx@@ -1,11 +1,11 @@import type { StoryFn } from "@storybook/react";import { updateIn } from "icepick";-import { color } from "metabase/lib/colors";import {measureTextHeight,measureTextWidth,} from "metabase/static-viz/lib/text";+import { color } from "metabase/ui/colors";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/static-viz/components/FunnelBarChart/FunnelBarChart.stories.tsx b/frontend/src/metabase/static-viz/components/FunnelBarChart/FunnelBarChart.stories.tsxindex 1222200e3e6..5558da6c62f 100644--- a/frontend/src/metabase/static-viz/components/FunnelBarChart/FunnelBarChart.stories.tsx+++ b/frontend/src/metabase/static-viz/components/FunnelBarChart/FunnelBarChart.stories.tsx@@ -1,10 +1,10 @@import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";import {measureTextHeight,measureTextWidth,} from "metabase/static-viz/lib/text";+import { color } from "metabase/ui/colors";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/static-viz/components/Gauge/Gauge.stories.tsx b/frontend/src/metabase/static-viz/components/Gauge/Gauge.stories.tsxindex 88a64e8d442..30fe0eaf290 100644--- a/frontend/src/metabase/static-viz/components/Gauge/Gauge.stories.tsx+++ b/frontend/src/metabase/static-viz/components/Gauge/Gauge.stories.tsx@@ -1,6 +1,5 @@import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";import GaugeContainer, {type GaugeContainerProps,} from "metabase/static-viz/components/Gauge/GaugeContainer";@@ -9,6 +8,7 @@ import {TRUNCATED_LABELS,WITH_FORMATTING,} from "metabase/static-viz/components/Gauge/stories-data";+import { color } from "metabase/ui/colors";export default {title: "Viz/Static Viz/Gauge",diff --git a/frontend/src/metabase/static-viz/components/Gauge/Gauge.tsx b/frontend/src/metabase/static-viz/components/Gauge/Gauge.tsxindex 5cbcf092c99..d7b92515257 100644--- a/frontend/src/metabase/static-viz/components/Gauge/Gauge.tsx+++ b/frontend/src/metabase/static-viz/components/Gauge/Gauge.tsx@@ -2,7 +2,7 @@ import { Group } from "@visx/group";import { Pie } from "@visx/shape";import type { PieArcDatum } from "@visx/shape/lib/shapes/Pie";-import type { ColorGetter } from "metabase/visualizations/types";+import type { ColorGetter } from "metabase/ui/colors/types";import Watermark from "../../watermark.svg?component";diff --git a/frontend/src/metabase/static-viz/components/Gauge/GaugeContainer.tsx b/frontend/src/metabase/static-viz/components/Gauge/GaugeContainer.tsxindex ebd75f1a38b..ef8007f579e 100644--- a/frontend/src/metabase/static-viz/components/Gauge/GaugeContainer.tsx+++ b/frontend/src/metabase/static-viz/components/Gauge/GaugeContainer.tsx@@ -1,8 +1,8 @@import { CHAR_SIZES_FONT_WEIGHT } from "metabase/static-viz/constants/char-sizes";import { formatNumber } from "metabase/static-viz/lib/numbers";import { measureTextWidth } from "metabase/static-viz/lib/text";+import type { ColorGetter } from "metabase/ui/colors/types";import { truncateText } from "metabase/visualizations/lib/text";-import type { ColorGetter } from "metabase/visualizations/types";import Gauge from "./Gauge";import {diff --git a/frontend/src/metabase/static-viz/components/Gauge/utils.tsx b/frontend/src/metabase/static-viz/components/Gauge/utils.tsxindex 134ffd05306..eeba9485e20 100644--- a/frontend/src/metabase/static-viz/components/Gauge/utils.tsx+++ b/frontend/src/metabase/static-viz/components/Gauge/utils.tsx@@ -3,8 +3,8 @@ import Color from "color";import type { NumberFormatOptions } from "metabase/static-viz/lib/numbers";import { measureTextWidth } from "metabase/static-viz/lib/text";+import type { ColorGetter } from "metabase/ui/colors/types";import { resolveColorFromCssVariable } from "metabase/ui/utils/colors";-import type { ColorGetter } from "metabase/visualizations/types";import {BASE_FONT_SIZE,diff --git a/frontend/src/metabase/static-viz/components/PieChart/PieChart.stories.tsx b/frontend/src/metabase/static-viz/components/PieChart/PieChart.stories.tsxindex 72bbd15b294..ea00701e1fb 100644--- a/frontend/src/metabase/static-viz/components/PieChart/PieChart.stories.tsx+++ b/frontend/src/metabase/static-viz/components/PieChart/PieChart.stories.tsx@@ -1,10 +1,10 @@import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";import {measureTextHeight,measureTextWidth,} from "metabase/static-viz/lib/text";+import { color } from "metabase/ui/colors";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/static-viz/components/RowChart/RowChart.stories.tsx b/frontend/src/metabase/static-viz/components/RowChart/RowChart.stories.tsxindex f125c802ceb..dc0f0be2004 100644--- a/frontend/src/metabase/static-viz/components/RowChart/RowChart.stories.tsx+++ b/frontend/src/metabase/static-viz/components/RowChart/RowChart.stories.tsx@@ -1,10 +1,10 @@import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";import {METRIC_COLUMN_WITH_SCALING,MULTIPLE_SERIES,} from "metabase/static-viz/components/RowChart/stories-data";+import { color } from "metabase/ui/colors";import {type StaticChartProps,diff --git a/frontend/src/metabase/static-viz/components/RowChart/stories-data.ts b/frontend/src/metabase/static-viz/components/RowChart/stories-data.tsindex 3ab5092646e..38c47c32703 100644--- a/frontend/src/metabase/static-viz/components/RowChart/stories-data.ts+++ b/frontend/src/metabase/static-viz/components/RowChart/stories-data.ts@@ -1,8 +1,8 @@-import { color } from "metabase/lib/colors";import {measureTextHeight,measureTextWidth,} from "metabase/static-viz/lib/text";+import { color } from "metabase/ui/colors";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/static-viz/components/RowChart/theme.ts b/frontend/src/metabase/static-viz/components/RowChart/theme.tsindex 3e4c9a480ca..6e522216738 100644--- a/frontend/src/metabase/static-viz/components/RowChart/theme.ts+++ b/frontend/src/metabase/static-viz/components/RowChart/theme.ts@@ -1,5 +1,5 @@+import type { ColorGetter } from "metabase/ui/colors/types";import type { RowChartTheme } from "metabase/visualizations/shared/components/RowChart/types";-import type { ColorGetter } from "metabase/visualizations/types";export const getStaticChartTheme = (getColor: ColorGetter,diff --git a/frontend/src/metabase/static-viz/components/SankeyChart/SankeyChart.stories.tsx b/frontend/src/metabase/static-viz/components/SankeyChart/SankeyChart.stories.tsxindex 9495cf93d6c..8b286f9bb71 100644--- a/frontend/src/metabase/static-viz/components/SankeyChart/SankeyChart.stories.tsx+++ b/frontend/src/metabase/static-viz/components/SankeyChart/SankeyChart.stories.tsx@@ -1,10 +1,10 @@import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";import {measureTextHeight,measureTextWidth,} from "metabase/static-viz/lib/text";+import { color } from "metabase/ui/colors";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/static-viz/components/ScalarChart/ScalarChart.stories.tsx b/frontend/src/metabase/static-viz/components/ScalarChart/ScalarChart.stories.tsxindex cc2a160f154..9892e5275ba 100644--- a/frontend/src/metabase/static-viz/components/ScalarChart/ScalarChart.stories.tsx+++ b/frontend/src/metabase/static-viz/components/ScalarChart/ScalarChart.stories.tsx@@ -1,10 +1,10 @@import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";import {measureTextHeight,measureTextWidth,} from "metabase/static-viz/lib/text";+import { color } from "metabase/ui/colors";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/static-viz/components/ScatterPlot/ScatterPlot.stories.tsx b/frontend/src/metabase/static-viz/components/ScatterPlot/ScatterPlot.stories.tsxindex e6674277bc4..e9f8fcc9932 100644--- a/frontend/src/metabase/static-viz/components/ScatterPlot/ScatterPlot.stories.tsx+++ b/frontend/src/metabase/static-viz/components/ScatterPlot/ScatterPlot.stories.tsx@@ -1,10 +1,10 @@import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";import {measureTextHeight,measureTextWidth,} from "metabase/static-viz/lib/text";+import { color } from "metabase/ui/colors";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.stories.tsx b/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.stories.tsxindex dc4041ad7ee..ef53710e43e 100644--- a/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.stories.tsx+++ b/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.stories.tsx@@ -1,9 +1,9 @@-import { colors } from "metabase/lib/colors";import { createColorGetter } from "metabase/static-viz/lib/colors";import {measureTextHeight,measureTextWidth,} from "metabase/static-viz/lib/text";+import { colors } from "metabase/ui/colors";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RowValues, VisualizationSettings } from "metabase-types/api";import {diff --git a/frontend/src/metabase/static-viz/components/Text/Text.tsx b/frontend/src/metabase/static-viz/components/Text/Text.tsxindex d410575a314..79311833abd 100644--- a/frontend/src/metabase/static-viz/components/Text/Text.tsx+++ b/frontend/src/metabase/static-viz/components/Text/Text.tsx@@ -1,7 +1,7 @@import type { TextProps } from "@visx/text";import { Text as VText } from "@visx/text";-import type { ColorPalette } from "metabase/lib/colors/types";+import type { ColorPalette } from "metabase/ui/colors/types";type Props = Omit<TextProps, "color"> & {color?: keyof ColorPalette;diff --git a/frontend/src/metabase/static-viz/components/WaterfallChart/WaterfallChart.stories.tsx b/frontend/src/metabase/static-viz/components/WaterfallChart/WaterfallChart.stories.tsxindex 6479436f542..bf72c53c305 100644--- a/frontend/src/metabase/static-viz/components/WaterfallChart/WaterfallChart.stories.tsx+++ b/frontend/src/metabase/static-viz/components/WaterfallChart/WaterfallChart.stories.tsx@@ -1,11 +1,11 @@import type { StoryFn } from "@storybook/react";-import { color } from "metabase/lib/colors";import { data } from "metabase/static-viz/components/WaterfallChart/stories-data";import {measureTextHeight,measureTextWidth,} from "metabase/static-viz/lib/text";+import { color } from "metabase/ui/colors";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/static-viz/containers/LegacyStaticChart/LegacyStaticChart.tsx b/frontend/src/metabase/static-viz/containers/LegacyStaticChart/LegacyStaticChart.tsxindex a8bbda06b7d..3c4d4ba6be8 100644--- a/frontend/src/metabase/static-viz/containers/LegacyStaticChart/LegacyStaticChart.tsx+++ b/frontend/src/metabase/static-viz/containers/LegacyStaticChart/LegacyStaticChart.tsx@@ -1,7 +1,7 @@-import type { ColorPalette } from "metabase/lib/colors/types";import Funnel from "metabase/static-viz/components/FunnelChart";import Gauge from "metabase/static-viz/components/Gauge";import { createColorGetter } from "metabase/static-viz/lib/colors";+import type { ColorPalette } from "metabase/ui/colors/types";export type LegacyStaticChartType = "gauge" | "funnel";diff --git a/frontend/src/metabase/static-viz/lib/colors.ts b/frontend/src/metabase/static-viz/lib/colors.tsindex ab0b489883b..1dbdb76e46b 100644--- a/frontend/src/metabase/static-viz/lib/colors.ts+++ b/frontend/src/metabase/static-viz/lib/colors.ts@@ -1,9 +1,8 @@import Color from "color";-import { getColors, staticVizOverrides } from "metabase/lib/colors/colors";-import { color } from "metabase/lib/colors/palette";-import type { ColorPalette } from "metabase/lib/colors/types";-import type { ColorGetter } from "metabase/visualizations/types";+import { getColors, staticVizOverrides } from "metabase/ui/colors/colors";+import { color } from "metabase/ui/colors/palette";+import type { ColorGetter, ColorPalette } from "metabase/ui/colors/types";export const createColorGetter = (instanceColors: ColorPalette = {},diff --git a/frontend/src/metabase/static-viz/lib/rendering-context.ts b/frontend/src/metabase/static-viz/lib/rendering-context.tsindex 59ddc0d23d9..a7e7e732108 100644--- a/frontend/src/metabase/static-viz/lib/rendering-context.ts+++ b/frontend/src/metabase/static-viz/lib/rendering-context.ts@@ -1,4 +1,4 @@-import type { ColorPalette } from "metabase/lib/colors/types";+import type { ColorPalette } from "metabase/ui/colors/types";import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/styled-components/theme/css-variables.ts b/frontend/src/metabase/styled-components/theme/css-variables.tsindex 48a9397fc2a..9f33fe0aa16 100644--- a/frontend/src/metabase/styled-components/theme/css-variables.ts+++ b/frontend/src/metabase/styled-components/theme/css-variables.ts@@ -10,9 +10,9 @@ import {SDK_UNCHANGEABLE_COLORS,} from "metabase/embedding-sdk/theme/embedding-color-palette";import type { ResolvedColorScheme } from "metabase/lib/color-scheme";-import { deriveFullMetabaseTheme } from "metabase/lib/colors";-import type { ColorName } from "metabase/lib/colors/types";import type { MantineTheme } from "metabase/ui";+import { deriveFullMetabaseTheme } from "metabase/ui/colors";+import type { ColorName } from "metabase/ui/colors/types";import type { ColorSettings } from "metabase-types/api";const createColorVars = (@@ -78,7 +78,7 @@ export function getMetabaseSdkCssVariables({* These CSS variables are part of the core design system colors.** Only keep colors that depend on the theme and are not specified anywhere else here.- * You don't need to add new colors from `frontend/src/metabase/lib/colors/colors.ts` here since+ * You don't need to add new colors from `frontend/src/metabase/ui/colors/colors.ts` here since* they're already included in `getMetabaseSdkCssVariables`**/function getSdkDesignSystemCssVariables(theme: MantineTheme) {diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsx b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsxindex 6cf3c29178a..a474957a2ff 100644--- a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsx+++ b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsx@@ -2,8 +2,8 @@import styled from "@emotion/styled";import { Markdown } from "metabase/common/components/Markdown";-import { alpha } from "metabase/lib/colors";import { Icon } from "metabase/ui";+import { alpha } from "metabase/ui/colors";interface CardRootProps {isSelected?: boolean;diff --git a/frontend/src/metabase/transforms/components/RunButton/RunButton.tsx b/frontend/src/metabase/transforms/components/RunButton/RunButton.tsxindex 7a5d8ec37c2..4bdc740c033 100644--- a/frontend/src/metabase/transforms/components/RunButton/RunButton.tsx+++ b/frontend/src/metabase/transforms/components/RunButton/RunButton.tsx@@ -7,8 +7,8 @@ import {} from "react";import { t } from "ttag";-import type { ColorName } from "metabase/lib/colors/types";import { Button, type ButtonProps, Icon, Loader, Tooltip } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type {TransformId,TransformJobId,diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsxindex 87c92543a59..156813d0f4f 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx@@ -25,7 +25,6 @@ import CS from "metabase/css/core/index.css";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";-import type { ColorName } from "metabase/lib/colors/types";import { useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { type NamedUser, getUserName } from "metabase/lib/user";@@ -48,6 +47,7 @@ import {TreeTableSkeleton,useTreeTableInstance,} from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import { CollectionRowMenu } from "./CollectionRowMenu";import S from "./TransformListPage.module.css";diff --git a/frontend/src/metabase/lib/colors/accents.ts b/frontend/src/metabase/ui/colors/accents.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/accents.tsrename to frontend/src/metabase/ui/colors/accents.tsdiff --git a/frontend/src/metabase/lib/colors/accents.unit.spec.ts b/frontend/src/metabase/ui/colors/accents.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/accents.unit.spec.tsrename to frontend/src/metabase/ui/colors/accents.unit.spec.tsdiff --git a/frontend/src/metabase/lib/colors/charts.ts b/frontend/src/metabase/ui/colors/charts.tssimilarity index 98%rename from frontend/src/metabase/lib/colors/charts.tsrename to frontend/src/metabase/ui/colors/charts.tsindex 71f5c4043a9..ac8ba1d7c7f 100644--- a/frontend/src/metabase/lib/colors/charts.ts+++ b/frontend/src/metabase/ui/colors/charts.ts@@ -127,7 +127,7 @@ const getHashBasedMapping = (// if we haven't found a value for a key,// let's try to find a preferred value for it (e.g. count gets its own specific color)- // see frontend/src/metabase/lib/colors/groups.ts, getPreferredColor()+ // see frontend/src/metabase/ui/colors/groups.ts, getPreferredColor()sortedKeys.forEach((key, i) => {if (!newMapping[key]) {const value = getPreferredValue(sortedDefaultKeys?.[i] ?? key);diff --git a/frontend/src/metabase/lib/colors/charts.unit.spec.ts b/frontend/src/metabase/ui/colors/charts.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/charts.unit.spec.tsrename to frontend/src/metabase/ui/colors/charts.unit.spec.tsdiff --git a/frontend/src/metabase/lib/colors/colors.ts b/frontend/src/metabase/ui/colors/colors.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/colors.tsrename to frontend/src/metabase/ui/colors/colors.tsdiff --git a/frontend/src/metabase/lib/colors/constants/accent-colors.ts b/frontend/src/metabase/ui/colors/constants/accent-colors.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/constants/accent-colors.tsrename to frontend/src/metabase/ui/colors/constants/accent-colors.tsdiff --git a/frontend/src/metabase/lib/colors/constants/accents.ts b/frontend/src/metabase/ui/colors/constants/accents.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/constants/accents.tsrename to frontend/src/metabase/ui/colors/constants/accents.tsdiff --git a/frontend/src/metabase/lib/colors/constants/base-colors.ts b/frontend/src/metabase/ui/colors/constants/base-colors.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/constants/base-colors.tsrename to frontend/src/metabase/ui/colors/constants/base-colors.tsdiff --git a/frontend/src/metabase/lib/colors/constants/color-names.ts b/frontend/src/metabase/ui/colors/constants/color-names.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/constants/color-names.tsrename to frontend/src/metabase/ui/colors/constants/color-names.tsdiff --git a/frontend/src/metabase/lib/colors/constants/protected-colors.ts b/frontend/src/metabase/ui/colors/constants/protected-colors.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/constants/protected-colors.tsrename to frontend/src/metabase/ui/colors/constants/protected-colors.tsdiff --git a/frontend/src/metabase/lib/colors/constants/themes/dark.ts b/frontend/src/metabase/ui/colors/constants/themes/dark.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/constants/themes/dark.tsrename to frontend/src/metabase/ui/colors/constants/themes/dark.tsdiff --git a/frontend/src/metabase/lib/colors/constants/themes/light.ts b/frontend/src/metabase/ui/colors/constants/themes/light.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/constants/themes/light.tsrename to frontend/src/metabase/ui/colors/constants/themes/light.tsdiff --git a/frontend/src/metabase/lib/colors/derive-theme.ts b/frontend/src/metabase/ui/colors/derive-theme.tssimilarity index 96%rename from frontend/src/metabase/lib/colors/derive-theme.tsrename to frontend/src/metabase/ui/colors/derive-theme.tsindex 0bc00698e39..7c69697b9e4 100644--- a/frontend/src/metabase/lib/colors/derive-theme.ts+++ b/frontend/src/metabase/ui/colors/derive-theme.ts@@ -1,10 +1,9 @@import _ from "underscore";import type { MetabaseEmbeddingThemeV2 } from "metabase/embedding-sdk/theme";+import type { ResolvedColorScheme } from "metabase/lib/color-scheme";import type { ColorSettings } from "metabase-types/api";-import type { ResolvedColorScheme } from "../color-scheme";-import { deriveAllAccentColors, mapChartColorsToAccents } from "./accents";import { PROTECTED_COLORS } from "./constants/protected-colors";import { getThemeFromColorScheme } from "./theme-from-color-scheme";diff --git a/frontend/src/metabase/lib/colors/derive-theme.unit.spec.ts b/frontend/src/metabase/ui/colors/derive-theme.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/derive-theme.unit.spec.tsrename to frontend/src/metabase/ui/colors/derive-theme.unit.spec.tsdiff --git a/frontend/src/metabase/lib/formatting/colors.ts b/frontend/src/metabase/ui/colors/formatting-colors.tssimilarity index 94%rename from frontend/src/metabase/lib/formatting/colors.tsrename to frontend/src/metabase/ui/colors/formatting-colors.tsindex 7ea69d554cf..2b8a070c272 100644--- a/frontend/src/metabase/lib/formatting/colors.ts+++ b/frontend/src/metabase/ui/colors/formatting-colors.ts@@ -1,4 +1,4 @@-import { color } from "metabase/lib/colors";+import { color } from "./palette";export function assignUserColors(userIds: string[],diff --git a/frontend/src/metabase/lib/formatting/colors.unit.spec.js b/frontend/src/metabase/ui/colors/formatting-colors.unit.spec.jssimilarity index 90%rename from frontend/src/metabase/lib/formatting/colors.unit.spec.jsrename to frontend/src/metabase/ui/colors/formatting-colors.unit.spec.jsindex 32f88bebed3..b19e9350bb4 100644--- a/frontend/src/metabase/lib/formatting/colors.unit.spec.js+++ b/frontend/src/metabase/ui/colors/formatting-colors.unit.spec.js@@ -1,6 +1,5 @@-import { color } from "metabase/lib/colors";--import { assignUserColors } from "./colors";+import { assignUserColors } from "./formatting-colors";+import { color } from "./palette";describe("lib/formatting/colors", () => {it("should assign colors to users when currentUserId is passed", () => {diff --git a/frontend/src/metabase/lib/colors/groups.ts b/frontend/src/metabase/ui/colors/groups.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/groups.tsrename to frontend/src/metabase/ui/colors/groups.tsdiff --git a/frontend/src/metabase/lib/colors/groups.unit.spec.ts b/frontend/src/metabase/ui/colors/groups.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/groups.unit.spec.tsrename to frontend/src/metabase/ui/colors/groups.unit.spec.tsdiff --git a/frontend/src/metabase/lib/colors/index.ts b/frontend/src/metabase/ui/colors/index.tssimilarity index 89%rename from frontend/src/metabase/lib/colors/index.tsrename to frontend/src/metabase/ui/colors/index.tsindex d892d76c5d8..3a8f007a4a0 100644--- a/frontend/src/metabase/lib/colors/index.ts+++ b/frontend/src/metabase/ui/colors/index.ts@@ -1,5 +1,6 @@export * from "./palette";export * from "./colors";+export * from "./formatting-colors";export { METABASE_DARK_THEME } from "./constants/themes/dark";export { METABASE_LIGHT_THEME } from "./constants/themes/light";diff --git a/frontend/src/metabase/lib/colors/palette.ts b/frontend/src/metabase/ui/colors/palette.tssimilarity index 97%rename from frontend/src/metabase/lib/colors/palette.tsrename to frontend/src/metabase/ui/colors/palette.tsindex 234bf45f31e..94ec927a96e 100644--- a/frontend/src/metabase/lib/colors/palette.ts+++ b/frontend/src/metabase/ui/colors/palette.ts@@ -1,9 +1,7 @@import Color from "color";-import type { ColorGetter } from "metabase/visualizations/types";-import { colors, getColors } from "./colors";-import type { ColorName, ColorPalette } from "./types";+import type { ColorGetter, ColorName, ColorPalette } from "./types";export const ACCENT_COUNT = 8;diff --git a/frontend/src/metabase/lib/colors/palette.unit.spec.ts b/frontend/src/metabase/ui/colors/palette.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/palette.unit.spec.tsrename to frontend/src/metabase/ui/colors/palette.unit.spec.tsdiff --git a/frontend/src/metabase/lib/colors/scales.ts b/frontend/src/metabase/ui/colors/scales.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/scales.tsrename to frontend/src/metabase/ui/colors/scales.tsdiff --git a/frontend/src/metabase/lib/colors/scales.unit.spec.ts b/frontend/src/metabase/ui/colors/scales.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/scales.unit.spec.tsrename to frontend/src/metabase/ui/colors/scales.unit.spec.tsdiff --git a/frontend/src/metabase/lib/colors/theme-from-color-scheme.ts b/frontend/src/metabase/ui/colors/theme-from-color-scheme.tssimilarity index 85%rename from frontend/src/metabase/lib/colors/theme-from-color-scheme.tsrename to frontend/src/metabase/ui/colors/theme-from-color-scheme.tsindex 22bdfb69a2c..6baef31b9e3 100644--- a/frontend/src/metabase/lib/colors/theme-from-color-scheme.ts+++ b/frontend/src/metabase/ui/colors/theme-from-color-scheme.ts@@ -1,4 +1,4 @@-import type { ResolvedColorScheme } from "../color-scheme";+import type { ResolvedColorScheme } from "metabase/lib/color-scheme";import { METABASE_DARK_THEME } from "./constants/themes/dark";import { METABASE_LIGHT_THEME } from "./constants/themes/light";diff --git a/frontend/src/metabase/lib/colors/types/accent-color-options.ts b/frontend/src/metabase/ui/colors/types/accent-color-options.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/types/accent-color-options.tsrename to frontend/src/metabase/ui/colors/types/accent-color-options.tsdiff --git a/frontend/src/metabase/lib/colors/types/color-keys.ts b/frontend/src/metabase/ui/colors/types/color-keys.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/types/color-keys.tsrename to frontend/src/metabase/ui/colors/types/color-keys.tsdiff --git a/frontend/src/metabase/lib/colors/types/index.ts b/frontend/src/metabase/ui/colors/types/index.tssimilarity index 85%rename from frontend/src/metabase/lib/colors/types/index.tsrename to frontend/src/metabase/ui/colors/types/index.tsindex 6c3b95e3714..c20ead9ddfb 100644--- a/frontend/src/metabase/lib/colors/types/index.ts+++ b/frontend/src/metabase/ui/colors/types/index.ts@@ -8,6 +8,7 @@ import type { MetabaseColorKey } from "./color-keys";export type ColorPalette = Partial<Record<MetabaseColorKey, string>>;export type ColorName = MetabaseColorKey;+export type ColorGetter = (colorName: string) => string;export type * from "./color-keys";export type * from "./accent-color-options";diff --git a/frontend/src/metabase/lib/colors/types/theme.ts b/frontend/src/metabase/ui/colors/types/theme.tssimilarity index 100%rename from frontend/src/metabase/lib/colors/types/theme.tsrename to frontend/src/metabase/ui/colors/types/theme.tsdiff --git a/frontend/src/metabase/ui/components/data-display/Avatar/Avatar.config.ts b/frontend/src/metabase/ui/components/data-display/Avatar/Avatar.config.tsindex 4b9c2b179dc..5002626f299 100644--- a/frontend/src/metabase/ui/components/data-display/Avatar/Avatar.config.ts+++ b/frontend/src/metabase/ui/components/data-display/Avatar/Avatar.config.ts@@ -1,6 +1,6 @@import { Avatar, rem } from "@mantine/core";-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";const avatarColors: ColorName[] = ["brand",diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/EntityNameCell/EntityNameCell.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/EntityNameCell/EntityNameCell.tsxindex 50291708fe0..df878632695 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/EntityNameCell/EntityNameCell.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/EntityNameCell/EntityNameCell.tsx@@ -2,9 +2,9 @@ import { type ComponentProps, memo } from "react";import { Ellipsified } from "metabase/common/components/Ellipsified";import CS from "metabase/css/core/index.css";-import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import { Group, Icon, Text } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";interface EntityNameCellProps {icon?: IconName;diff --git a/frontend/src/metabase/ui/components/icons/Icon/Icon.tsx b/frontend/src/metabase/ui/components/icons/Icon/Icon.tsxindex 39d0a0ace73..d9bba71ef79 100644--- a/frontend/src/metabase/ui/components/icons/Icon/Icon.tsx+++ b/frontend/src/metabase/ui/components/icons/Icon/Icon.tsx@@ -5,7 +5,7 @@ import cx from "classnames";import type { MouseEvent, ReactNode, SVGAttributes } from "react";import { forwardRef } from "react";-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";import { Tooltip } from "../../overlays/Tooltip";diff --git a/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.tsx b/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.tsxindex 840b5cfc3ce..280be40415f 100644--- a/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.tsx+++ b/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.tsx@@ -28,10 +28,10 @@ import {isValidColorScheme,setUserColorSchemeAfterUpdate,} from "metabase/lib/color-scheme";-import { mutateColors } from "metabase/lib/colors/colors";-import type { ColorName } from "metabase/lib/colors/types";import MetabaseSettings from "metabase/lib/settings";import type { DisplayTheme } from "metabase/public/lib/types";+import { mutateColors } from "metabase/ui/colors/colors";+import type { ColorName } from "metabase/ui/colors/types";import { getThemeOverrides } from "../../../theme";import { ColorSchemeProvider, useColorScheme } from "../ColorSchemeProvider";diff --git a/frontend/src/metabase/ui/utils/colors.ts b/frontend/src/metabase/ui/utils/colors.tsindex 71bbcff3e08..8c4ed84fecd 100644--- a/frontend/src/metabase/ui/utils/colors.ts+++ b/frontend/src/metabase/ui/utils/colors.ts@@ -1,8 +1,8 @@import type { MantineColorsTuple } from "@mantine/core";import type { ResolvedColorScheme } from "metabase/lib/color-scheme";-import { ALL_COLOR_NAMES, deriveFullMetabaseTheme } from "metabase/lib/colors";-import type { ColorName, MetabaseColorKey } from "metabase/lib/colors/types";+import { ALL_COLOR_NAMES, deriveFullMetabaseTheme } from "metabase/ui/colors";+import type { ColorName, MetabaseColorKey } from "metabase/ui/colors/types";import type { ColorSettings } from "metabase-types/api";const ORIGINAL_COLORS = [diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.styled.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.styled.tsxindex f6942bdbd55..50805c168ed 100644--- a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.styled.tsx+++ b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.styled.tsx@@ -1,8 +1,8 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { color } from "metabase/lib/colors";import { Warnings } from "metabase/query_builder/components/Warnings";+import { color } from "metabase/ui/colors";export const SectionWarnings = styled(Warnings)`color: ${() => color("accent4")};diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.tsxindex 7d5dab1c536..aca3c61c114 100644--- a/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.tsx+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.tsx@@ -1,6 +1,6 @@import { useMemo } from "react";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import type { StackedTooltipModel } from "metabase/visualizations/types";import { TooltipRow, TooltipTotalRow } from "../TooltipRow";diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.styled.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.styled.tsxindex a954875ca90..af2300fcb11 100644--- a/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.styled.tsx+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { darken } from "metabase/lib/colors";+import { darken } from "metabase/ui/colors";interface TooltipRowRootProps {isHeader?: boolean;diff --git a/frontend/src/metabase/visualizations/components/FunnelNormal.tsx b/frontend/src/metabase/visualizations/components/FunnelNormal.tsxindex 32a16389b9e..53c60e14e2d 100644--- a/frontend/src/metabase/visualizations/components/FunnelNormal.tsx+++ b/frontend/src/metabase/visualizations/components/FunnelNormal.tsx@@ -4,7 +4,6 @@ import { t } from "ttag";import { Ellipsified } from "metabase/common/components/Ellipsified";import CS from "metabase/css/core/index.css";-import { color } from "metabase/lib/colors";import {formatChangeWithSign,formatNumber,@@ -12,6 +11,7 @@ import {} from "metabase/lib/formatting";import { formatNullable } from "metabase/lib/formatting/nullable";import { isNotNull } from "metabase/lib/types";+import { color } from "metabase/ui/colors";import {FunnelNormalRoot,FunnelStart,diff --git a/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.tsx b/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.tsxindex f8815394b9c..d0c34d5ce90 100644--- a/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.tsx+++ b/frontend/src/metabase/visualizations/components/LeafletGridHeatMap.tsx@@ -2,7 +2,7 @@ import * as d3 from "d3";import L from "leaflet";import { t } from "ttag";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import type { ClickObject, HoveredObject } from "metabase/visualizations/types";import * as Lib from "metabase-lib";import Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/cells/MiniBarCell.tsx b/frontend/src/metabase/visualizations/components/TableInteractive/cells/MiniBarCell.tsxindex a5d3d39e5d9..c582f039eda 100644--- a/frontend/src/metabase/visualizations/components/TableInteractive/cells/MiniBarCell.tsx+++ b/frontend/src/metabase/visualizations/components/TableInteractive/cells/MiniBarCell.tsx@@ -7,7 +7,7 @@ import {type CellAlign,type CellFormatter,} from "metabase/data-grid";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import type { ColumnSettings } from "metabase-types/api";import S from "./MiniBarCell.module.css";diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsxindex 27f7be373d2..de968da874c 100644--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.unit.spec.tsx@@ -3,7 +3,7 @@ import type { ComponentProps } from "react";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";import { delay } from "__support__/utils";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import { registerVisualization } from "metabase/visualizations";import VisualizationComponent from "metabase/visualizations/components/Visualization";import registerVisualizations from "metabase/visualizations/register";diff --git a/frontend/src/metabase/visualizations/components/legend/Legend.styled.tsx b/frontend/src/metabase/visualizations/components/legend/Legend.styled.tsxindex bc5825106c4..8b33f3f1fe9 100644--- a/frontend/src/metabase/visualizations/components/legend/Legend.styled.tsx+++ b/frontend/src/metabase/visualizations/components/legend/Legend.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { darken } from "metabase/lib/colors";+import { darken } from "metabase/ui/colors";export const LegendRoot = styled.div<{ isVertical: boolean }>`display: flex;diff --git a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.jsx b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.jsxindex 72bc6dee42d..d578cfbb28b 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.jsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.jsx@@ -5,8 +5,8 @@ import { t } from "ttag";import { ColorSelector } from "metabase/common/components/ColorSelector";import CS from "metabase/css/core/index.css";-import { getAccentColors } from "metabase/lib/colors/groups";import { Flex } from "metabase/ui";+import { getAccentColors } from "metabase/ui/colors/groups";import {OptionsIcon,diff --git a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.tsx b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.tsxindex 0689fbc87ab..fcaf6efdf31 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesSingle.tsx@@ -2,7 +2,7 @@ import cx from "classnames";import { ColorSelector } from "metabase/common/components/ColorSelector";import CS from "metabase/css/core/index.css";-import { getAccentColors } from "metabase/lib/colors/groups";+import { getAccentColors } from "metabase/ui/colors/groups";import type { SingleSeries, VisualizationSettings } from "metabase-types/api";import { SeriesNameInput } from "./ChartNestedSettingSeries.styled";diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingColorPicker/ChartSettingColorPicker.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingColorPicker/ChartSettingColorPicker.tsxindex eef9e72e8f1..449536c8003 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingColorPicker/ChartSettingColorPicker.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingColorPicker/ChartSettingColorPicker.tsx@@ -4,9 +4,9 @@ import type { PillSize } from "metabase/common/components/ColorPill";import { ColorSelector } from "metabase/common/components/ColorSelector";import CS from "metabase/css/core/index.css";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";-import { getAccentColors } from "metabase/lib/colors/groups";-import type { AccentColorOptions } from "metabase/lib/colors/types";import { Box, type BoxProps } from "metabase/ui";+import { getAccentColors } from "metabase/ui/colors/groups";+import type { AccentColorOptions } from "metabase/ui/colors/types";interface ChartSettingColorPickerProps extends BoxProps {className?: string;diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedItems/ChartSettingOrderedItems.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedItems/ChartSettingOrderedItems.tsxindex 11b15bff422..c276326e01d 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedItems/ChartSettingOrderedItems.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedItems/ChartSettingOrderedItems.tsx@@ -6,8 +6,8 @@ import type {SortableDivider,} from "metabase/common/components/Sortable";import { Sortable, SortableList } from "metabase/common/components/Sortable";-import type { AccentColorOptions } from "metabase/lib/colors/types";import type { IconProps } from "metabase/ui";+import type { AccentColorOptions } from "metabase/ui/colors/types";import { ColumnItem } from "../ColumnItem";diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsxindex 37cdb751da6..377f5e89fb9 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx@@ -4,9 +4,9 @@ import _ from "underscore";import { ColorSelector } from "metabase/common/components/ColorSelector";import CS from "metabase/css/core/index.css";-import { color } from "metabase/lib/colors";-import { getAccentColors } from "metabase/lib/colors/groups";import { Box, Button, Icon, NumberInput, Text } from "metabase/ui";+import { color } from "metabase/ui/colors";+import { getAccentColors } from "metabase/ui/colors/groups";import type { ScalarSegment } from "metabase-types/api";import { ChartSettingInput } from "../ChartSettingInput";diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsxindex 4ca9d411b4f..94a1bb4c0d4 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx@@ -6,13 +6,13 @@ import _ from "underscore";import { ColorSelector } from "metabase/common/components/ColorSelector";import type { DragEndEvent } from "metabase/common/components/Sortable";-import { color } from "metabase/lib/colors";-import { getAccentColors } from "metabase/lib/colors/groups";-import type { AccentColorOptions } from "metabase/lib/colors/types";import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";import { getEventTarget } from "metabase/lib/dom";import { isEmpty } from "metabase/lib/validate";import { Box, Button, Flex, Group, Icon, Select, Text } from "metabase/ui";+import { color } from "metabase/ui/colors";+import { getAccentColors } from "metabase/ui/colors/groups";+import type { AccentColorOptions } from "metabase/ui/colors/types";import type { Series } from "metabase-types/api";import { ChartSettingMessage } from "./ChartSettingMessage";diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/constants.ts b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/constants.tsindex 36c0c387753..55955ab8f74 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/constants.ts+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/constants.ts@@ -1,7 +1,7 @@import {getAccentColors,getStatusColorRanges,-} from "metabase/lib/colors/groups";+} from "metabase/ui/colors/groups";import type {ColumnRangeFormattingSetting,ColumnSingleFormattingSetting,diff --git a/frontend/src/metabase/visualizations/components/settings/ColumnItem/ColumnItem.tsx b/frontend/src/metabase/visualizations/components/settings/ColumnItem/ColumnItem.tsxindex eacf1866636..40bdda47a24 100644--- a/frontend/src/metabase/visualizations/components/settings/ColumnItem/ColumnItem.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ColumnItem/ColumnItem.tsx@@ -1,7 +1,6 @@import cx from "classnames";import CS from "metabase/css/core/index.css";-import type { AccentColorOptions } from "metabase/lib/colors/types";import {Flex,type FlexProps,@@ -10,6 +9,7 @@ import {type IconProps,Text,} from "metabase/ui";+import type { AccentColorOptions } from "metabase/ui/colors/types";import { ChartSettingActionIcon } from "../ChartSettingActionIcon";import { ChartSettingColorPicker } from "../ChartSettingColorPicker";diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/series.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/series.tsindex d0848ac2776..dfe6a330b81 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/series.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/series.ts@@ -7,9 +7,9 @@ import type {} from "echarts/types/src/util/types";import _ from "underscore";-import { getTextColorForBackground } from "metabase/lib/colors/palette";import { getObjectValues } from "metabase/lib/objects";import { isNotNull } from "metabase/lib/types";+import { getTextColorForBackground } from "metabase/ui/colors/palette";import {INDEX_KEY,NEGATIVE_STACK_TOTAL_DATA_KEY,diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/index.ts b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/index.tsindex ff9eb76ad4a..e30e9f0bc83 100644--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/index.ts+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/index.ts@@ -1,6 +1,6 @@import { t } from "ttag";-import { getColorsForValues } from "metabase/lib/colors/charts";+import { getColorsForValues } from "metabase/ui/colors/charts";import type { ComputedVisualizationSettings } from "metabase/visualizations/types";import type { RawSeries } from "metabase-types/api";diff --git a/frontend/src/metabase/visualizations/echarts/pie/option.ts b/frontend/src/metabase/visualizations/echarts/pie/option.tsindex 77b6be1ef75..41f611bb0a0 100644--- a/frontend/src/metabase/visualizations/echarts/pie/option.ts+++ b/frontend/src/metabase/visualizations/echarts/pie/option.ts@@ -1,8 +1,8 @@import Color from "color";import type { EChartsOption, SunburstSeriesOption } from "echarts";-import { getTextColorForBackground } from "metabase/lib/colors";import { checkNotNull } from "metabase/lib/types";+import { getTextColorForBackground } from "metabase/ui/colors";import { CHAR_ELLIPSES, truncateText } from "metabase/visualizations/lib/text";import type {ComputedVisualizationSettings,diff --git a/frontend/src/metabase/visualizations/echarts/pie/util/colors.ts b/frontend/src/metabase/visualizations/echarts/pie/util/colors.tsindex 4fedebb8155..ba5b607c823 100644--- a/frontend/src/metabase/visualizations/echarts/pie/util/colors.ts+++ b/frontend/src/metabase/visualizations/echarts/pie/util/colors.ts@@ -1,7 +1,7 @@import { match } from "ts-pattern";-import { aliases, colors } from "metabase/lib/colors";import { isEmpty } from "metabase/lib/validate";+import { aliases, colors } from "metabase/ui/colors";const ACCENT_KEY_PREFIX = "accent";diff --git a/frontend/src/metabase/visualizations/hooks/use-browser-rendering-context.ts b/frontend/src/metabase/visualizations/hooks/use-browser-rendering-context.tsindex 230f4f4db40..b72e7107136 100644--- a/frontend/src/metabase/visualizations/hooks/use-browser-rendering-context.ts+++ b/frontend/src/metabase/visualizations/hooks/use-browser-rendering-context.ts@@ -1,9 +1,9 @@import { useMemo } from "react";import { usePalette } from "metabase/common/hooks/use-palette";-import { color } from "metabase/lib/colors";import { measureTextHeight, measureTextWidth } from "metabase/lib/measure-text";import { useMantineTheme } from "metabase/ui";+import { color } from "metabase/ui/colors";import { getVisualizationTheme } from "metabase/visualizations/shared/utils/theme";import type { RenderingContext } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/visualizations/lib/settings/graph.ts b/frontend/src/metabase/visualizations/lib/settings/graph.tsindex 74dbd068287..5c2da0a53ec 100644--- a/frontend/src/metabase/visualizations/lib/settings/graph.ts+++ b/frontend/src/metabase/visualizations/lib/settings/graph.ts@@ -1,7 +1,7 @@import { t } from "ttag";import _ from "underscore";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import {getMaxDimensionsSupported,getMaxMetricsSupported,diff --git a/frontend/src/metabase/visualizations/lib/settings/series.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings/series.unit.spec.tsindex de89e0fee11..b9cc25a7d9d 100644--- a/frontend/src/metabase/visualizations/lib/settings/series.unit.spec.ts+++ b/frontend/src/metabase/visualizations/lib/settings/series.unit.spec.ts@@ -50,7 +50,7 @@ describe("Series unit settings", () => {...createMockDataset(),// columnValuesMapping is needed by the color assignment logic// because certain series have a specific color based on their name (count, for instance)- // see frontend/src/metabase/lib/colors/groups.ts, getPreferredColor()+ // see frontend/src/metabase/ui/colors/groups.ts, getPreferredColor()columnValuesMapping: {COLUMN_1: [{diff --git a/frontend/src/metabase/visualizations/lib/table_format.ts b/frontend/src/metabase/visualizations/lib/table_format.tsindex b37d7ea9d0b..2fe5a498704 100644--- a/frontend/src/metabase/visualizations/lib/table_format.ts+++ b/frontend/src/metabase/visualizations/lib/table_format.ts@@ -3,9 +3,9 @@import Color from "color";-import { alpha } from "metabase/lib/colors";-import { getLinearColorScale, getSafeColor } from "metabase/lib/colors/scales";import { isNumber } from "metabase/lib/types";+import { alpha } from "metabase/ui/colors";+import { getLinearColorScale, getSafeColor } from "metabase/ui/colors/scales";import type {ColumnFormattingOperator,ColumnFormattingSetting,diff --git a/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.stories.tsx b/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.stories.tsxindex 5aae9979b50..ef5869c92f2 100644--- a/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.stories.tsx+++ b/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.stories.tsx@@ -1,10 +1,10 @@import type { StoryFn } from "@storybook/react";import { SdkVisualizationWrapper } from "__support__/storybook";-import { color } from "metabase/lib/colors";import { measureTextWidth } from "metabase/lib/measure-text";import { getStaticChartTheme } from "metabase/static-viz/components/RowChart/theme";import { Box } from "metabase/ui";+import { color } from "metabase/ui/colors";import { useRowChartTheme } from "metabase/visualizations/visualizations/RowChart/utils/theme";import { RowChart, type RowChartProps } from "./RowChart";diff --git a/frontend/src/metabase/visualizations/shared/settings/pie.ts b/frontend/src/metabase/visualizations/shared/settings/pie.tsindex 3867400d3b7..3b3e6f7d43e 100644--- a/frontend/src/metabase/visualizations/shared/settings/pie.ts+++ b/frontend/src/metabase/visualizations/shared/settings/pie.ts@@ -1,8 +1,8 @@import _ from "underscore";-import { getColorsForValues } from "metabase/lib/colors/charts";import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";import { checkNotNull, checkNumber, isNumber } from "metabase/lib/types";+import { getColorsForValues } from "metabase/ui/colors/charts";import { SLICE_THRESHOLD } from "metabase/visualizations/echarts/pie/constants";import { getPieColumns } from "metabase/visualizations/echarts/pie/model";import type { PieRow } from "metabase/visualizations/echarts/pie/model/types";diff --git a/frontend/src/metabase/visualizations/shared/settings/series.ts b/frontend/src/metabase/visualizations/shared/settings/series.tsindex 1caf62643c3..1d062f5bc8b 100644--- a/frontend/src/metabase/visualizations/shared/settings/series.ts+++ b/frontend/src/metabase/visualizations/shared/settings/series.ts@@ -1,6 +1,6 @@import { getIn } from "icepick";-import { getColorsForValues } from "metabase/lib/colors/charts";+import { getColorsForValues } from "metabase/ui/colors/charts";import type { ComputedVisualizationSettings } from "metabase/visualizations/types";import type { VisualizationSettings } from "metabase-types/api";diff --git a/frontend/src/metabase/visualizations/shared/utils/colors.ts b/frontend/src/metabase/visualizations/shared/utils/colors.tsindex 8b7645a2e28..78202bb4f0f 100644--- a/frontend/src/metabase/visualizations/shared/utils/colors.ts+++ b/frontend/src/metabase/visualizations/shared/utils/colors.ts@@ -1,4 +1,4 @@-import { getColorsForValues } from "metabase/lib/colors/charts";+import { getColorsForValues } from "metabase/ui/colors/charts";import type { VisualizationSettings } from "metabase-types/api";import type { Series } from "../components/RowChart/types";diff --git a/frontend/src/metabase/visualizations/shared/utils/colors.unit.spec.ts b/frontend/src/metabase/visualizations/shared/utils/colors.unit.spec.tsindex dfb88ca9704..85b9854e30a 100644--- a/frontend/src/metabase/visualizations/shared/utils/colors.unit.spec.ts+++ b/frontend/src/metabase/visualizations/shared/utils/colors.unit.spec.ts@@ -1,9 +1,9 @@-import { getColorsForValues } from "metabase/lib/colors/charts";+import { getColorsForValues } from "metabase/ui/colors/charts";import type { VisualizationSettings } from "metabase-types/api";import { getSeriesColors } from "./colors";-jest.mock("metabase/lib/colors/charts");+jest.mock("metabase/ui/colors/charts");const mockGetColorsForValues = getColorsForValues as jest.MockedFunction<typeof getColorsForValuesdiff --git a/frontend/src/metabase/visualizations/shared/utils/theme.ts b/frontend/src/metabase/visualizations/shared/utils/theme.tsindex c3421cd1364..a08a315b2b1 100644--- a/frontend/src/metabase/visualizations/shared/utils/theme.ts+++ b/frontend/src/metabase/visualizations/shared/utils/theme.ts@@ -1,8 +1,8 @@import Color from "color";import { DEFAULT_METABASE_COMPONENT_THEME } from "metabase/embedding-sdk/theme";-import { color } from "metabase/lib/colors";import type { MantineThemeOther } from "metabase/ui";+import { color } from "metabase/ui/colors";import { getSizeInPx } from "metabase/visualizations/shared/utils/size-in-px";import type { VisualizationTheme } from "metabase/visualizations/types";diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.tsindex aa4c73bb992..9123e1dd5ce 100644--- a/frontend/src/metabase/visualizations/types/visualization.ts+++ b/frontend/src/metabase/visualizations/types/visualization.ts@@ -2,6 +2,7 @@ import type { ComponentType, ReactNode } from "react";import type { OptionsType } from "metabase/lib/formatting/types";import type { IconName, IconProps } from "metabase/ui";+import type { ColorGetter } from "metabase/ui/colors/types";import type {TextHeightMeasurer,TextWidthMeasurer,@@ -63,8 +64,6 @@ export type Formatter = () => string | null;export type TableCellFormatter = (value: RowValue) => ReactNode;-export type ColorGetter = (colorName: string) => string;-export type Extent = [number, number];export interface RenderingContext {diff --git a/frontend/src/metabase/visualizations/visualizations/Gauge/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/Gauge/chart-definition.tsindex 71ae49ada27..385b3c09536 100644--- a/frontend/src/metabase/visualizations/visualizations/Gauge/chart-definition.ts+++ b/frontend/src/metabase/visualizations/visualizations/Gauge/chart-definition.ts@@ -2,7 +2,7 @@ import Color from "color";import { t } from "ttag";import _ from "underscore";-import { color as colorHex } from "metabase/lib/colors";+import { color as colorHex } from "metabase/ui/colors";import { ChartSettingSegmentsEditor } from "metabase/visualizations/components/settings/ChartSettingSegmentsEditor";import { columnSettings } from "metabase/visualizations/lib/settings/column";import { segmentIsValid } from "metabase/visualizations/lib/utils";diff --git a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsxindex 8528fcd4e93..84096b38f15 100644--- a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx+++ b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx@@ -4,8 +4,8 @@ import { t } from "ttag";import _ from "underscore";import { ColorRangeSelector } from "metabase/common/components/ColorRangeSelector";-import { getAccentColors } from "metabase/lib/colors/groups";import MetabaseSettings from "metabase/lib/settings";+import { getAccentColors } from "metabase/ui/colors/groups";import { ChartSettingsError } from "metabase/visualizations/lib/errors";import { columnSettings } from "metabase/visualizations/lib/settings/column";import {diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/PieRowsPicker.tsx b/frontend/src/metabase/visualizations/visualizations/PieChart/PieRowsPicker.tsxindex 703c2de08a4..8abaae6e9f3 100644--- a/frontend/src/metabase/visualizations/visualizations/PieChart/PieRowsPicker.tsx+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/PieRowsPicker.tsx@@ -1,6 +1,6 @@import { useMemo } from "react";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import {ChartSettingSeriesOrder,type SortableChartSettingOrderedItem,diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.styled.tsx b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.styled.tsxindex e620b1976ed..2674c166a84 100644--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.styled.tsx+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.styled.tsx@@ -3,8 +3,8 @@ import { css } from "@emotion/react";// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { adjustBrightness, alpha, color } from "metabase/lib/colors";import type { MantineTheme } from "metabase/ui";+import { adjustBrightness, alpha, color } from "metabase/ui/colors";import { CELL_HEIGHT, RESIZE_HANDLE_WIDTH } from "./constants";diff --git a/frontend/src/metabase/visualizations/visualizations/Progress/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/Progress/chart-definition.tsindex bf2fa97c604..af6c95a84c0 100644--- a/frontend/src/metabase/visualizations/visualizations/Progress/chart-definition.ts+++ b/frontend/src/metabase/visualizations/visualizations/Progress/chart-definition.ts@@ -1,6 +1,6 @@import { t } from "ttag";-import { color } from "metabase/lib/colors";+import { color } from "metabase/ui/colors";import { ChartSettingGoalInput } from "metabase/visualizations/components/settings/ChartSettingGoalInput";import { columnSettings } from "metabase/visualizations/lib/settings/column";import { fieldSetting } from "metabase/visualizations/lib/settings/utils";diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsxindex cbc48ab059b..93026919215 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsx@@ -1,8 +1,8 @@import { jt } from "ttag";-import type { ColorName } from "metabase/lib/colors/types";import { isEmpty } from "metabase/lib/validate";import { Text } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type { ComparisonResult } from "../compute";diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationDetails.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationDetails.tsxindex 1276764bad4..45ad84f39ca 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationDetails.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationDetails.tsx@@ -1,7 +1,7 @@import type { ReactNode } from "react";-import type { ColorName } from "metabase/lib/colors/types";import { Title } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";interface Props {children: ReactNode;diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsxindex 4aaafbac87c..c9287c2cb1a 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsx@@ -1,7 +1,7 @@import type { ReactNode } from "react";-import type { ColorName } from "metabase/lib/colors/types";import { Flex } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import type { ComparisonResult } from "../compute";diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.tsindex 9e18f035592..d2b41b08a25 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts@@ -7,11 +7,9 @@ import { formatDateTimeRangeWithUnit } from "metabase/lib/formatting/date";import type { OptionsType } from "metabase/lib/formatting/types";import { isNumber } from "metabase/lib/types";import { isEmpty } from "metabase/lib/validate";+import type { ColorGetter } from "metabase/ui/colors/types";import { computeChange } from "metabase/visualizations/lib/numeric";-import type {- ColorGetter,- ColumnSettings,-} from "metabase/visualizations/types";+import type { ColumnSettings } from "metabase/visualizations/types";import { COMPARISON_TYPES } from "metabase/visualizations/visualizations/SmartScalar/constants";import {formatChange,diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.tsindex a17a1d189b4..a63e639fadc 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts@@ -1,6 +1,6 @@-import { color, colors } from "metabase/lib/colors";import { formatValue } from "metabase/lib/formatting/value";import { isNumber } from "metabase/lib/types";+import { color, colors } from "metabase/ui/colors";import { computeChange } from "metabase/visualizations/lib/numeric";import {CHANGE_ARROW_ICONS,diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsxindex ecd7b2254eb..a5d055dbfa3 100644--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx@@ -12,10 +12,10 @@ import {} from "__support__/storybook";import { Api } from "metabase/api";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";-import type { ColorName } from "metabase/lib/colors/types";import { MetabaseReduxProvider } from "metabase/lib/redux";import { commonReducers } from "metabase/reducers-common";import { Box } from "metabase/ui";+import type { ColorName } from "metabase/ui/colors/types";import { registerVisualization } from "metabase/visualizations";import Visualization from "metabase/visualizations/components/Visualization";import { Table } from "metabase/visualizations/visualizations/Table/Table";diff --git a/frontend/src/metabase/visualizations/visualizations/Text/Text.styled.tsx b/frontend/src/metabase/visualizations/visualizations/Text/Text.styled.tsxindex 05e3b50b895..d0f2810fd24 100644--- a/frontend/src/metabase/visualizations/visualizations/Text/Text.styled.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Text/Text.styled.tsx@@ -4,11 +4,11 @@ import { css } from "@emotion/react";import styled from "@emotion/styled";import DashboardS from "metabase/css/dashboard.module.css";-import { alpha } from "metabase/lib/colors";import {breakpointMaxExtraLarge,breakpointMinExtraLarge,} from "metabase/styled-components/theme";+import { alpha } from "metabase/ui/colors";const DEFAULT_CONTAINER_PADDING_SIZE = "0.75rem";const SMALL_CONTAINER_PADDING_SIZE = "0.3rem";diff --git a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsxindex 2aca199134d..b4721cb6596 100644--- a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx+++ b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx@@ -1,7 +1,7 @@import Color from "color";import { t } from "ttag";-import { color, staticVizOverrides } from "metabase/lib/colors";+import { color, staticVizOverrides } from "metabase/ui/colors";import {GRAPH_AXIS_SETTINGS,GRAPH_DATA_SETTINGS,diff --git a/frontend/src/types/mantine.d.ts b/frontend/src/types/mantine.d.tsindex 10b57c45637..e29be772808 100644--- a/frontend/src/types/mantine.d.ts+++ b/frontend/src/types/mantine.d.ts@@ -1,7 +1,7 @@import type { MantineColorsTuple } from "@mantine/core";import type { EmbeddingThemeOptions } from "metabase/embedding-sdk/theme/private";-import type { ColorName } from "metabase/lib/colors/types";+import type { ColorName } from "metabase/ui/colors/types";import type { ColorSettings } from "metabase-types/api/settings";interface _EmotionCompatibilityTheme {