Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

ActionIcon: restyle to Figma (GDGT-2457) (#83909)

Egor Grushin02f31beebb2a
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Table_Light_Theme.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Table_Light_Theme.png
index 6763c4ef31e..e86eccfbe44 100644
Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Table_Light_Theme.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Table_Light_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Selectable.png b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Selectable.png
new file mode 100644
index 00000000000..cebc5f3709b
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Selectable.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Default.png b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Default.png
new file mode 100644
index 00000000000..38ffbd30145
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Default.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Filled.png b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Filled.png
new file mode 100644
index 00000000000..e83ead45dab
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Filled.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Light.png b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Light.png
new file mode 100644
index 00000000000..7f68432bad3
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Light.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_On_Dark.png b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_On_Dark.png
new file mode 100644
index 00000000000..e25b87bac32
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_On_Dark.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Subtle.png b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Subtle.png
new file mode 100644
index 00000000000..3db144a9d4a
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Buttons_ActionIcon_Variant_Subtle.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Data_display_Card_Shadow_matrix.png b/.loki/reference/chrome_laptop_Components_Data_display_Card_Shadow_matrix.png
index af6ce14a71b..3e051989af3 100644
Binary files a/.loki/reference/chrome_laptop_Components_Data_display_Card_Shadow_matrix.png and b/.loki/reference/chrome_laptop_Components_Data_display_Card_Shadow_matrix.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next.png
index 9d7b586d357..51ec3ddc19a 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next_Dark_Theme.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next_Dark_Theme.png
index e72e0689bd6..1ce6f92d0a1 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next_Dark_Theme.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Next_Dark_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous.png
index 54fe1d2b220..7d3e3accbca 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous_Dark_Theme.png b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous_Dark_Theme.png
index 573f4312555..4f93db3ff31 100644
Binary files a/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous_Dark_Theme.png and b/.loki/reference/chrome_laptop_Components_Parameters_DatePicker_Relative_Previous_Dark_Theme.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Utils_Paper_Shadow_matrix.png b/.loki/reference/chrome_laptop_Components_Utils_Paper_Shadow_matrix.png
index 8777553b325..722d3840bcb 100644
Binary files a/.loki/reference/chrome_laptop_Components_Utils_Paper_Shadow_matrix.png and b/.loki/reference/chrome_laptop_Components_Utils_Paper_Shadow_matrix.png differ
diff --git a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png
index 7d055c8684b..7515def9ab0 100644
Binary files a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png and b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png differ
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.ts
index 07cf13119a0..cac656e9eca 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
@@ -47,6 +47,7 @@ const knownIssues = [
"--mantine-shadow-xs_outline",
"--mantine-shadow-sm_outline",
"--mantine-shadow-lg_outline",
+ "--mantine-shadow-xs_on_dark",
];
interface UsageMap {
diff --git a/e2e/support/helpers/e2e-datamodel-helpers.ts b/e2e/support/helpers/e2e-datamodel-helpers.ts
index c1bab119657..61b8a4bc670 100644
--- a/e2e/support/helpers/e2e-datamodel-helpers.ts
+++ b/e2e/support/helpers/e2e-datamodel-helpers.ts
@@ -595,7 +595,7 @@ function getFieldSuffixInput() {
}
function getFieldSectionCloseButton() {
- return getFieldSectioHeader().findByRole("link", { name: /close/ });
+ return getFieldSectioHeader().findByRole("link", { name: /close/i });
}
/** preview section helpers */
diff --git a/e2e/support/helpers/e2e-metrics-viewer-helpers.ts b/e2e/support/helpers/e2e-metrics-viewer-helpers.ts
index 74f5b04cdd9..0826df553d9 100644
--- a/e2e/support/helpers/e2e-metrics-viewer-helpers.ts
+++ b/e2e/support/helpers/e2e-metrics-viewer-helpers.ts
@@ -56,7 +56,7 @@ export const MetricsViewer = {
getMetricControls: () => cy.findByTestId("metrics-viewer-controls"),
changeVizType: (display: string) =>
MetricsViewer.getMetricControls()
- .findByRole("button", { name: display })
- .click(),
+ .findByRole("radio", { name: display })
+ .click({ force: true }),
runButton: () => cy.findByTestId("run-expression-button"),
};
diff --git a/e2e/test/scenarios/admin/admin-reproductions.cy.spec.js b/e2e/test/scenarios/admin/admin-reproductions.cy.spec.js
index deb00823794..1a43ce6d49b 100644
--- a/e2e/test/scenarios/admin/admin-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/admin/admin-reproductions.cy.spec.js
@@ -159,7 +159,7 @@ describe("(metabase#45042)", () => {
//ensure that hamburger is visible and functional
cy.findByTestId("admin-navbar").within(() => {
- cy.findByRole("button", { name: /burger/ })
+ cy.findByRole("button", { name: "Toggle navigation" })
.should("be.visible")
.click();
cy.findByRole("list", { name: "Navigation links" }).should("exist");
@@ -167,7 +167,7 @@ describe("(metabase#45042)", () => {
});
// dismiss nav list
- cy.findByRole("button", { name: /burger/ })
+ cy.findByRole("button", { name: "Toggle navigation" })
.should("be.visible")
.click();
cy.findByRole("list", { name: "Navigation links" }).should("not.exist");
diff --git a/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts b/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts
index a23755b7ae9..69be4639713 100644
--- a/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts
+++ b/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts
@@ -1319,7 +1319,7 @@ describe("scenarios > metrics > explorer", () => {
H.MetricsViewer.assertVizType("Bar");
cy.log("should allow changing display types");
- H.MetricsViewer.changeVizType("line");
+ H.MetricsViewer.changeVizType("Line");
H.MetricsViewer.assertVizType("Line");
});
@@ -1680,7 +1680,7 @@ describe("scenarios > metrics > explorer", () => {
selectDimensionBreakout("Category");
H.MetricsViewer.assertVizType("Bar");
H.MetricsViewer.getAllMetricVisualizations().should("have.length", 1);
- H.MetricsViewer.changeVizType("line");
+ H.MetricsViewer.changeVizType("Line");
H.MetricsViewer.getMetricVisualizationDataPoints().should(
"have.length",
8,
diff --git a/e2e/test/scenarios/organization/timelines-collection.cy.spec.js b/e2e/test/scenarios/organization/timelines-collection.cy.spec.js
index ffbf0eccb6d..31ba68f9021 100644
--- a/e2e/test/scenarios/organization/timelines-collection.cy.spec.js
+++ b/e2e/test/scenarios/organization/timelines-collection.cy.spec.js
@@ -397,7 +397,7 @@ describe("scenarios > organization > timelines > collection", () => {
H.modal().within(() => {
cy.findByText("Our analytics events").should("be.visible");
- cy.button(/close/).click();
+ cy.button(/close/i).click();
});
H.main()
.findByText(`${H.getFullName(admin)}'s Personal Collection`)
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/GearIconMenu/GearIconMenu.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/GearIconMenu/GearIconMenu.tsx
index 7fdebbdb7e6..f2371e6e7dd 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/components/GearIconMenu/GearIconMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/components/GearIconMenu/GearIconMenu.tsx
@@ -21,14 +21,7 @@ export function GearIconMenu({ loading, disabled, onConfirm }: Props) {
<>
<Menu position="bottom-end">
<Menu.Target>
- <ActionIcon
- aria-label={t`Settings`}
- bd="1px solid var(--mb-color-border-neutral)"
- c="text-primary"
- disabled={disabled}
- size="lg"
- variant="outline"
- >
+ <ActionIcon aria-label={t`Settings`} disabled={disabled} size="lg">
<Icon name="gear" />
</ActionIcon>
</Menu.Target>
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsx
index 455ac9aa840..39c4d162d97 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotCustomizationPage/MetabotIconField.tsx
@@ -151,6 +151,7 @@ export function MetabotIconField() {
{!isDefaultIcon && (
<Tooltip label={t`Remove custom icon`}>
<ActionIcon
+ variant="subtle"
onClick={handleIconRemove}
aria-label={t`Remove custom icon`}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/CollectionExportAnalytics.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/components/CollectionExportAnalytics.tsx
index a13130f343a..39f806050a8 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/components/CollectionExportAnalytics.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/components/CollectionExportAnalytics.tsx
@@ -29,8 +29,7 @@ export function CollectionExportAnalytics() {
>
<span>
<ActionIcon
- variant="viewHeader"
- size="2rem"
+ variant="subtle"
aria-label={t`Export analytics`}
onClick={handleExport}
disabled={isLoading}
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/DatabaseCachingEditor.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/DatabaseCachingEditor.tsx
index c47fe02a2c3..218e4674fab 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/components/DatabaseCachingEditor.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/DatabaseCachingEditor.tsx
@@ -250,8 +250,6 @@ export const DatabaseCachingEditor = () => {
<Tooltip label={t`Reset all to default`}>
<ActionIcon
size="lg"
- c="icon-primary"
- bd="1px solid var(--mb-color-border-neutral)"
aria-label={t`Reset all to default`}
onClick={handleResetAllToDefault}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/PolicySidePanel/PolicySidePanel.module.css b/enterprise/frontend/src/metabase-enterprise/caching/components/PolicySidePanel/PolicySidePanel.module.css
index 10608af4d30..52786ddff80 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/components/PolicySidePanel/PolicySidePanel.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/PolicySidePanel/PolicySidePanel.module.css
@@ -2,15 +2,3 @@
flex-shrink: 0;
border-left: 1px solid var(--mb-color-border-neutral);
}
-
-.navButton:not([data-specificity-hack]) {
- color: var(--mb-color-icon-primary);
- border: 1px solid var(--mb-color-border-neutral);
-
- &:disabled,
- &[data-disabled] {
- color: var(--mb-color-icon-disabled);
- border-color: var(--mb-color-border-neutral-subtle);
- background-color: transparent;
- }
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/PolicySidePanel/PolicySidePanel.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/PolicySidePanel/PolicySidePanel.tsx
index d7f4167721d..dfb99d3b0b6 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/components/PolicySidePanel/PolicySidePanel.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/PolicySidePanel/PolicySidePanel.tsx
@@ -38,7 +38,6 @@ export const PolicySidePanel = ({
<Group gap="sm">
<ActionIcon
size="lg"
- className={S.navButton}
disabled={onPrevious === undefined}
aria-label={t`Previous item`}
onClick={onPrevious}
@@ -47,7 +46,6 @@ export const PolicySidePanel = ({
</ActionIcon>
<ActionIcon
size="lg"
- className={S.navButton}
disabled={onNext === undefined}
aria-label={t`Next item`}
onClick={onNext}
@@ -58,7 +56,6 @@ export const PolicySidePanel = ({
)}
<ActionIcon
variant="subtle"
- c="icon-primary"
size="lg"
ml="auto"
aria-label={t`Close`}
diff --git a/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedToggle.tsx b/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedToggle.tsx
index 94964de2c11..eb54a6e1ce8 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedToggle.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedToggle.tsx
@@ -15,11 +15,10 @@ export const VerifiedToggle = ({
return (
<Tooltip label={buttonLabel} position="bottom">
<ActionIcon
+ variant="subtle"
aria-label={buttonLabel}
aria-selected={verified}
- size={32}
role="switch"
- variant="viewHeader"
onClick={() => handleVerifiedFilterChange(!verified)}
c={verified ? "core-brand" : "text-primary"}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/custom_viz/components/ManageCustomVizPage.tsx b/enterprise/frontend/src/metabase-enterprise/custom_viz/components/ManageCustomVizPage.tsx
index a02732ecb01..ee768a9404c 100644
--- a/enterprise/frontend/src/metabase-enterprise/custom_viz/components/ManageCustomVizPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/custom_viz/components/ManageCustomVizPage.tsx
@@ -85,11 +85,7 @@ export function ManageCustomVizPage() {
</Button>
<Menu position="bottom-end">
<Menu.Target>
- <ActionIcon
- variant="subtle"
- size="lg"
- aria-label={t`More options`}
- >
+ <ActionIcon variant="subtle" aria-label={t`More options`}>
<Icon name="ellipsis" />
</ActionIcon>
</Menu.Target>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/dashboards/pages/DashboardSubscriptionsPage/SubscriptionSidebar/SubscriptionSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/dashboards/pages/DashboardSubscriptionsPage/SubscriptionSidebar/SubscriptionSidebar.tsx
index 5c66b320b87..33750f392a4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/dashboards/pages/DashboardSubscriptionsPage/SubscriptionSidebar/SubscriptionSidebar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/dashboards/pages/DashboardSubscriptionsPage/SubscriptionSidebar/SubscriptionSidebar.tsx
@@ -133,7 +133,12 @@ type CloseLinkProps = {
function CloseLink({ closeUrl }: CloseLinkProps) {
return (
- <ActionIcon component={ForwardRefLink} to={closeUrl} aria-label={t`Close`}>
+ <ActionIcon
+ variant="subtle"
+ component={ForwardRefLink}
+ to={closeUrl}
+ aria-label={t`Close`}
+ >
<FixedSizeIcon name="close" />
</ActionIcon>
);
@@ -182,6 +187,7 @@ function EditOnDashboardAction({
return (
<Tooltip label={t`Edit on dashboard`} openDelay={TOOLTIP_OPEN_DELAY_MS}>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={Urls.dashboard(dashboard, { openSubscriptions: subscription.id })}
aria-label={t`Edit on dashboard`}
@@ -202,7 +208,7 @@ function DisabledEditAction({ reason }: DisabledEditActionProps) {
<Tooltip label={reason} disabled={reason == null}>
{/* a disabled button fires no pointer events, so the tooltip listens on a wrapper */}
<Box>
- <ActionIcon aria-label={t`Edit on dashboard`} disabled>
+ <ActionIcon variant="subtle" aria-label={t`Edit on dashboard`} disabled>
<FixedSizeIcon name="pencil" />
</ActionIcon>
</Box>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
index 2599d1fbe8c..2c24890e740 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
@@ -29,6 +29,7 @@ export function TableMoreMenu({ table, onOpenModal }: TableMoreMenuProps) {
<Menu withinPortal>
<Menu.Target>
<ActionIcon
+ variant="subtle"
aria-label={t`Show table options`}
size="md"
onClick={(event) => {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
index eff9cef81c9..c0aa0ef4e85 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
@@ -17,8 +17,8 @@ import {
} from "metabase/metadata/components";
import { useParams } from "metabase/router";
import {
+ ActionIcon,
Box,
- Button,
Center,
Flex,
Group,
@@ -109,16 +109,16 @@ export function TableFieldsPage() {
bg="background_page-secondary"
>
<Text fw="bold">{t`Field Details`}</Text>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
component={ForwardRefLink}
to={Urls.dataStudioTableFields(table.id)}
onClick={closePreview}
- leftSection={<Icon name="close" />}
- />
+ aria-label={t`Close`}
+ >
+ <Icon name="close" />
+ </ActionIcon>
</Group>
<FieldSection
/**
diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppsPromoBanner/DataAppsBanner.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppsPromoBanner/DataAppsBanner.tsx
index bc7dfe81418..13a1c1c2611 100644
--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppsPromoBanner/DataAppsBanner.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppsPromoBanner/DataAppsBanner.tsx
@@ -21,7 +21,6 @@ export const DataAppsBanner = () => (
top="1rem"
right="1rem"
variant="subtle"
- c="text-primary"
aria-label={t`Dismiss`}
onClick={ack}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/PanelHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/PanelHeader.tsx
index 085451ae506..d246caf7d25 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/PanelHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/PanelHeader.tsx
@@ -63,7 +63,12 @@ export function PanelHeader({
<Title flex={1} order={4} lh="1rem">
{getHeaderLabel(node, groupType)}
</Title>
- <ActionIcon m="-sm" aria-label={t`Close`} onClick={onClose}>
+ <ActionIcon
+ variant="subtle"
+ m="-sm"
+ aria-label={t`Close`}
+ onClick={onClose}
+ >
<FixedSizeIcon name="close" />
</ActionIcon>
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/SearchModelPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/SearchModelPicker.tsx
index 429ff1acde8..c1620f99b7a 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/SearchModelPicker.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/SearchModelPicker/SearchModelPicker.tsx
@@ -32,6 +32,7 @@ export function SearchModelPicker({
<Popover opened={isOpened} position="right" onDismiss={close}>
<Popover.Target>
<ActionIcon
+ variant="subtle"
className={S.button}
aria-label={t`Filter`}
onClick={toggle}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphExternalLink/GraphExternalLink.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphExternalLink/GraphExternalLink.tsx
index 41a68cd3db5..a621e3ef0ad 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphExternalLink/GraphExternalLink.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphExternalLink/GraphExternalLink.tsx
@@ -22,6 +22,7 @@ export function GraphExternalLink({
return (
<Tooltip label={label} openDelay={TOOLTIP_OPEN_DELAY_MS}>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={url}
target={openLinksInNewTab ? "_blank" : undefined}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx
index 9fe7f9e4d1f..aa978933f41 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx
@@ -66,6 +66,7 @@ export function PanelHeader({ node, onClose }: PanelHeaderProps) {
{({ tooltip, isDisabled }) => (
<Tooltip label={tooltip ?? t`Find and replace`}>
<ActionIcon
+ variant="subtle"
aria-label={t`Replace data source`}
disabled={isDisabled}
onClick={openReplaceModal}
@@ -76,7 +77,7 @@ export function PanelHeader({ node, onClose }: PanelHeaderProps) {
)}
</PLUGIN_REPLACEMENT.SourceReplacementButton>
)}
- <ActionIcon aria-label={t`Close`} onClick={onClose}>
+ <ActionIcon variant="subtle" aria-label={t`Close`} onClick={onClose}>
<FixedSizeIcon name="close" />
</ActionIcon>
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/FilterOptionsPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/FilterOptionsPicker.tsx
index 2e528797047..24ed3dcab63 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/FilterOptionsPicker.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/FilterOptionsPicker/FilterOptionsPicker.tsx
@@ -46,6 +46,7 @@ export function FilterOptionsPicker({
>
{isCompact ? (
<ActionIcon
+ variant="subtle"
aria-label={t`Filter`}
disabled={isDisabled}
onClick={toggle}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx
index 165ce15ebc3..87f15a443c9 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx
@@ -31,7 +31,7 @@ export function SortOptionsPicker({
return (
<Popover opened={isOpened} onDismiss={close}>
<Popover.Target>
- <ActionIcon aria-label={t`Sort`} onClick={toggle}>
+ <ActionIcon variant="subtle" aria-label={t`Sort`} onClick={toggle}>
<FixedSizeIcon c="text-primary" name="sort" />
</ActionIcon>
</Popover.Target>
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx
index dd1c8bb036a..1b674fc3154 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx
@@ -83,11 +83,7 @@ export function ConversationHeader({
{conversation.user && (
<Menu shadow="sm" position="bottom-start" withinPortal>
<Menu.Target>
- <ActionIcon
- variant="subtle"
- color="text-secondary"
- aria-label={t`User actions`}
- >
+ <ActionIcon variant="subtle" aria-label={t`User actions`}>
<Icon name="ellipsis" size={16} />
</ActionIcon>
</Menu.Target>
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ToolCallDetailsSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ToolCallDetailsSidebar.tsx
index 4ff97ab4410..46d8c1226e0 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ToolCallDetailsSidebar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ToolCallDetailsSidebar.tsx
@@ -39,6 +39,7 @@ export function ToolCallDetailsSidebar({
<Flex align="center" justify="space-between" gap="lg" wrap="nowrap">
<Text id={headingId} fw="bold">{t`Tool Call`}</Text>
<ActionIcon
+ variant="subtle"
ref={closeButtonRef}
aria-label={t`Close`}
onClick={onClose}
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsSidebar/DiagnosticsSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsSidebar/DiagnosticsSidebar.tsx
index 7a374aa3657..b85bab800ec 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsSidebar/DiagnosticsSidebar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/DiagnosticsSidebar/DiagnosticsSidebar.tsx
@@ -128,6 +128,7 @@ function SidebarHeader({ finding, tab, onClose }: SidebarHeaderProps) {
<Group gap="xs" wrap="nowrap">
<Tooltip label={viewLabel} openDelay={TOOLTIP_OPEN_DELAY_MS}>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={entityUrl}
target="_blank"
@@ -137,7 +138,7 @@ function SidebarHeader({ finding, tab, onClose }: SidebarHeaderProps) {
<FixedSizeIcon name="external" />
</ActionIcon>
</Tooltip>
- <ActionIcon aria-label={t`Close`} onClick={onClose}>
+ <ActionIcon variant="subtle" aria-label={t`Close`} onClick={onClose}>
<FixedSizeIcon name="close" />
</ActionIcon>
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/ErrorsSection/ErrorsSection.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/ErrorsSection/ErrorsSection.tsx
index 78501a3ac41..99bf393e941 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/ErrorsSection/ErrorsSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/ErrorsSection/ErrorsSection.tsx
@@ -112,7 +112,12 @@ function ErrorListItem({ item }: ErrorListItemProps) {
{item}
</Box>
{/* The click bubbles up to the row, which does the copying */}
- <ActionIcon className={S.copyIcon} aria-label={t`Copy`}>
+ <ActionIcon
+ variant="subtle"
+ size="sm"
+ className={S.copyIcon}
+ aria-label={t`Copy`}
+ >
<FixedSizeIcon name="copy" />
</ActionIcon>
<span role="status" className={visuallyHidden.visuallyHidden}>
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx
index df3040bfb73..92471915074 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/dependency-diagnostics/components/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx
@@ -59,6 +59,7 @@ export function SidebarHeader({ node, onClose, mode }: SidebarHeaderProps) {
{link != null && (
<Tooltip label={link.label} openDelay={TOOLTIP_OPEN_DELAY_MS}>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={link.url}
target="_blank"
@@ -73,6 +74,7 @@ export function SidebarHeader({ node, onClose, mode }: SidebarHeaderProps) {
openDelay={TOOLTIP_OPEN_DELAY_MS}
>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={Urls.dependencyGraph({ entry: node })}
target="_blank"
@@ -83,7 +85,7 @@ export function SidebarHeader({ node, onClose, mode }: SidebarHeaderProps) {
<FixedSizeIcon name="dependencies" />
</ActionIcon>
</Tooltip>
- <ActionIcon aria-label={t`Close`} onClick={onClose}>
+ <ActionIcon variant="subtle" aria-label={t`Close`} onClick={onClose}>
<FixedSizeIcon name="close" />
</ActionIcon>
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionDetailSidebar/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionDetailSidebar/SidebarHeader.tsx
index e53c9849e6a..80a0a36043a 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionDetailSidebar/SidebarHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionDetailSidebar/SidebarHeader.tsx
@@ -41,17 +41,17 @@ export const SidebarHeader = ({
</Group>
<Group gap="sm">
<ActionIcon
+ variant="subtle"
aria-label={t`Copy link to clipboard`}
size="lg"
- c="icon-primary"
onClick={handleCopyLink}
>
<Icon name="link" />
</ActionIcon>
<ActionIcon
+ variant="subtle"
aria-label={t`Close`}
size="lg"
- c="icon-primary"
onClick={onClose}
>
<Icon name="close" />
diff --git a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/common/CopyableCodeBlock/CopyableCodeBlock.tsx b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/common/CopyableCodeBlock/CopyableCodeBlock.tsx
index f21cef722f3..baafe2e4ff1 100644
--- a/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/common/CopyableCodeBlock/CopyableCodeBlock.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/multi_factor_auth/components/common/CopyableCodeBlock/CopyableCodeBlock.tsx
@@ -18,15 +18,15 @@ export function CopyableCodeBlock({ codes }: CopyableCodeBlockProps) {
return (
<Group
px="lg"
- py="0.75rem"
+ py="sm"
justify="space-between"
align="flex-start"
bg="background_page-secondary"
bdrs="sm"
>
- <Stack gap="sm">
+ <Stack gap={0}>
{codes.map((code, index) => (
- <Box key={index} ff="mono" fz="sm" lh="1rem">
+ <Box key={index} ff="mono" fz="sm" lh="1.5rem">
{code}
</Box>
))}
@@ -34,7 +34,12 @@ export function CopyableCodeBlock({ codes }: CopyableCodeBlockProps) {
<CopyButton value={codes.join("\n")}>
{({ copy, copied }) => (
<Tooltip label={copied ? t`Copied!` : t`Copy`}>
- <ActionIcon size="xs" m={-1} aria-label={t`Copy`} onClick={copy}>
+ <ActionIcon
+ variant="subtle"
+ size="sm"
+ aria-label={t`Copy`}
+ onClick={copy}
+ >
<FixedSizeIcon name="copy" />
</ActionIcon>
</Tooltip>
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsx
index 000c3b22564..8e51d75e037 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsx
@@ -39,6 +39,7 @@ export function SidebarHeader({ card, onClose }: SidebarHeaderProps) {
<Group gap="xxs" wrap="nowrap">
<Tooltip label={t`Open in new tab`} openDelay={300}>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={link}
target="_blank"
@@ -49,6 +50,7 @@ export function SidebarHeader({ card, onClose }: SidebarHeaderProps) {
</Tooltip>
<Tooltip label={t`View in dependency graph`} openDelay={300}>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={Urls.dependencyGraph({
entry: { id: card.id, type: "card" },
@@ -59,7 +61,7 @@ export function SidebarHeader({ card, onClose }: SidebarHeaderProps) {
<FixedSizeIcon name="dependencies" />
</ActionIcon>
</Tooltip>
- <ActionIcon aria-label={t`Close`} onClick={onClose}>
+ <ActionIcon variant="subtle" aria-label={t`Close`} onClick={onClose}>
<FixedSizeIcon name="close" />
</ActionIcon>
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsx
index 579fac420b9..eef6445b501 100644
--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsx
@@ -4,7 +4,15 @@ import { t } from "ttag";
import _ from "underscore";
import CS from "metabase/css/core/index.css";
-import { Box, Button, Icon, Select, Text, Tooltip } from "metabase/ui";
+import {
+ ActionIcon,
+ Box,
+ Button,
+ Icon,
+ Select,
+ Text,
+ Tooltip,
+} from "metabase/ui";
import { QuestionParameterTargetWidget } from "metabase-enterprise/sandboxes/containers/QuestionParameterTargetWidget";
import type {
DataAttributeMap,
@@ -129,17 +137,17 @@ export const DataAttributeMappingEditor = ({
className={cx(CS.pb1, CS.pl1)}
style={{ verticalAlign: "middle" }}
>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
- leftSection={<Icon name="close" />}
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
onClick={() =>
handleChange(removeEntry<ValueType>(entries, index))
}
data-testid="remove-mapping"
- />
+ aria-label={t`Remove mapping`}
+ >
+ <Icon name="close" />
+ </ActionIcon>
</td>
</tr>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx
index 40846503414..ebc0ae378a3 100644
--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx
@@ -233,6 +233,8 @@ const EditSandboxingModal = ({
<Menu position="bottom-end">
<Menu.Target>
<ActionIcon
+ variant="subtle"
+ size="sm"
aria-label={t`Question options`}
className={S.optionsButton}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsx
index bd68541429e..64586958717 100644
--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsx
@@ -3,6 +3,7 @@ import { t } from "ttag";
import _ from "underscore";
import {
+ ActionIcon,
Box,
Button,
Flex,
@@ -253,30 +254,29 @@ const ValueInput = ({
w="100%"
{...valueOpts}
/>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
{canDelete && (
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
- leftSection={<Icon name="close" />}
onClick={onDelete}
data-testid="remove-mapping"
- />
+ aria-label={t`Remove mapping`}
+ >
+ <Icon name="close" />
+ </ActionIcon>
)}
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
{canRevert && (
<Tooltip
label={t`Revert to "${valueOpts?.revert?.value}" value from ${valueOpts?.revert?.source}`}
>
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
- leftSection={<Icon name="refresh" />}
onClick={onRevert}
data-testid="revert-mapping"
- />
+ >
+ <Icon name="refresh" />
+ </ActionIcon>
</Tooltip>
)}
</>
diff --git a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SelectedNodeInfoPanel/PanelHeader/PanelHeader.tsx b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SelectedNodeInfoPanel/PanelHeader/PanelHeader.tsx
index 314e418be3b..50fc9b3d658 100644
--- a/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SelectedNodeInfoPanel/PanelHeader/PanelHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/schema_viewer/components/SchemaViewer/components/SelectedNodeInfoPanel/PanelHeader/PanelHeader.tsx
@@ -85,6 +85,7 @@ export function PanelHeader({
<Group m="-sm" gap="xxs" wrap="nowrap">
<Tooltip label={t`View metadata`}>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={metadataUrl}
target="_blank"
@@ -93,7 +94,7 @@ export function PanelHeader({
<FixedSizeIcon name="external" />
</ActionIcon>
</Tooltip>
- <ActionIcon aria-label={t`Close`} onClick={onClose}>
+ <ActionIcon variant="subtle" aria-label={t`Close`} onClick={onClose}>
<FixedSizeIcon name="close" />
</ActionIcon>
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/AccessGrantList.tsx b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/AccessGrantList.tsx
index 7dc1c51be32..6f35a2aa564 100644
--- a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/AccessGrantList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/AccessGrantList.tsx
@@ -82,12 +82,12 @@ export const AccessGrantList = (props: AccessGrantListProps) => {
.t`${getTimeLeft(effectiveEndDate)} left`}
</Badge>
<ActionIcon
+ variant="subtle"
aria-label={t`Revoke access grant`}
loading={isRevoking}
onClick={() => handleRevokeAccessGrant(grant.id)}
size="sm"
title={t`Revoke access grant`}
- variant="viewHeader"
>
<Icon name="close" />
</ActionIcon>
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategySettingsButton.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategySettingsButton.tsx
index 749107335b0..c8cbadeb5d2 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategySettingsButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategySettingsButton.tsx
@@ -11,12 +11,7 @@ export const EditUserStrategySettingsButton = ({
}) => (
<Link to={Urls.editUserStrategy(page)}>
<Tooltip label={t`Edit user strategy`}>
- <ActionIcon
- size="lg"
- variant="outline"
- c="text-primary"
- bd="1px solid var(--mb-color-border-neutral)"
- >
+ <ActionIcon size="lg">
<Icon name="gear" />
</ActionIcon>
</Tooltip>
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/TenantsDocsButton.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/TenantsDocsButton.tsx
index 8bc485e9399..f75125dd1d1 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/TenantsDocsButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/TenantsDocsButton.tsx
@@ -15,12 +15,7 @@ export const TenantsDocsButton = () => {
return (
<ExternalLink href={url}>
<Tooltip label={t`View documentation`}>
- <ActionIcon
- size="lg"
- variant="outline"
- c="text-primary"
- bd="1px solid var(--mb-color-border-neutral)"
- >
+ <ActionIcon size="lg">
<Icon name="reference" />
</ActionIcon>
</Tooltip>
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
index c062ad67912..bd117d2001e 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
@@ -7,6 +7,7 @@ import { useToast } from "metabase/common/hooks";
import { createEmptyTenantDraft } from "metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/utils";
import type { CreatedTenantData } from "metabase/plugins/oss/tenants";
import {
+ ActionIcon,
Button,
Flex,
Group,
@@ -138,16 +139,15 @@ export const CreateTenantsOnboardingStep = ({
fw="bold"
classNames={{ input: S.TenantNameInput }}
/>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
{tenants.length > 1 && (
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
- leftSection={<Icon name="close" />}
onClick={() => removeTenantCard(index)}
aria-label={t`Remove tenant`}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
)}
</Group>
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx
index 53fe8459cdc..5eb61b0da4e 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx
@@ -131,6 +131,7 @@ export const MainNavSharedCollections = ({
{canCreateSharedCollection && (
<Tooltip label={t`Create a shared collection`}>
<ActionIcon
+ variant="subtle"
c="text-secondary"
onClick={() => setModalOpen(true)}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/components/JoinHeaderCell.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/components/JoinHeaderCell.tsx
index 85a0d701a7f..82146edc87c 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/components/JoinHeaderCell.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/JoinAnalysisSections/components/JoinHeaderCell.tsx
@@ -1,7 +1,7 @@
import { match } from "ts-pattern";
import { trackTransformInspectAlertClicked } from "metabase/transforms/analytics";
-import { ActionIcon, Icon } from "metabase/ui";
+import { ActionIcon, type ActionIconColor, Icon } from "metabase/ui";
import type {
InspectorAlertTrigger,
InspectorCard,
@@ -32,13 +32,16 @@ export const JoinHeaderCell = ({
return (
<ActionIcon
- variant={match(severity)
- .with("error", () => "error" as const)
- .with("warning", () => "warning" as const)
- .with("info", () => "info" as const)
- .otherwise(() => "subtle" as const)}
- size="lg"
- data-is-active={isExpanded}
+ variant="subtle"
+ color={match(severity)
+ .returnType<ActionIconColor | undefined>()
+ .with("error", () => "negative")
+ .with("warning", () => "warning")
+ .with("info", () => "brand")
+ .otherwise(() => undefined)}
+ size="sm"
+ aria-pressed={isExpanded}
+ mod={{ hovered: isExpanded }}
onClick={(e) => {
e.stopPropagation();
trackTransformInspectAlertClicked({ transformId, cardId: card.id });
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/AliasInput/AliasInput.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/AliasInput/AliasInput.tsx
index 9aca5abf0dd..97acb6880a8 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/AliasInput/AliasInput.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/AliasInput/AliasInput.tsx
@@ -55,7 +55,6 @@ export function AliasInput({
<ActionIcon
onClick={() => onChange(defaultAlias)}
aria-label={t`Reset alias to default`}
- color="text-disabled"
variant="subtle"
>
<Icon name="refresh" size={12} />
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx
index b2ce6e6aff5..03fbec59d56 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx
@@ -101,6 +101,7 @@ export function TableSelector({
{!disabled && (
<Tooltip label={t`Remove this table`}>
<ActionIcon
+ variant="subtle"
onClick={onRemove}
mr="sm"
aria-label={t`Remove this table`}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
index e547779af81..caa3f25884f 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
@@ -199,7 +199,7 @@ function DismissButton({ onDismiss }: { onDismiss: () => void }) {
return (
<ActionIcon
ml="auto"
- size="1.5rem"
+ size="sm"
radius="xl"
variant="subtle"
c="text-disabled"
diff --git a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
index 2d1fec940ab..c48f1a5ed58 100644
--- a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
@@ -11,8 +11,8 @@ import { ClientSortableTable } from "metabase/common/components/Table";
import { useToast } from "metabase/common/hooks";
import { SettingHeader } from "metabase/settings-components";
import {
+ ActionIcon,
Box,
- Button,
Checkbox,
Ellipsified,
Flex,
@@ -207,14 +207,14 @@ const UploadTableRow = ({
<td>{item.schema}</td>
<td>
<Flex align="center" justify="flex-end" py="sm">
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
onClick={() => onTrash(item)}
variant="subtle"
- color="neutral"
size="sm"
- leftSection={<Icon name="trash" />}
- />
+ aria-label={t`Delete table`}
+ >
+ <Icon name="trash" />
+ </ActionIcon>
</Flex>
</td>
</tr>
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
index 2e9123120d9..79585706254 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
@@ -11,7 +11,7 @@ import {
BasicAdminSettingInput,
SettingHeader,
} from "metabase/settings-components";
-import { Box, Button, Flex, Icon, Paper, Text } from "metabase/ui";
+import { ActionIcon, Box, Button, Flex, Icon, Paper, Text } from "metabase/ui";
import type {
EnterpriseSettingKey,
IllustrationSettingValue,
@@ -242,17 +242,16 @@ export function IllustrationWidget({
? fileName
: t`Remove uploaded image`}
</Text>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
{customIllustrationSource && (
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
- leftSection={<Icon name="close" />}
ml="lg"
onClick={handleRemoveCustomIllustration}
aria-label={t`Remove custom illustration`}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
)}
</Flex>
))}
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx
index 1d6852f3c95..bbb4a8c1468 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx
@@ -7,7 +7,7 @@ import { SetByEnvVar } from "metabase/common/components/SetByEnvVar";
import CS from "metabase/css/core/index.css";
import { useAdminSetting } from "metabase/settings";
import { SettingHeader } from "metabase/settings-components";
-import { Box, Button, Flex, Icon, Paper, Text } from "metabase/ui";
+import { ActionIcon, Box, Button, Flex, Icon, Paper, Text } from "metabase/ui";
import type { EnterpriseSettingKey } from "metabase-types/api";
import S from "./IllustrationWidget.module.css";
@@ -137,17 +137,16 @@ export function ImageUploadWidget({
? fileName
: t`Remove uploaded image`}
</Text>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
{!isDefaultImage && (
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
- leftSection={<Icon name="close" />}
ml="lg"
onClick={handleRemove}
aria-label={t`Remove custom illustration`}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
)}
</Flex>
</Flex>
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/EditorButton/EditorButton.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/EditorButton/EditorButton.tsx
index 55f663db2c7..cccb60a2a89 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/EditorButton/EditorButton.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/EditorButton/EditorButton.tsx
@@ -61,7 +61,7 @@ export const EditorButton = ({
tooltip={t`Edit question`}
icon="pencil_lines"
data-testid="notebook-button"
- data-active={isOpen}
+ active={isOpen}
{...actionIconProps}
/>
);
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/AddBadgeListItem/AddBadgeListItem.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/AddBadgeListItem/AddBadgeListItem.tsx
index 1a7fc6c86c5..384a1ee6421 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/AddBadgeListItem/AddBadgeListItem.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/AddBadgeListItem/AddBadgeListItem.tsx
@@ -26,7 +26,12 @@ const _AddBadgeListItem = (
pr="sm"
pl="xxs"
leftSection={
- <ActionIcon radius="xl" size="sm" className={CS.bgMediumHover}>
+ <ActionIcon
+ variant="subtle"
+ radius="xl"
+ size="sm"
+ className={CS.bgMediumHover}
+ >
<Icon name="add" c="text-brand" size={10} />
</ActionIcon>
}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeListItem/BadgeListItem.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeListItem/BadgeListItem.tsx
index 41c3e199f49..f585ae88e35 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeListItem/BadgeListItem.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeListItem/BadgeListItem.tsx
@@ -30,6 +30,7 @@ const _BadgeListItem = (
color="brand"
rightSection={
<ActionIcon
+ variant="subtle"
radius="xl"
size="sm"
ml={0}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/SdkActionIcon/SdkActionIcon.module.css b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/SdkActionIcon/SdkActionIcon.module.css
deleted file mode 100644
index c797b515c1f..00000000000
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/SdkActionIcon/SdkActionIcon.module.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.sdkActionIcon:not([data-css-specificity-hack]) {
- color: var(--mb-color-text-primary);
- background: var(--mb-color-background_page-primary);
- border: 1px solid var(--mb-color-border-neutral);
-
- &:hover {
- background: var(--mb-color-background_surface-hover);
- }
-
- &[data-active="true"] {
- color: var(--mb-color-text-primary-inverse);
- background: var(--mb-color-core-brand);
- border-color: var(--mb-color-core-brand);
-
- &:hover {
- background: color-mix(
- in srgb,
- var(--mb-color-core-brand),
- transparent 20%
- );
- }
- }
-}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/SdkActionIcon/SdkActionIcon.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/SdkActionIcon/SdkActionIcon.tsx
index a2c056b0cf7..2d98a08111f 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/SdkActionIcon/SdkActionIcon.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/SdkActionIcon/SdkActionIcon.tsx
@@ -1,4 +1,3 @@
-import cx from "classnames";
import { type ReactElement, forwardRef } from "react";
import type { IconName } from "metabase/embedding-sdk/types/icon";
@@ -10,8 +9,6 @@ import {
Tooltip,
} from "metabase/ui";
-import S from "./SdkActionIcon.module.css";
-
type OwnSdkActionIconProps = {
icon: IconName;
active?: boolean;
@@ -38,7 +35,6 @@ export const SdkActionIcon = forwardRef<
tooltip,
tooltipAriaLabel,
active,
- className,
...actionIconProps
},
ref,
@@ -53,9 +49,8 @@ export const SdkActionIcon = forwardRef<
tooltipAriaLabel ??
(typeof tooltip === "string" ? tooltip : undefined)
}
- size="lg"
- className={cx(S.sdkActionIcon, className)}
- variant="default"
+ size="md"
+ mod={{ hovered: active }}
{...actionIconProps}
>
<Icon name={icon} />
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx
index a5f000ff157..13b17f4a208 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx
@@ -31,7 +31,7 @@ export function ActionSettingsTriggerButton({
return (
<Tooltip label={t`Action settings`}>
<ActionIcon
- variant="viewHeader"
+ variant="subtle"
onClick={onClick}
aria-label={t`Action settings`}
>
diff --git a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
index a8ea153d92c..a0cf379df67 100644
--- a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
@@ -236,11 +236,12 @@ const SuggestedPromptRow = ({
{metabotEntityId === FIXED_METABOT_ENTITY_IDS.DEFAULT ? (
<Tooltip label={t`Run prompt`}>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={Urls.newMetabotConversation({ prompt: row.prompt })}
data-testid="prompt-run"
target="_blank"
- h="sm"
+ size="sm"
>
<Icon name="play" size="1rem" />
</ActionIcon>
@@ -248,16 +249,22 @@ const SuggestedPromptRow = ({
) : (
<Tooltip label={clipboard.copied ? t`Copied!` : t`Copy prompt`}>
<ActionIcon
+ variant="subtle"
onClick={() => clipboard.copy(row.prompt)}
data-testid="prompt-copy"
- h="sm"
+ size="sm"
>
<Icon name="copy" size="1rem" />
</ActionIcon>
</Tooltip>
)}
<Tooltip label={t`Remove prompt`}>
- <ActionIcon onClick={onDelete} data-testid="prompt-remove" h="sm">
+ <ActionIcon
+ variant="subtle"
+ onClick={onDelete}
+ data-testid="prompt-remove"
+ size="sm"
+ >
<Icon name="trash" size="1rem" />
</ActionIcon>
</Tooltip>
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
index be4ab91cb54..ea568c52f80 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
@@ -63,7 +63,11 @@ export const DatabaseHelpSidePanel = ({ engineKey, onClose }: Props) => {
<Title order={2} size="h4">
{c("{0} is the database engine name").t`Add ${driverName}`}
</Title>
- <ActionIcon aria-label={t`Close panel`} onClick={onClose}>
+ <ActionIcon
+ variant="subtle"
+ aria-label={t`Close panel`}
+ onClick={onClose}
+ >
<Icon name="close" />
</ActionIcon>
</Flex>
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx
index e152f0f20f1..45c6dc3b728 100644
--- a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx
@@ -27,7 +27,7 @@ export function SegmentActionSelect({
<>
<Menu position="bottom-end">
<Menu.Target>
- <ActionIcon>
+ <ActionIcon variant="subtle">
<Icon name="ellipsis" />
</ActionIcon>
</Menu.Target>
diff --git a/frontend/src/metabase/admin/settings/auth/components/GroupMappings/MappingRow.tsx b/frontend/src/metabase/admin/settings/auth/components/GroupMappings/MappingRow.tsx
index 83ef537d5ba..758b8f0471b 100644
--- a/frontend/src/metabase/admin/settings/auth/components/GroupMappings/MappingRow.tsx
+++ b/frontend/src/metabase/admin/settings/auth/components/GroupMappings/MappingRow.tsx
@@ -56,6 +56,7 @@ export function MappingRow({
{!readOnly && (
<Flex className={S.rowActions} gap="sm">
<ActionIcon
+ variant="subtle"
aria-label={t`Edit mapping`}
aria-describedby={nameId}
disabled={disabled}
@@ -64,6 +65,7 @@ export function MappingRow({
<Icon name="pencil" />
</ActionIcon>
<ActionIcon
+ variant="subtle"
aria-label={t`Delete mapping`}
aria-describedby={nameId}
disabled={disabled}
diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/SecretKeyModal.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/SecretKeyModal.tsx
index eb78d90ef88..67eb79fdf5c 100644
--- a/frontend/src/metabase/admin/settings/components/ApiKeys/SecretKeyModal.tsx
+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/SecretKeyModal.tsx
@@ -42,6 +42,7 @@ export const SecretKeyModal = ({
<Tooltip label={t`Copied!`} opened={copied}>
<ActionIcon
variant="subtle"
+ size="sm"
aria-label={t`Copy`}
onClick={copy}
>
diff --git a/frontend/src/metabase/browse/components/DatabaseQuickLinksMenu.tsx b/frontend/src/metabase/browse/components/DatabaseQuickLinksMenu.tsx
index 590b08b0771..00632f91a5c 100644
--- a/frontend/src/metabase/browse/components/DatabaseQuickLinksMenu.tsx
+++ b/frontend/src/metabase/browse/components/DatabaseQuickLinksMenu.tsx
@@ -29,9 +29,9 @@ export const DatabaseQuickLinksMenu = ({
<Menu position="bottom-end">
<Menu.Target>
<ActionIcon
+ variant="subtle"
className={className}
size="sm"
- color="text-secondary"
aria-label={t`Database options`}
>
<Icon name="ellipsis" />
diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
index 98a719cf7de..6f087dd165a 100644
--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
@@ -96,9 +96,8 @@ export function BrowseMetrics() {
{canCreateMetric && (
<Tooltip label={t`Create a new metric`} position="bottom">
<ActionIcon
+ variant="subtle"
aria-label={t`Create a new metric`}
- size={32}
- variant="viewHeader"
component={ForwardRefLink}
to={newMetricLink}
onClick={() => {
diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsx
index c6cec6b0645..79e1b4e86a8 100644
--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx
+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx
@@ -25,7 +25,7 @@ import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";
import CS from "metabase/css/core/index.css";
import { useNavigate } from "metabase/router";
import {
- Button,
+ ActionIcon,
FixedSizeIcon,
Flex,
Icon,
@@ -370,14 +370,9 @@ function MenuCell({ metric }: { metric?: MetricResult }) {
>
<Menu position="bottom-end">
<Menu.Target>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
- variant="subtle"
- color="neutral"
- size="sm"
- aria-label={t`Metric options`}
- leftSection={<Icon name="ellipsis" />}
- />
+ <ActionIcon variant="subtle" size="sm" aria-label={t`Metric options`}>
+ <Icon name="ellipsis" />
+ </ActionIcon>
</Menu.Target>
<Menu.Dropdown>
{actions.map((action) => (
diff --git a/frontend/src/metabase/browse/models/BrowseModels.tsx b/frontend/src/metabase/browse/models/BrowseModels.tsx
index 51197b490eb..eda27cf75f4 100644
--- a/frontend/src/metabase/browse/models/BrowseModels.tsx
+++ b/frontend/src/metabase/browse/models/BrowseModels.tsx
@@ -97,9 +97,8 @@ export const BrowseModels = () => {
{canCreateNewModel && (
<Tooltip label={t`Create a new model`} position="bottom">
<ActionIcon
+ variant="subtle"
aria-label={t`Create a new model`}
- size={32}
- variant="viewHeader"
component={ForwardRefLink}
to="/model/new"
onClick={() => trackNewModelInitiated()}
diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx
index b47b8749858..2c3c1c4327d 100644
--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx
+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowserInner.tsx
@@ -145,11 +145,11 @@ const TableBrowserItemButtons = ({
<Group gap="sm">
{xraysEnabled && (
<ActionIcon
+ variant="subtle"
component={Link}
to={`/auto/dashboard/table/${tableId}`}
size="sm"
tooltip={t`X-ray this table`}
- color="feedback-warning"
aria-label={t`X-ray this table`}
onClick={trackBrowseXRayClicked}
>
@@ -158,12 +158,12 @@ const TableBrowserItemButtons = ({
)}
{canEditTables && (
<ActionIcon
+ variant="subtle"
component={Link}
to={PLUGIN_TABLE_EDITING.getTableEditUrl(tableId, dbId)}
onClick={handleEditTableClicked}
size="sm"
tooltip={t`Edit this table`}
- color="text-secondary"
aria-label={t`Edit this table`}
data-testid="edit-table-icon"
>
@@ -171,11 +171,11 @@ const TableBrowserItemButtons = ({
</ActionIcon>
)}
<ActionIcon
+ variant="subtle"
component={Link}
to={`/reference/databases/${dbId}/tables/${tableId}`}
size="sm"
tooltip={t`Learn about this table`}
- color="text-secondary"
aria-label={t`Learn about this table`}
>
<Icon name="reference" />
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx
index 68bd448ede6..3df0ee03e6a 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx
@@ -17,7 +17,7 @@ const CollectionTimeline = ({
return (
<Tooltip label={t`Events`} position="bottom">
<div>
- <ActionIcon variant="viewHeader" size="2rem" component={Link} to={url}>
+ <ActionIcon variant="subtle" component={Link} to={url}>
<Icon name="calendar" />
</ActionIcon>
</div>
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUpload.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUpload.tsx
index 73d3e59ba2b..a559d4a676d 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUpload.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUpload.tsx
@@ -32,8 +32,7 @@ export function CollectionUpload({
<>
<UploadTooltip collection={collection}>
<ActionIcon
- variant="viewHeader"
- size="2rem"
+ variant="subtle"
aria-label={t`Upload data`}
onClick={() => setShowInfoModal(true)}
>
@@ -68,8 +67,7 @@ export function CollectionUpload({
<UploadTooltip collection={collection}>
<UploadLabel>
<ActionIcon
- variant="viewHeader"
- size="2rem"
+ variant="subtle"
component="span"
aria-label={t`Upload data`}
>
diff --git a/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx b/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx
index 2211d9cabac..23db6ba4f1e 100644
--- a/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx
+++ b/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx
@@ -152,7 +152,7 @@ export const CollectionMenu = ({
offset={6}
data-testid="menu-indicator-root"
>
- <ActionIcon size={32} variant="viewHeader">
+ <ActionIcon variant="subtle">
<Icon name="ellipsis" c="text-primary" />
</ActionIcon>
</Indicator>
diff --git a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.module.css b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.module.css
index d5a8094494f..da24508e7a6 100644
--- a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.module.css
+++ b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.module.css
@@ -188,19 +188,8 @@
}
.submitBtn {
- width: 24px;
- height: 24px;
flex: 0 0 auto;
- min-width: 0;
- min-height: 0;
margin-top: auto;
- border: none;
- transition: color ease 200ms;
-
- &.canSubmit,
- &.canSubmit:hover {
- color: var(--mb-color-core-brand);
- }
}
.bubbleMenu {
diff --git a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx
index 3ac99fa74e7..d99fecc4b81 100644
--- a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx
+++ b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx
@@ -218,9 +218,10 @@ export const CommentEditor = ({
<Tooltip disabled={!content} label={t`Send (${METAKEY} + Enter)`}>
<ActionIcon
aria-label={t`Send`}
- className={cx(S.submitBtn, { [S.canSubmit]: content })}
+ className={S.submitBtn}
disabled={!content}
variant="subtle"
+ color="brand"
size="sm"
onClick={submitDoc}
>
diff --git a/frontend/src/metabase/comments/components/Comments/Comments.tsx b/frontend/src/metabase/comments/components/Comments/Comments.tsx
index 18020ec48ea..371a1395f5f 100644
--- a/frontend/src/metabase/comments/components/Comments/Comments.tsx
+++ b/frontend/src/metabase/comments/components/Comments/Comments.tsx
@@ -196,7 +196,11 @@ export const Comments = ({
>
{title && <Title order={3}>{title}</Title>}
{showCloseButton && (
- <ActionIcon aria-label={t`Close`} onClick={closeSidebar}>
+ <ActionIcon
+ variant="subtle"
+ aria-label={t`Close`}
+ onClick={closeSidebar}
+ >
<Icon name="close" c="text-primary" />
</ActionIcon>
)}
diff --git a/frontend/src/metabase/comments/components/Discussion/DiscussionActionPanel.tsx b/frontend/src/metabase/comments/components/Discussion/DiscussionActionPanel.tsx
index ae209844cc3..1c940657558 100644
--- a/frontend/src/metabase/comments/components/Discussion/DiscussionActionPanel.tsx
+++ b/frontend/src/metabase/comments/components/Discussion/DiscussionActionPanel.tsx
@@ -29,8 +29,6 @@ export type DiscussionActionPanelProps = {
onResolve: (comment: Comment) => void;
};
-const ACTION_ICON_SIZE = "md";
-
export function DiscussionActionPanel({
canReact = true,
canResolve,
@@ -72,8 +70,8 @@ export function DiscussionActionPanel({
<Popover.Target>
<Tooltip label={t`Add reaction`} disabled={emojiPickerOpened}>
<ActionIcon
+ variant="subtle"
aria-label={t`Add reaction`}
- size={ACTION_ICON_SIZE}
onClick={() => setEmojiPickerOpened((opened) => !opened)}
>
<Icon name="smile" />
@@ -88,13 +86,13 @@ export function DiscussionActionPanel({
{canResolve && (
<Tooltip label={comment.is_resolved ? t`Re-open` : t`Resolve`}>
<ActionIcon
+ variant="subtle"
data-testid={
comment.is_resolved
? "comment-action-panel-reopen"
: "comment-action-panel-resolve"
}
aria-label={comment.is_resolved ? t`Re-open` : t`Resolve`}
- size={ACTION_ICON_SIZE}
onClick={() =>
comment.is_resolved ? onReopen?.(comment) : onResolve?.(comment)
}
@@ -114,9 +112,9 @@ export function DiscussionActionPanel({
<Popover.Target>
<Tooltip label={t`More actions`} disabled={popoverOpened}>
<ActionIcon
+ variant="subtle"
data-testid="comment-action-panel-more-actions"
aria-label={t`More actions`}
- size={ACTION_ICON_SIZE}
onClick={() => setPopoverOpened((opened) => !opened)}
>
<Icon name="ellipsis" />
diff --git a/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.tsx b/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.tsx
index 9b2d786e06c..1906abd11a9 100644
--- a/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.tsx
+++ b/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.tsx
@@ -70,7 +70,7 @@ export function CollectionRowMenu({
onClick={(e) => e.stopPropagation()}
openDelay={1000}
>
- <ActionIcon aria-label={optionsLabel} size="md">
+ <ActionIcon variant="subtle" aria-label={optionsLabel} size="md">
<FixedSizeIcon name="ellipsis" size={16} />
</ActionIcon>
</Tooltip>
diff --git a/frontend/src/metabase/common/collections/components/UnarchiveCollectionButton/UnarchiveCollectionButton.tsx b/frontend/src/metabase/common/collections/components/UnarchiveCollectionButton/UnarchiveCollectionButton.tsx
index 3a8f83bb79b..f9ca071bbc4 100644
--- a/frontend/src/metabase/common/collections/components/UnarchiveCollectionButton/UnarchiveCollectionButton.tsx
+++ b/frontend/src/metabase/common/collections/components/UnarchiveCollectionButton/UnarchiveCollectionButton.tsx
@@ -70,6 +70,7 @@ export function UnarchiveCollectionButton({
return (
<Tooltip label={label}>
<ActionIcon
+ variant="subtle"
aria-label={label}
size="md"
onClick={(event) => {
diff --git a/frontend/src/metabase/common/components/BookmarkToggle/BookmarkToggle.tsx b/frontend/src/metabase/common/components/BookmarkToggle/BookmarkToggle.tsx
index 8abe04fedf6..0960d1e5909 100644
--- a/frontend/src/metabase/common/components/BookmarkToggle/BookmarkToggle.tsx
+++ b/frontend/src/metabase/common/components/BookmarkToggle/BookmarkToggle.tsx
@@ -46,12 +46,11 @@ export const BookmarkToggle = forwardRef(function BookmarkToggle(
return (
<Tooltip label={label} position={tooltipPlacement}>
<ActionIcon
+ variant="subtle"
{...props}
aria-label={label}
ref={ref}
onClick={handleClick}
- variant="viewHeader"
- size="2rem"
>
<Icon
name={iconName}
diff --git a/frontend/src/metabase/common/components/CopyTextField/copy-text-field-props.tsx b/frontend/src/metabase/common/components/CopyTextField/copy-text-field-props.tsx
index fc74da555af..8cb800bd69b 100644
--- a/frontend/src/metabase/common/components/CopyTextField/copy-text-field-props.tsx
+++ b/frontend/src/metabase/common/components/CopyTextField/copy-text-field-props.tsx
@@ -48,6 +48,7 @@ export function getCopyTextFieldProps<E extends CopyableElement>({
<Tooltip label={t`Copied!`} opened={copied}>
<ActionIcon
variant="subtle"
+ size="sm"
aria-label={t`Copy`}
data-testid="copy-button"
onClick={() => {
diff --git a/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsx b/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsx
index ffefb6eb06a..4934780a8ce 100644
--- a/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsx
+++ b/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsx
@@ -100,9 +100,8 @@ function Emoji({
}: Omit<EmojiPickerListEmojiProps, "color">) {
return (
<ActionIcon
- c="text-primary"
+ variant="subtle"
component="button"
- w="2rem"
fz="1.25rem"
// Unjustified type cast. FIXME
ref={ref as React.RefObject<HTMLButtonElement>}
diff --git a/frontend/src/metabase/common/components/ListSearchField/ListSearchField.tsx b/frontend/src/metabase/common/components/ListSearchField/ListSearchField.tsx
index b8be4ccdcfc..5d3574b91d6 100644
--- a/frontend/src/metabase/common/components/ListSearchField/ListSearchField.tsx
+++ b/frontend/src/metabase/common/components/ListSearchField/ListSearchField.tsx
@@ -29,7 +29,7 @@ export function ListSearchField({
leftSection={<Icon name="search" />}
rightSection={
onResetClick && props.value ? (
- <ActionIcon onClick={onResetClick}>
+ <ActionIcon variant="subtle" onClick={onResetClick}>
<Icon name="close" />
</ActionIcon>
) : null
diff --git a/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsx b/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsx
index f58b44c40c2..f13ed44cb2c 100644
--- a/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsx
+++ b/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsx
@@ -67,7 +67,7 @@ export const PaginationControls = ({
)}
</Text>
<ActionIcon
- variant="viewHeader"
+ variant="subtle"
onClick={onPreviousPage ?? undefined}
disabled={isPreviousDisabled}
data-testid="previous-page-btn"
@@ -77,7 +77,7 @@ export const PaginationControls = ({
</ActionIcon>
<ActionIcon
- variant="viewHeader"
+ variant="subtle"
onClick={onNextPage ?? undefined}
disabled={isNextDisabled}
data-testid="next-page-btn"
diff --git a/frontend/src/metabase/common/components/PasswordReveal/PasswordReveal.tsx b/frontend/src/metabase/common/components/PasswordReveal/PasswordReveal.tsx
index 102ec166503..58f3476f21e 100644
--- a/frontend/src/metabase/common/components/PasswordReveal/PasswordReveal.tsx
+++ b/frontend/src/metabase/common/components/PasswordReveal/PasswordReveal.tsx
@@ -39,7 +39,6 @@ export const PasswordReveal = ({ password }: PasswordRevealProps) => {
data-testid="copy-button"
aria-label={t`Copy password`}
variant="subtle"
- color="icon-secondary"
size="lg"
>
<Icon name={copied ? "check" : "copy"} />
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPickerModal.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPickerModal.tsx
index 62690a6ef56..31c13e0ac31 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPickerModal.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPickerModal.tsx
@@ -246,6 +246,7 @@ const SearchInput = ({
rightSection={
value.length ? (
<ActionIcon
+ variant="subtle"
onClick={() => {
setLocalValue("");
onChange("");
diff --git a/frontend/src/metabase/common/components/PublicLinksListing/PublicLinksListing.tsx b/frontend/src/metabase/common/components/PublicLinksListing/PublicLinksListing.tsx
index 36c253a2989..7b0a9a256fc 100644
--- a/frontend/src/metabase/common/components/PublicLinksListing/PublicLinksListing.tsx
+++ b/frontend/src/metabase/common/components/PublicLinksListing/PublicLinksListing.tsx
@@ -83,6 +83,7 @@ export const PublicLinksListing = <
{revoke && (
<td className={cx(CS.flex, CS.layoutCentered)}>
<ActionIcon
+ variant="subtle"
aria-label={t`Revoke link`}
onClick={() => setLinkToRevoke(item)}
>
diff --git a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
index c287fa4caba..7d1651c5c75 100644
--- a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
+++ b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
@@ -9,6 +9,7 @@ import { useUserKeyValue } from "metabase/current-user";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
import { useUserSetting } from "metabase/settings";
import {
+ ActionIcon,
Box,
Button,
Flex,
@@ -205,18 +206,15 @@ export const QuestionDownloadWidget = ({
{t`Read the docs`}
</Link>
</Text>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
aria-label={t`Close hint`}
variant="subtle"
- color="neutral"
size="sm"
style={{ flexShrink: 0 }}
- leftSection={
- <Icon name="close" tooltip={t`Don't show me this again.`} />
- }
onClick={() => setDismissedExcelPivotExportsBanner(true)}
- />
+ >
+ <Icon name="close" tooltip={t`Don't show me this again.`} />
+ </ActionIcon>
</Flex>
)}
{hasTruncatedResults && (
diff --git a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
index 7adc143fc35..ee35d5a7491 100644
--- a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
+++ b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
@@ -5,7 +5,15 @@ import { getFormattedTime } from "metabase/common/components/DateTime/DateTime";
import type { RevisionOrModerationEvent } from "metabase/plugins";
import { useDispatch } from "metabase/redux";
import { addUndo } from "metabase/redux/undo";
-import { Box, Button, Center, Flex, Icon, Text, Tooltip } from "metabase/ui";
+import {
+ ActionIcon,
+ Box,
+ Center,
+ Flex,
+ Icon,
+ Text,
+ Tooltip,
+} from "metabase/ui";
import { getRelativeTime } from "metabase/utils/time-dayjs";
import type { Revision } from "metabase-types/api";
@@ -95,17 +103,16 @@ export function RevisionHistoryTimeline({
<Flex>
{revision && canWrite && isNotFirstEvent && (
<Tooltip label={t`Revert to this version`}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
className={S.revertButton}
variant="subtle"
- color="neutral"
size="sm"
onClick={() => handleRevert(revision)}
data-testid="question-revert-button"
aria-label={t`revert to ${title}`}
- leftSection={<Icon name="revert" />}
- />
+ >
+ <Icon name="revert" />
+ </ActionIcon>
</Tooltip>
)}
</Flex>
diff --git a/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx b/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx
index a942616a6c4..817a7a3e8b8 100644
--- a/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx
+++ b/frontend/src/metabase/common/components/SearchResult/SearchResult.tsx
@@ -9,9 +9,9 @@ import type { To } from "metabase/router";
import { useNavigate } from "metabase/router";
import type { AnchorProps, BoxProps, StackProps } from "metabase/ui";
import {
+ ActionIcon,
Anchor,
Box,
- Button,
Divider,
Group,
Icon,
@@ -245,14 +245,9 @@ export function SearchResult({
)}
{showXRayButton && (
<Box className={S.xraySection} pos="relative">
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
- variant="subtle"
- color="neutral"
- size="sm"
- leftSection={<Icon name="bolt" />}
- onClick={onXRayClick}
- />
+ <ActionIcon variant="subtle" size="sm" onClick={onXRayClick}>
+ <Icon name="bolt" />
+ </ActionIcon>
</Box>
)}
</SearchResultContainer>
diff --git a/frontend/src/metabase/common/components/ToolbarButton/ToolbarButton.tsx b/frontend/src/metabase/common/components/ToolbarButton/ToolbarButton.tsx
index 426737f9ddb..7516cd554a9 100644
--- a/frontend/src/metabase/common/components/ToolbarButton/ToolbarButton.tsx
+++ b/frontend/src/metabase/common/components/ToolbarButton/ToolbarButton.tsx
@@ -52,15 +52,15 @@ export const ToolbarButton = forwardRef(function ToolbarButton(
const actionButton = (
<ActionIcon
+ variant="subtle"
data-testid="toolbar-button"
- data-is-active={isActive}
+ aria-pressed={isActive || undefined}
+ selected={isActive}
ref={ref}
display={{
base: visibleOnSmallScreen ? "flex" : "none",
sm: "flex",
}}
- size="2rem"
- variant="viewHeader"
aria-label={
ariaLabel ??
(typeof tooltipLabel === "string" ? tooltipLabel : undefined)
@@ -70,13 +70,7 @@ export const ToolbarButton = forwardRef(function ToolbarButton(
disabled={disabled}
{...actionIconProps}
>
- {children ?? (
- <Icon
- name={icon}
- c={isActive ? "core-brand" : undefined}
- {...iconProps}
- />
- )}
+ {children ?? <Icon name={icon} {...iconProps} />}
</ActionIcon>
);
diff --git a/frontend/src/metabase/dashboard/components/ActionViz/ActionPicker/ActionPicker.tsx b/frontend/src/metabase/dashboard/components/ActionViz/ActionPicker/ActionPicker.tsx
index bd0c01d60c5..f6eac708aa9 100644
--- a/frontend/src/metabase/dashboard/components/ActionViz/ActionPicker/ActionPicker.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionViz/ActionPicker/ActionPicker.tsx
@@ -140,6 +140,7 @@ function ModelActionPicker({
>
<span>{action.name}</span>
<ActionIcon
+ variant="subtle"
onClick={(event: MouseEvent<HTMLButtonElement>) => {
// we have a click listener on the parent
event.stopPropagation();
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuButton.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuButton.tsx
index ea64be2c897..156fe8b776f 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuButton.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuButton.tsx
@@ -17,6 +17,7 @@ export const DashCardMenuButton = forwardRef(function DashCardMenuButton(
) {
return (
<ActionIcon
+ variant="subtle"
ref={ref}
aria-label={t`More options`}
size="xs"
diff --git a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx
index be359689454..1e0d2e93064 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSubscriptionsSidebar/PulsesListSidebar.tsx
@@ -14,7 +14,7 @@ import {
import { connect } from "metabase/redux";
import type { State } from "metabase/redux/store";
import {
- Button,
+ ActionIcon,
Card,
Flex,
Group,
@@ -83,28 +83,26 @@ function _PulsesListSidebar({
<Flex align="center">
<Tooltip label={createSubscriptionLabel}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
aria-label={createSubscriptionLabel}
- leftSection={<Icon name="add" />}
mr="1rem"
onClick={createSubscription}
- />
+ >
+ <Icon name="add" />
+ </ActionIcon>
</Tooltip>
<Tooltip label={closeSidebarLabel}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
aria-label={closeSidebarLabel}
- leftSection={<Icon name="close" />}
onClick={onCancel}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
</Tooltip>
</Flex>
</div>
diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsx b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsx
index 8161b116656..86da261eb2d 100644
--- a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsx
@@ -170,7 +170,7 @@ export function DashboardTabs({
)}
{isEditing && (
<ActionIcon
- variant="viewHeader"
+ variant="subtle"
onClick={createNewTab}
aria-label={t`Create new tab`}
className={S.createTabButton}
diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.module.css b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.module.css
index 1c4cf7d69d7..a660c320f04 100644
--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.module.css
+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.module.css
@@ -19,14 +19,6 @@
.VisualizerButton {
visibility: hidden;
- background-color: var(--mb-color-core-brand);
- color: var(--mb-color-text-primary-inverse);
- cursor: pointer;
-
- &:hover {
- color: var(--mb-color-text-primary-inverse);
- background-color: var(--mb-color-core-brand);
- }
}
&:hover .VisualizerButton {
diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx
index 5395b66d434..8880672802d 100644
--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx
+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx
@@ -159,8 +159,9 @@ export function QuestionList({
/>
<Tooltip label={t`Visualize another way`}>
<ActionIcon
+ variant="filled"
className={S.VisualizerButton}
- size="41px"
+ size="lg"
aria-label={t`Visualize another way`}
onClick={() => {
trackVisualizeAnotherWayClicked();
diff --git a/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/ActionMoreMenu.tsx b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/ActionMoreMenu.tsx
index 4ccbe2acdc5..7ce4cb09614 100644
--- a/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/ActionMoreMenu.tsx
+++ b/frontend/src/metabase/data-studio/actions/components/ActionHeader/ActionMoreMenu/ActionMoreMenu.tsx
@@ -47,7 +47,7 @@ export function ActionMoreMenu({ action }: ActionMoreMenuProps) {
<>
<Menu>
<Menu.Target>
- <ActionIcon size="sm" aria-label={t`Action options`}>
+ <ActionIcon variant="subtle" size="sm" aria-label={t`Action options`}>
<Icon name="ellipsis" />
</ActionIcon>
</Menu.Target>
diff --git a/frontend/src/metabase/data-studio/actions/pages/ArchivedActionListPage/ArchivedActionListPage.tsx b/frontend/src/metabase/data-studio/actions/pages/ArchivedActionListPage/ArchivedActionListPage.tsx
index b0bef561e6f..1a46114b00b 100644
--- a/frontend/src/metabase/data-studio/actions/pages/ArchivedActionListPage/ArchivedActionListPage.tsx
+++ b/frontend/src/metabase/data-studio/actions/pages/ArchivedActionListPage/ArchivedActionListPage.tsx
@@ -179,6 +179,7 @@ function ArchivedItemMenu({
return (
<Tooltip label={t`Unarchive action`}>
<ActionIcon
+ variant="subtle"
aria-label={t`Unarchive action`}
size="md"
onClick={(event) => {
diff --git a/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx b/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx
index a9400cf3e8e..ead49663dee 100644
--- a/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx
+++ b/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx
@@ -40,7 +40,7 @@ export function MoreMenu({
<>
<Menu>
<Menu.Target>
- <ActionIcon aria-label={ariaLabel}>
+ <ActionIcon variant="subtle" aria-label={ariaLabel}>
<Icon name="ellipsis" />
</ActionIcon>
</Menu.Target>
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
index 7671f8eb3f8..290a9b54eaf 100644
--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
@@ -27,8 +27,8 @@ import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { PLUGIN_LIBRARY } from "metabase/plugins";
import { useParams } from "metabase/router";
import {
+ ActionIcon,
Box,
- Button,
Flex,
Group,
Icon,
@@ -249,22 +249,21 @@ function DataModelContent() {
px="xl"
>
<DataStudioBreadcrumbs>{t`Table details`}</DataStudioBreadcrumbs>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
component={ForwardRefLink}
to={Urls.dataStudioData({
databaseId: table?.db_id,
schemaName: table?.schema,
})}
- leftSection={<Icon name="close" />}
onClick={() => {
closePreview();
resetSelection();
}}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
</Group>
<ScrollArea flex={1} px="xl" type="hover">
<LoadingAndErrorWrapper error={error} loading={isLoading}>
@@ -316,10 +315,8 @@ function DataModelContent() {
className={S.header}
>
<DataStudioBreadcrumbs>{t`Field details`}</DataStudioBreadcrumbs>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
component={ForwardRefLink}
to={Urls.dataStudioData({
@@ -327,9 +324,10 @@ function DataModelContent() {
schemaName: table?.schema,
tableId: table?.id,
})}
- leftSection={<Icon name="close" />}
onClick={closePreview}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
</Group>
<ScrollArea flex={1} px="xl" type="hover">
<LoadingAndErrorWrapper error={error} loading={isLoading}>
diff --git a/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetMoreMenu.tsx b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetMoreMenu.tsx
index 6a785655725..44fb113d73d 100644
--- a/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetMoreMenu.tsx
+++ b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetMoreMenu.tsx
@@ -77,7 +77,11 @@ function SnippetMenu({ onOpenModal, snippet }: SnippetMenuProps) {
return (
<Menu>
<Menu.Target>
- <ActionIcon size="sm" aria-label={t`Snippet menu options`}>
+ <ActionIcon
+ variant="subtle"
+ size="sm"
+ aria-label={t`Snippet menu options`}
+ >
<Icon name="ellipsis" />
</ActionIcon>
</Menu.Target>
diff --git a/frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/hooks.tsx b/frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/hooks.tsx
index e3ebd474e24..896419048d9 100644
--- a/frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/hooks.tsx
+++ b/frontend/src/metabase/data-studio/snippets/pages/ArchivedSnippetListPage/hooks.tsx
@@ -60,6 +60,7 @@ export const useColumnDef = ({ handleUnarchiveClick }: ColumnDefProps) => {
return (
<Tooltip label={t`Unarchive snippet`}>
<ActionIcon
+ variant="subtle"
aria-label={t`Unarchive snippet`}
size="md"
onClick={async (event) => {
diff --git a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsx b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsx
index 7a14916474f..9f4c674969b 100644
--- a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseFormFooter.tsx
@@ -53,6 +53,7 @@ export const DatabaseFormFooter = ({
{isNew && (
<Tooltip label={t`Need help connecting?`}>
<ActionIcon
+ variant="subtle"
component={ExternalLink}
href={docsUrl}
aria-label={t`Need help connecting?`}
diff --git a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
index 9bac1c06bfc..687f9419ef2 100644
--- a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
+++ b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
@@ -28,8 +28,8 @@ import {
} from "metabase/detail-view/utils";
import { useDispatch } from "metabase/redux";
import {
+ ActionIcon,
Box,
- Button,
Divider,
Group,
Icon,
@@ -243,35 +243,27 @@ export function DetailViewSidesheet({
{isNavEnabled && (
<>
<Tooltip disabled={!onPreviousClick} label={t`Previous row`}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
aria-label={t`Previous row`}
disabled={!onPreviousClick}
- leftSection={<Icon name="chevronup" />}
size="sm"
variant="subtle"
- color="neutral"
- style={{
- opacity: onPreviousClick ? undefined : 0.5,
- }}
onClick={onPreviousClick}
- />
+ >
+ <Icon name="chevronup" />
+ </ActionIcon>
</Tooltip>
<Tooltip disabled={!onNextClick} label={t`Next row`}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
aria-label={t`Next row`}
disabled={!onNextClick}
- leftSection={<Icon name="chevrondown" />}
size="sm"
variant="subtle"
- color="neutral"
- style={{
- opacity: onNextClick ? undefined : 0.5,
- }}
onClick={onNextClick}
- />
+ >
+ <Icon name="chevrondown" />
+ </ActionIcon>
</Tooltip>
<Divider orientation="vertical" />
@@ -286,15 +278,14 @@ export function DetailViewSidesheet({
>
<Menu.Target>
<Tooltip label={t`Actions`}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
aria-label={t`Actions`}
data-testid="actions-menu"
- leftSection={<Icon name="ellipsis" />}
size="sm"
variant="subtle"
- color="neutral"
- />
+ >
+ <Icon name="ellipsis" />
+ </ActionIcon>
</Tooltip>
</Menu.Target>
<Menu.Dropdown>
@@ -316,31 +307,29 @@ export function DetailViewSidesheet({
<Tooltip
label={linkCopied ? t`Copied!` : t`Copy link to this record`}
>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
aria-label={
linkCopied ? t`Copied!` : t`Copy link to this record`
}
- leftSection={<Icon name="link" />}
size="sm"
variant="subtle"
- color="neutral"
onClick={handleCopyLink}
- />
+ >
+ <Icon name="link" />
+ </ActionIcon>
</Tooltip>
<Tooltip label={t`Open in full page`}>
<Box>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
aria-label={t`Open in full page`}
component={Link}
- leftSection={<Icon name="expand" />}
size="sm"
variant="subtle"
- color="neutral"
to={url}
- />
+ >
+ <Icon name="expand" />
+ </ActionIcon>
</Box>
</Tooltip>
</>
diff --git a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsx b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsx
index ec7e9a1769f..6a5a7e93aec 100644
--- a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsx
+++ b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsx
@@ -3,7 +3,15 @@ import type { ReactNode } from "react";
import { t } from "ttag";
import Animation from "metabase/css/core/animation.module.css";
-import { Button, Group, Icon, Modal, Stack, Tooltip, rem } from "metabase/ui";
+import {
+ ActionIcon,
+ Group,
+ Icon,
+ Modal,
+ Stack,
+ Tooltip,
+ rem,
+} from "metabase/ui";
import S from "./Sidesheet.module.css";
@@ -43,15 +51,14 @@ export function Sidesheet({
{actions}
<Tooltip label={t`Close`}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
aria-label={t`Close`}
- leftSection={<Icon name="close" />}
size="sm"
variant="subtle"
- color="neutral"
onClick={onClose}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
</Tooltip>
</Group>
diff --git a/frontend/src/metabase/documents/components/DocumentHeader.module.css b/frontend/src/metabase/documents/components/DocumentHeader.module.css
index f7913dca2f1..d11b726c792 100644
--- a/frontend/src/metabase/documents/components/DocumentHeader.module.css
+++ b/frontend/src/metabase/documents/components/DocumentHeader.module.css
@@ -25,11 +25,6 @@
.actionsContainer {
flex-shrink: 0;
-
- .commentsIcon:hover {
- color: var(--mb-color-text-brand-hover);
- background-color: var(--mb-color-background_surface-hover);
- }
}
@media print {
diff --git a/frontend/src/metabase/documents/components/DocumentHeader.tsx b/frontend/src/metabase/documents/components/DocumentHeader.tsx
index 40eb0b7473c..08c3546be2f 100644
--- a/frontend/src/metabase/documents/components/DocumentHeader.tsx
+++ b/frontend/src/metabase/documents/components/DocumentHeader.tsx
@@ -192,7 +192,7 @@ export const DocumentHeader = ({
<Box>
{document && (
<ActionIcon
- className={S.commentsIcon}
+ variant="subtle"
component={Link}
to={`/document/${document.id}/comments/all`}
size="md"
diff --git a/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsx b/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsx
index dafa5d02f59..6bc7c38c369 100644
--- a/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsx
+++ b/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsx
@@ -1,22 +1,22 @@
import { useClipboard } from "@mantine/hooks";
-import type { ComponentPropsWithoutRef, ElementType } from "react";
import { useCallback } from "react";
import { t } from "ttag";
-import { Button, type ButtonProps, Icon, Text, Tooltip } from "metabase/ui";
+import {
+ ActionIcon,
+ type ActionIconProps,
+ Icon,
+ Text,
+ Tooltip,
+} from "metabase/ui";
import { isPlainKey } from "metabase/utils/keyboard";
-type Props<C extends ElementType = "button"> = ButtonProps & {
+type Props = ActionIconProps & {
url: string;
onCopy?: () => void;
- component?: C;
-} & Omit<ComponentPropsWithoutRef<C>, keyof ButtonProps | "component">;
+};
-export const AnchorLinkButton = <C extends ElementType = "button">({
- url,
- onCopy,
- ...props
-}: Props<C>) => {
+export const AnchorLinkButton = ({ url, onCopy, ...props }: Props) => {
const clipboard = useClipboard({ timeout: 2000 });
const handleCopy = useCallback(() => {
@@ -39,18 +39,16 @@ export const AnchorLinkButton = <C extends ElementType = "button">({
label={<Text fw={700} c="inherit">{t`Copied!`}</Text>}
opened={clipboard.copied}
>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
- // Unjustified type cast. FIXME
- {...(props as ButtonProps)}
+ <ActionIcon
+ {...props}
aria-label={t`Copy link`}
variant="subtle"
- color="neutral"
size="sm"
- leftSection={<Icon name="link" />}
onClick={handleCopy}
onKeyDown={handleKeyDown}
- />
+ >
+ <Icon name="link" />
+ </ActionIcon>
</Tooltip>
);
};
diff --git a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx
index 5f9fa89b139..374ba69b2d6 100644
--- a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx
+++ b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx
@@ -196,12 +196,7 @@ export const EmbedQuestionSettingsSidebar = ({
</Menu>
</Group>
- <ActionIcon
- mt="1rem"
- mr="1rem"
- color="text-primary"
- onClick={handleDone}
- >
+ <ActionIcon variant="subtle" mt="1rem" mr="1rem" onClick={handleDone}>
<Icon name="close" />
</ActionIcon>
</Group>
diff --git a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/ExternalDocumentCardMenu.tsx b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/ExternalDocumentCardMenu.tsx
index 1246e116073..ed36fa9903c 100644
--- a/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/ExternalDocumentCardMenu.tsx
+++ b/frontend/src/metabase/documents/components/editor-extensions/CardEmbed/ExternalDocumentCardMenu.tsx
@@ -48,6 +48,7 @@ export const ExternalDocumentCardMenu = ({
>
<Menu.Target>
<ActionIcon
+ variant="subtle"
size="xs"
className={cx({
[SAVING_DOM_IMAGE_HIDDEN_CLASS]: true,
diff --git a/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts b/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts
index 557c07b20a4..e006a0240cc 100644
--- a/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts
+++ b/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts
@@ -29,7 +29,7 @@ export const SDK_TO_MAIN_APP_COLORS_MAPPING: Record<
ColorName[]
> = {
brand: ["core-brand"],
- "brand-hover": ["background_surface-hover"],
+ "brand-hover": ["background_surface-hover", "button-default-neutral-hover"],
"brand-hover-light": ["background_surface-hover"],
border: ["border-neutral"],
filter: ["core-filter"],
diff --git a/frontend/src/metabase/embedding/mcp/ChartTypePicker/ChartTypePicker.module.css b/frontend/src/metabase/embedding/mcp/ChartTypePicker/ChartTypePicker.module.css
deleted file mode 100644
index afd6644c5c8..00000000000
--- a/frontend/src/metabase/embedding/mcp/ChartTypePicker/ChartTypePicker.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.selected {
- box-shadow: 0 1px 2px var(--mb-color-shadow-default);
-}
diff --git a/frontend/src/metabase/embedding/mcp/ChartTypePicker/ChartTypePicker.tsx b/frontend/src/metabase/embedding/mcp/ChartTypePicker/ChartTypePicker.tsx
index 7eee7f57aa2..7e43008a848 100644
--- a/frontend/src/metabase/embedding/mcp/ChartTypePicker/ChartTypePicker.tsx
+++ b/frontend/src/metabase/embedding/mcp/ChartTypePicker/ChartTypePicker.tsx
@@ -1,8 +1,6 @@
-import { ActionIcon, Flex, Icon } from "metabase/ui";
+import { SegmentedControl } from "metabase/ui";
import type { CardDisplayType, IconName } from "metabase-types/api";
-import S from "./ChartTypePicker.module.css";
-
type ChartTypeOption = {
type: CardDisplayType;
icon: IconName;
@@ -20,31 +18,14 @@ export function ChartTypePicker({
onChange,
}: ChartTypePickerProps) {
return (
- <Flex
- h={32}
- align="center"
- gap="xxs"
- bg="background_page-secondary"
- px="xxs"
- bdrs="sm"
- >
- {chartTypes.map(({ type, icon }) => (
- <ActionIcon
- w="2rem"
- key={type}
- size={24}
- variant={value === type ? "filled" : "subtle"}
- bg={value === type ? "background_page-primary" : undefined}
- onClick={() => onChange(type)}
- aria-label={type}
- className={value === type ? S.selected : undefined}
- >
- <Icon
- name={icon}
- c={value === type ? "core-brand" : "text-primary"}
- />
- </ActionIcon>
- ))}
- </Flex>
+ <SegmentedControl
+ data={chartTypes.map(({ type, icon }) => ({
+ value: type,
+ ariaLabel: type,
+ icon,
+ }))}
+ value={value ?? undefined}
+ onChange={onChange}
+ />
);
}
diff --git a/frontend/src/metabase/embedding/mcp/McpFeedbackButtons.tsx b/frontend/src/metabase/embedding/mcp/McpFeedbackButtons.tsx
index f264d0b593e..ea037c3395b 100644
--- a/frontend/src/metabase/embedding/mcp/McpFeedbackButtons.tsx
+++ b/frontend/src/metabase/embedding/mcp/McpFeedbackButtons.tsx
@@ -57,10 +57,11 @@ const FeedbackButton = forwardRef<HTMLButtonElement, FeedbackButtonProps>(
) {
return (
<ActionIcon
+ variant="subtle"
data-testid={dataTestId}
onClick={onClick}
disabled={disabled}
- h="sm"
+ size="sm"
ref={ref}
>
<Icon
diff --git a/frontend/src/metabase/embedding/themes/components/ThemeEditor/EditorPanel.tsx b/frontend/src/metabase/embedding/themes/components/ThemeEditor/EditorPanel.tsx
index e14a9058a6b..eb769e4c023 100644
--- a/frontend/src/metabase/embedding/themes/components/ThemeEditor/EditorPanel.tsx
+++ b/frontend/src/metabase/embedding/themes/components/ThemeEditor/EditorPanel.tsx
@@ -3,6 +3,7 @@ import { t } from "ttag";
import type { EmbeddingThemeEditorResult } from "metabase/embedding/themes/hooks/use-embedding-theme-editor";
import {
+ ActionIcon,
Box,
Button,
Card,
@@ -105,15 +106,14 @@ export function EditorPanel({
<Text fw={600}>{t`Main colors`}</Text>
{editor.hasMainColorChanges && (
<Tooltip label={t`Reset main colors to defaults`}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
aria-label={t`Reset main colors to defaults`}
onClick={editor.resetMainColors}
- leftSection={<Icon name="revert" />}
- />
+ >
+ <Icon name="revert" />
+ </ActionIcon>
</Tooltip>
)}
</Flex>
@@ -150,15 +150,14 @@ export function EditorPanel({
<Tooltip
label={t`Regenerate filter, summarize, positive, negative, and chart colors from the brand color`}
>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
aria-label={t`Regenerate from brand color`}
onClick={editor.regenerateAdditionalColorsFromBrand}
- leftSection={<Icon name="revert" />}
- />
+ >
+ <Icon name="revert" />
+ </ActionIcon>
</Tooltip>
)}
</Flex>
diff --git a/frontend/src/metabase/embedding/themes/components/ThemeListing/EmbeddingThemeCard.tsx b/frontend/src/metabase/embedding/themes/components/ThemeListing/EmbeddingThemeCard.tsx
index 39022de0ffb..9e7f7988ed6 100644
--- a/frontend/src/metabase/embedding/themes/components/ThemeListing/EmbeddingThemeCard.tsx
+++ b/frontend/src/metabase/embedding/themes/components/ThemeListing/EmbeddingThemeCard.tsx
@@ -57,6 +57,7 @@ const EmbeddingThemeActionMenu = ({
{/* stopPropagation prevents triggering the card's onEdit when clicking the menu */}
<Menu.Target>
<ActionIcon
+ variant="subtle"
aria-label={t`Duplicate and delete`}
onClick={(e) => e.stopPropagation()}
>
diff --git a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.module.css b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.module.css
index f29224cd6dd..a288de964cc 100644
--- a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.module.css
+++ b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.module.css
@@ -1,17 +1,5 @@
-.filterButton.filterButton {
+.filterButton {
flex: none;
- border: 1px solid var(--mb-color-border-neutral);
- background-color: var(--mb-color-background_page-primary);
-}
-
-.filterButton.filterButton:hover {
- background-color: var(--mb-color-background_surface-hover);
-}
-
-.filterButtonActive.filterButtonActive,
-.filterButtonActive.filterButtonActive:hover {
- border-color: var(--mb-color-core-brand);
- background-color: var(--mb-color-core-brand);
}
.tree {
diff --git a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsx b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsx
index 539e1d684cd..c7876e49a47 100644
--- a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationSidebar.tsx
@@ -1,4 +1,3 @@
-import cx from "classnames";
import { useEffect, useMemo } from "react";
import { t } from "ttag";
@@ -330,19 +329,14 @@ function SidebarShowFilterMenu({
<Menu position="bottom-end">
<Menu.Target>
<ActionIcon
- className={cx(S.filterButton, {
- [S.filterButtonActive]: showHidden,
- })}
+ variant={showHidden ? "filled" : undefined}
+ className={S.filterButton}
radius="xl"
- size="lg"
aria-label={t`Filter`}
aria-pressed={showHidden}
data-testid="exploration-show-hidden-toggle"
>
- <Icon
- name="filter"
- c={showHidden ? "core-white_constant" : "text-secondary"}
- />
+ <Icon name="filter" />
</ActionIcon>
</Menu.Target>
<Menu.Dropdown>
diff --git a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTitle.tsx b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTitle.tsx
index 292198be480..a3e2fce4c9b 100644
--- a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTitle.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTitle.tsx
@@ -65,11 +65,10 @@ function SidebarToggleButton({
return (
<Tooltip label={label} openDelay={1000}>
<ActionIcon
+ variant="subtle"
aria-label={label}
onClick={() => setIsSidebarOpen(!isSidebarOpen)}
data-testid="exploration-sidebar-toggle"
- size="2rem"
- variant="viewFooter"
>
<Icon name={isSidebarOpen ? "sidebar_closed" : "sidebar_open"} />
</ActionIcon>
diff --git a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTreeNode.tsx b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTreeNode.tsx
index 5753e1f4117..7acc9213d18 100644
--- a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTreeNode.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTreeNode.tsx
@@ -306,8 +306,9 @@ function ExplorationGroupMenu({
<Menu>
<Menu.Target>
<ActionIcon
+ variant="subtle"
className={S.groupMenuTrigger}
- size="1rem"
+ size="xs"
c="icon-primary"
aria-label={t`Group actions`}
onClick={(e) => e.stopPropagation()}
diff --git a/frontend/src/metabase/explorations/components/ExplorationSummary/ExplorationSummary.tsx b/frontend/src/metabase/explorations/components/ExplorationSummary/ExplorationSummary.tsx
index 40ce1873afc..dd069b9b2d7 100644
--- a/frontend/src/metabase/explorations/components/ExplorationSummary/ExplorationSummary.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationSummary/ExplorationSummary.tsx
@@ -160,6 +160,7 @@ export function ExplorationSummary({
{documentData && (
<Tooltip label={t`Revision history`}>
<ActionIcon
+ variant="subtle"
size="md"
aria-label={t`Revision history`}
onClick={handleShowHistory}
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.module.css b/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.module.css
index 2c17ec17bb0..2336d363930 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.module.css
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.module.css
@@ -10,23 +10,6 @@
box-shadow: var(--mantine-shadow-xs_outline);
}
-.triageButton {
- border: 1px solid var(--mb-color-border-neutral);
- background-color: var(--mb-color-background_page-primary);
- box-shadow: var(--mantine-shadow-xs_outline);
-
- &:hover:not(:disabled, [data-disabled]) {
- background-color: var(--mb-color-background_page-tertiary);
- color: var(--mb-color-core-brand);
- }
-
- &:disabled,
- &[data-disabled] {
- background-color: var(--mb-color-background_page-primary);
- opacity: 0.4;
- }
-}
-
.timelineMenuTarget {
cursor: pointer;
background-color: var(--mb-color-background_page-secondary);
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.tsx b/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.tsx
index 556c686e7a7..31d3a5690a7 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.tsx
@@ -346,6 +346,7 @@ export function ActionToolbar({
>
{selectedTimeline.name}
<ActionIcon
+ variant="subtle"
aria-label={t`Remove timeline`}
onClick={(e) => {
handleSelectTimelineId(null, "click");
@@ -456,11 +457,7 @@ export function ActionToolbar({
>
<Menu.Target>
<Tooltip label={t`More actions`} disabled={isMoreActionsOpen}>
- <ActionIcon
- size="2rem"
- variant="viewHeader"
- aria-label={t`More actions`}
- >
+ <ActionIcon variant="subtle" aria-label={t`More actions`}>
<Icon name="ellipsis" size="1.125rem" />
</ActionIcon>
</Tooltip>
@@ -512,10 +509,8 @@ function TriageNavButton({
return (
<Tooltip label={label} openDelay={TRIAGE_TOOLTIP_OPEN_DELAY}>
<ActionIcon
- className={S.triageButton}
aria-label={label}
radius="xl"
- size="2rem"
disabled={!onClick}
onClick={onClick}
>
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx
index 9fbe27c31dc..e96a9bf9e20 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx
@@ -212,7 +212,7 @@ export function ExplorationComments({
align="center"
>
<Title order={3}>{t`Comments`}</Title>
- <ActionIcon aria-label={t`Close`} onClick={onClose}>
+ <ActionIcon variant="subtle" aria-label={t`Close`} onClick={onClose}>
<Icon name="close" c="icon-primary" />
</ActionIcon>
</Group>
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/TimelineEventsSidebar.tsx b/frontend/src/metabase/explorations/components/ExplorationVisualization/TimelineEventsSidebar.tsx
index 49c50246524..5d61d70c7aa 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/TimelineEventsSidebar.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/TimelineEventsSidebar.tsx
@@ -37,7 +37,7 @@ export function TimelineEventsSidebar({
events.length,
)}
</Text>
- <ActionIcon aria-label={t`Close`} onClick={onClose}>
+ <ActionIcon variant="subtle" aria-label={t`Close`} onClick={onClose}>
<Icon name="close" />
</ActionIcon>
</Group>
diff --git a/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.tsx b/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.tsx
index aa66e81fde5..d66c3ee6004 100644
--- a/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.tsx
+++ b/frontend/src/metabase/explorations/components/NewExplorationEntry/NewExplorationEntry.tsx
@@ -217,6 +217,7 @@ function Banner() {
{t`Research mode helps automate running and inspecting combinations of metrics, dimensions, and event timelines so you can use your brain for analysis, not busy work.`}
</Text>
<ActionIcon
+ variant="subtle"
onClick={() => setHasDismissedBanner(true)}
aria-label={t`Dismiss`}
>
diff --git a/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.module.css b/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.module.css
index 547af3e4f5a..6f651721997 100644
--- a/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.module.css
+++ b/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.module.css
@@ -106,7 +106,7 @@
.copyCodeButton {
position: absolute;
- top: 0.375rem;
+ top: calc(0.625rem + 1px);
right: 0.375rem;
}
diff --git a/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.tsx b/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.tsx
index 3c51fe32c05..a9886096976 100644
--- a/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.tsx
+++ b/frontend/src/metabase/metabot/components/AIMarkdown/AIMarkdown.tsx
@@ -65,6 +65,7 @@ const MarkdownCodeBlock = ({
opened={copied || undefined}
>
<ActionIcon
+ variant="subtle"
aria-label={t`Copy code`}
className={S.copyCodeButton}
data-testid="metabot-code-block-copy"
diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx
index 3a19d54afd5..22bd38a832c 100644
--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx
+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx
@@ -302,7 +302,7 @@ function ProviderConnectionRow({
{!isEnvManaged && (
<Menu position="bottom-end">
<Menu.Target>
- <ActionIcon aria-label={t`Provider options`}>
+ <ActionIcon variant="subtle" aria-label={t`Provider options`}>
<Icon name="ellipsis" />
</ActionIcon>
</Menu.Target>
diff --git a/frontend/src/metabase/metabot/components/Metabot.tsx b/frontend/src/metabase/metabot/components/Metabot.tsx
index ff473ca10c6..f6031168807 100644
--- a/frontend/src/metabase/metabot/components/Metabot.tsx
+++ b/frontend/src/metabase/metabot/components/Metabot.tsx
@@ -81,6 +81,7 @@ const MetabotSidebarActions = ({ agentId }: { agentId: MetabotAgentId }) => {
{isConfigured && (
<Tooltip label={t`New conversation`} position="bottom">
<ActionIcon
+ variant="subtle"
onClick={handleNewConversation}
aria-label={t`New conversation`}
data-testid="metabot-new-conversation"
@@ -96,7 +97,11 @@ const MetabotSidebarActions = ({ agentId }: { agentId: MetabotAgentId }) => {
onConversationSelect={metabot.loadConversation}
/>
)}
- <ActionIcon onClick={handleCloseChat} data-testid="metabot-close-chat">
+ <ActionIcon
+ variant="subtle"
+ onClick={handleCloseChat}
+ data-testid="metabot-close-chat"
+ >
<Icon c="text-primary" name="close" />
</ActionIcon>
</Flex>
diff --git a/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx b/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
index 303fb44c2bb..90e93b5cde0 100644
--- a/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
@@ -44,13 +44,6 @@ export function MetabotAppBarButton({
<Tooltip label={label}>
<ActionIcon
className={className}
- variant="subtle"
- c={isFullPageMetabot ? "text-disabled" : "text-primary"}
- opacity={isFullPageMetabot ? 0.5 : undefined}
- bd="1px solid var(--mb-color-border-neutral)"
- p="sm"
- h="2rem"
- w="2rem"
aria-label={label}
onClick={handleClick}
{...rest}
diff --git a/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.module.css b/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.module.css
index a94d9963f2b..9774ad0beaf 100644
--- a/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.module.css
+++ b/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.module.css
@@ -64,19 +64,6 @@
align-items: flex-end;
}
-.sendButton {
- color: var(--mb-color-background_page-primary);
- border-radius: var(--mantine-radius-xs);
-
- &:disabled,
- &:disabled:hover {
- background-color: var(--mb-color-core-brand);
- color: var(--mb-color-text-primary-inverse);
- border-color: var(--mb-color-core-brand);
- opacity: 0.35;
- }
-}
-
.promptSuggestionsContainer {
display: flex;
flex-direction: column;
diff --git a/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx b/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx
index 2a8c8bf5316..ed81362c6aa 100644
--- a/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAsk/MetabotGreeting.tsx
@@ -117,9 +117,7 @@ export const MetabotGreeting = ({
</Box>
<Box className={S.inputActions}>
<ActionIcon
- className={S.sendButton}
variant="filled"
- size="2rem"
disabled={!canUseNlq || inputDisabled}
loading={metabot.isDoingScience}
onClick={handleSubmit}
diff --git a/frontend/src/metabase/metabot/components/MetabotBranchPicker/MetabotBranchPicker.tsx b/frontend/src/metabase/metabot/components/MetabotBranchPicker/MetabotBranchPicker.tsx
index 22f35a05ad7..489e27c12b7 100644
--- a/frontend/src/metabase/metabot/components/MetabotBranchPicker/MetabotBranchPicker.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotBranchPicker/MetabotBranchPicker.tsx
@@ -14,7 +14,8 @@ export const MetabotBranchPicker = ({
<Flex align="center" gap={2}>
<Tooltip label={t`Previous version`} disabled={index === 0}>
<ActionIcon
- h="sm"
+ variant="subtle"
+ size="sm"
aria-label={t`Previous version`}
disabled={index === 0}
onClick={() => onChange(index - 1)}
@@ -27,7 +28,8 @@ export const MetabotBranchPicker = ({
</Text>
<Tooltip label={t`Next version`} disabled={index === count - 1}>
<ActionIcon
- h="sm"
+ variant="subtle"
+ size="sm"
aria-label={t`Next version`}
disabled={index === count - 1}
onClick={() => onChange(index + 1)}
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataPart.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataPart.tsx
index b11caa1929a..e6d699c77cc 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataPart.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataPart.tsx
@@ -1,5 +1,4 @@
import { useClipboard } from "@mantine/hooks";
-import cx from "classnames";
import { useMemo } from "react";
import { match } from "ts-pattern";
import { jt, t } from "ttag";
@@ -246,12 +245,13 @@ const NavigateToDataPart = ({ type, path }: { type: string; path: string }) => (
<Text fw="bold">{formatPartType(type)}</Text>
</Flex>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={path}
target="_blank"
- h="sm"
+ size="sm"
aria-label={t`Visit`}
- className={cx(Styles.agentPartActions, Styles.agentPartActionIcon)}
+ className={Styles.agentPartActions}
>
<Icon name="external" size="1rem" />
</ActionIcon>
@@ -292,9 +292,10 @@ const DataPartJsonCard = ({
<Text fw="bold">{formatPartType(type)}</Text>
</Flex>
<ActionIcon
- h="sm"
+ variant="subtle"
+ size="sm"
onClick={() => clipboard.copy(formatted)}
- className={cx(Styles.agentPartActions, Styles.agentPartActionIcon)}
+ className={Styles.agentPartActions}
>
<Icon name="copy" size="1rem" />
</ActionIcon>
@@ -357,9 +358,10 @@ const CodeEditDataPart = ({
</Badge>
</Flex>
<ActionIcon
- h="sm"
+ variant="subtle"
+ size="sm"
onClick={() => clipboard.copy(value.value)}
- className={cx(Styles.agentPartActions, Styles.agentPartActionIcon)}
+ className={Styles.agentPartActions}
>
<Icon name="copy" size="1rem" />
</ActionIcon>
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
index 32d4884a2f4..f54c39bb0b6 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
@@ -218,7 +218,7 @@ const SourceFeedbackButtons = ({
<Tooltip label={t`Source is correct`}>
<ActionIcon
aria-label={t`Source is correct`}
- size={24}
+ size="sm"
variant="subtle"
bdrs="xs"
className={S.feedbackButton}
@@ -232,7 +232,7 @@ const SourceFeedbackButtons = ({
<Tooltip label={t`Source is wrong`}>
<ActionIcon
aria-label={t`Source is wrong`}
- size={24}
+ size="sm"
variant="subtle"
bdrs="xs"
className={S.feedbackButton}
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallPart.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallPart.tsx
index 344efb67430..f45b97f46d4 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallPart.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallPart.tsx
@@ -58,7 +58,8 @@ const ToolCallSection = ({
</Flex>
<Tooltip label={clipboard.copied ? t`Copied!` : t`Copy`}>
<ActionIcon
- h="sm"
+ variant="subtle"
+ size="sm"
aria-label={copyLabel}
onClick={() => clipboard.copy(value)}
>
@@ -203,13 +204,13 @@ export const AgentToolCallPart = ({
<Flex align="center" gap="xxs" className={Styles.agentPartActions}>
<Tooltip label={clipboard.copied ? t`Copied!` : t`Copy`}>
<ActionIcon
- h="sm"
+ variant="subtle"
+ size="sm"
aria-label={t`Copy tool call JSON`}
onClick={(e) => {
e.stopPropagation();
handleCopy();
}}
- className={Styles.agentPartActionIcon}
>
<Icon name="copy" size="1rem" />
</ActionIcon>
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css
index ea9c0cd8102..93c7db23115 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css
@@ -196,10 +196,6 @@
transition: opacity 150ms linear;
}
-.agentPartActionIcon:hover {
- background-color: var(--mb-color-background_page-tertiary) !important;
-}
-
.agentPartCard:hover .agentPartActions,
.agentPartCard:focus-within .agentPartActions {
opacity: 1;
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
index 65ab4cf66e4..d3c185881c9 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
@@ -121,7 +121,8 @@ const CopyAction = ({ text }: { text: string }) => {
return (
<Tooltip label={clipboard.copied ? t`Copied!` : t`Copy`}>
<ActionIcon
- size="1.5rem"
+ variant="subtle"
+ size="sm"
data-testid="metabot-chat-message-copy"
onClick={() => clipboard.copy(text)}
>
@@ -187,9 +188,10 @@ const FeedbackButton = forwardRef<HTMLButtonElement, FeedbackButtonProps>(
) {
return (
<ActionIcon
+ variant="subtle"
onClick={onClick}
disabled={disabled}
- size="1.5rem"
+ size="sm"
{...props}
ref={ref}
>
@@ -338,8 +340,9 @@ const MessageActions = ({
actions.push(
<Tooltip key="retry" label={t`Retry`}>
<ActionIcon
+ variant="subtle"
onClick={onRetry}
- size="1.5rem"
+ size="sm"
data-testid="metabot-chat-message-retry"
>
<Icon name="revert" size="0.9rem" c="icon-primary" />
@@ -356,7 +359,8 @@ const MessageActions = ({
actions.push(
<Tooltip key="fork" label={t`Fork conversation`}>
<ActionIcon
- size="1.5rem"
+ variant="subtle"
+ size="sm"
data-testid="metabot-chat-message-fork"
loading={isForking}
disabled={isForking}
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotConversationHistory.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotConversationHistory.tsx
index f145d65638c..111244b1674 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotConversationHistory.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotConversationHistory.tsx
@@ -57,6 +57,7 @@ export const MetabotConversationHistory = ({
<Menu.Target>
<Tooltip label={t`Recent conversations`} position="bottom">
<ActionIcon
+ variant="subtle"
aria-label={t`Recent conversations`}
data-testid="metabot-conversation-history"
>
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotLongChatNotice.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotLongChatNotice.tsx
index 4968f7cf921..1c3bb37a162 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotLongChatNotice.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotLongChatNotice.tsx
@@ -63,6 +63,7 @@ export const MetabotLongChatNotice = ({
>{t`New chat`}</Button>
{variant === "warning" && (
<ActionIcon
+ variant="subtle"
size="sm"
c="text-secondary"
onClick={() => setDismissedWarning(true)}
diff --git a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsx
index 5996b79f5f5..46de1a5ff12 100644
--- a/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotInlineSQLPrompt/useInlineSQLPrompt.unit.spec.tsx
@@ -21,7 +21,6 @@ import {
mockAgentEndpoint,
} from "metabase/metabot/tests/utils";
import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor/NativeQueryEditor";
-import { NATIVE_EDITOR_ICON_SIZE } from "metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons";
import { checkNotNull } from "metabase/utils/types";
import type Question from "metabase-lib/v1/Question";
import {
@@ -77,7 +76,6 @@ function TestEditor({ question }: { question: Question }) {
<NativeQueryEditor.Sidebar
promptButton={
<MetabotPromptButton
- size={NATIVE_EDITOR_ICON_SIZE}
isPromptInputOpen={isPromptOpen}
onClick={togglePrompt}
/>
diff --git a/frontend/src/metabase/metabot/components/MetabotPromptButton/MetabotPromptButton.module.css b/frontend/src/metabase/metabot/components/MetabotPromptButton/MetabotPromptButton.module.css
deleted file mode 100644
index 726dcbd0093..00000000000
--- a/frontend/src/metabase/metabot/components/MetabotPromptButton/MetabotPromptButton.module.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.button {
- color: var(--mb-color-text-primary);
- transition: color 0.3s linear;
-
- &:hover {
- color: var(--mb-color-core-brand);
- }
-
- &.isSelected {
- color: var(--mb-color-core-brand);
- }
-}
diff --git a/frontend/src/metabase/metabot/components/MetabotPromptButton/MetabotPromptButton.tsx b/frontend/src/metabase/metabot/components/MetabotPromptButton/MetabotPromptButton.tsx
index 9b31bc3bd32..355976d192c 100644
--- a/frontend/src/metabase/metabot/components/MetabotPromptButton/MetabotPromptButton.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotPromptButton/MetabotPromptButton.tsx
@@ -1,21 +1,15 @@
-import cx from "classnames";
import { t } from "ttag";
-import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";
import { useUserMetabotPermissions } from "metabase/metabot/hooks";
import { useSetting } from "metabase/settings";
-import { Icon, Tooltip } from "metabase/ui";
-
-import S from "./MetabotPromptButton.module.css";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
interface MetabotPromptButtonProps {
- size: number;
isPromptInputOpen?: boolean;
onClick?: () => void;
}
export const MetabotPromptButton = ({
- size,
isPromptInputOpen,
onClick,
}: MetabotPromptButtonProps) => {
@@ -30,16 +24,15 @@ export const MetabotPromptButton = ({
return (
<Tooltip label={label}>
- <IconButtonWrapper
+ <ActionIcon
+ variant="subtle"
aria-label={label}
aria-pressed={isPromptInputOpen}
- className={cx(S.button, {
- [S.isSelected]: isPromptInputOpen,
- })}
+ selected={isPromptInputOpen}
onClick={onClick}
>
- <Icon name="metabot" size={size} />
- </IconButtonWrapper>
+ <Icon name="metabot" />
+ </ActionIcon>
</Tooltip>
);
};
diff --git a/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx b/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
index be2631d9464..d9b917bfd88 100644
--- a/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
+++ b/frontend/src/metabase/metabot/components/editor-extensions/MetabotEmbed/MetabotEmbed.tsx
@@ -18,7 +18,15 @@ import { useEditorHost } from "metabase/rich_text_editing/tiptap/EditorHost";
import { buildDraftCard } from "metabase/rich_text_editing/tiptap/extensions/shared/draft-card";
import { wrapCardEmbed } from "metabase/rich_text_editing/tiptap/extensions/shared/layout";
import { useSetting } from "metabase/settings";
-import { Box, Button, Flex, Icon, Text, Tooltip } from "metabase/ui";
+import {
+ ActionIcon,
+ Box,
+ Button,
+ Flex,
+ Icon,
+ Text,
+ Tooltip,
+} from "metabase/ui";
import type { MetabotGenerateContentRequest } from "metabase-types/api";
import { useLazyMetabotGenerateContentQuery } from "../../../api";
@@ -275,16 +283,15 @@ export const MetabotComponent = memo(
mb="lg"
>
<Box pos="absolute" top={0} right={0} className={S.closeButton}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
{editor.options.editable && (
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
m="xxs"
- leftSection={<Icon name="close" data-hide-on-print />}
onClick={() => deleteNode()}
- />
+ >
+ <Icon name="close" data-hide-on-print />
+ </ActionIcon>
)}
</Box>
<Flex flex={1} direction="column" className={S.contentWrapper}>
diff --git a/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.tsx b/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.tsx
index 2d080483168..9bf90975b1a 100644
--- a/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.tsx
+++ b/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.tsx
@@ -60,11 +60,7 @@ const PreviewSectionBase = ({
<Group justify="space-between">
<Text fw="bold">{t`Field preview`}</Text>
- <ActionIcon
- color="text-primary"
- variant="transparent"
- onClick={onClose}
- >
+ <ActionIcon variant="subtle" onClick={onClose}>
<Icon name="close" />
</ActionIcon>
</Group>
diff --git a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx
index 22fa31c59a9..5a33d4ecefb 100644
--- a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx
@@ -88,7 +88,6 @@ const TableSectionBase = ({
component={Link}
to={Urls.queryBuilderTable(table.id, table.db_id)}
variant="subtle"
- color="text-disabled"
size="sm"
mr="sm"
aria-label={t`Go to this table`}
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/BulkTableVisibilityToggle.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/BulkTableVisibilityToggle.tsx
index 81cbb57cf20..b93d91e688a 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/BulkTableVisibilityToggle.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/BulkTableVisibilityToggle.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import { useUpdateTableListMutation } from "metabase/api";
import { useMetadataToasts } from "metabase/common/hooks";
-import { ActionIcon, Icon, Loader, Tooltip } from "metabase/ui";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
import type { Table } from "metabase-types/api";
interface Props {
@@ -85,21 +85,14 @@ export function BulkTableVisibilityToggle({
}
};
- if (isLoading) {
- return (
- <ActionIcon disabled variant="transparent">
- <Loader size="xs" />
- </ActionIcon>
- );
- }
-
return (
<Tooltip label={areAllHidden ? t`Unhide all tables` : t`Hide all tables`}>
<ActionIcon
+ variant="subtle"
aria-label={areAllHidden ? t`Unhide all tables` : t`Hide all tables`}
className={className}
- disabled={isLoading}
- variant="transparent"
+ size="sm"
+ loading={isLoading}
onClick={handleClick}
>
<Icon name={areAllHidden ? "eye_crossed_out" : "eye"} />
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.module.css b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.module.css
index d17c6e0673c..636938a0be2 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.module.css
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.module.css
@@ -64,6 +64,7 @@
flex-shrink: 0;
&:focus,
+ &[data-loading],
.item:hover &,
.item:focus &,
.item.selected &,
@@ -77,6 +78,7 @@
opacity: 0;
&:focus,
+ &[data-loading],
.item:hover &,
.item:focus &,
.item.selected {
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.tsx
index 834171c0425..4294b0fdbfa 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/TableVisibilityToggle.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import { useUpdateTableMutation } from "metabase/api";
import { useMetadataToasts } from "metabase/common/hooks";
-import { ActionIcon, Icon, Loader, Tooltip } from "metabase/ui";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
import type { Table } from "metabase-types/api";
interface Props {
@@ -77,22 +77,15 @@ export function TableVisibilityToggle({ className, table, onUpdate }: Props) {
}
};
- if (isLoading) {
- return (
- <ActionIcon disabled variant="transparent">
- <Loader size="xs" />
- </ActionIcon>
- );
- }
-
return (
<Tooltip label={isHidden ? t`Unhide table` : t`Hide table`}>
<ActionIcon
+ variant="subtle"
aria-label={isHidden ? t`Unhide table` : t`Hide table`}
c={table.visibility_type != null ? "text-secondary" : undefined}
className={className}
- disabled={isLoading}
- variant="transparent"
+ size="sm"
+ loading={isLoading}
onClick={handleClick}
>
<Icon name={isHidden ? "eye_crossed_out" : "eye"} />
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/components/CategoryButton.module.css b/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/components/CategoryButton.module.css
index 4d94466d998..5120eefb3cf 100644
--- a/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/components/CategoryButton.module.css
+++ b/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/components/CategoryButton.module.css
@@ -16,12 +16,7 @@
.settingsButton {
display: none;
- flex: 0 0 2rem;
- width: 2rem;
- height: 2rem;
- border-radius: 0.5rem;
- background-color: var(--mb-color-background_page-tertiary);
- color: var(--mb-color-icon-primary);
+ flex: 0 0 auto;
}
.categoryRow {
@@ -48,15 +43,6 @@
display: inline-flex;
}
}
-
- .settingsButton:hover {
- background-color: var(--mb-color-background_surface-hover);
- color: var(--mb-color-text-brand);
- }
-
- &.expanded .settingsButton {
- background-color: var(--mb-color-background_surface-selected);
- }
}
.itemIcon {
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/components/CategoryButton.tsx b/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/components/CategoryButton.tsx
index 8a9270c960e..33898ac6b0a 100644
--- a/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/components/CategoryButton.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/DimensionPickerSidebar/components/CategoryButton.tsx
@@ -46,7 +46,8 @@ export function CategoryButton({
className={S.settingsButton}
aria-label={t`Configure ${item.name}`}
aria-expanded={isExpanded}
- variant="subtle"
+ variant="light"
+ selected={isExpanded}
onClick={onConfigure}
>
<Icon name="sliders" />
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/ColumnLabelOptions.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/ColumnLabelOptions.module.css
index a56d4bd9a24..2e616cf6251 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/ColumnLabelOptions.module.css
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/CenterControls/components/ControlsContent/ColumnLabelOptions/ColumnLabelOptions.module.css
@@ -1,13 +1,5 @@
.ellipsisMenuButton {
--ellipsis-button-size: 2rem;
-
- border-radius: 0.5rem;
- height: var(--ellipsis-button-size);
- width: var(--ellipsis-button-size);
-
- &.ellipsisMenuButton:hover {
- background-color: var(--mb-color-background_surface-hover);
- }
}
.ellipsisMenuButtonFloating {
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/ChartLayoutPicker.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/ChartLayoutPicker.module.css
deleted file mode 100644
index e67d37405dd..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/ChartLayoutPicker.module.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.root button {
- min-height: 1.5rem;
-}
-
-.root button:not(.selected):hover {
- background-color: rgba(7, 23, 34, 0.05);
-}
-
-.selected {
- box-shadow: 0 1px 2px var(--mb-color-shadow-default);
-}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/ChartLayoutPicker.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/ChartLayoutPicker.tsx
index e794b7d26f5..0dc0cb13623 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/ChartLayoutPicker.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartLayoutPicker/ChartLayoutPicker.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
import { trackStackedSeriesEnabled } from "metabase/metrics-viewer/analytics";
-import { ActionIcon, Flex, Icon, Tooltip } from "metabase/ui";
+import { SegmentedControl } from "metabase/ui";
-import S from "./ChartLayoutPicker.module.css";
+type ChartLayout = "default" | "stack";
type ChartLayoutPickerProps = {
isStacked: boolean;
@@ -14,50 +14,33 @@ export function ChartLayoutPicker({
isStacked,
onToggle,
}: ChartLayoutPickerProps) {
+ const handleChange = (layout: ChartLayout) => {
+ const stacked = layout === "stack";
+ onToggle(stacked);
+ if (stacked) {
+ trackStackedSeriesEnabled();
+ }
+ };
+
return (
- <Flex
- className={S.root}
- gap="xxs"
- bg="background_page-secondary"
- p="xxs"
- bdrs="sm"
+ <SegmentedControl<ChartLayout>
data-testid="chart-layout-picker"
- >
- <Tooltip label={t`Default layout`}>
- <ActionIcon
- w="2rem"
- h="1.5rem"
- variant={!isStacked ? "filled" : "subtle"}
- bg={!isStacked ? "background_page-primary" : undefined}
- onClick={() => onToggle(false)}
- aria-label={t`Default layout`}
- className={!isStacked ? S.selected : undefined}
- >
- <Icon
- name="chart_layout_default"
- c={!isStacked ? "core-brand" : "text-primary"}
- />
- </ActionIcon>
- </Tooltip>
- <Tooltip label={t`Stack layout`}>
- <ActionIcon
- w="2rem"
- h="1.5rem"
- variant={isStacked ? "filled" : "subtle"}
- bg={isStacked ? "background_page-primary" : undefined}
- onClick={() => {
- onToggle(true);
- trackStackedSeriesEnabled();
- }}
- aria-label={t`Stack layout`}
- className={isStacked ? S.selected : undefined}
- >
- <Icon
- name="chart_layout_stack"
- c={isStacked ? "core-brand" : "text-primary"}
- />
- </ActionIcon>
- </Tooltip>
- </Flex>
+ data={[
+ {
+ value: "default",
+ ariaLabel: t`Default layout`,
+ icon: "chart_layout_default",
+ withTooltip: true,
+ },
+ {
+ value: "stack",
+ ariaLabel: t`Stack layout`,
+ icon: "chart_layout_stack",
+ withTooltip: true,
+ },
+ ]}
+ value={isStacked ? "stack" : "default"}
+ onChange={handleChange}
+ />
);
}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.module.css
deleted file mode 100644
index cc0f2c4f99f..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.module.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.root button {
- min-height: 1.5rem;
-}
-
-.root button:not(.selected):hover {
- background-color: var(--mb-color-background_surface-hover);
-}
-
-.selected {
- box-shadow: 0 1px 2px var(--mb-color-shadow-default);
-}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.tsx
index e76af36fcd5..663fdbcf11b 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/ChartTypePicker/ChartTypePicker.tsx
@@ -1,8 +1,9 @@
+import { match } from "ts-pattern";
+import { t } from "ttag";
+
import type { MetricsViewerDisplayType } from "metabase/metrics-viewer/types";
import type { ChartTypeOption } from "metabase/metrics-viewer/utils";
-import { ActionIcon, Flex, Icon } from "metabase/ui";
-
-import S from "./ChartTypePicker.module.css";
+import { SegmentedControl } from "metabase/ui";
type ChartTypePickerProps = {
chartTypes: ChartTypeOption[];
@@ -16,30 +17,21 @@ export function ChartTypePicker({
onChange,
}: ChartTypePickerProps) {
return (
- <Flex
- className={S.root}
- gap="xxs"
- bg="background_page-secondary"
- p="xxs"
- bdrs="sm"
- >
- {chartTypes.map(({ type, icon }) => (
- <ActionIcon
- w="2rem"
- h="1.5rem"
- key={type}
- variant={value === type ? "filled" : "subtle"}
- bg={value === type ? "background_page-primary" : undefined}
- onClick={() => onChange(type)}
- aria-label={type}
- className={value === type ? S.selected : undefined}
- >
- <Icon
- name={icon}
- c={value === type ? "core-brand" : "text-primary"}
- />
- </ActionIcon>
- ))}
- </Flex>
+ <SegmentedControl
+ data={chartTypes.map(({ type, icon }) => ({
+ value: type,
+ ariaLabel: match(type)
+ .with("line", () => t`Line`)
+ .with("area", () => t`Area`)
+ .with("bar", () => t`Bar`)
+ .with("map", () => t`Map`)
+ .with("scatter", () => t`Scatter`)
+ .with("scalar", () => t`Number`)
+ .exhaustive(),
+ icon,
+ }))}
+ value={value}
+ onChange={onChange}
+ />
);
}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.module.css b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.module.css
index 5b86cc77a8c..80d2d2adcb3 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.module.css
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.module.css
@@ -8,19 +8,6 @@
display: none;
}
-.compactChartTypeButton {
- background: var(--mb-color-background_page-primary);
- border: 1px solid var(--mb-color-border-neutral);
- border-radius: 0.75rem;
- color: var(--mb-color-text-primary);
- height: 2.5rem;
- width: 2.5rem;
-
- &.compactChartTypeButton:hover {
- background-color: var(--mb-color-background_surface-hover);
- }
-}
-
.compactChartMenuDropdown {
border-radius: var(--mantine-radius-lg);
min-width: 14rem;
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.tsx
index 41810f950b2..5ca5ce2cd8a 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/LeftControls/LeftControls.tsx
@@ -85,9 +85,8 @@ export function LeftControls({ showStackSeries }: LeftControlsProps) {
<Menu position="top-start" withinPortal>
<Menu.Target>
<ActionIcon
- className={S.compactChartTypeButton}
+ size="lg"
aria-label={t`Change visualization type`}
- variant="subtle"
data-testid="metrics-viewer-compact-chart-controls"
>
{selectedChartType && (
diff --git a/frontend/src/metabase/metrics/components/FilterPanel/FilterSectionLayout/FilterSectionLayout.tsx b/frontend/src/metabase/metrics/components/FilterPanel/FilterSectionLayout/FilterSectionLayout.tsx
index 81d20682480..03120308bd1 100644
--- a/frontend/src/metabase/metrics/components/FilterPanel/FilterSectionLayout/FilterSectionLayout.tsx
+++ b/frontend/src/metabase/metrics/components/FilterPanel/FilterSectionLayout/FilterSectionLayout.tsx
@@ -28,7 +28,7 @@ export function FilterSectionLayout({
</Box>
{children}
</Stack>
- <ActionIcon aria-label={t`Remove`} onClick={onRemove}>
+ <ActionIcon variant="subtle" aria-label={t`Remove`} onClick={onRemove}>
<FixedSizeIcon name="close" />
</ActionIcon>
</Group>
diff --git a/frontend/src/metabase/metrics/components/MetricDimensions/DimensionList.tsx b/frontend/src/metabase/metrics/components/MetricDimensions/DimensionList.tsx
index ee7a0367e84..0c06c1ab5c2 100644
--- a/frontend/src/metabase/metrics/components/MetricDimensions/DimensionList.tsx
+++ b/frontend/src/metabase/metrics/components/MetricDimensions/DimensionList.tsx
@@ -80,12 +80,7 @@ export function DimensionList({
<Title order={4}>{t`Dimensions of this metric`}</Title>
<Group gap="lg" wrap="nowrap" align="center">
{hasChecked && (
- <ActionIcon
- className={S.deleteIconButton}
- aria-label={t`Remove`}
- onClick={onRemove}
- variant="viewHeader"
- >
+ <ActionIcon aria-label={t`Remove`} onClick={onRemove}>
<Icon name="trash" />
</ActionIcon>
)}
diff --git a/frontend/src/metabase/metrics/components/MetricDimensions/MetricDimensions.module.css b/frontend/src/metabase/metrics/components/MetricDimensions/MetricDimensions.module.css
index 7b0ba7adf67..9d86940a4fe 100644
--- a/frontend/src/metabase/metrics/components/MetricDimensions/MetricDimensions.module.css
+++ b/frontend/src/metabase/metrics/components/MetricDimensions/MetricDimensions.module.css
@@ -123,13 +123,3 @@
padding: var(--mantine-spacing-sm) 0 0 var(--mantine-spacing-xl);
border-top: none;
}
-
-.column .deleteIconButton {
- border: 1px solid var(--mb-color-border-neutral);
- height: 2rem;
- width: 2rem;
-
- &:hover {
- border: 1px solid var(--mb-color-border-neutral-strong);
- }
-}
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.module.css b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.module.css
deleted file mode 100644
index 592ade435f9..00000000000
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.moreOptionsButton {
- border: 1px solid var(--mb-color-border-neutral);
-}
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
index 781b2cbe593..865dbdcc3f3 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
@@ -31,8 +31,6 @@ import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { Card } from "metabase-types/api";
-import S from "./MetricToolbar.module.css";
-
type MetricModalType =
| "move"
| "copy"
@@ -119,12 +117,7 @@ function MetricToolbarButtons({
return (
<Menu position="bottom-end">
<Menu.Target>
- <ActionIcon
- variant="default"
- size="lg"
- className={S.moreOptionsButton}
- aria-label={t`More options`}
- >
+ <ActionIcon size="lg" aria-label={t`More options`}>
<Icon name="ellipsis" />
</ActionIcon>
</Menu.Target>
diff --git a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.tsx b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.tsx
index 91915e1262b..97aee15be62 100644
--- a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.tsx
+++ b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.tsx
@@ -160,13 +160,7 @@ export function ModelActionListItem({
<>
<Box pos="absolute" top="0.5rem" right="0.5rem">
<Tooltip label={t`Run`}>
- <ActionIcon
- variant="subtle"
- bg="background_page-primary"
- c="text-primary"
- aria-label={t`Run`}
- onClick={openExecuteModal}
- >
+ <ActionIcon aria-label={t`Run`} onClick={openExecuteModal}>
<Icon name="play" />
</ActionIcon>
</Tooltip>
diff --git a/frontend/src/metabase/monitor/components/DetailSidebar/SidebarNavButton.module.css b/frontend/src/metabase/monitor/components/DetailSidebar/SidebarNavButton.module.css
deleted file mode 100644
index 447a4a491e2..00000000000
--- a/frontend/src/metabase/monitor/components/DetailSidebar/SidebarNavButton.module.css
+++ /dev/null
@@ -1,18 +0,0 @@
-.navButton {
- color: var(--mb-color-text-primary);
- background: var(--mb-color-background_surface-primary);
- border: 1px solid var(--mb-color-border-neutral);
-
- &:hover {
- background: var(--mb-color-background_surface-hover);
- }
-
- &[data-disabled] {
- color: var(--mb-color-text-disabled);
- background: var(--mb-color-background_surface-primary);
-
- &:hover {
- background: var(--mb-color-background_surface-primary);
- }
- }
-}
diff --git a/frontend/src/metabase/monitor/components/DetailSidebar/SidebarNavButton.tsx b/frontend/src/metabase/monitor/components/DetailSidebar/SidebarNavButton.tsx
index 0a00be0bebd..a0b0a05f8ab 100644
--- a/frontend/src/metabase/monitor/components/DetailSidebar/SidebarNavButton.tsx
+++ b/frontend/src/metabase/monitor/components/DetailSidebar/SidebarNavButton.tsx
@@ -1,7 +1,6 @@
import { ActionIcon, Icon } from "metabase/ui";
import type { IconName } from "metabase-types/api";
-import S from "./SidebarNavButton.module.css";
import type { SidebarNavButtonProps, SidebarNavDirection } from "./types";
const NAV_ICONS: Record<SidebarNavDirection, IconName> = {
@@ -18,8 +17,6 @@ export const SidebarNavButton = ({
<ActionIcon
aria-label={label}
size="lg"
- variant="default"
- className={S.navButton}
disabled={disabled}
onClick={onClick}
>
diff --git a/frontend/src/metabase/monitor/tools/components/JobInfoApp/JobTriggersSidebar.tsx b/frontend/src/metabase/monitor/tools/components/JobInfoApp/JobTriggersSidebar.tsx
index 02fa852e265..00b5f86cb27 100644
--- a/frontend/src/metabase/monitor/tools/components/JobInfoApp/JobTriggersSidebar.tsx
+++ b/frontend/src/metabase/monitor/tools/components/JobInfoApp/JobTriggersSidebar.tsx
@@ -37,7 +37,11 @@ export const JobTriggersSidebar = ({ jobKey }: JobTriggersSidebarProps) => {
<Text fw="bold" style={{ wordBreak: "break-all" }}>
{t`Triggers for ${jobKey}`}
</Text>
- <ActionIcon aria-label={t`Close`} onClick={handleClose}>
+ <ActionIcon
+ variant="subtle"
+ aria-label={t`Close`}
+ onClick={handleClose}
+ >
<Icon name="close" />
</ActionIcon>
</Flex>
diff --git a/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx b/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx
index 7892c79f7da..f14a9588246 100644
--- a/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx
+++ b/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx
@@ -13,6 +13,7 @@ import { MonitorHeaderTitle } from "metabase/monitor/components/MonitorHeaderTit
import { MonitorMain } from "metabase/monitor/components/MonitorLayout";
import { Outlet, useLocation } from "metabase/router";
import {
+ ActionIcon,
Button,
Center,
DefaultSelectItem,
@@ -83,18 +84,17 @@ export const Logs = ({
placeholder={t`Filter logs`}
rightSection={
query.length > 0 ? (
- // TODO: replace with ActionIcon (GDGT-2457)
- <Button
+ <ActionIcon
aria-label={t`Clear`}
- leftSection={<Icon name="close" />}
variant="subtle"
- color="neutral"
size="sm"
onClick={() => {
patchUrlState({ query: "" });
refollow();
}}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
) : undefined
}
value={query}
diff --git a/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.tsx b/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.tsx
index 3f29e3415ab..85b38cf6947 100644
--- a/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.tsx
+++ b/frontend/src/metabase/monitor/tools/components/ModelPersistenceLogJobs/ModelPersistenceLogJobs.tsx
@@ -230,6 +230,7 @@ function getColumns(
<Flex justify="flex-end" w="100%">
<Tooltip label={t`Refresh`}>
<ActionIcon
+ variant="subtle"
aria-label={t`Refresh`}
onClick={(event) => {
event.stopPropagation();
diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/SidebarHeader.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/SidebarHeader.tsx
index 0448d8ae92d..061d9ce0c5a 100644
--- a/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/SidebarHeader.tsx
+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationDetailSidebar/SidebarHeader.tsx
@@ -78,9 +78,9 @@ export const SidebarHeader = ({
<Menu position="bottom-end" withinPortal>
<Menu.Target>
<ActionIcon
+ variant="subtle"
aria-label={t`More actions`}
size="lg"
- c="icon-primary"
disabled={isBulkLoading}
>
<Icon name="ellipsis" />
@@ -105,18 +105,18 @@ export const SidebarHeader = ({
</Menu.Dropdown>
</Menu>
<ActionIcon
+ variant="subtle"
aria-label={t`Edit`}
size="lg"
- c="icon-primary"
disabled={isEditDisabled}
onClick={!isEditDisabled ? onEdit : undefined}
>
{isQuestionLoading ? <Loader size="sm" /> : <Icon name="pencil" />}
</ActionIcon>
<ActionIcon
+ variant="subtle"
aria-label={t`Close`}
size="lg"
- c="icon-primary"
onClick={onClose}
>
<Icon name="close" />
diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
index 5f05198d255..6b2d22ba567 100644
--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
@@ -11,7 +11,7 @@ import { useSelector } from "metabase/redux";
import type { AdminPath } from "metabase/redux/store";
import { useNavigate } from "metabase/router";
import { getIsPaidPlan } from "metabase/selectors/settings";
-import { Box, Button, Flex, Group, Icon } from "metabase/ui";
+import { ActionIcon, Box, Flex, Group, Icon } from "metabase/ui";
import { ADMIN_NAVBAR_HEIGHT } from "../../constants";
import { AppSwitcher } from "../AppSwitcher";
@@ -144,15 +144,13 @@ const MobileNavbar = ({
return (
<Group ref={ref} hiddenFrom="md" gap="0.5rem" align="center">
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
onClick={() => setMobileNavOpen((prev) => !prev)}
- variant="transparent"
- size="compact-md"
- leftSection={
- <Icon name="burger" size={24} color="text-primary-inverse" />
- }
- />
+ variant="on-dark-secondary"
+ aria-label={t`Toggle navigation`}
+ >
+ <Icon name="burger" />
+ </ActionIcon>
{mobileNavOpen && (
<Flex
diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
index 42c7f69a0c5..f0ceff1623f 100644
--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
@@ -204,26 +204,13 @@ export const AppSwitcher = ({ className }: { className?: string }) => {
<Menu.Target>
{appsSection ? (
<ActionIcon
- size="2rem"
- p="sm"
- variant="outline"
- bd="1px solid var(--mb-color-border-neutral)"
+ variant={currentApp === "admin" ? "on-dark-secondary" : "default"}
+ radius="xl"
aria-label={t`Settings`}
- bdrs="50%"
className={className}
data-testid="app-switcher-target"
>
- <Icon
- name="mode"
- // Need an escape hatch here for the white color in admin settings
- style={{
- color:
- currentApp === "admin"
- ? "var(--mantine-color-white)"
- : "var(--mb-color-text-primary)",
- }}
- size={16}
- />
+ <Icon name="mode" />
</ActionIcon>
) : (
<Avatar
diff --git a/frontend/src/metabase/nav/components/AreaLayout/ToggleActionIcon.tsx b/frontend/src/metabase/nav/components/AreaLayout/ToggleActionIcon.tsx
index 1668b648ec8..911d2aad508 100644
--- a/frontend/src/metabase/nav/components/AreaLayout/ToggleActionIcon.tsx
+++ b/frontend/src/metabase/nav/components/AreaLayout/ToggleActionIcon.tsx
@@ -26,6 +26,7 @@ export function ToggleActionIcon({
return (
<Tooltip label={label} openDelay={TOOLTIP_OPEN_DELAY}>
<ActionIcon
+ variant="subtle"
aria-label={label}
className={S.toggle}
onClick={() => onNavbarToggle(!isNavbarOpened)}
diff --git a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbsView.tsx b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbsView.tsx
index b39257a1b4f..6972b938d52 100644
--- a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbsView.tsx
+++ b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbsView.tsx
@@ -84,6 +84,7 @@ export const CollectionBreadcrumbsView = ({
key: "expand",
node: (
<ActionIcon
+ variant="subtle"
onClick={() => setIsExpanded(true)}
aria-label={t`Expand`}
>
diff --git a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx
index a406f4008df..89ec8742985 100644
--- a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx
@@ -5,7 +5,7 @@ import { t } from "ttag";
import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";
import { getSearchTextFromLocation } from "metabase/common/search";
import { useLocation } from "metabase/router";
-import { Button, type ButtonProps, Flex, Icon } from "metabase/ui";
+import { ActionIcon, Button, type ButtonProps, Flex, Icon } from "metabase/ui";
import { METAKEY } from "metabase/utils/browser";
import S from "./SearchButton.module.css";
@@ -23,16 +23,15 @@ export const SearchButton = (props: ButtonProps) => {
const isSmallScreen = useIsSmallScreen();
if (isSmallScreen) {
- // TODO: replace with ActionIcon (GDGT-2457)
return (
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
- leftSection={<Icon name="search" />}
onClick={handleClick}
aria-label="Search"
- />
+ >
+ <Icon name="search" />
+ </ActionIcon>
);
}
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx
index 32bda06d8bc..b26ff6cf151 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx
@@ -54,8 +54,8 @@ export const BrowseNavSection = ({
showAddDataButton ? (
<Tooltip label={t`Add data`}>
<ActionIcon
+ variant="subtle"
aria-label={t`Add data`}
- color="text-secondary"
onClick={() => {
trackAddDataModalOpened("left-nav");
onAddDataModalOpen();
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
index 6ffc9598fbf..0bbdde49c0d 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
@@ -258,8 +258,8 @@ export function MainNavbarView({
canWriteToCollections && !isTenantUser ? (
<Tooltip label={t`Create a new collection`}>
<ActionIcon
+ variant="subtle"
aria-label={t`Create a new collection`}
- color="text-secondary"
onClick={() => {
trackNewCollectionFromNavInitiated();
handleCreateNewCollection();
diff --git a/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsx b/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsx
index 836b60f3c95..d7b19c39ed8 100644
--- a/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsx
+++ b/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsx
@@ -1,7 +1,8 @@
import type { JSX, ReactNode } from "react";
+import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import { Button, Group, Icon, Stack, Text } from "metabase/ui";
+import { ActionIcon, Group, Icon, Stack, Text } from "metabase/ui";
import type { IconName } from "metabase-types/api";
type ChannelSettingsBlockProps = {
title: string;
@@ -24,15 +25,15 @@ export const ChannelSettingsBlock = ({
<Text className={CS.textShortLineHeight}>{title}</Text>
</Group>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
data-testid="remove-channel-button"
- leftSection={<Icon name="close" />}
onClick={onRemoveChannel}
- />
+ aria-label={t`Remove`}
+ >
+ <Icon name="close" />
+ </ActionIcon>
</Group>
{children}
diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItemActionButton.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItemActionButton.tsx
index 679daaada5f..d1d9ff1bce0 100644
--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItemActionButton.tsx
+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItemActionButton.tsx
@@ -1,6 +1,6 @@
import type { JSX, MouseEventHandler } from "react";
-import { Button, Icon, Tooltip } from "metabase/ui";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
import type { IconName } from "metabase-types/api";
interface Props {
label: string;
@@ -14,14 +14,8 @@ export const AlertListItemActionButton = ({
onClick,
}: Props): JSX.Element => (
<Tooltip label={label}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
- variant="subtle"
- color="neutral"
- size="sm"
- aria-label={label}
- leftSection={<Icon name={iconName} />}
- onClick={onClick}
- />
+ <ActionIcon variant="subtle" size="sm" aria-label={label} onClick={onClick}>
+ <Icon name={iconName} />
+ </ActionIcon>
</Tooltip>
);
diff --git a/frontend/src/metabase/parameters/components/ResponsiveParametersList.tsx b/frontend/src/metabase/parameters/components/ResponsiveParametersList.tsx
index 1abacaa2426..39e13de22d7 100644
--- a/frontend/src/metabase/parameters/components/ResponsiveParametersList.tsx
+++ b/frontend/src/metabase/parameters/components/ResponsiveParametersList.tsx
@@ -83,7 +83,7 @@ export const ResponsiveParametersList = ({
<Flex p="0.75rem 1rem" align="center" justify="space-between">
<h3>{t`Filters`}</h3>
<ActionIcon
- variant="viewHeader"
+ variant="subtle"
aria-label={t`Close`}
onClick={handleFilterButtonClick}
>
diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsx
index d0e940916e8..a9500686fbf 100644
--- a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsx
+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsx
@@ -42,7 +42,7 @@ const BaseQuestionDownloadPopover = ({
dashboardId,
dashcardId,
visualizationSettings,
- variant,
+ variant = "subtle",
floating,
formatPreference,
}: BaseQuestionDownloadPopoverProps) => {
diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.module.css b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.module.css
index adf58a38e9f..3f04b4e2581 100644
--- a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.module.css
+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.module.css
@@ -1,7 +1,3 @@
-.BorderedButton {
- border: var(--border-size) var(--border-style) var(--mb-color-border-neutral) !important;
-}
-
.SettingsButton {
opacity: 0;
}
diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsx b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsx
index ec05067f21d..d54f251a1a3 100644
--- a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsx
+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsx
@@ -1,4 +1,3 @@
-import cx from "classnames";
import { t } from "ttag";
import { EntityIcon } from "metabase/common/components/EntityIcon";
@@ -34,7 +33,6 @@ export const ChartTypeOption = ({
const displayName = visualization?.getUiName() ?? visualizationType;
const iconName = visualization?.iconName;
- const hasCustomIcon = !!visualization?.iconUrl;
return (
<Center pos="relative" data-testid="chart-type-option">
@@ -46,9 +44,11 @@ export const ChartTypeOption = ({
data-testid={`${displayName}-container`}
>
<ActionIcon
- w="3.125rem"
- h="3.125rem"
- radius="50%"
+ variant="light"
+ size="lg"
+ radius="xl"
+ aria-pressed={isSelected}
+ selected={isSelected}
onClick={() => {
if (isSelected) {
onOpenSettings?.();
@@ -56,26 +56,14 @@ export const ChartTypeOption = ({
onSelectVisualization(visualizationType);
}
}}
- color="core-brand"
- data-is-selected={isSelected}
- variant={isSelected ? "filled" : "outline"}
- className={cx(
- ChartTypeOptionS.BorderedButton,
- ChartTypeOptionS.VisualizationButton,
- )}
+ className={ChartTypeOptionS.VisualizationButton}
data-testid={`${displayName}-button`}
>
<EntityIcon
name={iconName ?? "unknown"}
iconUrl={visualization?.iconUrl}
alt={displayName}
- color={isSelected ? "core-white" : "core-brand"}
- size={20}
- style={
- hasCustomIcon && isSelected
- ? { filter: "brightness(0) invert(1)" }
- : undefined
- }
+ color="inherit"
/>
</ActionIcon>
@@ -85,13 +73,7 @@ export const ChartTypeOption = ({
top="-0.5rem"
right="-0.6rem"
radius="xl"
- color="text-disabled"
- variant="viewHeader"
- bg="background_page-primary"
- className={cx(
- ChartTypeOptionS.BorderedButton,
- ChartTypeOptionS.SettingsButton,
- )}
+ className={ChartTypeOptionS.SettingsButton}
onClick={() => onOpenSettings?.()}
>
<Icon name="gear" size={16} />
diff --git a/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx
index 75f93a27dd2..4b352cf47db 100644
--- a/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx
@@ -3,10 +3,7 @@ import { MetabotPromptButton } from "metabase/metabot/components/MetabotPromptBu
import { useUserMetabotPermissions } from "metabase/metabot/hooks";
import { getMetabotVisible } from "metabase/metabot/state";
import { NativeQueryParametersList } from "metabase/parameters/components/NativeQueryParametersList";
-import {
- NATIVE_EDITOR_ICON_SIZE,
- NativeQueryEditor,
-} from "metabase/querying/components/NativeQueryEditor";
+import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor";
import type { SelectionRange } from "metabase/querying/editor/types";
import { useSelector } from "metabase/redux";
import type { QueryModalType } from "metabase/redux/store";
@@ -123,7 +120,6 @@ export const ViewNativeQueryEditor = (props: ViewNativeQueryEditorProps) => {
promptButton={
inlineSQLPrompt && (
<MetabotPromptButton
- size={NATIVE_EDITOR_ICON_SIZE}
isPromptInputOpen={inlineSQLPrompt.isPromptOpen}
onClick={inlineSQLPrompt.togglePrompt}
/>
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterCopyWidget.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterCopyWidget.tsx
index 267a891d50f..cdd8a4f8ac3 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterCopyWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterCopyWidget.tsx
@@ -75,11 +75,11 @@ const CopyResultsButton = ({
<Flex visibleFrom="sm">
<Tooltip label={ineligibleReason ?? label}>
<ActionIcon
+ variant="subtle"
data-testid="question-results-copy-button"
onClick={copyResults}
aria-label={label}
disabled={ineligibleReason !== null}
- variant="viewFooter"
>
<Icon name="clipboard" />
</ActionIcon>
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx
index 19c9ca24495..a55d3b61860 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx
@@ -26,7 +26,6 @@ export const ViewFooterDownloadWidget = () => {
visualizationSettings={visualizationSettings}
dashcardId={question.card().dashcardId}
dashboardId={question.card().dashboardId}
- variant="viewFooter"
/>
)
);
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooterButton/ViewFooterButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooterButton/ViewFooterButton.tsx
index d2892bc28cc..84b94a55690 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooterButton/ViewFooterButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooterButton/ViewFooterButton.tsx
@@ -27,7 +27,7 @@ export const ViewFooterButton = forwardRef(function _ViewFooterButton(
return (
<Tooltip label={tooltipLabel} disabled={disableTooltip}>
<Center ref={ref}>
- <ActionIcon variant="viewFooter" {...actionIconProps}>
+ <ActionIcon variant="subtle" {...actionIconProps}>
<Icon size={18} name={icon} />
</ActionIcon>
</Center>
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
index 8b8f316d110..f32bfe30a43 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
@@ -55,17 +55,15 @@ export function QueryBuilderBackButton({
return (
<Tooltip label={label}>
<ActionIcon
- variant="outline"
+ size="lg"
radius="xl"
- size="2.625rem"
- color="border-neutral"
aria-label={label}
onClick={handleClick}
component={noLink ? undefined : Link}
to={url}
{...actionIconProps}
>
- <Icon c="core-brand" name="arrow_left" />
+ <Icon name="arrow_left" />
</ActionIcon>
</Tooltip>
);
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
index e299b4ae96d..46f5092bfff 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
@@ -67,10 +67,6 @@ export const QuestionActions = ({
[isShowingQuestionInfoSidebar, isBookmarked],
);
- const infoButtonColor = isShowingQuestionInfoSidebar
- ? "core-brand"
- : undefined;
-
const hasCollectionPermissions = question.canWrite();
const uploadTableId = question._card.based_on_upload;
const canAppend = hasCollectionPermissions && !!uploadTableId;
@@ -148,7 +144,6 @@ export const QuestionActions = ({
className={ViewTitleHeaderS.ViewHeaderIconButton}
icon="info"
onClick={onInfoClick}
- color={infoButtonColor}
data-testid="qb-header-info-button"
tooltipLabel={t`More info`}
aria-label={t`More info`}
@@ -167,7 +162,6 @@ export const QuestionActions = ({
<ToolbarButton
className={ViewTitleHeaderS.ViewHeaderIconButton}
icon="upload"
- color={infoButtonColor}
data-testid="qb-header-append-button"
tooltipLabel={t`Upload data to this model`}
aria-label={t`Upload data to this model`}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx
index 458cef9f7bd..ef73b2c668a 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx
@@ -58,10 +58,9 @@ export const ToggleNativeQueryPreview = ({
return (
<Tooltip label={buttonText} position="top">
<ActionIcon
+ variant="subtle"
aria-label={buttonText}
- size={32}
role="switch"
- variant="viewHeader"
onClick={handleClick}
>
<Icon name="sql" />
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsx
index d66855add1a..5c6e264a533 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsx
@@ -7,7 +7,7 @@ import {
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
import { dayjs } from "metabase/dayjs";
import { PLUGIN_MODEL_PERSISTENCE } from "metabase/plugins";
-import { Box, Button, Flex, Icon } from "metabase/ui";
+import { ActionIcon, Box, Button, Flex, Icon } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
import { checkCanRefreshModelCache } from "metabase-lib/v1/metadata/utils/models";
import type { ModelCacheRefreshStatus } from "metabase-types/api";
@@ -95,15 +95,14 @@ export function ModelCacheManagementSection({ model }: Props) {
{t`Create now`}
</Button>
) : (
- // TODO: replace with ActionIcon (GDGT-2457)
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
aria-label={t`Refresh now`}
- leftSection={<Icon name="refresh" tooltip={t`Refresh now`} />}
onClick={() => onRefresh(model.id())}
- />
+ >
+ <Icon name="refresh" tooltip={t`Refresh now`} />
+ </ActionIcon>
))}
</Flex>
)}
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
index 8e5314aedb1..7e4c901b766 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
@@ -10,7 +10,14 @@ import {
} from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { ColumnBucketPickerPopover } from "metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover";
-import { Box, type BoxProps, Button, Flex, Icon, Tooltip } from "metabase/ui";
+import {
+ ActionIcon,
+ Box,
+ type BoxProps,
+ Flex,
+ Icon,
+ Tooltip,
+} from "metabase/ui";
import * as Lib from "metabase-lib";
import BreakoutColumnListItemS from "./BreakoutColumnListItem.module.css";
@@ -94,11 +101,11 @@ export function BreakoutColumnListItem({
>
<Flex
className={BreakoutColumnListItemS.Content}
+ px="sm"
onClick={handleListItemClick}
>
<Flex
align="center"
- ml="sm"
p="0.5rem 0"
className={BreakoutColumnListItemS.TitleContainer}
>
@@ -133,30 +140,28 @@ export function BreakoutColumnListItem({
: onAddBreakout(column)
}
/>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
{isSelected && (
- <Button
- variant="transparent"
- size="compact-md"
- w="2rem"
- leftSection={<Icon c="icon-primary-inverse" name="close" />}
+ <ActionIcon
+ variant="on-dark-secondary"
+ size="sm"
onClick={handleRemoveColumn}
aria-label={t`Remove dimension`}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
)}
</Flex>
{!isSelected && (
<Tooltip label={t`Add grouping`}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
className={BreakoutColumnListItemS.AddButton}
- leftSection={<Icon name="add" />}
aria-label={t`Add dimension`}
onClick={handleAddClick}
- />
+ >
+ <Icon name="add" />
+ </ActionIcon>
</Tooltip>
)}
</HoverParent>
diff --git a/frontend/src/metabase/querying/action-creator/InlineDataReference.tsx b/frontend/src/metabase/querying/action-creator/InlineDataReference.tsx
index 89b7e632965..70d57fcb263 100644
--- a/frontend/src/metabase/querying/action-creator/InlineDataReference.tsx
+++ b/frontend/src/metabase/querying/action-creator/InlineDataReference.tsx
@@ -41,7 +41,7 @@ export const DataReferenceTriggerButton = ({
}) => (
<Tooltip label={t`Data Reference`}>
<ActionIcon
- variant="viewHeader"
+ variant="subtle"
onClick={onClick}
aria-label={t`Data Reference`}
>
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx
index 9132a0b429e..73a7735ec55 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx
@@ -6,7 +6,7 @@ import type {
RelativeDatePickerValue,
} from "metabase/querying/common/types";
import {
- Button,
+ ActionIcon,
Divider,
Flex,
Group,
@@ -103,16 +103,15 @@ export function DateIntervalPicker({
}}
/>
<Tooltip label={t`Starting from…`} position="bottom">
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
- size="sm"
+ size="lg"
ml="sm"
aria-label={t`Starting from…`}
- leftSection={<Icon name="arrow_left_to_line" />}
onClick={handleStartingFromClick}
- />
+ >
+ <Icon name="arrow_left_to_line" />
+ </ActionIcon>
</Tooltip>
</Flex>
<Flex p="lg" pt={0}>
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx
index aa7937198df..13d0ad2309b 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx
@@ -5,7 +5,15 @@ import type {
DatePickerUnit,
RelativeDatePickerValue,
} from "metabase/querying/common/types";
-import { Box, Button, Divider, Group, Icon, Select, Text } from "metabase/ui";
+import {
+ ActionIcon,
+ Box,
+ Divider,
+ Group,
+ Icon,
+ Select,
+ Text,
+} from "metabase/ui";
import { NumberInputWithFallbackValue } from "../../NumberInputWithFallbackValue";
import type { DatePickerSubmitButtonProps } from "../../types";
@@ -140,15 +148,14 @@ export function DateOffsetIntervalPicker({
floatingStrategy: "fixed",
}}
/>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
- size="sm"
- leftSection={<Icon name="close" />}
+ size="lg"
aria-label={t`Remove offset`}
onClick={handleOffsetRemove}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
</Box>
<Divider />
<Group px="lg" py="sm" gap="sm" justify="space-between">
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.module.css
deleted file mode 100644
index ecd4ce70a7d..00000000000
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.module.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.ButtonRoot {
- transition: color 0.3s linear;
-
- &:hover {
- color: var(--mb-color-core-brand);
- }
-
- &.isSelected {
- color: var(--mb-color-core-brand);
- }
-}
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.tsx
index 7034303c477..2c251b0330b 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.tsx
@@ -1,35 +1,28 @@
-import cx from "classnames";
import { t } from "ttag";
-import { Box, Icon, Tooltip } from "metabase/ui";
-
-import DataReferenceButtonS from "./DataReferenceButton.module.css";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
interface DataReferenceButtonProps {
className?: string;
isShowingDataReference: boolean;
- size: number;
onClick?: () => void;
}
export const DataReferenceButton = ({
className,
isShowingDataReference,
- size,
onClick,
-}: DataReferenceButtonProps) => {
- return (
- <Tooltip label={t`Learn about your data`}>
- <Box
- aria-label={t`Learn about your data`}
- component="a"
- h={size}
- className={cx(className, DataReferenceButtonS.ButtonRoot, {
- [DataReferenceButtonS.isSelected]: isShowingDataReference,
- })}
- >
- <Icon name="reference" size={size} onClick={onClick} />
- </Box>
- </Tooltip>
- );
-};
+}: DataReferenceButtonProps) => (
+ <Tooltip label={t`Learn about your data`}>
+ <ActionIcon
+ variant="subtle"
+ className={className}
+ aria-label={t`Learn about your data`}
+ aria-pressed={isShowingDataReference}
+ selected={isShowingDataReference}
+ onClick={onClick}
+ >
+ <Icon name="reference" />
+ </ActionIcon>
+ </Tooltip>
+);
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.module.css
deleted file mode 100644
index e8a83e397c5..00000000000
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.module.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.button {
- color: var(--mb-color-text-primary);
- transition: color 0.3s linear;
- border: none;
-
- &:hover {
- color: var(--mb-color-core-brand);
- }
-}
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
index 0be50c250b5..eaaab40f227 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
@@ -7,14 +7,10 @@ import { PreviewQueryButton } from "metabase/querying/components/NativeQueryEdit
import { SnippetSidebarButton } from "metabase/querying/components/NativeQueryEditor/SnippetSidebarButton";
import type { SidebarFeatures } from "metabase/querying/editor/types";
import type { QueryModalType } from "metabase/redux/store";
-import { Button, Flex, Icon, Tooltip } from "metabase/ui";
+import { ActionIcon, Flex, Icon, Tooltip } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
import type { Collection, NativeQuerySnippet } from "metabase-types/api";
-import S from "./NativeQueryEditorActionButtons.module.css";
-
-export const NATIVE_EDITOR_ICON_SIZE = 18;
-
interface NativeQueryEditorActionButtonsProps {
question: Question;
features: SidebarFeatures;
@@ -65,7 +61,7 @@ export const NativeQueryEditorActionButtons = (
<Flex
component="aside"
data-testid="native-query-editor-action-buttons"
- gap="xl"
+ gap="sm"
align="center"
>
{promptButton}
@@ -74,35 +70,23 @@ export const NativeQueryEditorActionButtons = (
<PreviewQueryButton {...props} />
)}
{features.dataReference && (
- <DataReferenceButton
- {...props}
- size={NATIVE_EDITOR_ICON_SIZE}
- onClick={toggleDataReference}
- />
+ <DataReferenceButton {...props} onClick={toggleDataReference} />
)}
{features.snippets && showSnippetSidebarButton && (
- <SnippetSidebarButton {...props} size={NATIVE_EDITOR_ICON_SIZE} />
+ <SnippetSidebarButton {...props} />
)}
{features.variables && (
- <NativeVariablesButton
- {...props}
- size={NATIVE_EDITOR_ICON_SIZE}
- onClick={toggleTemplateTagsEditor}
- />
+ <NativeVariablesButton {...props} onClick={toggleTemplateTagsEditor} />
)}
{showFormatButton && onFormatQuery && (
<Tooltip label={t`Auto-format`}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
- variant="transparent"
- size="compact-md"
- className={S.button}
+ <ActionIcon
+ variant="subtle"
aria-label={t`Auto-format`}
- leftSection={
- <Icon name="format_code" size={NATIVE_EDITOR_ICON_SIZE} />
- }
onClick={onFormatQuery}
- />
+ >
+ <Icon name="format_code" />
+ </ActionIcon>
</Tooltip>
)}
</Flex>
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.module.css
deleted file mode 100644
index ecd4ce70a7d..00000000000
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.module.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.ButtonRoot {
- transition: color 0.3s linear;
-
- &:hover {
- color: var(--mb-color-core-brand);
- }
-
- &.isSelected {
- color: var(--mb-color-core-brand);
- }
-}
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.tsx
index bec45e52429..449b3d90dc8 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.tsx
@@ -1,35 +1,28 @@
-import cx from "classnames";
import { t } from "ttag";
-import { Box, Icon, Tooltip } from "metabase/ui";
-
-import NativeVariablesButtonS from "./NativeVariablesButton.module.css";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
interface NativeVariablesButtonProps {
className?: string;
isShowingTemplateTagsEditor: boolean;
onClick?: () => void;
- size: number;
}
export const NativeVariablesButton = ({
className,
isShowingTemplateTagsEditor,
onClick,
- size,
-}: NativeVariablesButtonProps) => {
- return (
- <Tooltip label={t`Variables`}>
- <Box
- component="a"
- aria-label={t`Variables`}
- h={size}
- className={cx(className, NativeVariablesButtonS.ButtonRoot, {
- [NativeVariablesButtonS.isSelected]: isShowingTemplateTagsEditor,
- })}
- >
- <Icon name="variable" size={size} onClick={onClick} />
- </Box>
- </Tooltip>
- );
-};
+}: NativeVariablesButtonProps) => (
+ <Tooltip label={t`Variables`}>
+ <ActionIcon
+ variant="subtle"
+ className={className}
+ aria-label={t`Variables`}
+ aria-pressed={isShowingTemplateTagsEditor}
+ selected={isShowingTemplateTagsEditor}
+ onClick={onClick}
+ >
+ <Icon name="variable" />
+ </ActionIcon>
+ </Tooltip>
+);
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.module.css
deleted file mode 100644
index 05df0c07544..00000000000
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.module.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.PreviewButton {
- color: var(--mb-color-text-primary);
-
- &:hover {
- color: var(--mb-color-core-brand);
- }
-}
-
-.PreviewButtonIcon {
- width: 1.125rem;
- height: 1.125rem;
-}
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.tsx
index df34e12c8cb..2099ef4b6c2 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.tsx
@@ -1,17 +1,14 @@
import { useCallback } from "react";
import { t } from "ttag";
-import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";
import type { QueryModalType } from "metabase/redux/store";
-import { Icon, Tooltip } from "metabase/ui";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
import { MODAL_TYPES } from "../../../constants";
-import PreviewQueryButtonS from "./PreviewQueryButton.module.css";
-
interface PreviewQueryButtonProps {
onOpenModal?: (modalType: QueryModalType) => void;
}
@@ -25,16 +22,13 @@ export const PreviewQueryButton = ({
return (
<Tooltip label={t`Preview the query`}>
- <IconButtonWrapper
- className={PreviewQueryButtonS.PreviewButton}
+ <ActionIcon
+ variant="subtle"
aria-label={t`Preview the query`}
onClick={handleClick}
>
- <Icon
- className={PreviewQueryButtonS.PreviewButtonIcon}
- name="eye_filled"
- />
- </IconButtonWrapper>
+ <Icon name="eye_filled" />
+ </ActionIcon>
</Tooltip>
);
};
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/SnippetSidebarButton.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/SnippetSidebarButton.module.css
deleted file mode 100644
index ecd4ce70a7d..00000000000
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/SnippetSidebarButton.module.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.ButtonRoot {
- transition: color 0.3s linear;
-
- &:hover {
- color: var(--mb-color-core-brand);
- }
-
- &.isSelected {
- color: var(--mb-color-core-brand);
- }
-}
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/SnippetSidebarButton.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/SnippetSidebarButton.tsx
index ad7bf740b94..ba3c5da1864 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/SnippetSidebarButton.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/SnippetSidebarButton.tsx
@@ -1,35 +1,28 @@
-import cx from "classnames";
import { t } from "ttag";
-import { Box, Icon, Tooltip } from "metabase/ui";
-
-import SnippetSidebarButtonS from "./SnippetSidebarButton.module.css";
+import { ActionIcon, Icon, Tooltip } from "metabase/ui";
interface SnippetSidebarButtonProps {
className?: string;
isShowingSnippetSidebar: boolean;
toggleSnippetSidebar?: () => void;
- size: number;
}
export const SnippetSidebarButton = ({
className,
isShowingSnippetSidebar,
toggleSnippetSidebar,
- size,
-}: SnippetSidebarButtonProps) => {
- return (
- <Tooltip label={t`SQL Snippets`}>
- <Box
- aria-label={t`SQL Snippets`}
- component="a"
- h={size}
- className={cx(className, SnippetSidebarButtonS.ButtonRoot, {
- [SnippetSidebarButtonS.isSelected]: isShowingSnippetSidebar,
- })}
- >
- <Icon name="snippet" size={size} onClick={toggleSnippetSidebar} />
- </Box>
- </Tooltip>
- );
-};
+}: SnippetSidebarButtonProps) => (
+ <Tooltip label={t`SQL Snippets`}>
+ <ActionIcon
+ variant="subtle"
+ className={className}
+ aria-label={t`SQL Snippets`}
+ aria-pressed={isShowingSnippetSidebar}
+ selected={isShowingSnippetSidebar}
+ onClick={toggleSnippetSidebar}
+ >
+ <Icon name="snippet" />
+ </ActionIcon>
+ </Tooltip>
+);
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/__mocks__/NativeQueryEditor.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/__mocks__/NativeQueryEditor.tsx
index 56cb51cf751..4d521749fce 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/__mocks__/NativeQueryEditor.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/__mocks__/NativeQueryEditor.tsx
@@ -17,8 +17,6 @@ type NativeQueryEditorProps = Pick<
| "setDatasetQuery"
>;
-export const NATIVE_EDITOR_ICON_SIZE = 18;
-
export const NativeQueryEditor = ({
canChangeDatabase = true,
editorContext = "question",
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/index.ts
index 18f7d58ddfb..733e5488046 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/index.ts
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/index.ts
@@ -1,3 +1,2 @@
export { NativeQueryEditor } from "./NativeQueryEditor";
-export { NATIVE_EDITOR_ICON_SIZE } from "./NativeQueryEditorActionButtons/NativeQueryEditorActionButtons";
export { type SelectionRange } from "metabase/querying/editor/types";
diff --git a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsx
index c07a9b61a76..23b7d512bcb 100644
--- a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsx
+++ b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsx
@@ -22,7 +22,7 @@ import {
} from "metabase/plugins";
import { useDispatch, useSelector } from "metabase/redux";
import type { Dispatch } from "metabase/redux/store";
-import { Box, Button, Flex, Icon, Menu } from "metabase/ui";
+import { ActionIcon, Box, Flex, Icon, Menu } from "metabase/ui";
import type {
Collection,
CollectionId,
@@ -192,14 +192,14 @@ class SnippetSidebarInner extends Component<
}
}}
/>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
onClick={this.hideSearch}
- leftSection={<Icon name="close" />}
- />
+ aria-label={t`Close search`}
+ >
+ <Icon name="close" />
+ </ActionIcon>
</>
) : (
<>
@@ -223,26 +223,26 @@ class SnippetSidebarInner extends Component<
)}
{snippets.length >= MIN_SNIPPETS_FOR_SEARCH && (
- // TODO: replace with ActionIcon (GDGT-2457)
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
+ aria-label={t`Search snippets`}
onClick={this.showSearch}
- leftSection={<Icon name="search" />}
- />
+ >
+ <Icon name="search" />
+ </ActionIcon>
)}
{showAddMenu && (
<Menu position="bottom-end">
<Menu.Target>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
- leftSection={<Icon name="add" />}
- />
+ aria-label={t`Add`}
+ >
+ <Icon name="add" />
+ </ActionIcon>
</Menu.Target>
<Menu.Dropdown>
{[
diff --git a/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx
index 978b6149edc..6ee3883ade9 100644
--- a/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx
+++ b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx
@@ -2,7 +2,7 @@ import type { FocusEvent } from "react";
import { useState } from "react";
import { t } from "ttag";
-import { Button, Flex, Icon, Text, TextInput, rem } from "metabase/ui";
+import { ActionIcon, Flex, Icon, Text, TextInput, rem } from "metabase/ui";
import type * as Lib from "metabase-lib";
import { formatSeparator, label } from "../util";
@@ -58,19 +58,17 @@ export const ColumnAndSeparatorRow = ({
onChange(index, column, separator);
}}
/>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
{showRemove && (
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
- size="sm"
- mb="sm"
+ size="lg"
aria-label={t`Remove column`}
- leftSection={<Icon name="close" />}
onClick={() => {
onRemove(index);
}}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
)}
</Flex>
);
diff --git a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx
index 4f3e4f01494..7836bd8707b 100644
--- a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx
+++ b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx
@@ -20,7 +20,13 @@ import {
tokenAtPos,
} from "metabase/querying/expressions";
import { COMMA, GROUP } from "metabase/querying/expressions/pratt";
-import { Button, Tooltip as ButtonTooltip, Flex, Icon } from "metabase/ui";
+import {
+ ActionIcon,
+ Button,
+ Tooltip as ButtonTooltip,
+ Flex,
+ Icon,
+} from "metabase/ui";
import * as Lib from "metabase-lib";
import type { Database } from "metabase-types/api";
@@ -211,17 +217,15 @@ export function Editor(props: EditorProps) {
</ButtonTooltip>
{source.trim() !== "" && error == null && isValidated && (
<ButtonTooltip label={t`Auto-format`}>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
- size="sm"
aria-label={t`Auto-format`}
onClick={formatExpression}
className={S.toolbarButton}
disabled={isFormatting || error != null}
- leftSection={<Icon name="format_code" />}
- />
+ >
+ <Icon name="format_code" />
+ </ActionIcon>
</ButtonTooltip>
)}
</Flex>
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
index 058088b81ef..65541acf475 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx
@@ -68,7 +68,6 @@ export function NativeQueryPreviewSidebarToggle({
onClick={onToggleNativeQueryPreviewSidebar}
size="lg"
className={S.nativeSidebarToggle}
- c="text-primary"
variant="subtle"
aria-label={label}
>
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/components/CommentsButton.tsx b/frontend/src/metabase/rich_text_editing/tiptap/components/CommentsButton.tsx
index 53ed5246b9e..f5c38819dd7 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/components/CommentsButton.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/components/CommentsButton.tsx
@@ -14,7 +14,6 @@ export const CommentsButton = <C extends ElementType = "button">({
active,
...props
}: Props<C>) => {
- // TODO: replace with ActionIcon (GDGT-2457)
return (
<Button
aria-label={t`Comments`}
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/LinkEditor.tsx b/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/LinkEditor.tsx
index 1678b8ac058..19b27ecdd63 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/LinkEditor.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/LinkEditor.tsx
@@ -70,17 +70,17 @@ export const LinkEditor = ({
</Box>
<Box c="text-secondary">
<Tooltip label={t`Save`}>
- <ActionIcon c="inherit" onClick={handleSubmit}>
+ <ActionIcon variant="subtle" onClick={handleSubmit}>
<FixedSizeIcon name="check" />
</ActionIcon>
</Tooltip>
<Tooltip label={t`Remove link`}>
- <ActionIcon c="inherit" onClick={() => onSubmit("")}>
+ <ActionIcon variant="subtle" onClick={() => onSubmit("")}>
<FixedSizeIcon name="trash" />
</ActionIcon>
</Tooltip>
<Tooltip label={t`Formatting`}>
- <ActionIcon c="inherit" onClick={handleCancel}>
+ <ActionIcon variant="subtle" onClick={handleCancel}>
<FixedSizeIcon name="ellipsis" />
</ActionIcon>
</Tooltip>
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/LinkHoverMenu/LinkHoverMenu.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/LinkHoverMenu/LinkHoverMenu.tsx
index b7e2257e469..4cb6c6bface 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/LinkHoverMenu/LinkHoverMenu.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/LinkHoverMenu/LinkHoverMenu.tsx
@@ -126,6 +126,7 @@ export const LinkHoverMenu = ({ editor, editable }: LinkHoverMenuProps) => {
</Ellipsified>
{editable && (
<ActionIcon
+ variant="subtle"
ml="sm"
c="text-secondary"
onClick={() => {
diff --git a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
index 8af9cd5e6b6..99c17f8f9d9 100644
--- a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
+++ b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
@@ -1,6 +1,7 @@
import cx from "classnames";
import type { MouseEvent } from "react";
import { useLayoutEffect, useRef, useState } from "react";
+import { t } from "ttag";
import { isEmpty } from "underscore";
import { EventSandbox } from "metabase/common/components/EventSandbox";
@@ -16,7 +17,15 @@ import type {
import CS from "metabase/css/core/index.css";
import { useSelector } from "metabase/redux";
import { getIsNavbarOpen } from "metabase/selectors/app";
-import { Box, Button, Group, Icon, Popover, Stack, Text } from "metabase/ui";
+import {
+ ActionIcon,
+ Box,
+ Group,
+ Icon,
+ Popover,
+ Stack,
+ Text,
+} from "metabase/ui";
import { isNotNull } from "metabase/utils/types";
import type { IconName } from "metabase-types/api";
@@ -136,15 +145,15 @@ export const DropdownSidebarFilter = ({
</Text>
</Group>
)}
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
data-testid="sidebar-filter-dropdown-button"
onClick={onClearFilter}
- leftSection={<Icon name={getDropdownIcon()} />}
- />
+ aria-label={fieldHasValue ? t`Clear` : label()}
+ >
+ <Icon name={getDropdownIcon()} />
+ </ActionIcon>
</Group>
</FieldSet>
</Box>
diff --git a/frontend/src/metabase/setup/components/SetupSection/SetupSection.tsx b/frontend/src/metabase/setup/components/SetupSection/SetupSection.tsx
index 13b73574338..14f50c5e7e5 100644
--- a/frontend/src/metabase/setup/components/SetupSection/SetupSection.tsx
+++ b/frontend/src/metabase/setup/components/SetupSection/SetupSection.tsx
@@ -37,12 +37,7 @@ export const SetupSection = ({
{description}
</Box>
</Box>
- <ActionIcon
- component="span"
- variant="default"
- radius="xl"
- size="2.5rem"
- >
+ <ActionIcon component="span" radius="xl" size="lg">
<Icon
name={isExpanded ? "chevronup" : "chevrondown"}
c="core-brand"
diff --git a/frontend/src/metabase/status/components/StatusLarge/StatusLarge.tsx b/frontend/src/metabase/status/components/StatusLarge/StatusLarge.tsx
index 9d358ac62e2..bb9af4e73e8 100644
--- a/frontend/src/metabase/status/components/StatusLarge/StatusLarge.tsx
+++ b/frontend/src/metabase/status/components/StatusLarge/StatusLarge.tsx
@@ -58,7 +58,14 @@ export const StatusLarge = ({
radius="xs"
withBorder
>
- <Flex align="center" py="0.625rem" pl="lg" pr="md" bg="core-brand">
+ <Flex
+ align="center"
+ gap="xs"
+ py="0.375rem"
+ pl="lg"
+ pr="md"
+ bg="core-brand"
+ >
<Box
flex="1 1 auto"
w="100%"
@@ -71,9 +78,8 @@ export const StatusLarge = ({
</Box>
{onCollapse && (
<ActionIcon
- variant="static"
- size="xs"
- c="text-primary-inverse"
+ variant="on-dark-secondary"
+ size="sm"
onClick={onCollapse}
aria-label={t`Collapse`}
>
@@ -82,9 +88,8 @@ export const StatusLarge = ({
)}
{onDismiss && (
<ActionIcon
- variant="static"
- size="xs"
- c="text-primary-inverse"
+ variant="on-dark-secondary"
+ size="sm"
onClick={onDismiss}
aria-label={t`Dismiss`}
>
diff --git a/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx b/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
index 48733d7272b..931f0afb361 100644
--- a/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
+++ b/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
@@ -17,7 +17,15 @@ import {
FormTextInput,
FormTextarea,
} from "metabase/forms";
-import { Button, Flex, Group, Icon, Stack, TimeInput } from "metabase/ui";
+import {
+ ActionIcon,
+ Button,
+ Flex,
+ Group,
+ Icon,
+ Stack,
+ TimeInput,
+} from "metabase/ui";
import * as Errors from "metabase/utils/errors";
import { parseTimestamp } from "metabase/utils/time-dayjs";
import type {
@@ -149,16 +157,15 @@ const EventForm = ({
setFieldValue("timestamp", date.toISOString());
}}
/>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
size="sm"
mb="sm"
onClick={() => setFieldValue("time_matters", false)}
aria-label={t`Remove time`}
variant="subtle"
- color="neutral"
- leftSection={<Icon name="close" />}
- />
+ >
+ <Icon name="close" />
+ </ActionIcon>
</Flex>
) : (
<Button
diff --git a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx
index f5860d594a6..d126044f48c 100644
--- a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx
+++ b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx
@@ -1,6 +1,6 @@
import cx from "classnames";
import type { ReactNode } from "react";
-import { c } from "ttag";
+import { c, t } from "ttag";
import CS from "metabase/css/core/index.css";
import { ActionIcon, Box, Ellipsified, Flex, Group, Icon } from "metabase/ui";
@@ -48,9 +48,9 @@ export const ModalHeader = ({
{title}
</Ellipsified>
</Flex>
- {children && <Box mr="lg">{children}</Box>}
+ {children}
{onClose && (
- <ActionIcon onClick={onClose}>
+ <ActionIcon variant="subtle" onClick={onClose} aria-label={t`Close`}>
<Icon name="close" />
</ActionIcon>
)}
diff --git a/frontend/src/metabase/transforms/components/JobMoreMenu/JobMoreMenu.tsx b/frontend/src/metabase/transforms/components/JobMoreMenu/JobMoreMenu.tsx
index 46f0ece3cc8..6f77f7a9382 100644
--- a/frontend/src/metabase/transforms/components/JobMoreMenu/JobMoreMenu.tsx
+++ b/frontend/src/metabase/transforms/components/JobMoreMenu/JobMoreMenu.tsx
@@ -66,7 +66,7 @@ function JobMenu({
return (
<Menu>
<Menu.Target>
- <ActionIcon onClick={handleIconClick}>
+ <ActionIcon variant="subtle" onClick={handleIconClick}>
<Icon name="ellipsis" />
</ActionIcon>
</Menu.Target>
diff --git a/frontend/src/metabase/transforms/components/RunCancelButton/RunCancelButton.tsx b/frontend/src/metabase/transforms/components/RunCancelButton/RunCancelButton.tsx
index 3762db21794..cd6923c7ce1 100644
--- a/frontend/src/metabase/transforms/components/RunCancelButton/RunCancelButton.tsx
+++ b/frontend/src/metabase/transforms/components/RunCancelButton/RunCancelButton.tsx
@@ -48,6 +48,7 @@ export function RunCancelButton({
{isRunning && (
<Tooltip label={t`Cancel`} position="bottom">
<ActionIcon
+ variant="subtle"
aria-label={t`Cancel run`}
onClickCapture={(evt) => {
evt.stopPropagation();
diff --git a/frontend/src/metabase/transforms/components/RunInfo/RunInfo.tsx b/frontend/src/metabase/transforms/components/RunInfo/RunInfo.tsx
index 471d2244e06..af64ce0ca20 100644
--- a/frontend/src/metabase/transforms/components/RunInfo/RunInfo.tsx
+++ b/frontend/src/metabase/transforms/components/RunInfo/RunInfo.tsx
@@ -45,7 +45,11 @@ export function RunInfo({ status, message, endTime }: RunInfoProps) {
return (
<>
<Tooltip label={getTooltip(status)}>
- <ActionIcon aria-label={t`See error`} onClick={handleIconClick}>
+ <ActionIcon
+ variant="subtle"
+ aria-label={t`See error`}
+ onClick={handleIconClick}
+ >
<Icon name="document" />
</ActionIcon>
</Tooltip>
diff --git a/frontend/src/metabase/transforms/components/TagMultiSelect/TagMultiSelect.tsx b/frontend/src/metabase/transforms/components/TagMultiSelect/TagMultiSelect.tsx
index 9e83624ad7f..28ccc588c70 100644
--- a/frontend/src/metabase/transforms/components/TagMultiSelect/TagMultiSelect.tsx
+++ b/frontend/src/metabase/transforms/components/TagMultiSelect/TagMultiSelect.tsx
@@ -226,6 +226,7 @@ function ExistingTagSelectItem({
</Text>
<Tooltip label={t`Rename tag`}>
<ActionIcon
+ variant="subtle"
className={S.actionIcon}
c="inherit"
bg="none"
@@ -237,6 +238,7 @@ function ExistingTagSelectItem({
</Tooltip>
<Tooltip label={t`Delete tag`}>
<ActionIcon
+ variant="subtle"
className={S.actionIcon}
c="inherit"
bg="none"
diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx
index e960a955331..7bdd12922b1 100644
--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx
@@ -69,7 +69,7 @@ function TransformMenu({
return (
<Menu>
<Menu.Target>
- <ActionIcon size="sm" onClick={handleIconClick}>
+ <ActionIcon variant="subtle" size="sm" onClick={handleIconClick}>
<Icon name="ellipsis" />
</ActionIcon>
</Menu.Target>
diff --git a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/JobRunSidebar.tsx b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/JobRunSidebar.tsx
index 562ebfd6f8a..d44b1a0ec6f 100644
--- a/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/JobRunSidebar.tsx
+++ b/frontend/src/metabase/transforms/pages/JobRunListPage/JobRunSidebar/JobRunSidebar.tsx
@@ -147,7 +147,7 @@ function JobRunSidebarHeader({ onClose }: JobRunSidebarHeaderProps) {
data-testid="job-run-list-sidebar-header"
>
<Title order={3}>{t`Job run`}</Title>
- <ActionIcon aria-label={t`Close`} onClick={onClose}>
+ <ActionIcon variant="subtle" aria-label={t`Close`} onClick={onClose}>
<FixedSizeIcon name="close" />
</ActionIcon>
</Group>
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.tsx
index 97570d5e94b..23331247cf3 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.tsx
@@ -55,7 +55,11 @@ export const FilterFieldSet = forwardRef(function FilterWidget(
{displayValue}
</Text>
<Tooltip label={t`Remove filter`}>
- <ActionIcon aria-label={t`Remove filter`} onClick={handleRemove}>
+ <ActionIcon
+ variant="subtle"
+ aria-label={t`Remove filter`}
+ onClick={handleRemove}
+ >
<Icon name="close" />
</ActionIcon>
</Tooltip>
@@ -64,7 +68,7 @@ export const FilterFieldSet = forwardRef(function FilterWidget(
<>
<Icon name={icon} />
<Text flex={1}>{label}</Text>
- <ActionIcon aria-label={t`Open filter widget`}>
+ <ActionIcon variant="subtle" aria-label={t`Open filter widget`}>
<Icon name="chevrondown" />
</ActionIcon>
</>
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
index 626318e06eb..db45a6e54ab 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
@@ -57,6 +57,7 @@ export function SidebarHeader({ run, onClose }: SidebarHeaderProps) {
openDelay={TOOLTIP_OPEN_DELAY_MS}
>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={Urls.transform(transform.id)}
target="_blank"
@@ -72,6 +73,7 @@ export function SidebarHeader({ run, onClose }: SidebarHeaderProps) {
openDelay={TOOLTIP_OPEN_DELAY_MS}
>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={Urls.dependencyGraph({
entry: { id: transform.id, type: "transform" },
@@ -85,7 +87,7 @@ export function SidebarHeader({ run, onClose }: SidebarHeaderProps) {
</ActionIcon>
</Tooltip>
)}
- <ActionIcon aria-label={t`Close`} onClick={onClose}>
+ <ActionIcon variant="subtle" aria-label={t`Close`} onClick={onClose}>
<FixedSizeIcon name="close" />
</ActionIcon>
</Group>
diff --git a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunSidebar.tsx b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunSidebar.tsx
index e8e392456c2..d67566e726f 100644
--- a/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunSidebar.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformGraphRunListPage/TransformGraphRunSidebar/TransformGraphRunSidebar.tsx
@@ -283,7 +283,7 @@ function TransformGraphRunSidebarHeader({
</Title>
<Group gap="xxs" wrap="nowrap">
<HeaderEntityActions run={run} />
- <ActionIcon aria-label={t`Close`} onClick={onClose}>
+ <ActionIcon variant="subtle" aria-label={t`Close`} onClick={onClose}>
<FixedSizeIcon name="close" />
</ActionIcon>
</Group>
@@ -301,6 +301,7 @@ function HeaderEntityActions({ run }: { run: TransformGraphRun }) {
return (
<Tooltip label={t`View this job`}>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={Urls.transformJob(entity_id)}
target="_blank"
@@ -316,6 +317,7 @@ function HeaderEntityActions({ run }: { run: TransformGraphRun }) {
<>
<Tooltip label={t`View this transform`}>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={Urls.transform(entity_id)}
target="_blank"
@@ -327,6 +329,7 @@ function HeaderEntityActions({ run }: { run: TransformGraphRun }) {
{PLUGIN_DEPENDENCIES.isEnabled && (
<Tooltip label={t`View in dependency graph`}>
<ActionIcon
+ variant="subtle"
component={ForwardRefLink}
to={Urls.dependencyGraph({
entry: { id: entity_id, type: "transform" },
diff --git a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexTable/IndexRowMenu.tsx b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexTable/IndexRowMenu.tsx
index 32a7ac440d2..bc2b51104c3 100644
--- a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexTable/IndexRowMenu.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexTable/IndexRowMenu.tsx
@@ -27,7 +27,11 @@ export function IndexRowMenu({ index, onEdit, onDelete }: IndexRowMenuProps) {
return (
<Menu position="bottom-end">
<Menu.Target>
- <ActionIcon aria-label={t`Index actions`} onClick={handleIconClick}>
+ <ActionIcon
+ variant="subtle"
+ aria-label={t`Index actions`}
+ onClick={handleIconClick}
+ >
<Icon name="ellipsis" />
</ActionIcon>
</Menu.Target>
diff --git a/frontend/src/metabase/ui/colors/constants/base-colors.ts b/frontend/src/metabase/ui/colors/constants/base-colors.ts
index 9d2f242c6ea..6700b7aff1c 100644
--- a/frontend/src/metabase/ui/colors/constants/base-colors.ts
+++ b/frontend/src/metabase/ui/colors/constants/base-colors.ts
@@ -116,7 +116,7 @@ const baseColors = {
50: "hsla(204, 66%, 8%, 0.51)",
40: "hsla(204, 66%, 8%, 0.44)",
30: "hsla(204, 66%, 8%, 0.29)",
- 20: "hsla(204, 66%, 8%, 0.17)",
+ 20: "hsla(204, 66%, 8%, 0.14)",
10: "hsla(204, 66%, 8%, 0.05)",
5: "hsla(204, 66%, 8%, 0.02)",
},
@@ -215,6 +215,11 @@ const baseColors = {
5: "hsla(45, 100%, 96%, 1)",
},
+ dubloonAlpha: {
+ 40: "hsla(44, 100%, 44%, 0.78)",
+ 30: "hsla(46, 100%, 49%, 0.51)",
+ },
+
// Palm
palmAlpha: {
30: "hsla(90, 100%, 31%, 0.57)",
diff --git a/frontend/src/metabase/ui/colors/constants/themes/dark.ts b/frontend/src/metabase/ui/colors/constants/themes/dark.ts
index f8742029505..28800b9b615 100644
--- a/frontend/src/metabase/ui/colors/constants/themes/dark.ts
+++ b/frontend/src/metabase/ui/colors/constants/themes/dark.ts
@@ -122,6 +122,9 @@ export const getDarkTheme = (
"button-subtle-positive-default": baseColors.transparent,
"button-subtle-positive-hover": baseColors.orionAlphaInverse[20],
"button-subtle-positive-pressed": baseColors.orionAlphaInverse[10],
+ "button-subtle-warning-default": baseColors.transparent,
+ "button-subtle-warning-hover": baseColors.orionAlphaInverse[20],
+ "button-subtle-warning-pressed": baseColors.orionAlphaInverse[10],
"button_label-default-neutral-default": baseColors.orionAlphaInverse[80], // Matches text-primary
"button_label-filled-brand-default": brand[80],
"button_label-filled-filter-default": baseColors.filter[80],
@@ -147,6 +150,8 @@ export const getDarkTheme = (
"button_label-subtle-neutral-default": baseColors.orionAlphaInverse[80], // Matches text-primary
"button_label-subtle-positive-default": baseColors.palm[30],
"button_label-subtle-positive-hover": baseColors.palm[20],
+ "button_label-subtle-warning-default": baseColors.dubloon[20],
+ "button_label-subtle-warning-hover": baseColors.dubloon[10],
"chart-axis": baseColors.orionAlphaInverse[20],
"core-blue-saturated": baseColors.ocean[40],
"core-brand": baseColors.blue[40],
diff --git a/frontend/src/metabase/ui/colors/constants/themes/light.ts b/frontend/src/metabase/ui/colors/constants/themes/light.ts
index f920520f87a..67b5b24f18e 100644
--- a/frontend/src/metabase/ui/colors/constants/themes/light.ts
+++ b/frontend/src/metabase/ui/colors/constants/themes/light.ts
@@ -129,6 +129,9 @@ export const getLightTheme = (
"button-subtle-positive-default": baseColors.transparent,
"button-subtle-positive-hover": baseColors.palmAlpha[20],
"button-subtle-positive-pressed": baseColors.palmAlpha[30],
+ "button-subtle-warning-default": baseColors.transparent,
+ "button-subtle-warning-hover": baseColors.dubloonAlpha[30],
+ "button-subtle-warning-pressed": baseColors.dubloonAlpha[40],
"button_label-default-neutral-default": baseColors.orionAlpha[80], // Matches text-primary
"button_label-filled-brand-default": baseColors.white,
"button_label-filled-filter-default": baseColors.white,
@@ -154,6 +157,8 @@ export const getLightTheme = (
"button_label-subtle-neutral-default": baseColors.orionAlpha[80], // Matches text-primary
"button_label-subtle-positive-default": baseColors.palm[70],
"button_label-subtle-positive-hover": baseColors.palm[80],
+ "button_label-subtle-warning-default": baseColors.mango[70],
+ "button_label-subtle-warning-hover": baseColors.mango[80],
"chart-axis": baseColors.orionAlpha[20],
"core-blue-saturated": baseColors.ocean[60],
"core-brand": baseColors.blue[40],
diff --git a/frontend/src/metabase/ui/colors/types/color-keys.ts b/frontend/src/metabase/ui/colors/types/color-keys.ts
index d5679c208a8..23421abfd10 100644
--- a/frontend/src/metabase/ui/colors/types/color-keys.ts
+++ b/frontend/src/metabase/ui/colors/types/color-keys.ts
@@ -115,6 +115,9 @@ export type MetabaseColorKey =
| "button-subtle-positive-default"
| "button-subtle-positive-hover"
| "button-subtle-positive-pressed"
+ | "button-subtle-warning-default"
+ | "button-subtle-warning-hover"
+ | "button-subtle-warning-pressed"
| "button_label-default-neutral-default"
| "button_label-filled-brand-default"
| "button_label-filled-filter-default"
@@ -140,6 +143,8 @@ export type MetabaseColorKey =
| "button_label-subtle-neutral-default"
| "button_label-subtle-positive-default"
| "button_label-subtle-positive-hover"
+ | "button_label-subtle-warning-default"
+ | "button_label-subtle-warning-hover"
| "chart-axis"
| "core-blue-saturated"
| "core-brand"
diff --git a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionButton.stories.tsx b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionButton.stories.tsx
deleted file mode 100644
index b9a74071336..00000000000
--- a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionButton.stories.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Icon } from "../../";
-
-import { ActionIcon, type ActionIconProps } from "./";
-
-export default {
- title: "Components/Buttons/ActionIcon",
- component: ActionIcon,
- argTypes: {
- color: {
- control: {
- type: "select",
- },
- options: ["core-brand"],
- },
- disabled: {
- control: {
- type: "boolean",
- },
- },
- size: {
- control: {
- type: "select",
- },
- options: ["xs", "sm", "md", "lg", "xl"],
- },
- variant: {
- control: {
- type: "select",
- },
- options: [
- "filled",
- "subtle",
- "viewFooter",
- "viewHeader",
- "info",
- "warning",
- "error",
- ],
- },
- },
-};
-
-export const Default = {
- render: (args: ActionIconProps) => (
- <ActionIcon {...args}>
- <Icon name="ai" />
- </ActionIcon>
- ),
- args: {
- color: "core-brand",
- size: "md",
- variant: "filled",
- disabled: false,
- },
-};
diff --git a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.config.tsx b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.config.tsx
index 1c1c656ce9a..5559e9a4121 100644
--- a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.config.tsx
+++ b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.config.tsx
@@ -1,17 +1,118 @@
-import { ActionIcon, type MantineThemeOverride } from "@mantine/core";
+import {
+ ActionIcon,
+ type ActionIconProps as MantineActionIconProps,
+} from "@mantine/core";
+
+import { color } from "metabase/ui/utils/colors";
import ActionIconStyles from "./ActionIcon.module.css";
+import type { ActionIconColor, ActionIconVariant } from "./types";
+
+const ACTION_ICON_VARIANTS = [
+ "default",
+ "filled",
+ "light",
+ "subtle",
+ "on-dark-primary",
+ "on-dark-secondary",
+] as const satisfies readonly ActionIconVariant[];
+
+const ACTION_ICON_COLORS = [
+ "brand",
+ "negative",
+ "positive",
+ "warning",
+ "neutral",
+] as const satisfies readonly ActionIconColor[];
+
+const DEFAULT_COLORS: Partial<Record<ActionIconVariant, ActionIconColor>> = {
+ default: "neutral",
+ filled: "brand",
+ light: "neutral",
+ subtle: "neutral",
+};
+
+const CELLS = [
+ "default-neutral",
+ "filled-brand",
+ "light-neutral",
+ "subtle-brand",
+ "subtle-negative",
+ "subtle-neutral",
+ "subtle-positive",
+ "subtle-warning",
+] as const satisfies readonly `${ActionIconVariant}-${ActionIconColor}`[];
+
+const DEFAULT_LABEL_HOVER_CELLS = [
+ "default-neutral",
+ "filled-brand",
+ "light-neutral",
+ "subtle-neutral",
+] as const satisfies readonly Cell[];
+
+type Cell = (typeof CELLS)[number];
+type DefaultLabelHoverCell = (typeof DEFAULT_LABEL_HOVER_CELLS)[number];
+
+const isActionIconVariant = (value: unknown): value is ActionIconVariant =>
+ ACTION_ICON_VARIANTS.some((item) => item === value);
+
+const isActionIconColor = (value: unknown): value is ActionIconColor =>
+ ACTION_ICON_COLORS.some((item) => item === value);
+
+const isCell = (value: string): value is Cell =>
+ CELLS.some((item) => item === value);
+
+const isDefaultLabelHoverCell = (value: Cell): value is DefaultLabelHoverCell =>
+ DEFAULT_LABEL_HOVER_CELLS.some((item) => item === value);
+
+const getCell = (
+ variant: ActionIconVariant,
+ iconColor: MantineActionIconProps["color"],
+): Cell | undefined => {
+ const defaultColor = DEFAULT_COLORS[variant];
+ const cellColor = isActionIconColor(iconColor) ? iconColor : defaultColor;
+ const cell = `${variant}-${cellColor}`;
+ if (isCell(cell)) {
+ return cell;
+ }
+ const defaultCell = `${variant}-${defaultColor}`;
+ return isCell(defaultCell) ? defaultCell : undefined;
+};
+
+const getRootVars = ({
+ variant,
+ color: iconColor,
+}: MantineActionIconProps): Record<string, string> => {
+ const cell = isActionIconVariant(variant)
+ ? getCell(variant, iconColor)
+ : undefined;
+ if (!cell) {
+ return {};
+ }
+ return {
+ "--ai-color": color(`button_label-${cell}-default`),
+ "--ai-hover-color": isDefaultLabelHoverCell(cell)
+ ? color(`button_label-${cell}-default`)
+ : color(`button_label-${cell}-hover`),
+ "--ai-bg": color(`button-${cell}-default`),
+ "--ai-hover": color(`button-${cell}-hover`),
+ "--ai-pressed": color(`button-${cell}-pressed`),
+ };
+};
-export const actionIconOverrides: MantineThemeOverride["components"] = {
+export const actionIconOverrides = {
ActionIcon: ActionIcon.extend({
defaultProps: {
- variant: "subtle",
+ variant: "default",
+ size: "md",
loaderProps: {
color: "currentColor",
},
},
+ vars: (_theme, props) => ({ root: getRootVars(props) }),
classNames: {
root: ActionIconStyles.root,
+ icon: ActionIconStyles.icon,
},
}),
};
diff --git a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.mdx b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.mdx
new file mode 100644
index 00000000000..5ca22ea56e6
--- /dev/null
+++ b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.mdx
@@ -0,0 +1,57 @@
+import { Canvas, Meta } from "@storybook/blocks";
+import * as ActionIconStories from "./ActionIcon.stories";
+
+<Meta of={ActionIconStories} />
+
+# ActionIcon
+
+Our themed wrapper around [Mantine ActionIcon](https://mantine.dev/core/action-icon/).
+
+## When to use ActionIcon
+
+- Icon-only actions in toolbars, headers, table rows, and other compact places.
+- Always pass `aria-label` (or wrap in a `Tooltip` with a string label) since there's no visible text.
+
+Not to use:
+
+- If the action needs a text label, use `Button`.
+- If the button shows a counter or other content next to the icon, use `Button`.
+
+## Docs
+
+- [Figma File](https://www.figma.com/design/qYbAmJHUJ2Tkb01WFegUKp/Component-Library?node-id=22-1453)
+- [Mantine ActionIcon Docs](https://mantine.dev/core/action-icon/)
+
+## Examples
+
+<Canvas of={ActionIconStories.Default} />
+
+### Variant: Filled
+
+<Canvas of={ActionIconStories.VariantFilled} />
+
+### Variant: Default
+
+Pass `radius="xl"` for the rounded corners.
+
+<Canvas of={ActionIconStories.VariantDefault} />
+
+### Variant: Light
+
+<Canvas of={ActionIconStories.VariantLight} />
+
+### Variant: Subtle
+
+`xs` is available for `subtle` only. Any other variant with `size="xs"` falls back to `sm`.
+
+<Canvas of={ActionIconStories.VariantSubtle} />
+
+### Variant: On Dark
+
+<Canvas of={ActionIconStories.VariantOnDark} />
+
+### Selectable
+
+`light` and `subtle` have a selected state. Pass `selected={isSelected}` (and `aria-pressed` for toggle buttons). To force the hover or pressed look, pass `mod={{ hovered: true }}` or `mod={{ pressed: true }}`.
+
+<Canvas of={ActionIconStories.Selectable} />
diff --git a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.css b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.css
index 256cfafb961..e8624f6bf44 100644
--- a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.css
+++ b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.css
@@ -1,93 +1,178 @@
.root {
- &[data-disabled] {
- color: var(--mb-color-icon-disabled);
- pointer-events: all;
+ --ai-size-xs: 16px;
+ --ai-size-sm: 24px;
+ --ai-size-md: 32px;
+ --ai-size-lg: 40px;
+ --mb-ai-radius: 6px;
+ --mb-ai-icon-size: 16px;
+
+ border-radius: var(--ai-radius, var(--mb-ai-radius));
+
+ &:active {
+ transform: none;
+ }
+
+ &[data-size="xs"],
+ &[data-size="sm"] {
+ --mb-ai-radius: 4px;
+ --mb-ai-icon-size: 12px;
}
- &[data-variant="subtle"] {
- color: var(--mb-color-text-disabled);
+ &[data-size="lg"] {
+ --mb-ai-radius: 8px;
+ }
- &:hover {
- color: var(--mb-color-text-secondary);
- background-color: var(--mb-color-background_page-secondary);
+ &[data-size="xs"],
+ &[data-size="sm"],
+ &[data-size="md"],
+ &[data-size="lg"] {
+ .icon > svg {
+ width: var(--mb-ai-icon-size);
+ height: var(--mb-ai-icon-size);
}
}
- &[data-variant="static"] {
- color: var(--mb-color-text-disabled);
- background-color: transparent;
+ &[data-disabled] {
+ pointer-events: all;
+ }
- &:active {
- transform: none;
- }
+ &[data-variant="default"],
+ &[data-variant="filled"] {
+ box-shadow: var(--mantine-shadow-xs);
}
+}
- /* To be able to seamlessly support color property across variants we need
- to implement variantColorResolver. Same thing is pointed out in Button component. */
- &[data-variant="info"] {
- color: var(--mb-color-core-brand);
- background-color: transparent;
+.root[data-variant="default"] {
+ border-color: var(--mb-color-border-neutral-strong);
+}
- &:hover,
- &:active,
- &[data-is-active="true"] {
- background-color: var(--mb-color-background_surface-brand-subtle);
- }
+.root[data-variant="default"],
+.root[data-variant="filled"],
+.root[data-variant="light"],
+.root[data-variant="subtle"],
+.root[data-variant^="on-dark-"] {
+ border-width: 0.5px;
+
+ &:hover:not([data-loading]),
+ &[data-hovered]:not([data-loading]) {
+ color: var(--ai-hover-color, var(--ai-color));
+ background-color: var(--ai-hover);
}
- &[data-variant="warning"] {
- color: var(--mb-color-feedback-warning);
- background-color: transparent;
+ &:active:not([data-loading]),
+ &[data-pressed]:not([data-loading]) {
+ color: var(--ai-hover-color, var(--ai-color));
+ background-color: var(--ai-pressed, var(--ai-hover));
+ box-shadow: none;
+ }
- &:hover,
- &:active,
- &[data-is-active="true"] {
- background-color: var(--mb-color-background_surface-warning);
- }
+ &:disabled:not([data-loading]),
+ &[data-disabled]:not([data-loading]) {
+ color: var(--mb-color-icon-disabled);
+ border-color: transparent;
+ background-color: var(--mb-color-background_surface-disabled);
+ box-shadow: none;
}
+}
- &[data-variant="error"] {
- color: var(--mb-color-feedback-negative);
- background-color: transparent;
+.root[data-variant="light"],
+.root[data-variant="subtle"] {
+ &[data-selected]:not([data-loading], :disabled, [data-disabled]) {
+ color: var(--ai-selected-color);
+ background-color: var(--ai-selected-bg);
- &:hover,
- &:active,
- &[data-is-active="true"] {
- background-color: var(--mb-color-background_surface-error);
+ &:hover {
+ color: var(--ai-selected-hover-color);
+ background-color: var(--ai-selected-hover);
}
}
+}
+
+.root[data-variant="light"] {
+ --ai-selected-color: var(--mb-color-button_label-filled-brand-default);
+ --ai-selected-hover-color: var(--mb-color-button_label-filled-brand-default);
+ --ai-selected-bg: var(--mb-color-background_surface-brand-strong);
+ --ai-selected-hover: var(--mb-color-background_surface-brand-strong-hover);
+}
+
+.root[data-variant="subtle"] {
+ --ai-selected-color: var(--mb-color-text-brand-strong);
+ --ai-selected-hover-color: var(--mb-color-text-brand-strong-hover);
+ --ai-selected-bg: var(--mb-color-background_surface-brand-subtle);
+ --ai-selected-hover: var(--mb-color-background_surface-brand-subtle-hover);
- &[data-variant="viewHeader"] {
- color: var(--mb-color-text-primary);
+ &:disabled:not([data-loading]),
+ &[data-disabled]:not([data-loading]) {
background-color: transparent;
- border: 1px solid transparent;
- transition: all 300ms linear;
+ }
+}
- &:hover {
- color: var(--mb-color-core-brand);
- background-color: var(--mb-color-background_page-tertiary);
- border: 1px solid transparent;
- }
+.root[data-variant="on-dark-primary"] {
+ --ai-color: var(--mb-color-button_label-on_dark-primary);
+ --ai-hover-color: var(--mb-color-button_label-on_dark-primary);
+ --ai-bg: var(--mb-color-button-on_dark-primary-default);
+ --ai-hover: var(--mb-color-button-on_dark-primary-hover);
+ --ai-pressed: var(--mb-color-button-on_dark-primary-pressed);
+ --ai-bd: 0.5px solid transparent;
+}
- &:disabled,
- &[data-disabled] {
- color: var(--mb-color-text-disabled);
- background-color: transparent;
- }
+.root[data-variant="on-dark-secondary"] {
+ --ai-color: var(--mb-color-button_label-on_dark-secondary);
+ --ai-hover-color: var(--mb-color-button_label-on_dark-secondary);
+ --ai-bg: var(--mb-color-button-on_dark-secondary-default);
+ --ai-hover: var(--mb-color-button-on_dark-secondary-hover);
+ --ai-pressed: var(--mb-color-button-on_dark-secondary-pressed);
+ --ai-bd: 0.5px solid var(--mb-color-border-on_dark);
+}
+
+.root[data-variant^="on-dark-"] {
+ box-shadow: var(--mantine-shadow-xs_on_dark);
+
+ &:disabled:not([data-loading]),
+ &[data-disabled]:not([data-loading]) {
+ color: var(--mb-color-button_label-on_dark-disabled);
+ background-color: var(--mb-color-button-on_dark-disabled);
}
+}
- &[data-variant="viewFooter"] {
- color: var(--mb-color-text-secondary);
- background-color: transparent;
+:global(.mb-mantine-ActionIconGroup-group) {
+ &:has(> .root) {
+ --ai-border-width: 0px;
- &:hover {
- color: var(--mb-color-core-brand);
+ width: fit-content;
+ overflow: hidden;
+ border: 0.5px solid var(--mb-color-border-neutral-strong);
+ border-radius: 6px;
+ box-shadow: var(--mantine-shadow-xs);
+ }
+
+ &:has(> .root[data-size="lg"]) {
+ border-radius: 8px;
+ }
+
+ & > .root[data-variant] {
+ width: auto;
+ min-width: auto;
+ padding-inline: 16px;
+ border-width: 0;
+ border-radius: 0;
+ box-shadow: none;
+ overflow: visible;
+
+ &[data-size="lg"] {
+ padding-inline: 24px;
+ }
+
+ &:disabled:not([data-loading]),
+ &[data-disabled]:not([data-loading]) {
+ background-color: var(--mb-color-background_surface-disabled);
}
- &:disabled,
- &[data-disabled] {
- color: var(--mb-color-text-disabled);
- background-color: transparent;
+ &:not(:first-child)::before {
+ content: "";
+ position: absolute;
+ inset: 0 auto 0 0;
+ border-inline-start: 0.5px solid var(--mb-color-border-neutral-strong);
}
}
}
diff --git a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.stories.tsx b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.stories.tsx
new file mode 100644
index 00000000000..2a0c1ab9be6
--- /dev/null
+++ b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.stories.tsx
@@ -0,0 +1,446 @@
+import { Fragment } from "react";
+
+import { Box, Icon } from "metabase/ui";
+import {
+ StoryBoard,
+ StoryJsx,
+ StoryLabel,
+ StorySection,
+} from "metabase/ui/stories/showcase";
+
+import { ActionIcon, type ActionIconProps, type ActionIconVariant } from "./";
+
+const args = {
+ variant: "default",
+ color: undefined,
+ size: "md",
+ disabled: false,
+ loading: false,
+};
+
+const argTypes = {
+ variant: {
+ options: [
+ "default",
+ "filled",
+ "light",
+ "subtle",
+ "on-dark-primary",
+ "on-dark-secondary",
+ ],
+ control: { type: "inline-radio" },
+ },
+ color: {
+ options: [undefined, "brand", "negative", "positive", "warning", "neutral"],
+ control: { type: "inline-radio" },
+ },
+ size: {
+ options: ["xs", "sm", "md", "lg"],
+ control: { type: "inline-radio" },
+ },
+ disabled: {
+ control: { type: "boolean" },
+ },
+ loading: {
+ control: { type: "boolean" },
+ },
+};
+
+const DefaultTemplate = (args: ActionIconProps) => (
+ <ActionIcon aria-label="action" {...args}>
+ <Icon name="model" />
+ </ActionIcon>
+);
+
+export default {
+ title: "Components/Buttons/ActionIcon",
+ component: ActionIcon,
+ args,
+ argTypes,
+};
+
+export const Default = {
+ render: DefaultTemplate,
+};
+
+const MATRIX_SIZES = ["xs", "sm", "md", "lg"] as const;
+const NO_XS_SIZES = ["sm", "md", "lg"] as const;
+const GROUP_SIZES = ["md", "lg"] as const;
+const MATRIX_STATES = [
+ "default",
+ "hover",
+ "active",
+ "disabled",
+ "loading",
+] as const;
+const SELECTABLE_STATES = [
+ "default",
+ "hover",
+ "active",
+ "disabled",
+ "selected",
+ "selected-hover",
+ "selected-disabled",
+] as const;
+
+const MATRIX_COLORS = {
+ neutral: undefined,
+ brand: "brand",
+ negative: "negative",
+ positive: "positive",
+ warning: "warning",
+} as const;
+
+const COLOR_TITLES: Record<MatrixColor, string> = {
+ neutral: "Neutral",
+ brand: "Brand",
+ negative: "Negative",
+ positive: "Positive",
+ warning: "Warning",
+};
+
+const STATE_LABELS: Record<MatrixState, string> = {
+ default: "default",
+ hover: "hover",
+ active: "pressed",
+ disabled: "disabled",
+ loading: "loading",
+ selected: "selected",
+ "selected-hover": "hover (selected)",
+ "selected-disabled": "disabled (selected)",
+};
+
+type MatrixSize = (typeof MATRIX_SIZES)[number];
+type MatrixState =
+ | (typeof MATRIX_STATES)[number]
+ | (typeof SELECTABLE_STATES)[number];
+type MatrixColor = keyof typeof MATRIX_COLORS;
+
+const SELECTED_STATE = "selected";
+const SELECTED_STATE_PREFIX = `${SELECTED_STATE}-`;
+
+const isSelectedState = (state: MatrixState) =>
+ state === SELECTED_STATE || state.startsWith(SELECTED_STATE_PREFIX);
+
+const matrixStateProps = (
+ state: MatrixState,
+): { disabled?: boolean; loading?: boolean; selected?: boolean } => {
+ const selectedProps = isSelectedState(state) ? { selected: true } : {};
+ if (state === "disabled" || state === "selected-disabled") {
+ return { ...selectedProps, disabled: true };
+ }
+ if (state === "loading") {
+ return { loading: true };
+ }
+ return selectedProps;
+};
+
+const specCellKey = (cell: string, size: MatrixSize, state: MatrixState) => {
+ if (state === SELECTED_STATE) {
+ return `${cell}-${SELECTED_STATE}/${size}/default`;
+ }
+ if (state.startsWith(SELECTED_STATE_PREFIX)) {
+ return `${cell}-${SELECTED_STATE}/${size}/${state.slice(SELECTED_STATE_PREFIX.length)}`;
+ }
+ return `${cell}/${size}/${state}`;
+};
+
+const matrixCell = (
+ variant: ActionIconVariant,
+ color: MatrixColor,
+ rounded: boolean,
+) =>
+ [variant, color === "neutral" ? null : color, rounded ? "rounded" : null]
+ .filter(Boolean)
+ .join("-");
+
+const matrixJsx = (
+ variant: ActionIconVariant,
+ color: MatrixColor,
+ rounded: boolean,
+ selectable: boolean,
+) =>
+ [
+ "<ActionIcon",
+ `variant="${variant}"`,
+ color === "neutral" ? null : `color="${MATRIX_COLORS[color]}"`,
+ rounded ? 'radius="xl"' : null,
+ selectable ? "selected={selected}" : null,
+ "/>",
+ ]
+ .filter(Boolean)
+ .join(" ");
+
+const BOARD_BACKGROUND = "background_page-primary";
+
+const matrixGridStyle = (columns: number) =>
+ ({
+ display: "grid",
+ gridTemplateColumns: `6rem repeat(${columns}, max-content)`,
+ columnGap: "2rem",
+ rowGap: "1rem",
+ alignItems: "center",
+ justifyItems: "start",
+ }) as const;
+
+interface MatrixSectionProps {
+ title: string;
+ variant: ActionIconVariant;
+ color: MatrixColor;
+ sizes: readonly MatrixSize[];
+ rounded?: boolean;
+ states?: readonly MatrixState[];
+}
+
+const MatrixSection = ({
+ title,
+ variant,
+ color,
+ sizes,
+ rounded = false,
+ states = MATRIX_STATES,
+}: MatrixSectionProps) => {
+ const selectable = states === SELECTABLE_STATES;
+ return (
+ <StorySection
+ title={title}
+ description={
+ <StoryJsx>{matrixJsx(variant, color, rounded, selectable)}</StoryJsx>
+ }
+ >
+ <Box style={matrixGridStyle(sizes.length)}>
+ <Box />
+ {sizes.map((size) => (
+ <StoryLabel key={size}>{size}</StoryLabel>
+ ))}
+ {states.map((state) => (
+ <Fragment key={state}>
+ <StoryLabel>{STATE_LABELS[state]}</StoryLabel>
+ {sizes.map((size) => (
+ <ActionIcon
+ key={size}
+ variant={variant}
+ color={MATRIX_COLORS[color]}
+ size={size}
+ radius={rounded ? "xl" : undefined}
+ aria-label="action"
+ data-spec-cell={specCellKey(
+ selectable
+ ? `selectable-${matrixCell(variant, color, rounded)}`
+ : matrixCell(variant, color, rounded),
+ size,
+ state,
+ )}
+ {...matrixStateProps(state)}
+ >
+ <Icon name="model" />
+ </ActionIcon>
+ ))}
+ </Fragment>
+ ))}
+ </Box>
+ </StorySection>
+ );
+};
+
+const groupJsx = (variant: ActionIconVariant) =>
+ [
+ "<ActionIcon.Group>",
+ ` <ActionIcon variant="${variant}" />`,
+ ` <ActionIcon variant="${variant}" />`,
+ "</ActionIcon.Group>",
+ ].join("\n");
+
+const groupCell = (variant: ActionIconVariant) =>
+ variant === "subtle" ? "group" : `group-${variant}`;
+
+const GroupSection = ({ variant }: { variant: ActionIconVariant }) => (
+ <StorySection
+ title="ActionIcon.Group"
+ description={<StoryJsx>{groupJsx(variant)}</StoryJsx>}
+ >
+ <Box style={matrixGridStyle(GROUP_SIZES.length)}>
+ <Box />
+ {GROUP_SIZES.map((size) => (
+ <StoryLabel key={size}>{size}</StoryLabel>
+ ))}
+ {MATRIX_STATES.map((state) => (
+ <Fragment key={state}>
+ <StoryLabel>{STATE_LABELS[state]}</StoryLabel>
+ {GROUP_SIZES.map((size) => (
+ <ActionIcon.Group key={size}>
+ <ActionIcon
+ variant={variant}
+ size={size}
+ aria-label="action"
+ data-spec-cell={`${groupCell(variant)}/${size}/${state}`}
+ {...matrixStateProps(state)}
+ >
+ <Icon name="model" />
+ </ActionIcon>
+ <ActionIcon
+ variant={variant}
+ size={size}
+ aria-label="more"
+ data-group-state={state}
+ {...matrixStateProps(state)}
+ >
+ <Icon name="model" />
+ </ActionIcon>
+ </ActionIcon.Group>
+ ))}
+ </Fragment>
+ ))}
+ </Box>
+ </StorySection>
+);
+
+interface VariantMatrixProps {
+ title: string;
+ variant: ActionIconVariant;
+ colors: readonly MatrixColor[];
+ sizes?: readonly MatrixSize[];
+ group?: boolean;
+}
+
+const VariantMatrix = ({
+ title,
+ variant,
+ colors,
+ sizes = MATRIX_SIZES,
+ group = false,
+}: VariantMatrixProps) => (
+ <StoryBoard title={title} background={BOARD_BACKGROUND} padding="2rem">
+ {colors.map((color) => (
+ <MatrixSection
+ key={color}
+ title={COLOR_TITLES[color]}
+ variant={variant}
+ color={color}
+ sizes={sizes}
+ />
+ ))}
+ {group && <GroupSection variant={variant} />}
+ </StoryBoard>
+);
+
+const matrixParameters = {
+ pseudo: {
+ hover: ['[data-spec-cell$="/hover"]', '[data-group-state="hover"]'],
+ active: ['[data-spec-cell$="/active"]', '[data-group-state="active"]'],
+ },
+ controls: { disable: true },
+};
+
+export const VariantDefault = {
+ name: "Variant: Default",
+ render: () => (
+ <StoryBoard
+ title="ActionIcon · default"
+ background={BOARD_BACKGROUND}
+ padding="2rem"
+ >
+ <MatrixSection
+ title="Neutral"
+ variant="default"
+ color="neutral"
+ sizes={NO_XS_SIZES}
+ />
+ <MatrixSection
+ title="Rounded"
+ variant="default"
+ color="neutral"
+ sizes={NO_XS_SIZES}
+ rounded
+ />
+ <GroupSection variant="default" />
+ </StoryBoard>
+ ),
+ parameters: matrixParameters,
+};
+
+export const VariantLight = {
+ name: "Variant: Light",
+ render: () => (
+ <VariantMatrix
+ title="ActionIcon · light"
+ variant="light"
+ colors={["neutral"]}
+ sizes={NO_XS_SIZES}
+ group
+ />
+ ),
+ parameters: matrixParameters,
+};
+
+export const VariantSubtle = {
+ name: "Variant: Subtle",
+ render: () => (
+ <VariantMatrix
+ title="ActionIcon · subtle"
+ variant="subtle"
+ colors={["neutral", "brand", "negative", "positive", "warning"]}
+ group
+ />
+ ),
+ parameters: matrixParameters,
+};
+
+export const VariantFilled = {
+ name: "Variant: Filled",
+ render: () => (
+ <VariantMatrix
+ title="ActionIcon · filled"
+ variant="filled"
+ colors={["brand"]}
+ sizes={NO_XS_SIZES}
+ />
+ ),
+ parameters: matrixParameters,
+};
+
+export const VariantOnDark = {
+ name: "Variant: On Dark",
+ render: () => (
+ <StoryBoard title="ActionIcon · on dark" padding="2rem" onDark>
+ <MatrixSection
+ title="Primary"
+ variant="on-dark-primary"
+ color="neutral"
+ sizes={NO_XS_SIZES}
+ />
+ <MatrixSection
+ title="Secondary"
+ variant="on-dark-secondary"
+ color="neutral"
+ sizes={NO_XS_SIZES}
+ />
+ </StoryBoard>
+ ),
+ parameters: matrixParameters,
+};
+
+export const Selectable = {
+ render: () => (
+ <StoryBoard
+ title="ActionIcon · selectable"
+ background={BOARD_BACKGROUND}
+ padding="2rem"
+ >
+ {(["light", "subtle"] as const).flatMap((variant) =>
+ [false, true].map((rounded) => (
+ <MatrixSection
+ key={`${variant}-${rounded}`}
+ title={`${variant === "light" ? "Light" : "Subtle"}${rounded ? " · rounded" : ""}`}
+ variant={variant}
+ color="neutral"
+ sizes={NO_XS_SIZES}
+ rounded={rounded}
+ states={SELECTABLE_STATES}
+ />
+ )),
+ )}
+ </StoryBoard>
+ ),
+ parameters: matrixParameters,
+};
diff --git a/frontend/src/metabase/ui/components/buttons/ActionIcon/index.ts b/frontend/src/metabase/ui/components/buttons/ActionIcon/index.ts
deleted file mode 100644
index ebc62c2e6bc..00000000000
--- a/frontend/src/metabase/ui/components/buttons/ActionIcon/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { actionIconOverrides } from "./ActionIcon.config";
-export { ActionIcon } from "@mantine/core";
-export type { ActionIconProps } from "@mantine/core";
diff --git a/frontend/src/metabase/ui/components/buttons/ActionIcon/index.tsx b/frontend/src/metabase/ui/components/buttons/ActionIcon/index.tsx
new file mode 100644
index 00000000000..8f4a14b9f32
--- /dev/null
+++ b/frontend/src/metabase/ui/components/buttons/ActionIcon/index.tsx
@@ -0,0 +1,57 @@
+import {
+ ActionIcon as MantineActionIcon,
+ type ActionIconProps as MantineActionIconProps,
+ createPolymorphicComponent,
+} from "@mantine/core";
+import { forwardRef } from "react";
+
+import type { ActionIconProps } from "./types";
+
+export type { ActionIconGroupProps } from "@mantine/core";
+export { actionIconOverrides } from "./ActionIcon.config";
+export type {
+ ActionIconColor,
+ ActionIconProps,
+ ActionIconSize,
+ ActionIconVariant,
+} from "./types";
+
+type SizeVariantProps = Pick<ActionIconProps, "size" | "variant">;
+
+const guardSubtleOnlyXs = ({
+ size,
+ variant,
+}: SizeVariantProps): SizeVariantProps =>
+ size === "xs" && variant !== "subtle"
+ ? { size: "sm", variant }
+ : { size, variant };
+
+const ActionIconRoot = forwardRef<HTMLButtonElement, ActionIconProps>(
+ function ActionIconRoot(
+ { size, variant, color, selected, mod, ...props },
+ ref,
+ ) {
+ return (
+ <MantineActionIcon
+ {...props}
+ mod={[{ selected }, mod]}
+ {...guardSubtleOnlyXs({ size, variant })}
+ // `color` is overloaded with Figma color names that ActionIcon.config.tsx
+ // resolves into button tokens, so it is not a Mantine color
+ color={color as MantineActionIconProps["color"]}
+ ref={ref}
+ />
+ );
+ },
+);
+
+const ActionIconStaticComponents = {
+ Group: MantineActionIcon.Group,
+ GroupSection: MantineActionIcon.GroupSection,
+};
+
+export const ActionIcon = createPolymorphicComponent<
+ "button",
+ ActionIconProps,
+ typeof ActionIconStaticComponents
+>(Object.assign(ActionIconRoot, ActionIconStaticComponents));
diff --git a/frontend/src/metabase/ui/components/buttons/ActionIcon/types.ts b/frontend/src/metabase/ui/components/buttons/ActionIcon/types.ts
new file mode 100644
index 00000000000..49070801340
--- /dev/null
+++ b/frontend/src/metabase/ui/components/buttons/ActionIcon/types.ts
@@ -0,0 +1,41 @@
+import type { ActionIconProps as MantineActionIconProps } from "@mantine/core";
+import type { ButtonHTMLAttributes } from "react";
+
+/**
+ * @inline
+ */
+export type ActionIconSize = "xs" | "sm" | "md" | "lg";
+
+/**
+ * @inline
+ */
+export type ActionIconVariant =
+ | "default"
+ | "filled"
+ | "light"
+ | "subtle"
+ | "on-dark-primary"
+ | "on-dark-secondary";
+
+/**
+ * @inline
+ */
+export type ActionIconColor =
+ | "brand"
+ | "negative"
+ | "positive"
+ | "warning"
+ | "neutral";
+
+/**
+ * @inline
+ */
+export type ActionIconProps = Omit<
+ MantineActionIconProps,
+ "size" | "variant" | "color"
+> & {
+ size?: ActionIconSize;
+ variant?: ActionIconVariant;
+ color?: ActionIconColor;
+ selected?: boolean;
+} & ButtonHTMLAttributes<HTMLButtonElement>;
diff --git a/frontend/src/metabase/ui/components/buttons/Button/Button.module.css b/frontend/src/metabase/ui/components/buttons/Button/Button.module.css
index 9c823396b9e..2d0ba568b45 100644
--- a/frontend/src/metabase/ui/components/buttons/Button/Button.module.css
+++ b/frontend/src/metabase/ui/components/buttons/Button/Button.module.css
@@ -160,7 +160,7 @@
}
.root[data-variant^="on-dark-"] {
- box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2);
+ box-shadow: var(--mantine-shadow-xs_on_dark);
&:disabled:not([data-loading]),
&[data-disabled]:not([data-loading]) {
diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/ExpandButton/ExpandButton.module.css b/frontend/src/metabase/ui/components/data-display/TreeTable/ExpandButton/ExpandButton.module.css
index d117f0c8f92..83df8f7045d 100644
--- a/frontend/src/metabase/ui/components/data-display/TreeTable/ExpandButton/ExpandButton.module.css
+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/ExpandButton/ExpandButton.module.css
@@ -7,8 +7,6 @@
}
.button {
- border: none;
- background: transparent;
cursor: pointer;
&:focus-visible {
diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/ExpandButton/ExpandButton.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/ExpandButton/ExpandButton.tsx
index 96e371332ae..ba48c04effa 100644
--- a/frontend/src/metabase/ui/components/data-display/TreeTable/ExpandButton/ExpandButton.tsx
+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/ExpandButton/ExpandButton.tsx
@@ -37,11 +37,12 @@ export const ExpandButton = memo(function ExpandButton({
return (
<ActionIcon
+ variant="subtle"
aria-expanded={isExpanded}
aria-label={isExpanded ? t`Collapse` : t`Expand`}
className={cx(S.wrapper, S.button, className)}
onClick={onClick}
- size="1rem"
+ size="xs"
tabIndex={-1}
>
<Icon
diff --git a/frontend/src/metabase/ui/theme.ts b/frontend/src/metabase/ui/theme.ts
index f950c6e65ce..cf85d82d2af 100644
--- a/frontend/src/metabase/ui/theme.ts
+++ b/frontend/src/metabase/ui/theme.ts
@@ -76,6 +76,7 @@ import { getMantineThemeColors } from "./utils/colors";
/* eslint-disable metabase/no-color-literals */
const LIGHT_SHADOWS = {
xs: "0 1px 3px 0 rgba(0, 0, 0, 0.07)",
+ xs_on_dark: "0 1px 3px 0 rgba(0, 0, 0, 0.20)",
xs_outline:
"0 0 0 0.5px rgba(0, 0, 0, 0.07), 0 1px 3px 0 rgba(0, 0, 0, 0.07)",
sm: "0 1px 4px 0 rgba(0, 0, 0, 0.05), 0 5px 15px 0 rgba(0, 0, 0, 0.10)",
@@ -87,6 +88,7 @@ const LIGHT_SHADOWS = {
const DARK_SHADOWS = {
xs: "0 1px 3px 0 rgba(0, 0, 0, 0.20)",
+ xs_on_dark: "0 1px 3px 0 rgba(0, 0, 0, 0.20)",
xs_outline:
"0 0 0 0.5px rgba(0, 0, 0, 0.15), 0 1px 3px 0 rgba(0, 0, 0, 0.20)",
sm: "0 1px 4px 0 rgba(0, 0, 0, 0.07), 0 5px 15px 0 rgba(0, 0, 0, 0.20)",
diff --git a/frontend/src/metabase/ui/theme.unit.spec.ts b/frontend/src/metabase/ui/theme.unit.spec.ts
index 35dc03259b4..3ca5b0a61de 100644
--- a/frontend/src/metabase/ui/theme.unit.spec.ts
+++ b/frontend/src/metabase/ui/theme.unit.spec.ts
@@ -6,16 +6,20 @@ import { getThemeOverrides } from "metabase/ui/theme";
const SHADOW_SCALE_KEYS = [
"xs",
+ "xs_on_dark",
"xs_outline",
"sm",
"sm_outline",
"lg_outline",
];
+const THEME_INDEPENDENT_SHADOWS: string[] = ["xs_on_dark"];
+
// Keep expected values independent from the production scale definitions so
// these tests catch accidental changes to the theme.
const LIGHT_SHADOWS = {
xs: "0 1px 3px 0 rgba(0, 0, 0, 0.07)",
+ xs_on_dark: "0 1px 3px 0 rgba(0, 0, 0, 0.20)",
xs_outline:
"0 0 0 0.5px rgba(0, 0, 0, 0.07), 0 1px 3px 0 rgba(0, 0, 0, 0.07)",
sm: "0 1px 4px 0 rgba(0, 0, 0, 0.05), 0 5px 15px 0 rgba(0, 0, 0, 0.10)",
@@ -27,6 +31,7 @@ const LIGHT_SHADOWS = {
const DARK_SHADOWS = {
xs: "0 1px 3px 0 rgba(0, 0, 0, 0.20)",
+ xs_on_dark: "0 1px 3px 0 rgba(0, 0, 0, 0.20)",
xs_outline:
"0 0 0 0.5px rgba(0, 0, 0, 0.15), 0 1px 3px 0 rgba(0, 0, 0, 0.20)",
sm: "0 1px 4px 0 rgba(0, 0, 0, 0.07), 0 5px 15px 0 rgba(0, 0, 0, 0.20)",
@@ -131,7 +136,10 @@ describe("theme scales", () => {
const light = getThemeOverrides({ colorScheme: "light" }).shadows ?? {};
const dark = getThemeOverrides({ colorScheme: "dark" }).shadows ?? {};
- for (const key of SHADOW_SCALE_KEYS) {
+ const themedKeys = SHADOW_SCALE_KEYS.filter(
+ (key) => !THEME_INDEPENDENT_SHADOWS.includes(key),
+ );
+ for (const key of themedKeys) {
expect(dark[key]).not.toEqual(light[key]);
}
});
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.tsx
index b41a10ea0f1..8e527caa27e 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.tsx
@@ -52,7 +52,7 @@ export function ObjectDetailHeader({
{canZoom && (
<>
<ActionIcon
- variant="viewHeader"
+ variant="subtle"
data-testid="view-previous-object-detail"
disabled={!canZoomPreviousRow}
onClick={viewPreviousObjectDetail}
@@ -60,7 +60,7 @@ export function ObjectDetailHeader({
<Icon name="chevronup" />
</ActionIcon>
<ActionIcon
- variant="viewHeader"
+ variant="subtle"
data-testid="view-next-object-detail"
disabled={!canZoomNextRow}
onClick={viewNextObjectDetail}
@@ -97,7 +97,7 @@ export function ObjectDetailHeader({
<Flex ml="lg" pl="lg" className={S.closeButton}>
<ActionIcon
- variant="viewHeader"
+ variant="subtle"
data-testid="object-detail-close-button"
onClick={closeObjectDetail}
>
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingActionIcon.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingActionIcon.tsx
index ac55e3c4f8a..d5c2ba4fe52 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingActionIcon.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingActionIcon.tsx
@@ -15,6 +15,7 @@ export const ChartSettingActionIcon = ({
"data-testid": dataTestId,
}: ChartSettingActionIconProps) => (
<ActionIcon
+ variant="subtle"
data-testid={dataTestId}
onClick={(e) => {
e.stopPropagation();
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker/ChartSettingFieldPicker.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker/ChartSettingFieldPicker.tsx
index ba23a3231a7..6cd5b7eca08 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker/ChartSettingFieldPicker.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker/ChartSettingFieldPicker.tsx
@@ -180,7 +180,12 @@ export const ChartSettingFieldPicker = ({
rightSection={
<>
{!disabled && (
- <ActionIcon c="text-secondary" size="sm" radius="xl" p={0}>
+ <ActionIcon
+ variant="subtle"
+ c="text-secondary"
+ size="sm"
+ radius="xl"
+ >
<Icon name="chevrondown" />
</ActionIcon>
)}
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingIconRadio.module.css b/frontend/src/metabase/visualizations/components/settings/ChartSettingIconRadio.module.css
deleted file mode 100644
index 231d2e1dad8..00000000000
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingIconRadio.module.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.iconButton {
- &[data-variant="default"] {
- border: 1px solid var(--mb-color-border-neutral);
- color: var(--mb-color-text-primary);
- background-color: var(--mb-color-background_page-primary);
-
- &:hover {
- background-color: var(--mb-color-background_surface-hover);
- }
- }
-}
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingIconRadio.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingIconRadio.tsx
index 22064121918..e41083e99c8 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingIconRadio.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingIconRadio.tsx
@@ -1,8 +1,6 @@
import { ActionIcon, Icon } from "metabase/ui";
import type { IconName } from "metabase-types/api";
-import S from "./ChartSettingIconRadio.module.css";
-
interface ChartSettingIconRadioProps {
value: string;
onChange: (val: string | null) => void;
@@ -27,9 +25,9 @@ export const ChartSettingIconRadio = ({
{options.map((option) => (
<ActionIcon
key={`radio-icon-${option.iconName}`}
- className={S.iconButton}
- variant={option.value === value ? "filled" : "default"}
- size="2rem"
+ variant="light"
+ aria-pressed={option.value === value}
+ selected={option.value === value}
ml="sm"
onClick={() => handleClick(option.value)}
>
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx
index 0ab4da5ae11..18fefac5df9 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx
@@ -4,7 +4,7 @@ import _ from "underscore";
import { ColorSelector } from "metabase/common/components/ColorSelector";
import CS from "metabase/css/core/index.css";
-import { Box, Button, Icon, NumberInput, Text } from "metabase/ui";
+import { ActionIcon, Box, Button, Icon, NumberInput, Text } from "metabase/ui";
import { color } from "metabase/ui/colors";
import { getAccentColors } from "metabase/ui/colors/groups";
import type { ChartSettingSegmentsEditorProps } from "metabase/viz-core";
@@ -96,17 +96,17 @@ export const ChartSettingSegmentsEditor = ({
/>
</td>
<td>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
{(segments.length > 1 || canRemoveAll) && (
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
- size="sm"
- leftSection={<Icon name="trash" />}
+ size="lg"
onClick={() =>
onChange(segments.filter((v, i) => i !== index))
}
- />
+ aria-label={t`Remove segment`}
+ >
+ <Icon name="trash" />
+ </ActionIcon>
)}
</td>
</tr>
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
index 297334eca6e..abbbc305c4b 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
@@ -7,6 +7,7 @@ import _ from "underscore";
import { ColorSelector } from "metabase/common/components/ColorSelector";
import type { DragEndEvent } from "metabase/common/components/Sortable";
import {
+ ActionIcon,
Box,
Button,
Flex,
@@ -174,15 +175,14 @@ export const ChartSettingSeriesOrder = ({
/>
<Text truncate fw="bold">{t`Other`}</Text>
</Group>
- {/* TODO: replace with ActionIcon (GDGT-2457) */}
- <Button
+ <ActionIcon
variant="subtle"
- color="neutral"
size="sm"
- leftSection={<Icon name="gear" />}
aria-label={t`Other series settings`}
onClick={handleOtherSeriesSettingsClick}
- />
+ >
+ <Icon name="gear" />
+ </ActionIcon>
</Flex>
),
},
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RulePreview.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RulePreview.tsx
index 62a39f72f9d..61e2869fe89 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RulePreview.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RulePreview.tsx
@@ -51,6 +51,7 @@ export const RulePreview = ({
)}
</Text>
<ActionIcon
+ variant="subtle"
onClick={(e) => {
e.stopPropagation();
onRemove();
diff --git a/frontend/src/metabase/visualizations/components/settings/ColorRangeSelector/ColorRangeToggle.tsx b/frontend/src/metabase/visualizations/components/settings/ColorRangeSelector/ColorRangeToggle.tsx
index 2a755c7c9a0..8af9605ebe9 100644
--- a/frontend/src/metabase/visualizations/components/settings/ColorRangeSelector/ColorRangeToggle.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ColorRangeSelector/ColorRangeToggle.tsx
@@ -29,13 +29,7 @@ export const ColorRangeToggle = ({
className={onColorRangeSelect ? CS.cursorPointer : CS.cursorDefault}
/>
{showToggleButton && (
- <ActionIcon
- onClick={onToggleClick}
- variant="outline"
- color="border-neutral"
- p="sm"
- size="lg"
- >
+ <ActionIcon onClick={onToggleClick}>
<Icon c="text-secondary" name="compare" />
</ActionIcon>
)}
diff --git a/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListView.module.css b/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListView.module.css
index cffd2404f55..785f5078b85 100644
--- a/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListView.module.css
+++ b/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListView.module.css
@@ -113,7 +113,6 @@
display: flex;
padding: 0;
border-radius: 50%;
- border: 1px solid var(--mb-color-border-neutral);
align-items: center;
justify-content: center;
flex-shrink: 0;
diff --git a/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListViewConfiguration.tsx b/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListViewConfiguration.tsx
index 9cdc193a2e8..a77dea0ad7a 100644
--- a/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListViewConfiguration.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/List/components/ListView/ListViewConfiguration.tsx
@@ -242,7 +242,6 @@ export const ListViewConfiguration = ({
<Flex className={S.iconMenuButtonContainer}>
<ActionIcon
data-testid="list-view-icon"
- variant="subtle"
className={S.iconMenuButton}
style={{
backgroundColor: iconConfig.entityIconEnabled
@@ -310,17 +309,13 @@ export const ListViewConfiguration = ({
<Menu.Divider m={0} />
<SimpleGrid cols={5} p="lg">
<ActionIcon
- radius="lg"
- p="lg"
- w="2rem"
- h="2rem"
+ variant="light"
+ radius="xl"
disabled={!imageColumn}
- className={cx({
- [S.imageColumn]: !!imageColumn,
- [S.selected]:
- iconConfig.useImageColumn &&
- iconConfig.entityIconEnabled,
- })}
+ selected={
+ iconConfig.useImageColumn && iconConfig.entityIconEnabled
+ }
+ className={cx({ [S.imageColumn]: !!imageColumn })}
onClick={() => {
handleConfigurationChange({
left: leftValues,
@@ -353,14 +348,12 @@ export const ListViewConfiguration = ({
{Object.entries(ENTITY_ICONS).map(([key, iconName]) => (
<Flex justify="center" align="center" key={key}>
<ActionIcon
- w="2rem"
- h="2rem"
- radius="lg"
- className={cx({
- [S.selected]:
- iconConfig.selectedEntityIcon === iconName &&
- iconConfig.entityIconEnabled,
- })}
+ variant="light"
+ radius="xl"
+ selected={
+ iconConfig.selectedEntityIcon === iconName &&
+ iconConfig.entityIconEnabled
+ }
onClick={() => {
handleConfigurationChange({
left: leftValues,
@@ -370,7 +363,7 @@ export const ListViewConfiguration = ({
});
}}
>
- <Icon name={iconName} c="text-primary" />
+ <Icon name={iconName} />
</ActionIcon>
</Flex>
))}
diff --git a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx
index 540b50471c2..8405e48f94d 100644
--- a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx
+++ b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx
@@ -82,7 +82,11 @@ export const ColumnsListItem = forwardRef<HTMLDivElement, ColumnsListItemProps>(
<Ellipsified>{displayNameForColumn(column)}</Ellipsified>
</Flex>
{!!onRemove && (
- <ActionIcon aria-label={t`Remove`} onClick={handleRemoveClick}>
+ <ActionIcon
+ variant="subtle"
+ aria-label={t`Remove`}
+ onClick={handleRemoveClick}
+ >
<Icon name="close" size={14} />
</ActionIcon>
)}
diff --git a/frontend/src/metabase/visualizer/components/Header/Header.tsx b/frontend/src/metabase/visualizer/components/Header/Header.tsx
index 4da3af16986..c9aafee7c15 100644
--- a/frontend/src/metabase/visualizer/components/Header/Header.tsx
+++ b/frontend/src/metabase/visualizer/components/Header/Header.tsx
@@ -74,7 +74,10 @@ export function Header({
className={className}
data-testid="visualizer-header"
>
- <ActionIcon onClick={() => setDataSidebarOpen((isOpen) => !isOpen)}>
+ <ActionIcon
+ variant="subtle"
+ onClick={() => setDataSidebarOpen((isOpen) => !isOpen)}
+ >
<Icon name="sidebar_open" />
</ActionIcon>
<EditableText
@@ -120,6 +123,7 @@ export function Header({
{saveLabel ?? t`Add to dashboard`}
</Button>
<ActionIcon
+ variant="subtle"
data-testid="visualizer-close-button"
onClick={() => {
trackVisualizerCloseClicked();
diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx
index 57aad07571d..cb3c922fa8e 100644
--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx
@@ -122,6 +122,7 @@ export function VisualizationCanvas({ className }: VisualizationCanvasProps) {
>
<Tooltip withinPortal={false} label={t`View as table`}>
<ActionIcon
+ variant="subtle"
data-testid="visualizer-view-as-table-button"
onClick={() => {
trackVisualizerViewAsTableClicked();
diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/WellItem.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/WellItem.tsx
index 59ebdd29632..7a5fe19ce29 100644
--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/WellItem.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/WellItem.tsx
@@ -51,6 +51,7 @@ export const WellItem = forwardRef<HTMLDivElement, WellItemProps>(
{children}
{!!onRemove && (
<ActionIcon
+ variant="subtle"
aria-label={t`Remove`}
size="sm"
ml="xxs"
diff --git a/loki.config.js b/loki.config.js
index a79cb990b11..9f92dc5ddbb 100644
--- a/loki.config.js
+++ b/loki.config.js
@@ -22,6 +22,7 @@ module.exports = {
"^Components/Inputs/Switch (Overview|Switch\\.Group)$",
"^Components/Parameters/DatePicker",
"^Components/Buttons/Button (Variant|Compact|Sections)",
+ "^Components/Buttons/ActionIcon (Variant|Selectable)",
"^Components/Overlays/Tooltip",
"^Components/Documents",
"^Components/Feedback/Alert",