From ada1af0a8e2f387d3a7b1e64315b09b32a517ae2 Mon Sep 17 00:00:00 2001 From: Maarten Date: Fri, 11 Oct 2024 10:25:57 +0200 Subject: [PATCH] Card in tooltip --- src/lib/components/Bubble.svelte | 7 ++++--- src/lib/components/CardModal.svelte | 2 +- src/lib/components/Timeline.svelte | 12 ++++++------ src/lib/components/Tooltip.svelte | 8 +++++--- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/lib/components/Bubble.svelte b/src/lib/components/Bubble.svelte index 52c143a..41fe76a 100644 --- a/src/lib/components/Bubble.svelte +++ b/src/lib/components/Bubble.svelte @@ -6,8 +6,8 @@ export let opacity; export let stroke; export let strokeWidth; - export let ttContent; - export let tooltipContent; + export let caseData; + export let hoveredCaseData; export let tooltipX; export let tooltipY; export let showTooltip; @@ -16,7 +16,8 @@ showTooltip = true; tooltipX = event.clientX; tooltipY = event.clientY; - tooltipContent = ttContent; + //tooltipContent = ttContent; + hoveredCaseData = caseData; } function handleMouseOut() { showTooltip = false; diff --git a/src/lib/components/CardModal.svelte b/src/lib/components/CardModal.svelte index 6fbc4b8..f3c0e27 100644 --- a/src/lib/components/CardModal.svelte +++ b/src/lib/components/CardModal.svelte @@ -13,7 +13,7 @@ diff --git a/src/lib/components/Timeline.svelte b/src/lib/components/Timeline.svelte index 82a0b57..12fe950 100644 --- a/src/lib/components/Timeline.svelte +++ b/src/lib/components/Timeline.svelte @@ -83,7 +83,7 @@ // Tooltip let showTooltip = false; - let tooltipContent; + let hoveredCaseData; let tooltipX; let tooltipY; @@ -132,9 +132,9 @@ fill={actorNations.includes(attrCase.actor_nation[0]) ? colorScale(attrCase.actor_nation[0]) : colorScale('Other')} stroke={'#ffffff'} strokeWidth={1.5} - ttContent={`

${attrCase.short_title}

`} opacity={opacityScale(attrCase.attribution_score)} - bind:tooltipContent + caseData={attrCase} + bind:hoveredCaseData bind:tooltipX bind:tooltipY bind:showTooltip @@ -212,7 +212,7 @@ {/each} {#if xScale} {#each events as event} - + > {/each} {/if} {/if} {#if showTooltip} - + {/if} diff --git a/src/lib/components/Tooltip.svelte b/src/lib/components/Tooltip.svelte index 757ebcb..8fe6290 100644 --- a/src/lib/components/Tooltip.svelte +++ b/src/lib/components/Tooltip.svelte @@ -1,8 +1,10 @@ @@ -15,7 +17,7 @@ left:{tooltipX < width - 300 ? tooltipX + 10 : tooltipX - 300 - 10}px; " > - {@html tooltipContent} + \ No newline at end of file