Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: shortcuts into tooltips (#1621)
Chase Baucomd0712e6887fd
diff --git a/frontend/src/lib/components/arcane-tooltip/arcane-tooltip-content.svelte b/frontend/src/lib/components/arcane-tooltip/arcane-tooltip-content.svelteindex cf34f0faf..17a10a6c0 100644--- a/frontend/src/lib/components/arcane-tooltip/arcane-tooltip-content.svelte+++ b/frontend/src/lib/components/arcane-tooltip/arcane-tooltip-content.svelte@@ -2,20 +2,22 @@import * as Tooltip from '$lib/components/ui/tooltip/index.js';import * as Popover from '$lib/components/ui/popover/index.js';import { getArcaneTooltipContext } from './context.svelte.js';- import { cn } from '$lib/utils.js';- import type { Snippet } from 'svelte';+ import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';+ import type { ComponentProps, Snippet } from 'svelte';++ export type ArcaneTooltipContentProps = WithoutChildrenOrChild<ComponentProps<typeof Tooltip.Content>>;let {+ ref = $bindable(null),children,- side = 'top',- align = 'center',class: className,+ sideOffset = 0,+ side = 'top',+ arrowClasses,+ portalProps,...restProps- }: {+ }: ArcaneTooltipContentProps & {children?: Snippet;- side?: 'top' | 'right' | 'bottom' | 'left';- align?: 'start' | 'center' | 'end';- class?: string;} = $props();const ctx = getArcaneTooltipContext();@@ -23,8 +25,9 @@{#if ctx.isTouch}<Popover.Content+ bind:ref+ {sideOffset}{side}- {align}class={cn('bg-popover/90 border-border/50 w-fit max-w-[min(calc(100vw-2rem),320px)] px-3 py-1.5 text-xs text-balance shadow-lg backdrop-blur-md',className@@ -34,7 +37,7 @@{@render children?.()}</Popover.Content>{:else}- <Tooltip.Content {side} {align} class={className} {...restProps}>+ <Tooltip.Content bind:ref {sideOffset} {side} class={className} {arrowClasses} {portalProps} {...restProps}>{@render children?.()}</Tooltip.Content>{/if}diff --git a/frontend/src/lib/components/arcane-tooltip/index.ts b/frontend/src/lib/components/arcane-tooltip/index.tsindex 4b0b520a1..a47880c55 100644--- a/frontend/src/lib/components/arcane-tooltip/index.ts+++ b/frontend/src/lib/components/arcane-tooltip/index.ts@@ -2,6 +2,8 @@ import Root from './arcane-tooltip.svelte';import Trigger from './arcane-tooltip-trigger.svelte';import Content from './arcane-tooltip-content.svelte';+export type { ArcaneTooltipContentProps } from './arcane-tooltip-content.svelte';+export {Root,Trigger,diff --git a/frontend/src/lib/components/sidebar/sidebar-collapsible-item.svelte b/frontend/src/lib/components/sidebar/sidebar-collapsible-item.sveltenew file mode 100644index 000000000..1367f053e--- /dev/null+++ b/frontend/src/lib/components/sidebar/sidebar-collapsible-item.svelte@@ -0,0 +1,60 @@+<script lang="ts">+ import type { Snippet } from 'svelte';+ import * as Collapsible from '$lib/components/ui/collapsible/index.js';+ import * as Sidebar from '$lib/components/ui/sidebar/index.js';+ import { ArrowRightIcon } from '$lib/icons';+ import SidebarItemTooltipContent from './sidebar-item-tooltip-content.svelte';+ import type { ShortcutKey } from '$lib/utils/keyboard-shortcut.utils';++ let {+ item,+ showTooltip,+ includeTitleInTooltip,+ getIsOpen,+ onOpenChange,+ content+ }: {+ item: {+ title: string;+ url: string;+ icon?: typeof ArrowRightIcon;+ shortcut?: ShortcutKey[];+ isActive: boolean;+ };+ showTooltip: boolean;+ includeTitleInTooltip: boolean;+ getIsOpen: (title: string, isActive: boolean) => boolean;+ onOpenChange: (open: boolean) => void;+ content?: Snippet;+ } = $props();+</script>++{#snippet tooltipContent()}+ <SidebarItemTooltipContent title={item.title} shortcut={item.shortcut} includeTitle={includeTitleInTooltip} />+{/snippet}++<Collapsible.Root open={getIsOpen(item.title, item.isActive)} {onOpenChange} class="group/collapsible">+ {#snippet child({ props })}+ <Sidebar.MenuItem {...props}>+ <Collapsible.Trigger>+ {#snippet child({ props })}+ {@const Icon = item.icon}+ <Sidebar.MenuButton tooltipContent={showTooltip ? tooltipContent : undefined} isActive={item.isActive}>+ {#snippet child({ props })}+ <a href={item.url} {...props}>+ {#if item.icon}+ <Icon />+ {/if}+ <span>{item.title}</span>+ <ArrowRightIcon class="ml-auto transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90" />+ </a>+ {/snippet}+ </Sidebar.MenuButton>+ {/snippet}+ </Collapsible.Trigger>+ {#if content}+ {@render content()}+ {/if}+ </Sidebar.MenuItem>+ {/snippet}+</Collapsible.Root>diff --git a/frontend/src/lib/components/sidebar/sidebar-item-tooltip-content.svelte b/frontend/src/lib/components/sidebar/sidebar-item-tooltip-content.sveltenew file mode 100644index 000000000..20d73eefb--- /dev/null+++ b/frontend/src/lib/components/sidebar/sidebar-item-tooltip-content.svelte@@ -0,0 +1,35 @@+<script lang="ts">+ import * as Kbd from '$lib/components/ui/kbd/index.js';+ import { formatShortcutKeys, type ShortcutKey } from '$lib/utils/keyboard-shortcut.utils';++ let {+ title,+ shortcut,+ includeTitle = true+ }: {+ title: string;+ shortcut?: ShortcutKey[];+ includeTitle?: boolean;+ } = $props();+</script>++<div class="flex flex-wrap items-center gap-2">+ {#if includeTitle}+ <span>{title}</span>+ {/if}+ {#if shortcut?.length}+ {@const displayKeys = formatShortcutKeys(shortcut)}+ <Kbd.Group class="text-muted-foreground inline-flex items-center gap-1">+ {#each displayKeys as key, index}+ <Kbd.Root+ class="text-popover-foreground! in-data-[slot=tooltip-content]:text-popover-foreground! dark:in-data-[slot=tooltip-content]:text-popover-foreground!"+ >+ {key}+ </Kbd.Root>+ {#if index < displayKeys.length - 1}+ <span class="text-muted-foreground/70 text-[10px]">+</span>+ {/if}+ {/each}+ </Kbd.Group>+ {/if}+</div>diff --git a/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelte b/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelteindex 7706d5d54..1eac211e1 100644--- a/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelte+++ b/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelte@@ -1,11 +1,12 @@<script lang="ts">import * as Collapsible from '$lib/components/ui/collapsible/index.js';- import * as Kbd from '$lib/components/ui/kbd/index.js';import * as Sidebar from '$lib/components/ui/sidebar/index.js';import { page } from '$app/state';import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';- import { formatShortcutKeys, type ShortcutKey } from '$lib/utils/keyboard-shortcut.utils';+ import type { ShortcutKey } from '$lib/utils/keyboard-shortcut.utils';import { ArrowRightIcon } from '$lib/icons';+ import SidebarCollapsibleItem from './sidebar-collapsible-item.svelte';+ import SidebarItemTooltipContent from './sidebar-item-tooltip-content.svelte';let {items,@@ -68,23 +69,10 @@}return openStates[itemTitle];}-</script>-{#snippet Shortcut({ keys }: { keys?: ShortcutKey[] })}- {@const displayKeys = keys ? formatShortcutKeys(keys) : []}- {#if displayKeys.length}- <Kbd.Group- class="text-muted-foreground ml-auto items-center gap-1 group-data-[collapsible=icon]:hidden group-data-[collapsible=icon]:group-data-[hovered=true]:inline-flex"- >- {#each displayKeys as key, index}- <Kbd.Root>{key}</Kbd.Root>- {#if index < displayKeys.length - 1}- <span class="text-muted-foreground/70 text-[10px]">+</span>- {/if}- {/each}- </Kbd.Group>- {/if}-{/snippet}+ const collapsed = $derived(sidebar.state === 'collapsed');+ const includeTitleInTooltip = $derived(collapsed && !(sidebar.hoverExpansionEnabled && sidebar.isHovered));+</script><Sidebar.Group><Sidebar.GroupLabel>{label}</Sidebar.GroupLabel>@@ -93,8 +81,11 @@{#if (item.items?.length ?? 0) > 0}{#if sidebar.state === 'collapsed' && !sidebar.hoverExpansionEnabled}<!-- In collapsed mode without hover expansion, show parent and children as separate icon buttons -->+ {#snippet tooltipContent()}+ <SidebarItemTooltipContent title={item.title} shortcut={item.shortcut} includeTitle={true} />+ {/snippet}<Sidebar.MenuItem>- <Sidebar.MenuButton isActive={item.isActive} tooltipContent={sidebar.hoverExpansionEnabled ? undefined : item.title}>+ <Sidebar.MenuButton isActive={item.isActive} {tooltipContent}>{#snippet child({ props })}{@const Icon = item.icon}<a href={item.url} {...props}>@@ -102,7 +93,6 @@<Icon />{/if}<span>{item.title}</span>- {@render Shortcut({ keys: item.shortcut })}</a>{/snippet}</Sidebar.MenuButton>@@ -112,11 +102,11 @@<Sidebar.Separator class="my-0 w-6" /></div>{#each item.items ?? [] as subItem (subItem.title)}+ {#snippet subItemTooltipContent()}+ <SidebarItemTooltipContent title={subItem.title} shortcut={subItem.shortcut} includeTitle={true} />+ {/snippet}<Sidebar.MenuItem>- <Sidebar.MenuButton- isActive={subItem.isActive}- tooltipContent={sidebar.hoverExpansionEnabled ? undefined : subItem.title}- >+ <Sidebar.MenuButton isActive={subItem.isActive} tooltipContent={subItemTooltipContent}>{#snippet child({ props })}{@const SubIcon = subItem.icon}<a href={subItem.url} {...props}>@@ -124,77 +114,59 @@<SubIcon />{/if}<span>{subItem.title}</span>- {@render Shortcut({ keys: subItem.shortcut })}</a>{/snippet}</Sidebar.MenuButton></Sidebar.MenuItem>{/each}{:else}- <Collapsible.Root- open={getIsOpen(item.title, item.isActive)}+ {#snippet collapsibleSubMenu()}+ <Collapsible.Content>+ <Sidebar.MenuSub+ class={sidebar.state === 'collapsed' && (!sidebar.isHovered || !sidebar.hoverExpansionEnabled)+ ? 'hidden'+ : undefined}+ >+ {#each item.items ?? [] as subItem (subItem.title)}+ <Sidebar.MenuSubItem>+ <Sidebar.MenuSubButton isActive={subItem.isActive}>+ {#snippet child({ props })}+ {@const SubIcon = subItem.icon}+ <a href={subItem.url} {...props}>+ {#if subItem.icon}+ <SubIcon />+ {/if}+ <span>{subItem.title}</span>+ </a>+ {/snippet}+ </Sidebar.MenuSubButton>+ </Sidebar.MenuSubItem>+ {/each}+ </Sidebar.MenuSub>+ </Collapsible.Content>+ {/snippet}+ <SidebarCollapsibleItem+ {item}+ showTooltip={collapsed || !!item.shortcut?.length}+ {includeTitleInTooltip}+ {getIsOpen}onOpenChange={(open) => {if (!sidebar.hoverExpansionEnabled) {openStates[item.title] = open;}}}- class="group/collapsible"- >- {#snippet child({ props })}- <Sidebar.MenuItem {...props}>- <Collapsible.Trigger>- {#snippet child({ props })}- {@const Icon = item.icon}- <Sidebar.MenuButton- tooltipContent={sidebar.hoverExpansionEnabled ? undefined : item.title}- isActive={item.isActive}- >- {#snippet child({ props })}- <a href={item.url} {...props}>- {#if item.icon}- <Icon />- {/if}- <span>{item.title}</span>- {@render Shortcut({ keys: item.shortcut })}- <ArrowRightIcon- class="ml-auto transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90"- />- </a>- {/snippet}- </Sidebar.MenuButton>- {/snippet}- </Collapsible.Trigger>- <Collapsible.Content>- <Sidebar.MenuSub- class={sidebar.state === 'collapsed' && (!sidebar.isHovered || !sidebar.hoverExpansionEnabled)- ? 'hidden'- : undefined}- >- {#each item.items ?? [] as subItem (subItem.title)}- <Sidebar.MenuSubItem>- <Sidebar.MenuSubButton isActive={subItem.isActive}>- {#snippet child({ props })}- {@const SubIcon = subItem.icon}- <a href={subItem.url} {...props}>- {#if subItem.icon}- <SubIcon />- {/if}- <span>{subItem.title}</span>- {@render Shortcut({ keys: subItem.shortcut })}- </a>- {/snippet}- </Sidebar.MenuSubButton>- </Sidebar.MenuSubItem>- {/each}- </Sidebar.MenuSub>- </Collapsible.Content>- </Sidebar.MenuItem>- {/snippet}- </Collapsible.Root>+ content={collapsibleSubMenu}+ />{/if}{:else}+ {#snippet simpleItemTooltipContent()}+ <SidebarItemTooltipContent title={item.title} shortcut={item.shortcut} includeTitle={includeTitleInTooltip} />+ {/snippet}<Sidebar.MenuItem>- <Sidebar.MenuButton isActive={item.isActive} tooltipContent={sidebar.hoverExpansionEnabled ? undefined : item.title}>+ <Sidebar.MenuButton+ isActive={item.isActive}+ tooltipContent={collapsed || !!item.shortcut?.length ? simpleItemTooltipContent : undefined}+ >{#snippet child({ props })}{@const Icon = item.icon}<a href={item.url} {...props}>@@ -202,7 +174,6 @@<Icon />{/if}<span>{item.title}</span>- {@render Shortcut({ keys: item.shortcut })}</a>{/snippet}</Sidebar.MenuButton>diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-menu-button.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-menu-button.svelteindex 77c2e30be..1a079e728 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-menu-button.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-menu-button.svelte@@ -26,7 +26,7 @@</script><script lang="ts">- import * as Tooltip from '$lib/components/ui/tooltip/index.js';+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';import { cn, type WithElementRef, type WithoutChildrenOrChild } from '$lib/utils.js';import { mergeProps } from 'bits-ui';import type { ComponentProps, Snippet } from 'svelte';@@ -49,7 +49,7 @@variant?: SidebarMenuButtonVariant;size?: SidebarMenuButtonSize;tooltipContent?: Snippet | string;- tooltipContentProps?: WithoutChildrenOrChild<ComponentProps<typeof Tooltip.Content>>;+ tooltipContentProps?: WithoutChildrenOrChild<ComponentProps<typeof ArcaneTooltip.Content>>;child?: Snippet<[{ props: Record<string, unknown> }]>;} = $props();@@ -94,23 +94,19 @@{#if !tooltipContent}{@render Button({})}-{:else if sidebar.state === 'collapsed' && !(sidebar.hoverExpansionEnabled && sidebar.isHovered)}- <!-- Render tooltip only when collapsed and not in hover expansion mode -->- <Tooltip.Root>- <Tooltip.Trigger>+{:else}+ <ArcaneTooltip.Root>+ <ArcaneTooltip.Trigger>{#snippet child({ props })}{@render Button({ props })}{/snippet}- </Tooltip.Trigger>- <Tooltip.Content side="right" align="center" class="z-50" {...tooltipContentProps}>+ </ArcaneTooltip.Trigger>+ <ArcaneTooltip.Content side="right" align="center" class="z-50" {...tooltipContentProps}>{#if typeof tooltipContent === 'string'}{tooltipContent}{:else if tooltipContent}{@render tooltipContent()}{/if}- </Tooltip.Content>- </Tooltip.Root>-{:else}- <!-- Either expanded (hover expansion active) or not collapsed: no tooltip to avoid empty popover -->- {@render Button({})}+ </ArcaneTooltip.Content>+ </ArcaneTooltip.Root>{/if}diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-menu-item.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-menu-item.svelteindex acd286066..327d3df43 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-menu-item.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-menu-item.svelte@@ -14,7 +14,7 @@bind:this={ref}data-slot="sidebar-menu-item"data-sidebar="menu-item"- class={cn('group/menu-item relative', className)}+ class={cn('group/menu-item relative flex min-w-0 *:min-w-0 *:flex-1', className)}{...restProps}>{@render children?.()}diff --git a/frontend/src/routes/(app)/settings/+layout.svelte b/frontend/src/routes/(app)/settings/+layout.svelteindex 86dda7179..6b2b9c37c 100644--- a/frontend/src/routes/(app)/settings/+layout.svelte+++ b/frontend/src/routes/(app)/settings/+layout.svelte@@ -2,19 +2,19 @@import { page } from '$app/state';import { goto, beforeNavigate } from '$app/navigation';import { setContext } from 'svelte';+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';import { ArcaneButton } from '$lib/components/arcane-button/index.js';import { SettingsIcon, ArrowRightIcon, ArrowLeftIcon } from '$lib/icons';import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';- import * as Kbd from '$lib/components/ui/kbd/index.js';import { m } from '$lib/paraglide/messages';import settingsStore from '$lib/stores/config-store';import { IsMobile } from '$lib/hooks/is-mobile.svelte.js';import { IsTablet } from '$lib/hooks/is-tablet.svelte.js';import { getEffectiveNavigationSettings } from '$lib/utils/navigation.utils';- import { formatShortcutKeys, type ShortcutKey } from '$lib/utils/keyboard-shortcut.utils';import { cn } from '$lib/utils';import { navigationItems } from '$lib/config/navigation-config';import MobileFloatingFormActions from '$lib/components/form/mobile-floating-form-actions.svelte';+ import SidebarItemTooltipContent from '$lib/components/sidebar/sidebar-item-tooltip-content.svelte';interface Props {children: import('svelte').Snippet;@@ -31,7 +31,6 @@const isTablet = new IsTablet();const isReadOnly = $derived.by(() => $settingsStore.uiConfigDisabled);const navigationSettings = $derived(getEffectiveNavigationSettings());- const navigationMode = $derived(navigationSettings.mode);const scrollToHideEnabled = $derived(navigationSettings.scrollToHide);const navItems = $derived.by(() => {@@ -182,40 +181,39 @@}</script>-{#snippet Shortcut({ keys }: { keys?: ShortcutKey[] })}- {@const displayKeys = keys ? formatShortcutKeys(keys) : []}- {#if displayKeys.length}- <Kbd.Group class="text-muted-foreground ml-auto items-center gap-1">- {#each displayKeys as key, index}- <Kbd.Root>{key}</Kbd.Root>- {#if index < displayKeys.length - 1}- <span class="text-muted-foreground/70 text-[10px]">+</span>- {/if}- {/each}- </Kbd.Group>- {/if}-{/snippet}-<div class="flex h-full min-h-full flex-col md:flex-row"><!-- Desktop Sidebar --><aside class={cn('relative hidden w-64 shrink-0 self-stretch md:block md:h-full md:min-h-full', 'backdrop-blur-sm')}><div aria-hidden="true" class="bg-border/60 pointer-events-none absolute top-4 right-0 bottom-4 w-px"></div><div class="sticky top-0 px-3 py-4"><h2 class="mb-4 px-4 text-lg font-semibold tracking-tight">{m.settings_title()}</h2>- <nav class="space-y-1">+ <nav class="flex min-w-0 flex-col gap-1">{#each navItems as item (item.href)}{@const isActive = currentPath.startsWith(item.href)}- <a- href={item.href}- class={cn(- 'flex items-center gap-3 rounded-md px-3 py-2 text-sm font-medium transition-colors',- isActive ? 'bg-primary/10 text-primary' : 'text-muted-foreground hover:bg-muted hover:text-foreground'- )}- >- <item.icon class="size-4" />- {item.label}- {@render Shortcut({ keys: item.shortcut })}- </a>+ {@const linkClass = cn(+ 'flex w-full min-w-0 items-center gap-3 rounded-md px-3 py-2 text-sm font-medium transition-colors',+ isActive ? 'bg-primary/10 text-primary' : 'text-muted-foreground hover:bg-muted hover:text-foreground'+ )}+ <div class="w-full min-w-0">+ {#if item.shortcut?.length}+ <ArcaneTooltip.Root>+ <ArcaneTooltip.Trigger class="w-full">+ <a href={item.href} class={linkClass}>+ <item.icon class="size-4 shrink-0" />+ <span class="truncate">{item.label}</span>+ </a>+ </ArcaneTooltip.Trigger>+ <ArcaneTooltip.Content side="right" align="start">+ <SidebarItemTooltipContent title={item.label} shortcut={item.shortcut} includeTitle={false} />+ </ArcaneTooltip.Content>+ </ArcaneTooltip.Root>+ {:else}+ <a href={item.href} class={linkClass}>+ <item.icon class="size-4 shrink-0" />+ <span class="truncate">{item.label}</span>+ </a>+ {/if}+ </div>{/each}</nav></div>diff --git a/tests/spec/containers.spec.ts b/tests/spec/containers.spec.tsindex 6d045d955..1078c56df 100644--- a/tests/spec/containers.spec.ts+++ b/tests/spec/containers.spec.ts@@ -40,7 +40,7 @@ test.describe('Containers Page', () => {await expect(page.locator('table')).toBeVisible();await expect(page.getByRole('button', { name: 'Name' })).toBeVisible();await expect(page.getByRole('button', { name: 'ID' })).toBeVisible();- await expect(page.getByRole('button', { name: 'Image' })).toBeVisible();+ await expect(page.getByRole('button', { name: 'Image', exact: true })).toBeVisible();await expect(page.getByRole('button', { name: 'State' })).toBeVisible();await expect(page.getByRole('button', { name: 'Created' })).toBeVisible();});