Skip to content

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

Fix data studio missing some hover states (#67891)

Anderson85fe26063c9b
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css
index 5aa58db671e..b50298869d5 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css
@@ -8,10 +8,10 @@
}
.logo {
- width: 32px;
- height: 32px;
- margin: 0 -8px;
display: block;
+ height: 2rem;
+ transition: opacity 400ms ease;
+ width: 2rem;
}
.icon {
@@ -31,8 +31,9 @@
.tab,
.toggle {
- position: relative;
color: var(--mb-color-text-primary);
+ position: relative;
+ transition: opacity 400ms ease;
&:hover,
&.selected {
@@ -44,34 +45,28 @@
}
}
-.hoverButton {
- &:hover {
- .showOnHover {
- opacity: 1;
- }
+.logoWrapper {
+ position: relative;
- .hideOnHover {
- opacity: 0;
- }
+ .toggle {
+ left: 50%;
+ opacity: 0;
+ position: absolute;
+ top: 50%;
+ transform: translate(-50%, -50%);
}
-}
-.showOnHover {
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- opacity: 0;
- transition: opacity 400ms ease;
-}
-
-.hideOnHover {
- opacity: 1;
- transition: opacity 400ms ease;
-}
+ &.navbarClosed {
+ &:hover {
+ .toggle {
+ opacity: 1;
+ }
-.disablePointer {
- cursor: default;
+ .logo {
+ opacity: 0;
+ }
+ }
+ }
}
.badgeOverlay {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
index 0a4f8226d6d..ff6ec909921 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
@@ -17,6 +17,7 @@ import {
} from "metabase/plugins";
import { getLocation } from "metabase/selectors/routing";
import {
+ ActionIcon,
Box,
Center,
FixedSizeIcon,
@@ -27,7 +28,6 @@ import {
Stack,
Text,
Tooltip,
- UnstyledButton,
} from "metabase/ui";
import S from "./DataStudioLayout.module.css";
@@ -268,54 +268,58 @@ function DataStudioNavbarToggle({
onNavbarToggle,
}: DataStudioNavbarToggleProps) {
return (
- <Flex justify="space-between" mb={2}>
+ <Flex
+ align="center"
+ justify="space-between"
+ mb="0.75rem"
+ mt="sm"
+ mr="0.125rem"
+ >
<Group gap="sm">
- <Tooltip
- label={getSidebarTooltipLabel(isNavbarOpened)}
- withArrow
- offset={-12}
- openDelay={1000}
+ <Box
+ className={cx(S.logoWrapper, { [S.navbarClosed]: !isNavbarOpened })}
>
- <UnstyledButton
- className={cx(S.toggle, {
- [S.hoverButton]: !isNavbarOpened,
- [S.disablePointer]: isNavbarOpened,
- })}
- p="0.5rem"
- bdrs="md"
- onClick={() => !isNavbarOpened && onNavbarToggle(true)}
- >
- <img
- alt="Data Studio Logo"
- className={cx(S.hideOnHover, S.logo)}
- src={DataStudioLogo}
- />
- <FixedSizeIcon
- name="sidebar_open"
- className={S.showOnHover}
- c="text-secondary"
+ <img
+ alt={t`Data Studio Logo`}
+ className={S.logo}
+ src={DataStudioLogo}
+ />
+ {!isNavbarOpened && (
+ <ToggleActionIcon
+ isNavbarOpened={isNavbarOpened}
+ onNavbarToggle={onNavbarToggle}
/>
- </UnstyledButton>
- </Tooltip>
+ )}
+ </Box>
{isNavbarOpened && <PLUGIN_REMOTE_SYNC.GitSyncAppBarControls />}
</Group>
{isNavbarOpened && (
- <Tooltip
- label={getSidebarTooltipLabel(isNavbarOpened)}
- withArrow
- offset={-12}
- openDelay={1000}
- >
- <UnstyledButton
- className={S.toggle}
- p="0.5rem"
- bdrs="md"
- onClick={() => onNavbarToggle(false)}
- >
- <FixedSizeIcon name="sidebar_closed" c="text-secondary" />
- </UnstyledButton>
- </Tooltip>
+ <ToggleActionIcon isNavbarOpened onNavbarToggle={onNavbarToggle} />
)}
</Flex>
);
}
+
+type ToggleActionIconProps = DataStudioNavbarToggleProps & {
+ className?: string;
+};
+
+function ToggleActionIcon(props: ToggleActionIconProps) {
+ const { isNavbarOpened, onNavbarToggle } = props;
+ const label = getSidebarTooltipLabel(isNavbarOpened);
+
+ return (
+ <Tooltip label={label} openDelay={1000}>
+ <ActionIcon
+ aria-label={label}
+ className={S.toggle}
+ onClick={() => onNavbarToggle(!isNavbarOpened)}
+ >
+ <FixedSizeIcon
+ name={isNavbarOpened ? "sidebar_closed" : "sidebar_open"}
+ c="text-secondary"
+ />
+ </ActionIcon>
+ </Tooltip>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx
index d38b1aac255..d5912c5e54c 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx
@@ -7,23 +7,19 @@ import { useListCollectionsTreeQuery } from "metabase/api";
import { isLibraryCollection } from "metabase/collections/utils";
import DateTime from "metabase/common/components/DateTime";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
import { useRouter } from "metabase/router";
-import { getUserIsAdmin } from "metabase/selectors/user";
-import type { TreeTableColumnDef } from "metabase/ui";
import {
- Button,
Card,
EntityNameCell,
- FixedSizeIcon,
Flex,
Icon,
- Menu,
Stack,
TextInput,
TreeTable,
+ type TreeTableColumnDef,
TreeTableSkeleton,
useTreeTableInstance,
} from "metabase/ui";
@@ -37,6 +33,7 @@ import type { Collection, CollectionId } from "metabase-types/api";
import { SectionLayout } from "../../components/SectionLayout";
import { CreateMenu } from "./CreateMenu";
+import { RootSnippetsCollectionMenu } from "./RootSnippetsCollectionMenu";
import {
useBuildSnippetTree,
useBuildTreeForCollection,
@@ -63,11 +60,9 @@ export function LibrarySectionLayout() {
}
const ids = Array.isArray(rawIds) ? rawIds : [rawIds];
- const expanded = _.object(
+ return _.object(
ids.map((id) => [`collection:${id}`, true]),
) as ExpandedState;
-
- return expanded;
}, [location.query?.expandedId]);
const { data: collections = [], isLoading: isLoadingCollections } =
@@ -288,43 +283,3 @@ export function LibrarySectionLayout() {
</>
);
}
-
-const RootSnippetsCollectionMenu = ({
- setPermissionsCollectionId,
-}: {
- setPermissionsCollectionId: (id: CollectionId) => void;
-}) => {
- const isAdmin = useSelector(getUserIsAdmin);
-
- if (!isAdmin) {
- return null;
- }
-
- return (
- <Menu position="bottom-end">
- <Menu.Target>
- <Button
- w={24}
- h={24}
- c="text-secondary"
- size="compact-xs"
- variant="subtle"
- leftSection={<FixedSizeIcon name="ellipsis" size={16} />}
- aria-label={t`Snippet collection options`}
- onClick={(e) => e.stopPropagation()}
- />
- </Menu.Target>
- <Menu.Dropdown>
- <Menu.Item
- leftSection={<FixedSizeIcon name="lock" />}
- onClick={(e) => {
- e.stopPropagation();
- setPermissionsCollectionId("root");
- }}
- >
- {t`Change permissions`}
- </Menu.Item>
- </Menu.Dropdown>
- </Menu>
- );
-};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx
new file mode 100644
index 00000000000..99b9942bd14
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/RootSnippetsCollectionMenu.tsx
@@ -0,0 +1,47 @@
+import { t } from "ttag";
+
+import { useSelector } from "metabase/lib/redux";
+import { getUserIsAdmin } from "metabase/selectors/user";
+import { ActionIcon, FixedSizeIcon, Menu, Tooltip } from "metabase/ui";
+import type { CollectionId } from "metabase-types/api";
+
+export const RootSnippetsCollectionMenu = ({
+ setPermissionsCollectionId,
+}: {
+ setPermissionsCollectionId: (id: CollectionId) => void;
+}) => {
+ const isAdmin = useSelector(getUserIsAdmin);
+
+ if (!isAdmin) {
+ return null;
+ }
+
+ const optionsLabel = t`Snippet collection options`;
+
+ return (
+ <Menu position="bottom-end">
+ <Menu.Target>
+ <Tooltip
+ label={optionsLabel}
+ onClick={(e) => e.stopPropagation()}
+ openDelay={1000}
+ >
+ <ActionIcon aria-label={optionsLabel} size="md">
+ <FixedSizeIcon name="ellipsis" size={16} />
+ </ActionIcon>
+ </Tooltip>
+ </Menu.Target>
+ <Menu.Dropdown>
+ <Menu.Item
+ leftSection={<FixedSizeIcon name="lock" />}
+ onClick={(e) => {
+ e.stopPropagation();
+ setPermissionsCollectionId("root");
+ }}
+ >
+ {t`Change permissions`}
+ </Menu.Item>
+ </Menu.Dropdown>
+ </Menu>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.module.css
new file mode 100644
index 00000000000..faab8d14e62
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.module.css
@@ -0,0 +1,5 @@
+.breadcrumbs {
+ a:hover {
+ color: var(--mb-color-brand);
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx
index 068cd562bef..6aa2d2a1fa4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs.tsx
@@ -1,5 +1,7 @@
import { Breadcrumbs, type BreadcrumbsProps, Icon } from "metabase/ui";
+import S from "./DataStudioBreadcrumbs.module.css";
+
interface DataStudioBreadcrumbs extends BreadcrumbsProps {
loading?: boolean;
}
@@ -9,6 +11,7 @@ export const DataStudioBreadcrumbs = ({
...rest
}: DataStudioBreadcrumbs) => (
<Breadcrumbs
+ className={S.breadcrumbs}
separator={<Icon size={12} name="chevronright" />}
fz="sm"
c="text-secondary"
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx
index 2b55542524b..89eebb7b558 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx
@@ -6,7 +6,14 @@ import { useDispatch, useSelector } from "metabase/lib/redux";
import type { SnippetCollectionMenuProps } from "metabase/plugins";
import { addUndo } from "metabase/redux/undo";
import { getUserIsAdmin } from "metabase/selectors/user";
-import { Box, Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";
+import {
+ ActionIcon,
+ Box,
+ FixedSizeIcon,
+ Icon,
+ Menu,
+ Tooltip,
+} from "metabase/ui";
export function SnippetCollectionMenu({
collection,
@@ -51,20 +58,21 @@ export function SnippetCollectionMenu({
}
};
+ const optionsLabel = t`Snippet folder options`;
+
return (
<Box onClick={(e) => e.stopPropagation()}>
<Menu position="bottom-end">
<Menu.Target>
- <Button
- w={24}
- h={24}
- c="text-secondary"
- size="compact-xs"
- variant="subtle"
- leftSection={<FixedSizeIcon name="ellipsis" size={16} />}
- aria-label={t`Snippet collection options`}
+ <Tooltip
+ label={optionsLabel}
onClick={(e) => e.stopPropagation()}
- />
+ openDelay={1000}
+ >
+ <ActionIcon aria-label={optionsLabel} size="md">
+ <FixedSizeIcon name="ellipsis" size={16} />
+ </ActionIcon>
+ </Tooltip>
</Menu.Target>
<Menu.Dropdown>
{isArchived ? (
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.module.css
index 32bc97218d5..8c440d24ce2 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.module.css
@@ -1,4 +1,10 @@
.fieldset {
- cursor: pointer;
border-radius: var(--default-border-radius);
+ border: 2px solid var(--mb-color-border);
+ cursor: pointer;
+ transition: border 0.2s ease-in-out;
+
+ &:hover {
+ border-color: var(--mb-color-brand);
+ }
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsx
index 556e9dbaccc..9afbaa3a3f3 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsx
@@ -47,7 +47,6 @@ export const FilterFieldSet = forwardRef(function FilterWidget(
pl="md"
pr="xs"
py="xs"
- bd="2px solid border"
bg="background-primary"
aria-label={label}
>
diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx
index e3072ac4db4..999168f0d73 100644
--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx
@@ -40,6 +40,7 @@ export const SearchInputContainer = styled.div<{
}
return css`
background-color: var(--mb-color-background-primary);
+
&:hover {
background-color: var(--mb-color-background-secondary);
}
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 92f67edff6a..788b81fbf9d 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
@@ -1,3 +1,4 @@
+import { ActionIcon } from "@mantine/core";
import cx from "classnames";
import { memo } from "react";
import { t } from "ttag";
@@ -35,23 +36,19 @@ export const ExpandButton = memo(function ExpandButton({
}
return (
- <Center
- component="button"
- type="button"
- w={16}
- h={16}
- p={0}
+ <ActionIcon
+ aria-expanded={isExpanded}
+ aria-label={isExpanded ? t`Collapse` : t`Expand`}
className={cx(S.wrapper, S.button, className)}
onClick={onClick}
- aria-label={isExpanded ? t`Collapse` : t`Expand`}
- aria-expanded={isExpanded}
+ size="1rem"
tabIndex={-1}
>
<Icon
+ className={cx(S.icon, { [S.iconExpanded]: isExpanded })}
name="chevronright"
size={10}
- className={cx(S.icon, { [S.iconExpanded]: isExpanded })}
/>
- </Center>
+ </ActionIcon>
);
});