Skip to content

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

Fix disappearing drill icon (#64228)

Romeo Van Snick9683555c34d2
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css
index e14fddaccdd..8f2b812e210 100644
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css
+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css
@@ -3,11 +3,12 @@
color: var(--mb-color-text-white);
background-color: var(--mb-color-brand);
- .nested {
+ .subtitle {
color: var(--mb-color-text-white);
}
- .ClickActionButtonIcon {
+ .clickActionButtonIcon,
+ .clickActionButtonTextIcon {
color: var(--mb-color-text-white);
}
}
@@ -23,6 +24,36 @@
}
}
-.ClickActionButtonIcon {
- margin-right: 0.2rem;
+.tokenFilterActionButton {
+ border-radius: 100px;
+ height: 1.4rem;
+ padding-bottom: 0.125rem;
+ border: 1px solid var(--mb-color-focus);
+}
+
+.tokenFilterActionTokenButton {
+ border-radius: 100px;
+ padding: 0.3125rem 0.875rem;
+ border: 1px solid var(--mb-color-focus);
+}
+
+.clickActionButtonTextIcon {
+ margin-right: 0.25rem;
+ width: 0.875rem;
+ height: 100%;
+ font-weight: 700;
+ font-size: 1.25rem;
+}
+
+.infoControl {
+ color: var(--mb-color-text-dark);
+ font-weight: bold;
+ line-height: 1.5rem;
+ max-width: 10.75rem;
+}
+
+.subtitle {
+ color: var(--mb-color-text-light);
+ font-weight: normal;
+ margin-left: 1rem;
}
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.styled.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.styled.tsx
deleted file mode 100644
index f228c57522d..00000000000
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.styled.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import Button from "metabase/common/components/Button";
-import { alpha } from "metabase/lib/colors";
-import { rem } from "metabase/ui";
-
-export const ClickActionButtonTextIcon = styled.span`
- margin-right: ${rem(4)};
- width: 0.875rem;
- text-align: center;
- font-weight: 700;
- font-size: 1.25rem;
- transition: all 200ms linear;
-`;
-
-export const Subtitle = styled.div`
- color: var(--mb-color-text-light);
- font-weight: normal;
- margin-left: 1rem;
-`;
-
-export const TokenFilterActionButton = styled(Button)`
- color: var(--mb-color-brand);
- font-size: 1.25rem;
- line-height: 1rem;
- padding: 0.125rem 0.85rem 0.25rem;
- border: 1px solid var(--mb-color-focus);
- border-radius: 100px;
-
- &:hover {
- color: var(--mb-color-text-white);
- background-color: var(--mb-color-brand);
- border-color: var(--mb-color-brand);
- }
-`;
-
-export const TokenActionButton = styled(Button)`
- color: var(--mb-color-brand);
- font-size: 0.875em;
- line-height: 1rem;
- padding: 0.3125rem 0.875rem;
- border: 1px solid ${({ theme }) => alpha(theme.fn.themeColor("brand"), 0.35)};
- border-radius: 100px;
-
- &:hover {
- color: var(--mb-color-text-white);
- background-color: var(--mb-color-brand);
- border-color: var(--mb-color-brand);
- }
-`;
-
-export const SortControl = styled(Button)`
- color: var(--mb-color-brand);
- border: 1px solid ${({ theme }) => alpha(theme.fn.themeColor("brand"), 0.35)};
- line-height: 1;
- font-size: 0.75rem;
- padding: 0.1875rem 0.875rem 0.0625rem;
- border-radius: 100px;
-
- &:hover {
- color: var(--mb-color-text-white);
- background-color: var(--mb-color-brand);
- border-color: var(--mb-color-brand);
- }
-`;
-
-export const FormattingControl = styled(Button)`
- color: ${({ theme }) => alpha(theme.fn.themeColor("text-light"), 0.65)};
- margin-left: auto;
- line-height: 1;
- border: none;
- padding: 0.125rem 0.25rem;
-
- &:hover {
- color: var(--mb-color-brand);
- background-color: transparent;
- }
-`;
-
-export const InfoControl = styled.div`
- color: var(--mb-color-text-dark);
- font-weight: bold;
- line-height: 1.5rem;
- max-width: 10.75rem;
-`;
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
index efdf10d4f1e..f734519e4ec 100644
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
@@ -1,5 +1,5 @@
import { useDispatch } from "metabase/lib/redux";
-import { Button, Icon, Tooltip } from "metabase/ui";
+import { Box, Button, Icon, Tooltip } from "metabase/ui";
import {
type ClickAction,
isCustomClickAction,
@@ -8,15 +8,6 @@ import {
import { isRegularClickAction } from "metabase/visualizations/types";
import S from "./ClickActionControl.module.css";
-import {
- ClickActionButtonTextIcon,
- FormattingControl,
- InfoControl,
- SortControl,
- Subtitle,
- TokenActionButton,
- TokenFilterActionButton,
-} from "./ClickActionControl.styled";
interface Props {
action: ClickAction;
@@ -57,49 +48,65 @@ export const ClickActionControl = ({
switch (buttonType) {
case "token-filter":
return (
- <TokenFilterActionButton
- small
- icon={
+ <Button
+ variant="outline"
+ fz="xl"
+ size="xs"
+ onClick={handleClick}
+ className={S.tokenFilterActionButton}
+ leftSection={
typeof action.icon === "string" && (
- <Icon className={S.ClickActionButtonIcon} name={action.icon} />
+ <Icon
+ className={S.clickActionButtonIcon}
+ name={action.icon}
+ m={0}
+ />
)
}
- onClick={handleClick}
>
{action.title}
- </TokenFilterActionButton>
+ </Button>
);
case "token":
return (
- <TokenActionButton small onClick={handleClick}>
+ <Button
+ variant="outline"
+ size="xs"
+ fz="sm"
+ className={S.tokenFilterActionTokenButton}
+ onClick={handleClick}
+ >
{action.title}
- </TokenActionButton>
+ </Button>
);
case "sort":
return (
<Tooltip label={action.tooltip}>
- <SortControl
- onlyIcon
- onClick={handleClick}
+ <Button
+ variant="outline"
+ fz="xl"
+ size="xs"
+ className={S.tokenFilterActionButton}
data-testid={`click-actions-sort-control-${action.name}`}
+ onClick={handleClick}
>
{typeof action.icon === "string" && (
<Icon size={14} name={action.icon} />
)}
- </SortControl>
+ </Button>
</Tooltip>
);
case "formatting":
return (
<Tooltip label={action.tooltip}>
- <FormattingControl onlyIcon onClick={handleClick}>
+ <Button variant="outline" fz="xl" size="xs" onClick={handleClick}>
{typeof action.icon === "string" && (
<Icon size={16} name={action.icon} />
)}
- </FormattingControl>
+ </Button>
</Tooltip>
);
@@ -117,23 +124,25 @@ export const ClickActionControl = ({
}}
leftSection={
action.iconText ? (
- <ClickActionButtonTextIcon>
+ <Box className={S.clickActionButtonTextIcon}>
{action.iconText}
- </ClickActionButtonTextIcon>
+ </Box>
) : action.icon ? (
- <Icon className={S.ClickActionButtonIcon} name={action.icon} />
+ <Icon
+ className={S.clickActionButtonIcon}
+ name={action.icon}
+ m={0}
+ />
) : null
}
onClick={handleClick}
>
{action.title}
- {action.subTitle && (
- <Subtitle className={S.nested}>{action.subTitle}</Subtitle>
- )}
+ {action.subTitle && <Box>{action.subTitle}</Box>}
</Button>
);
case "info":
- return <InfoControl>{action.title}</InfoControl>;
+ return <Box className={S.infoControl}>{action.title}</Box>;
}
};