Skip to content

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

Migrate Swapper and TabButton off Emotion, remove unused Tab (#84008)

Andrei Chernykh9de957fc08a0
diff --git a/frontend/src/metabase/common/components/Swapper/Swapper.module.css b/frontend/src/metabase/common/components/Swapper/Swapper.module.css
new file mode 100644
index 00000000000..bf805236192
--- /dev/null
+++ b/frontend/src/metabase/common/components/Swapper/Swapper.module.css
@@ -0,0 +1,3 @@
+.scaledDown {
+ transform: scale(0);
+}
diff --git a/frontend/src/metabase/common/components/Swapper/Swapper.styled.tsx b/frontend/src/metabase/common/components/Swapper/Swapper.styled.tsx
deleted file mode 100644
index 37b85fdd76b..00000000000
--- a/frontend/src/metabase/common/components/Swapper/Swapper.styled.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-interface SwapperElementProps {
- isVisible: boolean;
-}
-
-export const SwapperRoot = styled.div`
- position: relative;
-`;
-
-export const SwapperDefaultElement = styled.div<SwapperElementProps>`
- transform: scale(${(props) => (props.isVisible ? 1 : 0)});
-`;
-
-export const SwapperLayeredElement = styled.div<SwapperElementProps>`
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- transform: scale(${(props) => (props.isVisible ? 1 : 0)});
-`;
diff --git a/frontend/src/metabase/common/components/Swapper/Swapper.tsx b/frontend/src/metabase/common/components/Swapper/Swapper.tsx
index f026e6ebe99..d657d84256b 100644
--- a/frontend/src/metabase/common/components/Swapper/Swapper.tsx
+++ b/frontend/src/metabase/common/components/Swapper/Swapper.tsx
@@ -1,11 +1,10 @@
+import cx from "classnames";
import type { HTMLAttributes, ReactNode, Ref } from "react";
import { forwardRef, useCallback, useState } from "react";
-import {
- SwapperDefaultElement,
- SwapperLayeredElement,
- SwapperRoot,
-} from "./Swapper.styled";
+import { Box } from "metabase/ui";
+
+import S from "./Swapper.module.css";
export interface SwapperProps extends HTMLAttributes<HTMLDivElement> {
defaultElement?: ReactNode;
@@ -23,18 +22,21 @@ export const Swapper = forwardRef(function Swapper(
const handleMouseLeave = useCallback(() => setIsHovered(false), []);
return (
- <SwapperRoot
+ <Box
{...props}
ref={ref}
+ pos="relative"
onMouseEnter={handleMouseEnter}
onMouseLeave={handleMouseLeave}
>
- <SwapperDefaultElement isVisible={!isSelected}>
- {defaultElement}
- </SwapperDefaultElement>
- <SwapperLayeredElement isVisible={isSelected}>
+ <Box className={cx({ [S.scaledDown]: isSelected })}>{defaultElement}</Box>
+ <Box
+ className={cx({ [S.scaledDown]: !isSelected })}
+ pos="absolute"
+ inset={0}
+ >
{swappedElement}
- </SwapperLayeredElement>
- </SwapperRoot>
+ </Box>
+ </Box>
);
});
diff --git a/frontend/src/metabase/common/components/TabButton/TabButton.module.css b/frontend/src/metabase/common/components/TabButton/TabButton.module.css
index 570da9961b3..76f46757654 100644
--- a/frontend/src/metabase/common/components/TabButton/TabButton.module.css
+++ b/frontend/src/metabase/common/components/TabButton/TabButton.module.css
@@ -1,3 +1,68 @@
+/* tab list padding, minus the label frame's padding and border */
+.root {
+ padding: calc(0.6875rem - 0.25rem - 1px) calc(0.5rem - 0.25rem - 2px);
+ color: var(--mb-color-text-primary);
+ border-bottom: 0.125rem solid transparent;
+
+ &:hover {
+ color: var(--mb-color-core-brand);
+ }
+
+ &::after {
+ content: " ";
+ position: absolute;
+ top: 100%;
+ left: 0;
+ width: 100%;
+ border-bottom: 0.125rem solid transparent;
+ }
+}
+
+.selected {
+ color: var(--mb-color-core-brand);
+
+ &::after {
+ border-color: var(--mb-color-core-brand);
+ }
+}
+
+.disabled {
+ opacity: 0.3;
+
+ &:hover {
+ color: var(--mb-color-text-primary);
+ }
+}
+
+/* The frame and the resizer let the input grow with its content:
+ https://css-tricks.com/auto-growing-inputs-textareas/#aa-resizing-actual-input-elements */
+.inputWrapper {
+ border: 1px solid transparent;
+}
+
+.renaming,
+.renameable:hover {
+ box-shadow: 0 0 2px 1px var(--mb-color-core-brand);
+}
+
+.resizer {
+ visibility: hidden;
+ white-space: pre;
+ padding-right: 2px;
+}
+
+.input {
+ border: 1px solid transparent;
+ outline: none;
+ background-color: transparent;
+ color: inherit;
+ font-size: inherit;
+
+ &:disabled {
+ pointer-events: none;
+ }
+}
+
.menuButton {
&[data-variant="subtle"] {
align-self: center;
@@ -12,3 +77,13 @@
}
}
}
+
+.menuItem {
+ color: var(--mb-color-text-primary);
+
+ &:hover,
+ &:focus {
+ color: var(--mb-color-core-brand);
+ background-color: var(--mb-color-background_page-secondary);
+ }
+}
diff --git a/frontend/src/metabase/common/components/TabButton/TabButton.styled.tsx b/frontend/src/metabase/common/components/TabButton/TabButton.styled.tsx
deleted file mode 100644
index 3146f68c044..00000000000
--- a/frontend/src/metabase/common/components/TabButton/TabButton.styled.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import { css } from "@emotion/react";
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
-
-interface TabButtonProps {
- isSelected?: boolean;
- disabled?: boolean;
-}
-
-// Wrapper and Resizer are needed to auto-grow the input with its content
-// https://css-tricks.com/auto-growing-inputs-textareas/#aa-resizing-actual-input-elements
-export const TabButtonInputWrapper = styled.span<TabButtonProps>`
- position: relative;
- padding: 0.25rem;
- border: 1px solid transparent;
- border-radius: 6px;
- line-height: 1.15; /* Matches .tabLabel */
-`;
-
-export const TabButtonInputResizer = styled.span`
- visibility: hidden;
- white-space: pre;
- padding-right: 2px;
-`;
-
-export const TabButtonInput = styled.input<TabButtonProps & { value: string }>`
- position: absolute;
- width: 100%;
- left: 0;
- bottom: -1px; /* offsets 1px input border */
- padding: 0.25rem;
- border: 1px solid transparent;
- border-radius: 4px;
- outline: none;
- background-color: transparent;
- color: inherit;
- font-size: inherit;
- font-weight: bold;
- text-align: center;
-
- ${(props) =>
- props.disabled &&
- css`
- pointer-events: none;
- `}
-`;
-
-export const TabButtonRoot = styled.div<TabButtonProps>`
- position: relative;
- display: flex;
- padding: calc(0.6875rem - 0.25rem - 1px) calc(0.5rem - 0.25rem - 2px); /* tab .list padding - input padding - borders/margins */
- color: ${(props) =>
- props.isSelected && !props.disabled
- ? "var(--mb-color-core-brand)"
- : "var(--mb-color-text-primary)"};
- opacity: ${(props) => (props.disabled ? 0.3 : 1)};
- font-size: var(--mantine-font-size-md);
- font-weight: 700;
- cursor: ${(props) => (props.disabled ? "default" : "pointer")};
- border-bottom: 0.125rem solid transparent;
-
- :hover {
- ${(props) =>
- !props.disabled &&
- css`
- color: var(--mb-color-core-brand);
- `}
- }
-
- :after {
- content: " ";
- position: absolute;
- top: 100%;
- left: 0;
- width: 100%;
- border-bottom: 0.125rem solid transparent;
- }
-
- ${(props) =>
- props.isSelected &&
- !props.disabled &&
- css`
- :after {
- border-color: var(--mb-color-core-brand);
- }
- `}
-`;
-
-export const MenuContent = styled.ul`
- padding: 0.5rem;
-`;
-
-export const MenuItem = styled.li`
- width: 100%;
- padding: 0.85em 1.45em;
- border-radius: 0.5em;
- color: var(--mb-color-text-primary);
- font-weight: 700;
- text-align: start;
- text-decoration: none;
- cursor: pointer;
-
- &:focus,
- :hover {
- color: var(--mb-color-core-brand);
- background-color: var(--mb-color-background_page-secondary);
- }
-`;
diff --git a/frontend/src/metabase/common/components/TabButton/TabButton.tsx b/frontend/src/metabase/common/components/TabButton/TabButton.tsx
index 7deca9a82a5..024ac1ea586 100644
--- a/frontend/src/metabase/common/components/TabButton/TabButton.tsx
+++ b/frontend/src/metabase/common/components/TabButton/TabButton.tsx
@@ -1,8 +1,4 @@
import type { UniqueIdentifier } from "@dnd-kit/core";
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import { css } from "@emotion/react";
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import styled from "@emotion/styled";
import cx from "classnames";
import type {
ChangeEventHandler,
@@ -23,7 +19,8 @@ import {
import { t } from "ttag";
import { useTranslateContent } from "metabase/content-translation/hooks";
-import { ActionIcon, Icon, Popover } from "metabase/ui";
+import CS from "metabase/css/core/index.css";
+import { ActionIcon, Box, Flex, Icon, Popover } from "metabase/ui";
import type { TabContextType } from "../Tab";
import {
@@ -34,12 +31,6 @@ import {
} from "../Tab";
import S from "./TabButton.module.css";
-import {
- TabButtonInput,
- TabButtonInputResizer,
- TabButtonInputWrapper,
- TabButtonRoot,
-} from "./TabButton.styled";
import { TabButtonMenu } from "./TabButtonMenu";
export const INPUT_WRAPPER_TEST_ID = "tab-button-input-wrapper";
@@ -64,9 +55,11 @@ export interface TabButtonProps extends HTMLAttributes<HTMLDivElement> {
isRenaming?: boolean;
onInputDoubleClick?: MouseEventHandler<HTMLSpanElement>;
disabled?: boolean;
+ /** Frames the label on hover while the tab is selected, hinting that a double click renames it */
+ canRename?: boolean;
}
-const _TabButton = forwardRef(function TabButton(
+const PlainTabButton = forwardRef(function PlainTabButton(
{
value,
menuItems,
@@ -77,7 +70,9 @@ const _TabButton = forwardRef(function TabButton(
onInputDoubleClick,
disabled = false,
isRenaming = false,
+ canRename = false,
showMenu: showMenuProp = true,
+ className,
...props
}: TabButtonProps,
inputRef: Ref<HTMLInputElement>,
@@ -122,11 +117,21 @@ const _TabButton = forwardRef(function TabButton(
);
return (
- <TabButtonRoot
+ <Flex
{...props}
+ className={cx(
+ S.root,
+ {
+ [S.selected]: isSelected && !disabled,
+ [S.disabled]: disabled,
+ },
+ disabled ? CS.cursorDefault : CS.cursorPointer,
+ className,
+ )}
+ pos="relative"
+ fz="md"
+ fw={700}
onClick={handleButtonClick}
- isSelected={isSelected}
- disabled={disabled}
role="tab"
aria-selected={isSelected}
aria-controls={getTabPanelId(idPrefix, value)}
@@ -134,20 +139,36 @@ const _TabButton = forwardRef(function TabButton(
aria-label={label}
id={getTabId(idPrefix, value)}
>
- <TabButtonInputWrapper
+ <Box
+ component="span"
+ className={cx(S.inputWrapper, {
+ [S.renaming]: isRenaming,
+ [S.renameable]: canRename && isSelected,
+ })}
+ pos="relative"
+ p="xxs"
+ bdrs="xs"
+ lh={1.15}
onDoubleClick={onInputDoubleClick}
- isSelected={isSelected}
- disabled={disabled}
data-testid={INPUT_WRAPPER_TEST_ID}
>
- <TabButtonInputResizer aria-hidden="true">
+ <Box component="span" className={S.resizer} aria-hidden="true">
{label}
- </TabButtonInputResizer>
- <TabButtonInput
+ </Box>
+ <Box
+ component="input"
+ className={S.input}
+ pos="absolute"
+ left={0}
+ bottom="-1px"
+ w="100%"
+ p="xxs"
+ bdrs="xxs"
+ fw="bold"
+ ta="center"
maxLength={75}
type="text"
value={label}
- isSelected={isSelected}
disabled={!isRenaming}
onChange={onRename}
onKeyPress={handleInputKeyPress}
@@ -157,7 +178,7 @@ const _TabButton = forwardRef(function TabButton(
id={getTabButtonInputId(idPrefix, value)}
ref={inputRef}
/>
- </TabButtonInputWrapper>
+ </Box>
{showMenu && (
<Popover
opened={isMenuOpen}
@@ -188,7 +209,7 @@ const _TabButton = forwardRef(function TabButton(
</Popover.Dropdown>
</Popover>
)}
- </TabButtonRoot>
+ </Flex>
);
});
@@ -203,23 +224,6 @@ export interface RenameableTabButtonProps extends Omit<
value: UniqueIdentifier;
}
-// These styles need to be here instead of .styled to avoid circular dependency
-const getBorderStyle = () => css`
- box-shadow: 0px 0px 2px 1px var(--mb-color-core-brand);
-`;
-export const RenameableTabButtonStyled = styled(_TabButton)<{
- isRenaming: boolean;
- isSelected: boolean;
- canRename: boolean;
-}>`
- ${TabButtonInputWrapper} {
- ${(props) => props.isRenaming && getBorderStyle()}
- :hover {
- ${(props) => props.canRename && props.isSelected && getBorderStyle()}
- }
- }
-`;
-
export function RenameableTabButton({
label: labelProp,
menuItems: originalMenuItems = [],
@@ -232,9 +236,6 @@ export function RenameableTabButton({
}: RenameableTabButtonProps) {
const tc = useTranslateContent();
- const { value: selectedValue } = useContext(TabContext);
- const isSelected = props.value === selectedValue;
-
// Only translate the label if it is not editable
const maybeTranslatedLabelProp = canRename ? labelProp : tc(labelProp);
@@ -282,9 +283,8 @@ export function RenameableTabButton({
}
return (
- <RenameableTabButtonStyled
+ <PlainTabButton
label={label}
- isSelected={isSelected}
isRenaming={canRename && isRenaming}
canRename={canRename}
onRename={(e) => setLabel(e.target.value)}
@@ -297,7 +297,6 @@ export function RenameableTabButton({
);
}
-export const TabButton = Object.assign(_TabButton, {
- Root: TabButtonRoot,
+export const TabButton = Object.assign(PlainTabButton, {
Renameable: RenameableTabButton,
});
diff --git a/frontend/src/metabase/common/components/TabButton/TabButtonMenu.tsx b/frontend/src/metabase/common/components/TabButton/TabButtonMenu.tsx
index 921cee7caf6..1cacdb99bda 100644
--- a/frontend/src/metabase/common/components/TabButton/TabButtonMenu.tsx
+++ b/frontend/src/metabase/common/components/TabButton/TabButtonMenu.tsx
@@ -1,12 +1,16 @@
import type { UniqueIdentifier } from "@dnd-kit/core";
+import cx from "classnames";
import type { MouseEvent } from "react";
import { useContext } from "react";
+import CS from "metabase/css/core/index.css";
+import { Box } from "metabase/ui";
+
import { TabContext } from "../Tab/TabContext";
import { getTabButtonInputId } from "../Tab/utils";
import type { TabButtonMenuAction, TabButtonMenuItem } from "./TabButton";
-import { MenuContent, MenuItem } from "./TabButton.styled";
+import S from "./TabButton.module.css";
interface TabButtonMenuProps {
menuItems: TabButtonMenuItem[];
@@ -28,21 +32,32 @@ export function TabButtonMenu({
};
return (
- <MenuContent
+ <Box
+ component="ul"
+ p="sm"
role="listbox"
aria-labelledby={getTabButtonInputId(context.idPrefix, value)}
tabIndex={0}
>
{menuItems.map(({ label, action }) => (
- <MenuItem
+ <Box
+ component="li"
+ className={cx(S.menuItem, CS.cursorPointer)}
key={label}
+ w="100%"
+ py="0.85em"
+ px="1.45em"
+ bdrs="0.5em"
+ fw={700}
+ ta="start"
+ td="none"
onClick={clickHandler(action)}
role="option"
tabIndex={0}
>
{label}
- </MenuItem>
+ </Box>
))}
- </MenuContent>
+ </Box>
);
}
diff --git a/frontend/src/metabase/common/style/focus-outline.ts b/frontend/src/metabase/common/style/focus-outline.ts
deleted file mode 100644
index 427f6d0a951..00000000000
--- a/frontend/src/metabase/common/style/focus-outline.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// eslint-disable-next-line eslint-js/no-restricted-imports
-import { css } from "@emotion/react";
-
-import { getFocusColor } from "metabase/ui/colors";
-
-/**
- * @deprecated styled components are deprecated
- */
-export const focusOutlineStyle = (color: string) => css`
- &:focus {
- outline: 2px solid ${getFocusColor(color)};
- }
-
- &:focus:not(:focus-visible) {
- outline: none;
- }
-`;