Skip to content

Modern Docker Management, Designed for Everyone

feat: unified tooltip/popover component (#1125)

Chase Baucome01693bec2cc
diff --git a/backend/frontend/frontend.go b/backend/frontend/frontend.go
index f76d02901..ccd029378 100644
--- a/backend/frontend/frontend.go
+++ b/backend/frontend/frontend.go
@@ -14,7 +14,7 @@ import (
"github.com/gin-gonic/gin"
)
-//go:embed all:dist/*
+//go:embed all:dist
var frontendFS embed.FS
const indexHtmlFileConstant = "index.html"
diff --git a/frontend/knip.json b/frontend/knip.json
index 98ed7cef3..488a21693 100644
--- a/frontend/knip.json
+++ b/frontend/knip.json
@@ -11,7 +11,7 @@
"src/lib/components/**/index.ts"
],
"project": ["src/**/*.{svelte,ts,js}"],
- "ignore": ["src/lib/paraglide/server.js"],
+ "ignore": ["src/lib/paraglide/server.js", "src/lib/paraglide/runtime.js", "src/lib/paraglide/registry.js"],
"ignoreDependencies": ["paneforge", "svelte-toolbelt", "isomorphic-dompurify", "tw-animate-css"],
"ignoreExportsUsedInFile": {
"interface": true,
diff --git a/frontend/src/lib/components/arcane-button/variants.ts b/frontend/src/lib/components/arcane-button/variants.ts
index 4485f7e56..0c8113c8c 100644
--- a/frontend/src/lib/components/arcane-button/variants.ts
+++ b/frontend/src/lib/components/arcane-button/variants.ts
@@ -23,7 +23,7 @@ import {
export const arcaneButtonVariants = tv({
base:
'inline-flex items-center justify-center gap-2 rounded-lg text-sm font-medium whitespace-nowrap select-none ' +
- 'transition-[transform,box-shadow,background-color,border-color,color] duration-150 will-change-transform hover:-translate-y-0.5 active:translate-y-0 ' +
+ 'transition-[transform,box-shadow,background-color,border-color,color] duration-150 will-change-transform ' +
'border disabled:pointer-events-none disabled:opacity-50 ' +
'focus-visible:outline-none focus-visible:ring-0 ring-0 ring-offset-0 ' +
"[&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
@@ -44,16 +44,22 @@ export const arcaneButtonVariants = tv({
sm: 'h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5',
lg: 'h-10 rounded-md px-5 has-[>svg]:px-4',
icon: 'size-9'
+ },
+ hoverEffect: {
+ none: '',
+ lift: 'hover:-translate-y-0.5 active:translate-y-0'
}
},
defaultVariants: {
tone: 'outline-primary',
- size: 'default'
+ size: 'default',
+ hoverEffect: 'lift'
}
});
export type ArcaneButtonTone = VariantProps<typeof arcaneButtonVariants>['tone'];
export type ArcaneButtonSize = VariantProps<typeof arcaneButtonVariants>['size'];
+export type ArcaneButtonHoverEffect = VariantProps<typeof arcaneButtonVariants>['hoverEffect'];
export type Action =
| 'start'
diff --git a/frontend/src/lib/components/arcane-tooltip/arcane-tooltip-content.svelte b/frontend/src/lib/components/arcane-tooltip/arcane-tooltip-content.svelte
new file mode 100644
index 000000000..11e415be4
--- /dev/null
+++ b/frontend/src/lib/components/arcane-tooltip/arcane-tooltip-content.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+ 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 type { Snippet } from 'svelte';
+
+ let {
+ children,
+ side = 'top',
+ align = 'center',
+ class: className,
+ ...restProps
+ }: {
+ children?: Snippet;
+ side?: 'top' | 'right' | 'bottom' | 'left';
+ align?: 'start' | 'center' | 'end';
+ class?: string;
+ } = $props();
+
+ const ctx = getArcaneTooltipContext();
+</script>
+
+{#if ctx.isTouch}
+ <Popover.Content {side} {align} class={className} {...restProps}>
+ {@render children?.()}
+ </Popover.Content>
+{:else}
+ <Tooltip.Content {side} {align} class={className} {...restProps}>
+ {@render children?.()}
+ </Tooltip.Content>
+{/if}
diff --git a/frontend/src/lib/components/arcane-tooltip/arcane-tooltip-trigger.svelte b/frontend/src/lib/components/arcane-tooltip/arcane-tooltip-trigger.svelte
new file mode 100644
index 000000000..439a7608a
--- /dev/null
+++ b/frontend/src/lib/components/arcane-tooltip/arcane-tooltip-trigger.svelte
@@ -0,0 +1,117 @@
+<script lang="ts">
+ 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 { Tooltip as TooltipPrimitive } from 'bits-ui';
+
+ type ChildProps = { props: Record<string, unknown> };
+
+ let { children, child, class: className }: TooltipPrimitive.TriggerProps = $props();
+
+ const ctx = getArcaneTooltipContext();
+
+ // Long press logic for interactive touch
+ let longPressTimer: ReturnType<typeof setTimeout> | null = null;
+ let isLongPressing = $state(false);
+
+ function handleTouchStart() {
+ if (!ctx.isTouch || !ctx.interactive) return;
+ if (ctx.open) return;
+
+ isLongPressing = false;
+ longPressTimer = setTimeout(() => {
+ isLongPressing = true;
+ ctx.setOpen(true);
+ }, 500);
+ }
+
+ function handleTouchEnd(event: TouchEvent) {
+ if (!ctx.isTouch || !ctx.interactive) return;
+
+ if (longPressTimer) {
+ clearTimeout(longPressTimer);
+ longPressTimer = null;
+ }
+
+ if (ctx.open && !isLongPressing) {
+ ctx.setOpen(false);
+ event.preventDefault();
+ event.stopPropagation();
+ return;
+ }
+
+ if (isLongPressing) {
+ event.preventDefault();
+ event.stopPropagation();
+ isLongPressing = false;
+ }
+ }
+
+ function handleTouchCancel() {
+ if (longPressTimer) {
+ clearTimeout(longPressTimer);
+ longPressTimer = null;
+ }
+ isLongPressing = false;
+ }
+
+ function handleTouchMove() {
+ if (longPressTimer) {
+ clearTimeout(longPressTimer);
+ longPressTimer = null;
+ }
+ }
+
+ function handleClick(event: MouseEvent) {
+ if (ctx.open && ctx.interactive && ctx.isTouch) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ }
+</script>
+
+{#if ctx.isTouch}
+ {#if ctx.interactive}
+ <Popover.Trigger>
+ {#snippet child({ props }: ChildProps)}
+ <span
+ {...props}
+ class={className}
+ ontouchstart={handleTouchStart}
+ ontouchend={handleTouchEnd}
+ ontouchcancel={handleTouchCancel}
+ ontouchmove={handleTouchMove}
+ onclick={handleClick}
+ role="button"
+ tabindex="0"
+ >
+ {#if child}
+ {@render child({ props: {} })}
+ {:else}
+ {@render children?.()}
+ {/if}
+ </span>
+ {/snippet}
+ </Popover.Trigger>
+ {:else}
+ <Popover.Trigger class={className}>
+ {#if child}
+ {#snippet child({ props }: ChildProps)}
+ {@render child({ props })}
+ {/snippet}
+ {:else}
+ {@render children?.()}
+ {/if}
+ </Popover.Trigger>
+ {/if}
+{:else}
+ <Tooltip.Trigger class={className}>
+ {#if child}
+ {#snippet child({ props }: ChildProps)}
+ {@render child({ props })}
+ {/snippet}
+ {:else}
+ {@render children?.()}
+ {/if}
+ </Tooltip.Trigger>
+{/if}
diff --git a/frontend/src/lib/components/arcane-tooltip/arcane-tooltip.svelte b/frontend/src/lib/components/arcane-tooltip/arcane-tooltip.svelte
new file mode 100644
index 000000000..594e1b1e7
--- /dev/null
+++ b/frontend/src/lib/components/arcane-tooltip/arcane-tooltip.svelte
@@ -0,0 +1,49 @@
+<script lang="ts">
+ import { IsTouchDevice } from '$lib/hooks/is-touch-device.svelte.js';
+ import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+ import * as Popover from '$lib/components/ui/popover/index.js';
+ import { setArcaneTooltipContext } from './context.svelte.js';
+ import type { Snippet } from 'svelte';
+
+ let {
+ open = $bindable(false),
+ delayDuration = 500,
+ interactive = false,
+ children
+ }: {
+ open?: boolean;
+ delayDuration?: number;
+ interactive?: boolean;
+ children?: Snippet;
+ } = $props();
+
+ const isTouchDevice = new IsTouchDevice();
+ let isTouch = $derived(isTouchDevice.current);
+
+ setArcaneTooltipContext({
+ get isTouch() {
+ return isTouch;
+ },
+ get interactive() {
+ return interactive;
+ },
+ get open() {
+ return open;
+ },
+ setOpen: (v) => {
+ open = v;
+ }
+ });
+</script>
+
+{#if isTouch}
+ <Popover.Root bind:open>
+ {@render children?.()}
+ </Popover.Root>
+{:else}
+ <Tooltip.Provider {delayDuration}>
+ <Tooltip.Root bind:open>
+ {@render children?.()}
+ </Tooltip.Root>
+ </Tooltip.Provider>
+{/if}
diff --git a/frontend/src/lib/components/arcane-tooltip/context.svelte.ts b/frontend/src/lib/components/arcane-tooltip/context.svelte.ts
new file mode 100644
index 000000000..7850a2e5e
--- /dev/null
+++ b/frontend/src/lib/components/arcane-tooltip/context.svelte.ts
@@ -0,0 +1,18 @@
+import { getContext, setContext } from 'svelte';
+
+const CONTEXT_KEY = 'arcane-tooltip-context';
+
+export interface ArcaneTooltipContext {
+ isTouch: boolean;
+ interactive: boolean;
+ open: boolean;
+ setOpen: (value: boolean) => void;
+}
+
+export function setArcaneTooltipContext(context: ArcaneTooltipContext) {
+ setContext(CONTEXT_KEY, context);
+}
+
+export function getArcaneTooltipContext(): ArcaneTooltipContext {
+ return getContext(CONTEXT_KEY);
+}
diff --git a/frontend/src/lib/components/arcane-tooltip/index.ts b/frontend/src/lib/components/arcane-tooltip/index.ts
new file mode 100644
index 000000000..4b0b520a1
--- /dev/null
+++ b/frontend/src/lib/components/arcane-tooltip/index.ts
@@ -0,0 +1,13 @@
+import Root from './arcane-tooltip.svelte';
+import Trigger from './arcane-tooltip-trigger.svelte';
+import Content from './arcane-tooltip-content.svelte';
+
+export {
+ Root,
+ Trigger,
+ Content,
+ //
+ Root as ArcaneTooltip,
+ Trigger as ArcaneTooltipTrigger,
+ Content as ArcaneTooltipContent
+};
diff --git a/frontend/src/lib/components/badges/port-badge.svelte b/frontend/src/lib/components/badges/port-badge.svelte
index 7642d30f8..adb4c3e1d 100644
--- a/frontend/src/lib/components/badges/port-badge.svelte
+++ b/frontend/src/lib/components/badges/port-badge.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import type { ContainerPorts } from '$lib/types/container.type';
import { m } from '$lib/paraglide/messages';
- import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import settingsStore from '$lib/stores/config-store';
let { ports = [] as ContainerPorts[] } = $props<{
@@ -80,49 +80,47 @@
{#if allPorts.length === 0}
<span class="text-muted-foreground text-xs">{m.containers_no_ports()}</span>
{:else}
- <Tooltip.Provider>
- <div class="flex flex-wrap gap-1.5">
- {#each published as p, i (i)}
- <Tooltip.Root>
- <Tooltip.Trigger>
- <a
- class="ring-offset-background focus-visible:ring-ring bg-background/70 inline-flex items-center gap-1 rounded-lg border border-sky-700/20 px-2 py-1 text-[11px] shadow-sm transition-colors hover:border-sky-700/40 hover:bg-sky-500/10 hover:shadow-md focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none"
- href={toHref(p.hostPort!)}
- target="_blank"
- rel="noopener noreferrer"
- >
- <span class="font-medium tabular-nums">{p.hostPort}:{p.containerPort}</span>
- {#if p.proto}
- <span class="text-muted-foreground uppercase">{p.proto}</span>
- {/if}
- </a>
- </Tooltip.Trigger>
- <Tooltip.Content>
- <p class="text-xs">
- Published: {p.ip ?? '0.0.0.0'}:{p.hostPort} → {p.containerPort}{p.proto ? `/${p.proto}` : ''}
- </p>
- </Tooltip.Content>
- </Tooltip.Root>
- {/each}
- {#each exposedOnly as p, i (i)}
- <Tooltip.Root>
- <Tooltip.Trigger>
- <span
- class="bg-background/50 inline-flex items-center gap-1 rounded-lg border border-gray-600/30 px-2 py-1 text-[11px] text-gray-400 shadow-sm"
- >
- <span class="tabular-nums">{p.containerPort}</span>
- {#if p.proto}
- <span class="text-muted-foreground uppercase">{p.proto}</span>
- {/if}
- </span>
- </Tooltip.Trigger>
- <Tooltip.Content>
- <p class="text-xs">
- Exposed: {p.containerPort}{p.proto ? `/${p.proto}` : ''} (not published to host)
- </p>
- </Tooltip.Content>
- </Tooltip.Root>
- {/each}
- </div>
- </Tooltip.Provider>
+ <div class="flex flex-wrap gap-1.5">
+ {#each published as p, i (i)}
+ <ArcaneTooltip.Root interactive>
+ <ArcaneTooltip.Trigger>
+ <a
+ class="ring-offset-background focus-visible:ring-ring bg-background/70 inline-flex items-center gap-1 rounded-lg border border-sky-700/20 px-2 py-1 text-[11px] shadow-sm transition-colors hover:border-sky-700/40 hover:bg-sky-500/10 hover:shadow-md focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none"
+ href={toHref(p.hostPort!)}
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ <span class="font-medium tabular-nums">{p.hostPort}:{p.containerPort}</span>
+ {#if p.proto}
+ <span class="text-muted-foreground uppercase">{p.proto}</span>
+ {/if}
+ </a>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ <p class="text-xs">
+ Published: {p.ip ?? '0.0.0.0'}:{p.hostPort} → {p.containerPort}{p.proto ? `/${p.proto}` : ''}
+ </p>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+ {/each}
+ {#each exposedOnly as p, i (i)}
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <span
+ class="bg-background/50 inline-flex items-center gap-1 rounded-lg border border-gray-600/30 px-2 py-1 text-[11px] text-gray-400 shadow-sm"
+ >
+ <span class="tabular-nums">{p.containerPort}</span>
+ {#if p.proto}
+ <span class="text-muted-foreground uppercase">{p.proto}</span>
+ {/if}
+ </span>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ <p class="text-xs">
+ Exposed: {p.containerPort}{p.proto ? `/${p.proto}` : ''} (not published to host)
+ </p>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+ {/each}
+ </div>
{/if}
diff --git a/frontend/src/lib/components/badges/status-badge.svelte b/frontend/src/lib/components/badges/status-badge.svelte
index a28d9ce4a..b04d60b50 100644
--- a/frontend/src/lib/components/badges/status-badge.svelte
+++ b/frontend/src/lib/components/badges/status-badge.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { cn } from '$lib/utils';
import { m } from '$lib/paraglide/messages';
- import * as Tooltip from '$lib/components/ui/tooltip';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
type Variant =
| 'red'
@@ -102,16 +102,14 @@
{/snippet}
{#if tooltip}
- <Tooltip.Provider>
- <Tooltip.Root>
- <Tooltip.Trigger>
- {@render BadgeContent()}
- </Tooltip.Trigger>
- <Tooltip.Content>
- <p class="max-w-xs text-xs">{tooltip}</p>
- </Tooltip.Content>
- </Tooltip.Root>
- </Tooltip.Provider>
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ {@render BadgeContent()}
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ <p class="max-w-xs text-xs">{tooltip}</p>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
{:else}
{@render BadgeContent()}
{/if}
diff --git a/frontend/src/lib/components/badges/ui-config-disabled-tag.svelte b/frontend/src/lib/components/badges/ui-config-disabled-tag.svelte
index f69ef6b18..d8f869b64 100644
--- a/frontend/src/lib/components/badges/ui-config-disabled-tag.svelte
+++ b/frontend/src/lib/components/badges/ui-config-disabled-tag.svelte
@@ -2,28 +2,26 @@
import settingsStore from '$lib/stores/config-store';
import { m } from '$lib/paraglide/messages';
import { LockIcon } from '$lib/icons';
- import * as Tooltip from '$lib/components/ui/tooltip';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
const active = $derived.by(() => $settingsStore.uiConfigDisabled);
</script>
{#if active}
- <Tooltip.Provider>
- <Tooltip.Root>
- <Tooltip.Trigger>
- <span
- class="inline-flex items-center gap-1.5 rounded-full bg-amber-100 px-2.5 py-1 text-xs font-medium text-amber-800 ring-1 ring-amber-200 dark:bg-amber-900/50 dark:text-amber-200 dark:ring-amber-800"
- >
- <LockIcon class="size-3" />
- Read-only
- </span>
- </Tooltip.Trigger>
- <Tooltip.Content side="bottom" class="max-w-xs">
- <div class="space-y-1">
- <p class="font-medium">{m.ui_config_disabled_title()}</p>
- <p class="text-xs opacity-90">{m.ui_config_disabled_description()}</p>
- </div>
- </Tooltip.Content>
- </Tooltip.Root>
- </Tooltip.Provider>
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <span
+ class="inline-flex items-center gap-1.5 rounded-full bg-amber-100 px-2.5 py-1 text-xs font-medium text-amber-800 ring-1 ring-amber-200 dark:bg-amber-900/50 dark:text-amber-200 dark:ring-amber-800"
+ >
+ <LockIcon class="size-3" />
+ Read-only
+ </span>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="bottom" class="max-w-xs">
+ <div class="space-y-1">
+ <p class="font-medium">{m.ui_config_disabled_title()}</p>
+ <p class="text-xs opacity-90">{m.ui_config_disabled_description()}</p>
+ </div>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
{/if}
diff --git a/frontend/src/lib/components/image-update-item.svelte b/frontend/src/lib/components/image-update-item.svelte
index 85713cef9..9c4aa7eb5 100644
--- a/frontend/src/lib/components/image-update-item.svelte
+++ b/frontend/src/lib/components/image-update-item.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { toast } from 'svelte-sonner';
import type { ImageUpdateData } from '$lib/types/image.type';
@@ -197,11 +197,11 @@
{#snippet recheckButton()}
{#if canCheckUpdate}
- <div class="border-t border-gray-200/50 bg-gray-50/50 p-3 dark:border-gray-800/50 dark:bg-gray-900/50">
+ <div class="border-border/50 bg-muted/50 border-t p-3">
{#if effectiveUpdateInfo?.hasUpdate && onUpdateContainer}
<button
onclick={handleUpdateContainer}
- class="group flex w-full items-center justify-center gap-2 rounded-lg bg-blue-500 px-3 py-2 text-xs font-medium text-white shadow-sm transition-all hover:bg-blue-600 hover:shadow-md"
+ class="group bg-primary text-primary-foreground hover:bg-primary/90 flex w-full items-center justify-center gap-2 rounded-lg px-3 py-2 text-xs font-medium shadow-sm transition-all hover:shadow-md"
>
<CircleArrowUpIcon class="size-3" />
{m.containers_update_container()}
@@ -210,7 +210,7 @@
<button
onclick={checkImageUpdate}
disabled={isChecking}
- class="group flex w-full items-center justify-center gap-2 rounded-lg bg-white/80 px-3 py-2 text-xs font-medium text-gray-700 shadow-sm transition-all hover:bg-white hover:shadow-md disabled:cursor-not-allowed disabled:opacity-50 dark:bg-gray-800/80 dark:text-gray-300 dark:hover:bg-gray-800"
+ class="group bg-secondary/80 text-secondary-foreground hover:bg-secondary flex w-full items-center justify-center gap-2 rounded-lg px-3 py-2 text-xs font-medium shadow-sm transition-all hover:shadow-md disabled:cursor-not-allowed disabled:opacity-50"
>
{#if isChecking}
<Spinner class="size-3" />
@@ -236,7 +236,7 @@
</div>
</div>
</div>
- <div class="bg-white/90 p-4 dark:bg-gray-950/90">
+ <div class="bg-transparent p-4">
<div class="space-y-3">
<div class="text-xs text-gray-600 dark:text-gray-300">
<span class="font-medium">{m.image_update_error_label()}</span>
@@ -265,13 +265,13 @@
</div>
</div>
</div>
- <div class="bg-white/90 p-4 dark:bg-gray-950/90">
+ <div class="bg-transparent p-4">
<div class="text-center">
- <div class="mb-2 text-xs text-gray-600 dark:text-gray-400">
+ <div class="text-muted-foreground mb-2 text-xs">
{m.common_running()}
- <span class="rounded bg-gray-100 px-1.5 py-0.5 font-mono text-xs font-medium dark:bg-gray-800">{currentVersion}</span>
+ <span class="bg-muted rounded px-1.5 py-0.5 font-mono text-xs font-medium">{currentVersion}</span>
</div>
- <div class="text-xs leading-relaxed text-gray-500 dark:text-gray-400">
+ <div class="text-muted-foreground text-xs leading-relaxed">
{m.image_update_up_to_date_desc()}
</div>
</div>
@@ -290,10 +290,10 @@
</div>
</div>
</div>
- <div class="bg-white/90 p-4 dark:bg-gray-950/90">
+ <div class="bg-transparent p-4">
<div class="space-y-3">
<div class="space-y-2 text-xs">
- {@render versionDisplay(m.image_update_current_label(), currentVersion, 'bg-gray-100 dark:bg-gray-800', '')}
+ {@render versionDisplay(m.image_update_current_label(), currentVersion, 'bg-muted', '')}
{#if latestVersion}
{@render versionDisplay(
m.image_update_latest_digest_label(),
@@ -326,10 +326,10 @@
</div>
</div>
</div>
- <div class="bg-white/90 p-4 dark:bg-gray-950/90">
+ <div class="bg-transparent p-4">
<div class="space-y-3">
<div class="space-y-2 text-xs">
- {@render versionDisplay(m.image_update_current_label(), currentVersion, 'bg-gray-100 dark:bg-gray-800', '')}
+ {@render versionDisplay(m.image_update_current_label(), currentVersion, 'bg-muted', '')}
{#if latestVersion}
{@render versionDisplay(
m.image_update_latest_label(),
@@ -382,95 +382,74 @@
{/snippet}
{#if effectiveUpdateInfo}
- <Tooltip.Provider>
- <Tooltip.Root bind:open={isOpen}>
- <Tooltip.Trigger>
- <span class="mr-2 inline-flex size-4 items-center justify-center align-middle">
- {#if hasError}
- <AlertIcon class="size-4 text-red-500" />
- {:else if !effectiveUpdateInfo.hasUpdate}
- <VerifiedCheckIcon class="size-4 text-green-500" />
- {:else if effectiveUpdateInfo.updateType === 'digest'}
- <CircleArrowUpIcon class="size-4 text-blue-500" />
- {:else}
- <CircleArrowUpIcon class="size-4 text-yellow-500" />
- {/if}
- </span>
- </Tooltip.Trigger>
- <Tooltip.Content
- side="right"
- class="tooltip-with-arrow relative max-w-[280px] rounded-xl border border-gray-200/50 bg-white/95 p-0 shadow-2xl shadow-black/10 backdrop-blur-sm dark:border-gray-800/50 dark:bg-gray-950/95 dark:shadow-black/30"
- arrowClasses="bg-popover"
- align="center"
- >
- <div class="overflow-hidden rounded-xl">
- {#if hasError}
- {@render errorState()}
- {:else if !effectiveUpdateInfo.hasUpdate}
- {@render successState()}
- {:else if effectiveUpdateInfo.updateType === 'digest'}
- {@render digestUpdateState()}
- {:else}
- {@render versionUpdateState()}
- {/if}
- </div>
- </Tooltip.Content>
- </Tooltip.Root>
- </Tooltip.Provider>
+ <ArcaneTooltip.Root bind:open={isOpen}>
+ <ArcaneTooltip.Trigger>
+ <span class="mr-2 inline-flex size-4 items-center justify-center align-middle">
+ {#if hasError}
+ <AlertIcon class="size-4 text-red-500" />
+ {:else if !effectiveUpdateInfo?.hasUpdate}
+ <VerifiedCheckIcon class="size-4 text-green-500" />
+ {:else if effectiveUpdateInfo?.updateType === 'digest'}
+ <CircleArrowUpIcon class="size-4 text-blue-500" />
+ {:else}
+ <CircleArrowUpIcon class="size-4 text-yellow-500" />
+ {/if}
+ </span>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="right" class="max-w-[280px] p-0">
+ <div class="overflow-hidden rounded-xl">
+ {#if hasError}
+ {@render errorState()}
+ {:else if !effectiveUpdateInfo?.hasUpdate}
+ {@render successState()}
+ {:else if effectiveUpdateInfo?.updateType === 'digest'}
+ {@render digestUpdateState()}
+ {:else}
+ {@render versionUpdateState()}
+ {/if}
+ </div>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
{:else if isLoadingInBackground || isChecking}
- <Tooltip.Provider>
- <Tooltip.Root>
- <Tooltip.Trigger>
- <span class="mr-2 inline-flex size-4 items-center justify-center">
- <Spinner class="size-4 text-blue-400" />
- </span>
- </Tooltip.Trigger>
- <Tooltip.Content
- side="right"
- class="tooltip-with-arrow relative max-w-[220px] rounded-xl border border-gray-200/50 bg-white/95 p-0 shadow-2xl shadow-black/10 backdrop-blur-sm dark:border-gray-800/50 dark:bg-gray-950/95 dark:shadow-black/30"
- arrowClasses="bg-popover"
- align="center"
- >
- <div class="overflow-hidden rounded-xl">
- {@render loadingState()}
- </div>
- </Tooltip.Content>
- </Tooltip.Root>
- </Tooltip.Provider>
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <span class="mr-2 inline-flex size-4 items-center justify-center">
+ <Spinner class="size-4 text-blue-400" />
+ </span>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="right" class="max-w-[220px] p-0">
+ <div class="overflow-hidden rounded-xl">
+ {@render loadingState()}
+ </div>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
{:else}
- <Tooltip.Provider>
- <Tooltip.Root>
- <Tooltip.Trigger>
- <span class="mr-2 inline-flex size-4 items-center justify-center">
- {#if canCheckUpdate}
- <button
- onclick={checkImageUpdate}
- disabled={isChecking}
- class="group flex h-4 w-4 items-center justify-center rounded-full border-2 border-dashed border-gray-400 transition-colors hover:border-blue-400 hover:bg-blue-50 disabled:cursor-not-allowed dark:hover:bg-blue-950"
- >
- {#if isChecking}
- <Spinner class="h-2 w-2 text-blue-400" />
- {:else}
- <div class="h-1.5 w-1.5 rounded-full bg-gray-400 transition-colors group-hover:bg-blue-400"></div>
- {/if}
- </button>
- {:else}
- <div class="flex h-4 w-4 items-center justify-center rounded-full border-2 border-dashed border-gray-400 opacity-30">
- <div class="h-1.5 w-1.5 rounded-full bg-gray-400"></div>
- </div>
- {/if}
- </span>
- </Tooltip.Trigger>
- <Tooltip.Content
- side="right"
- class="tooltip-with-arrow relative max-w-[240px] rounded-xl border border-gray-200/50 bg-white/95 p-0 shadow-2xl shadow-black/10 backdrop-blur-sm dark:border-gray-800/50 dark:bg-gray-950/95 dark:shadow-black/30"
- arrowClasses="bg-popover"
- align="center"
- >
- <div class="overflow-hidden rounded-xl">
- {@render unknownState()}
- </div>
- </Tooltip.Content>
- </Tooltip.Root>
- </Tooltip.Provider>
+ <ArcaneTooltip.Root interactive>
+ <ArcaneTooltip.Trigger>
+ <span class="mr-2 inline-flex size-4 items-center justify-center">
+ {#if canCheckUpdate}
+ <button
+ onclick={checkImageUpdate}
+ disabled={isChecking}
+ class="group flex h-4 w-4 items-center justify-center rounded-full border-2 border-dashed border-gray-400 transition-colors hover:border-blue-400 hover:bg-blue-50 disabled:cursor-not-allowed dark:hover:bg-blue-950"
+ >
+ {#if isChecking}
+ <Spinner class="h-2 w-2 text-blue-400" />
+ {:else}
+ <div class="h-1.5 w-1.5 rounded-full bg-gray-400 transition-colors group-hover:bg-blue-400"></div>
+ {/if}
+ </button>
+ {:else}
+ <div class="flex h-4 w-4 items-center justify-center rounded-full border-2 border-dashed border-gray-400 opacity-30">
+ <div class="h-1.5 w-1.5 rounded-full bg-gray-400"></div>
+ </div>
+ {/if}
+ </span>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="right" class="max-w-[240px] p-0">
+ <div class="overflow-hidden rounded-xl">
+ {@render unknownState()}
+ </div>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
{/if}
diff --git a/frontend/src/lib/components/ui/popover/popover-content.svelte b/frontend/src/lib/components/ui/popover/popover-content.svelte
index 4a156e3e3..bef5d3a3a 100644
--- a/frontend/src/lib/components/ui/popover/popover-content.svelte
+++ b/frontend/src/lib/components/ui/popover/popover-content.svelte
@@ -22,7 +22,7 @@
{sideOffset}
{align}
class={cn(
- 'text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 origin-(--bits-popover-content-transform-origin) rounded-xl border p-4 shadow-md outline-hidden backdrop-blur-(--glass-blur-popup) backdrop-saturate-150',
+ 'bg-popover/20 text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 origin-(--bits-popover-content-transform-origin) rounded-xl border p-4 shadow-md outline-hidden backdrop-blur-2xl backdrop-saturate-150',
className
)}
{...restProps}
diff --git a/frontend/src/lib/components/ui/tooltip/index.ts b/frontend/src/lib/components/ui/tooltip/index.ts
index 273d831e6..171860421 100644
--- a/frontend/src/lib/components/ui/tooltip/index.ts
+++ b/frontend/src/lib/components/ui/tooltip/index.ts
@@ -1,10 +1,8 @@
-import { Tooltip as TooltipPrimitive } from 'bits-ui';
-import Trigger from './tooltip-trigger.svelte';
-import Content from './tooltip-content.svelte';
-
-const Root = TooltipPrimitive.Root;
-const Provider = TooltipPrimitive.Provider;
-const Portal = TooltipPrimitive.Portal;
+import Root from "./tooltip.svelte";
+import Trigger from "./tooltip-trigger.svelte";
+import Content from "./tooltip-content.svelte";
+import Provider from "./tooltip-provider.svelte";
+import Portal from "./tooltip-portal.svelte";
export {
Root,
@@ -17,5 +15,5 @@ export {
Content as TooltipContent,
Trigger as TooltipTrigger,
Provider as TooltipProvider,
- Portal as TooltipPortal
+ Portal as TooltipPortal,
};
diff --git a/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte b/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte
index 535523458..ddd2d43fc 100644
--- a/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte
+++ b/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte
@@ -1,6 +1,9 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from 'bits-ui';
import { cn } from '$lib/utils.js';
+ import TooltipPortal from './tooltip-portal.svelte';
+ import type { ComponentProps } from 'svelte';
+ import type { WithoutChildrenOrChild } from '$lib/utils.js';
let {
ref = $bindable(null),
@@ -9,39 +12,27 @@
side = 'top',
children,
arrowClasses,
+ portalProps,
...restProps
}: TooltipPrimitive.ContentProps & {
arrowClasses?: string;
+ portalProps?: WithoutChildrenOrChild<ComponentProps<typeof TooltipPortal>>;
} = $props();
</script>
-<TooltipPrimitive.Portal>
+<TooltipPortal {...portalProps}>
<TooltipPrimitive.Content
bind:ref
data-slot="tooltip-content"
{sideOffset}
{side}
class={cn(
- 'bg-popover/90 text-popover-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 border-border/40 z-50 w-fit origin-(--bits-tooltip-content-transform-origin) rounded-xl border px-3 py-1.5 text-xs text-balance shadow-lg backdrop-blur-(--glass-blur-popup) backdrop-saturate-150',
+ 'bg-popover/20 text-popover-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 border-border/40 z-50 w-fit origin-(--bits-tooltip-content-transform-origin) rounded-xl border px-3 py-1.5 text-xs text-balance shadow-lg backdrop-blur-md backdrop-saturate-150',
className
)}
{...restProps}
>
{@render children?.()}
- <TooltipPrimitive.Arrow>
- {#snippet child({ props })}
- <div
- class={cn(
- 'bg-popover/20 border-border/40 backdrop-blur-medium z-50 size-2.5 rotate-45 rounded-[2px] border backdrop-saturate-150',
- 'data-[side=top]:translate-x-1/2 data-[side=top]:translate-y-[calc(-50%_+_2px)]',
- 'data-[side=bottom]:-translate-x-1/2 data-[side=bottom]:-translate-y-[calc(-50%_+_1px)]',
- 'data-[side=right]:translate-x-[calc(50%_+_2px)] data-[side=right]:translate-y-1/2',
- 'data-[side=left]:-translate-y-[calc(50%_-_3px)]',
- arrowClasses
- )}
- {...props}
- ></div>
- {/snippet}
- </TooltipPrimitive.Arrow>
+ <TooltipPrimitive.Arrow />
</TooltipPrimitive.Content>
-</TooltipPrimitive.Portal>
+</TooltipPortal>
diff --git a/frontend/src/lib/components/ui/tooltip/tooltip-portal.svelte b/frontend/src/lib/components/ui/tooltip/tooltip-portal.svelte
new file mode 100644
index 000000000..d234f7d7d
--- /dev/null
+++ b/frontend/src/lib/components/ui/tooltip/tooltip-portal.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+ import { Tooltip as TooltipPrimitive } from "bits-ui";
+
+ let { ...restProps }: TooltipPrimitive.PortalProps = $props();
+</script>
+
+<TooltipPrimitive.Portal {...restProps} />
diff --git a/frontend/src/lib/components/ui/tooltip/tooltip-provider.svelte b/frontend/src/lib/components/ui/tooltip/tooltip-provider.svelte
new file mode 100644
index 000000000..8150bef2e
--- /dev/null
+++ b/frontend/src/lib/components/ui/tooltip/tooltip-provider.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+ import { Tooltip as TooltipPrimitive } from "bits-ui";
+
+ let { ...restProps }: TooltipPrimitive.ProviderProps = $props();
+</script>
+
+<TooltipPrimitive.Provider {...restProps} />
diff --git a/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte b/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte
index 5631d1b4c..1acdaa47b 100644
--- a/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte
+++ b/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Tooltip as TooltipPrimitive } from 'bits-ui';
+ import { Tooltip as TooltipPrimitive } from "bits-ui";
let { ref = $bindable(null), ...restProps }: TooltipPrimitive.TriggerProps = $props();
</script>
diff --git a/frontend/src/lib/components/ui/tooltip/tooltip.svelte b/frontend/src/lib/components/ui/tooltip/tooltip.svelte
new file mode 100644
index 000000000..0b0f9cef2
--- /dev/null
+++ b/frontend/src/lib/components/ui/tooltip/tooltip.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+ import { Tooltip as TooltipPrimitive } from "bits-ui";
+
+ let { open = $bindable(false), ...restProps }: TooltipPrimitive.RootProps = $props();
+</script>
+
+<TooltipPrimitive.Root bind:open {...restProps} />
diff --git a/frontend/src/lib/hooks/index.ts b/frontend/src/lib/hooks/index.ts
index 7a285e1e1..2ad4ae524 100644
--- a/frontend/src/lib/hooks/index.ts
+++ b/frontend/src/lib/hooks/index.ts
@@ -1,5 +1,6 @@
export { IsMobile } from './is-mobile.svelte';
export { IsTablet } from './is-tablet.svelte';
+export { IsTouchDevice } from './is-touch-device.svelte';
export { UseClipboard } from './use-clipboard.svelte';
export { useEnvironmentRefresh } from './use-environment-refresh.svelte';
export { ScrollDirectionDetector, type ScrollDirection } from './use-scroll-direction.svelte';
diff --git a/frontend/src/lib/hooks/is-touch-device.svelte.ts b/frontend/src/lib/hooks/is-touch-device.svelte.ts
new file mode 100644
index 000000000..5f9c29c26
--- /dev/null
+++ b/frontend/src/lib/hooks/is-touch-device.svelte.ts
@@ -0,0 +1,33 @@
+/**
+ * Detects if the device has touch capability.
+ *
+ * Note: Some hybrid devices (laptops with touchscreens) will be detected as touch devices,
+ * which is correct as they support both touch and pointer interactions.
+ */
+export class IsTouchDevice {
+ current = $state(false);
+
+ constructor() {
+ // Check on initialization
+ this.current = this.detectTouch();
+
+ // Re-check if media query changes (for devices that can switch modes)
+ $effect(() => {
+ this.current = this.detectTouch();
+ });
+ }
+
+ private detectTouch(): boolean {
+ // Check if running in browser
+ if (typeof window === 'undefined') return false;
+
+ // Multiple checks for better accuracy across browsers
+ const hasTouchPoints = 'maxTouchPoints' in navigator && navigator.maxTouchPoints > 0;
+ const hasTouchStart = 'ontouchstart' in window;
+ const hasTouchEvent = 'DocumentTouch' in window && 'ontouchstart' in document.documentElement;
+ const hasPointerCoarse = window.matchMedia?.('(pointer: coarse)').matches;
+
+ return hasTouchPoints || hasTouchStart || hasTouchEvent || hasPointerCoarse;
+ }
+}
+
diff --git a/frontend/src/routes/(app)/containers/container-table.svelte b/frontend/src/routes/(app)/containers/container-table.svelte
index f8f56109b..00d82b485 100644
--- a/frontend/src/routes/(app)/containers/container-table.svelte
+++ b/frontend/src/routes/(app)/containers/container-table.svelte
@@ -23,7 +23,7 @@
import * as Table from '$lib/components/ui/table/index.js';
import FlexRender from '$lib/components/ui/data-table/flex-render.svelte';
import DataTableToolbar from '$lib/components/arcane-table/arcane-table-toolbar.svelte';
- import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import ImageUpdateItem from '$lib/components/image-update-item.svelte';
import { PersistedState } from 'runed';
import { onMount } from 'svelte';
@@ -406,16 +406,16 @@
{/snippet}
{#snippet ImageCell({ item }: { item: ContainerSummaryDto })}
- <Tooltip.Provider>
- <Tooltip.Root>
- <Tooltip.Trigger class="block max-w-[200px] cursor-default truncate text-left lg:max-w-[300px]">
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <span class="block max-w-[200px] cursor-default truncate text-left lg:max-w-[300px]">
{item.image}
- </Tooltip.Trigger>
- <Tooltip.Content>
- <p>{item.image}</p>
- </Tooltip.Content>
- </Tooltip.Root>
- </Tooltip.Provider>
+ </span>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ <p>{item.image}</p>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
{/snippet}
{#snippet CreatedCell({ item }: { item: ContainerSummaryDto })}
diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelte
index 0ba2e0487..faa7eff81 100644
--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte
@@ -2,7 +2,7 @@
import * as Card from '$lib/components/ui/card/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import * as AlertDialog from '$lib/components/ui/alert-dialog';
- import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import { goto, invalidateAll } from '$app/navigation';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { toast } from 'svelte-sonner';
@@ -320,16 +320,14 @@
<div class="text-muted-foreground text-xs">{m.environments_enable_disable_description()}</div>
</div>
{#if environment.id === '0'}
- <Tooltip.Provider>
- <Tooltip.Root>
- <Tooltip.Trigger>
- <Switch id="env-enabled" disabled={true} bind:checked={formEnabled} />
- </Tooltip.Trigger>
- <Tooltip.Content>
- <p>{m.environments_local_setting_disabled()}</p>
- </Tooltip.Content>
- </Tooltip.Root>
- </Tooltip.Provider>
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <Switch id="env-enabled" disabled={true} bind:checked={formEnabled} />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ <p>{m.environments_local_setting_disabled()}</p>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
{:else}
<Switch id="env-enabled" bind:checked={formEnabled} />
{/if}
@@ -421,24 +419,22 @@
<div>
<Label for="api-url" class="text-sm font-medium">{m.environments_api_url()}</Label>
{#if environment.id === '0'}
- <Tooltip.Provider>
- <Tooltip.Root>
- <Tooltip.Trigger class="w-full">
- <Input
- id="api-url"
- type="url"
- bind:value={formApiUrl}
- class="mt-1.5 font-mono"
- placeholder={m.environments_api_url_placeholder()}
- disabled={true}
- required
- />
- </Tooltip.Trigger>
- <Tooltip.Content>
- <p>{m.environments_local_setting_disabled()}</p>
- </Tooltip.Content>
- </Tooltip.Root>
- </Tooltip.Provider>
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <Input
+ id="api-url"
+ type="url"
+ bind:value={formApiUrl}
+ class="mt-1.5 w-full font-mono"
+ placeholder={m.environments_api_url_placeholder()}
+ disabled={true}
+ required
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ <p>{m.environments_local_setting_disabled()}</p>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
{:else}
<Input
id="api-url"
diff --git a/frontend/src/routes/(app)/images/image-table.svelte b/frontend/src/routes/(app)/images/image-table.svelte
index 98c7fc865..677309cb5 100644
--- a/frontend/src/routes/(app)/images/image-table.svelte
+++ b/frontend/src/routes/(app)/images/image-table.svelte
@@ -294,9 +294,9 @@
rowActions={RowActions}
onclick={(item: ImageSummaryDto) => goto(`/images/${item.id}`)}
>
- {#if (mobileFieldVisibility.updates ?? true) && item.updateInfo !== undefined}
- <div class="flex flex-wrap gap-x-4 gap-y-3 border-t pt-3">
- <div class="flex min-w-0 flex-1 basis-[180px] flex-col">
+ {#if mobileFieldVisibility.updates ?? true}
+ <div class="flex items-center gap-x-2 gap-y-2 border-t pt-2">
+ <div class="flex min-w-0 shrink flex-col">
<div class="text-muted-foreground text-[10px] font-medium tracking-wide uppercase">
{m.images_updates()}
</div>
diff --git a/frontend/src/routes/(app)/projects/components/EditableName.svelte b/frontend/src/routes/(app)/projects/components/EditableName.svelte
index 027fd1555..083822fef 100644
--- a/frontend/src/routes/(app)/projects/components/EditableName.svelte
+++ b/frontend/src/routes/(app)/projects/components/EditableName.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { Input } from '$lib/components/ui/input/index.js';
import { Button } from '$lib/components/ui/button/index.js';
- import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import { tick } from 'svelte';
import { m } from '$lib/paraglide/messages';
import { cn } from '$lib/utils';
@@ -147,16 +147,16 @@
<EditIcon class="size-3.5" />
</Button>
{:else}
- <Tooltip.Provider>
- <Tooltip.Root>
- <Tooltip.Trigger>
- <span class="text-muted-foreground inline-flex cursor-help items-center leading-none">
- <InfoIcon class="relative top-0.5 size-4 shrink-0" />
- </span>
- </Tooltip.Trigger>
- <Tooltip.Content>{m.compose_name_change_not_allowed()}</Tooltip.Content>
- </Tooltip.Root>
- </Tooltip.Provider>
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <span class="text-muted-foreground inline-flex cursor-help items-center leading-none">
+ <InfoIcon class="relative top-0.5 size-4 shrink-0" />
+ </span>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ {m.compose_name_change_not_allowed()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
{/if}
</div>
{/if}
diff --git a/frontend/src/routes/(app)/projects/new/+page.svelte b/frontend/src/routes/(app)/projects/new/+page.svelte
index 0ec8cb3bd..979d8471a 100644
--- a/frontend/src/routes/(app)/projects/new/+page.svelte
+++ b/frontend/src/routes/(app)/projects/new/+page.svelte
@@ -10,7 +10,7 @@
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { Textarea } from '$lib/components/ui/textarea/index.js';
import * as Dialog from '$lib/components/ui/dialog/index.js';
- import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import TemplateSelectionDialog from '$lib/components/dialogs/template-selection-dialog.svelte';
import type { Template } from '$lib/types/template.type';
import { z } from 'zod/v4';
@@ -146,7 +146,8 @@
const templateBtnClass = arcaneButtonVariants({
tone: actionConfigs.template?.tone ?? 'outline-primary',
- size: 'default'
+ size: 'default',
+ hoverEffect: 'none'
});
const dropdownContentClass =
@@ -185,53 +186,48 @@
<div class="flex items-center gap-2">
<ButtonGroup.Root>
- <Tooltip.Provider>
- <Tooltip.Root open={!$inputs.name.value && !saving && !converting && !isLoadingTemplateContent ? undefined : false}>
- <Tooltip.Trigger>
- {#snippet child({ props })}
- <span {...props}>
- <Button
- disabled={!$inputs.name.value ||
- !$inputs.composeContent.value ||
- saving ||
- converting ||
- isLoadingTemplateContent}
- onclick={() => handleSubmit()}
- class={`${templateBtnClass} gap-2 rounded-r-none hover:translate-y-0 focus:translate-y-0 active:translate-y-0`}
- >
- {#if saving}
- <Spinner class="size-4" />
- {m.common_action_creating()}
- {:else}
- <AddIcon class="size-4" />
- {m.compose_create_project()}
- {/if}
- </Button>
- </span>
- {/snippet}
- </Tooltip.Trigger>
+ <ArcaneTooltip.Root
+ open={!$inputs.name.value && !saving && !converting && !isLoadingTemplateContent ? undefined : false}
+ >
+ <ArcaneTooltip.Trigger>
+ <span>
+ <Button
+ variant="ghost"
+ disabled={!$inputs.name.value ||
+ !$inputs.composeContent.value ||
+ saving ||
+ converting ||
+ isLoadingTemplateContent}
+ onclick={() => handleSubmit()}
+ class={`${templateBtnClass} gap-2 rounded-r-none`}
+ >
+ {#if saving}
+ <Spinner class="size-4" />
+ {m.common_action_creating()}
+ {:else}
+ <AddIcon class="size-4" />
+ {m.compose_create_project()}
+ {/if}
+ </Button>
+ </span>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content class="arcane-tooltip-content max-w-[280px]">
{#if $inputs.name.value === ''}
- <Tooltip.Content class="arcane-tooltip-content max-w-[280px]">
- <p class="mb-1 text-sm font-medium">{m.compose_project_name_tooltip_title()}</p>
- <p class="text-muted-foreground text-xs">
- {m.compose_project_name_tooltip_description()}
- </p>
- <p class="bg-muted mt-1.5 inline-block rounded px-1.5 py-0.5 font-mono text-xs">
- {m.compose_project_name_tooltip_example()}
- </p>
- </Tooltip.Content>
+ <p class="mb-1 text-sm font-medium">{m.compose_project_name_tooltip_title()}</p>
+ <p class="text-muted-foreground text-xs">
+ {m.compose_project_name_tooltip_description()}
+ </p>
+ <p class="bg-muted mt-1.5 inline-block rounded px-1.5 py-0.5 font-mono text-xs">
+ {m.compose_project_name_tooltip_example()}
+ </p>
{/if}
- </Tooltip.Root>
- </Tooltip.Provider>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button
- {...props}
- class={`${templateBtnClass} -ml-px rounded-l-none px-2 hover:translate-y-0 focus:translate-y-0 active:translate-y-0`}
- variant="outline"
- >
+ <Button {...props} class={`${templateBtnClass} -ml-px rounded-l-none px-2`} variant="ghost">
<ChevronDown class="size-4" />
</Button>
{/snippet}
diff --git a/frontend/src/routes/(app)/settings/security/+page.svelte b/frontend/src/routes/(app)/settings/security/+page.svelte
index a89d7b685..73941fbdc 100644
--- a/frontend/src/routes/(app)/settings/security/+page.svelte
+++ b/frontend/src/routes/(app)/settings/security/+page.svelte
@@ -10,7 +10,7 @@
import { toast } from 'svelte-sonner';
import type { PageData } from './$types';
import type { Settings } from '$lib/types/settings.type';
- import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import { m } from '$lib/paraglide/messages';
import { LockIcon, InfoIcon } from '$lib/icons';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
@@ -412,54 +412,58 @@
<p class="text-muted-foreground mt-1 text-sm">{m.security_password_policy_description()}</p>
</div>
<div>
- <Tooltip.Provider>
- <div class="grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-3" role="group" aria-labelledby="passwordPolicyLabel">
- <Tooltip.Root>
- <Tooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'basic' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'basic'
- ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
- : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
- onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
- type="button"
- >{m.common_basic()}
- </Button>
- </Tooltip.Trigger>
- <Tooltip.Content side="top" align="center">{m.security_password_policy_basic_tooltip()}</Tooltip.Content>
- </Tooltip.Root>
-
- <Tooltip.Root>
- <Tooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'standard' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'standard'
- ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
- : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
- onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
- type="button"
- >{m.security_password_policy_standard()}
- </Button>
- </Tooltip.Trigger>
- <Tooltip.Content side="top" align="center">{m.security_password_policy_standard_tooltip()}</Tooltip.Content>
- </Tooltip.Root>
-
- <Tooltip.Root>
- <Tooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'strong' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'strong'
- ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
- : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
- onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
- type="button"
- >{m.security_password_policy_strong()}
- </Button>
- </Tooltip.Trigger>
- <Tooltip.Content side="top" align="center">{m.security_password_policy_strong_tooltip()}</Tooltip.Content>
- </Tooltip.Root>
- </div>
- </Tooltip.Provider>
+ <div class="grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-3" role="group" aria-labelledby="passwordPolicyLabel">
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <Button
+ variant={$formInputs.authPasswordPolicy.value === 'basic' ? 'default' : 'outline'}
+ class={$formInputs.authPasswordPolicy.value === 'basic'
+ ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
+ : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
+ type="button"
+ >{m.common_basic()}
+ </Button>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_basic_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <Button
+ variant={$formInputs.authPasswordPolicy.value === 'standard' ? 'default' : 'outline'}
+ class={$formInputs.authPasswordPolicy.value === 'standard'
+ ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
+ : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
+ type="button"
+ >{m.security_password_policy_standard()}
+ </Button>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_standard_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <Button
+ variant={$formInputs.authPasswordPolicy.value === 'strong' ? 'default' : 'outline'}
+ class={$formInputs.authPasswordPolicy.value === 'strong'
+ ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
+ : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
+ type="button"
+ >{m.security_password_policy_strong()}
+ </Button>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_strong_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+ </div>
</div>
</div>
</div>
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 1955e6c02..db6e23eae 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -17,6 +17,7 @@
import FirstLoginPasswordDialog from '$lib/components/dialogs/first-login-password-dialog.svelte';
import { invalidateAll } from '$app/navigation';
import { cn } from '$lib/utils';
+ import * as Tooltip from '$lib/components/ui/tooltip/index.js';
let {
data,
@@ -82,7 +83,9 @@
{#if !settings && data.user}
<Error message={m.error_occurred()} showButton={true} />
{:else}
- {@render children()}
+ <Tooltip.Provider>
+ {@render children()}
+ </Tooltip.Provider>
{/if}
</div>
diff --git a/tests/spec/project.spec.ts b/tests/spec/project.spec.ts
index a2431cec8..84168be59 100644
--- a/tests/spec/project.spec.ts
+++ b/tests/spec/project.spec.ts
@@ -34,10 +34,6 @@ test.describe('Projects Page', () => {
await expect(page.getByText('View and Manage Compose Projects')).toBeVisible();
});
- test('should display the "Create Project" button', async ({ page }) => {
- await expect(page.getByRole('button', { name: 'Create Project' })).toBeVisible();
- });
-
test('should display summary cards with correct counts', async ({ page }) => {
await expect(page.locator('div:has(> p:has-text("Total Projects")) h3').first()).toHaveText(
String(projectCounts.totalProjects)
@@ -122,7 +118,7 @@ test.describe('New Compose Project Page', () => {
});
test('should validate required fields', async ({ page }) => {
- const createButton = page.getByRole('button', { name: 'Create' }).first();
+ const createButton = page.getByRole('button', { name: 'Create Project' }).locator('[data-slot="button"]');
await expect(createButton).toBeDisabled();
await page.getByRole('button', { name: 'My New Project' }).click();
@@ -137,8 +133,9 @@ test.describe('New Compose Project Page', () => {
if (msg.type() === 'error') observedErrors.push(msg.text());
});
- const createProjectButton = page.getByRole('button', { name: 'Create Project', exact: true });
- await expect(createProjectButton).toBeVisible();
+ const createButton = page.getByRole('button', { name: 'Create Project' }).locator('[data-slot="button"]');
+
+ await expect(createButton).toBeVisible();
// Open the inline name editor and set a valid name.
await page.getByRole('button', { name: 'My New Project' }).click();
@@ -146,7 +143,7 @@ test.describe('New Compose Project Page', () => {
await page.getByRole('textbox', { name: 'My New Project' }).press('Enter');
// The button should become enabled once name + compose content are present.
- await expect(createProjectButton).toBeEnabled();
+ await expect(createButton).toBeEnabled();
const stateUnsafe = observedErrors.filter((e) => e.includes('state_unsafe_mutation'));
expect(stateUnsafe, `Unexpected state_unsafe_mutation errors: ${stateUnsafe.join('\n')}`).toHaveLength(0);
@@ -201,7 +198,7 @@ test.describe('New Compose Project Page', () => {
}
});
- const createButton = page.getByRole('button', { name: 'Create Project', exact: true });
+ const createButton = page.getByRole('button', { name: 'Create Project' }).locator('[data-slot="button"]')
await createButton.click();
await page.waitForURL(/\/projects\/.+/, { timeout: 10000 });