Skip to content

The only tool you need to know what is happening and how to fix it.

fix: tooltip fixes (exception + position)

ddux39574070cbc7
diff --git a/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte b/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte
index 863f4961..10db4f91 100644
--- a/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte
+++ b/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte
@@ -43,7 +43,7 @@
'data-[side=left]:border-r data-[side=left]:border-b',
'data-[side=right]:border-t data-[side=right]:border-l',
'data-[side=top]:translate-x-1/2 data-[side=top]:translate-y-[calc(-50%_+_3px)]',
- 'data-[side=bottom]:-translate-x-1/2 data-[side=bottom]:-translate-y-[calc(-50%_+_1px)]',
+ 'data-[side=bottom]:-translate-x-1/2 data-[side=bottom]:-translate-y-[calc(50%_-_2px)] data-[side=bottom]:rotate-225',
'data-[side=right]:translate-x-[calc(50%_+_2px)] data-[side=right]:translate-y-1/2',
'data-[side=left]:-translate-y-[calc(50%_-_3px)]',
arrowClasses
diff --git a/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte b/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte
index 1acdaa47..d61af940 100644
--- a/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte
+++ b/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte
@@ -1,7 +1,17 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from "bits-ui";
+ import { getContext } from "svelte";
let { ref = $bindable(null), ...restProps }: TooltipPrimitive.TriggerProps = $props();
+
+ const ctx = getContext<{ toggle: () => void }>("traceway-tooltip");
+
+ function handleTouchStart(e: TouchEvent) {
+ if (ctx) {
+ e.preventDefault();
+ ctx.toggle();
+ }
+ }
</script>
-<TooltipPrimitive.Trigger bind:ref data-slot="tooltip-trigger" {...restProps} />
+<TooltipPrimitive.Trigger bind:ref data-slot="tooltip-trigger" ontouchstart={handleTouchStart} {...restProps} />
diff --git a/frontend/src/lib/components/ui/tooltip/tooltip.svelte b/frontend/src/lib/components/ui/tooltip/tooltip.svelte
index 0b0f9cef..6c08e813 100644
--- a/frontend/src/lib/components/ui/tooltip/tooltip.svelte
+++ b/frontend/src/lib/components/ui/tooltip/tooltip.svelte
@@ -1,7 +1,44 @@
<script lang="ts">
import { Tooltip as TooltipPrimitive } from "bits-ui";
+ import { setContext } from "svelte";
let { open = $bindable(false), ...restProps }: TooltipPrimitive.RootProps = $props();
+
+ let openedByTouch = false;
+ let removeListener: (() => void) | null = null;
+
+ function closeTooltip() {
+ openedByTouch = false;
+ open = false;
+ if (removeListener) {
+ removeListener();
+ removeListener = null;
+ }
+ }
+
+ function toggle() {
+ if (open && openedByTouch) {
+ closeTooltip();
+ return;
+ }
+ openedByTouch = true;
+ open = true;
+ setTimeout(() => {
+ const handler = () => closeTooltip();
+ document.addEventListener("pointerdown", handler);
+ removeListener = () => document.removeEventListener("pointerdown", handler);
+ }, 0);
+ }
+
+ function handleOpenChange(v: boolean) {
+ if (!v && openedByTouch) {
+ open = true;
+ return;
+ }
+ open = v;
+ }
+
+ setContext("traceway-tooltip", { toggle });
</script>
-<TooltipPrimitive.Root bind:open {...restProps} />
+<TooltipPrimitive.Root bind:open {...restProps} onOpenChange={handleOpenChange} />
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 34917e81..b3231329 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -18,6 +18,7 @@
import { page } from '$app/state';
import { setupTraceway } from '@tracewayapp/svelte';
import { captureException } from '@tracewayapp/frontend';
+ import * as Tooltip from '$lib/components/ui/tooltip';
if (__TRACEWAY_URL__) {
setupTraceway({
@@ -87,6 +88,7 @@
<svelte:head><link rel="icon" href="/favicon.ico" /></svelte:head>
+<Tooltip.Provider delayDuration={0}>
<!-- This is not ideal, but because our layout is a top level route it can end up showing sidebar on the login page (after the login before the transition). -->
<!-- We could consider moving this to a lower level layout for the actual app, for now it's just a path check -->
{#if authState.isAuthenticated && page.url.pathname !== '/login' && page.url.pathname !== '/register' && !page.url.pathname.startsWith('/accept-invitation')}
@@ -175,3 +177,4 @@
</main>
{/if}
{/if}
+</Tooltip.Provider>