From 569ee74633cabcc79e746c5e1fd16bacc9908c07 Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 03:33:00 +0000
Subject: [PATCH] chore(deps): bump workerpool from 9.1.1 to 9.1.2 (#1215)
---
quartz/components/scripts/graph.inline.ts | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/quartz/components/scripts/graph.inline.ts b/quartz/components/scripts/graph.inline.ts
index a76409c..1a4140b 100644
--- a/quartz/components/scripts/graph.inline.ts
+++ b/quartz/components/scripts/graph.inline.ts
@@ -44,6 +44,7 @@
opacityScale,
removeTags,
showTags,
+ focusOnHover,
} = JSON.parse(graph.dataset["cfg"]!)
const data: Map<SimpleSlug, ContentDetails> = new Map(
@@ -189,6 +190,8 @@
return 2 + Math.sqrt(numLinks)
}
+ let connectedNodes: SimpleSlug[] = []
+
// draw individual nodes
const node = graphNode
.append("circle")
@@ -202,17 +205,37 @@
window.spaNavigate(new URL(targ, window.location.toString()))
})
.on("mouseover", function (_, d) {
- const neighbours: SimpleSlug[] = data.get(slug)?.links ?? []
- const neighbourNodes = d3
- .selectAll<HTMLElement, NodeData>(".node")
- .filter((d) => neighbours.includes(d.id))
const currentId = d.id
const linkNodes = d3
.selectAll(".link")
.filter((d: any) => d.source.id === currentId || d.target.id === currentId)
- // highlight neighbour nodes
- neighbourNodes.transition().duration(200).attr("fill", color)
+ if (focusOnHover) {
+ // fade out non-neighbour nodes
+ connectedNodes = linkNodes.data().flatMap((d: any) => [d.source.id, d.target.id])
+
+ d3.selectAll<HTMLElement, NodeData>(".link")
+ .transition()
+ .duration(200)
+ .style("opacity", 0.2)
+ d3.selectAll<HTMLElement, NodeData>(".node")
+ .filter((d) => !connectedNodes.includes(d.id))
+ .transition()
+ .duration(200)
+ .style("opacity", 0.2)
+
+ d3.selectAll<HTMLElement, NodeData>(".node")
+ .filter((d) => !connectedNodes.includes(d.id))
+ .nodes()
+ .map((it) => d3.select(it.parentNode as HTMLElement).select("text"))
+ .forEach((it) => {
+ let opacity = parseFloat(it.style("opacity"))
+ it.transition()
+ .duration(200)
+ .attr("opacityOld", opacity)
+ .style("opacity", Math.min(opacity, 0.2))
+ })
+ }
// highlight links
linkNodes.transition().duration(200).attr("stroke", "var(--gray)").attr("stroke-width", 1)
@@ -231,6 +254,16 @@
.style("font-size", bigFont + "em")
})
.on("mouseleave", function (_, d) {
+ if (focusOnHover) {
+ d3.selectAll<HTMLElement, NodeData>(".link").transition().duration(200).style("opacity", 1)
+ d3.selectAll<HTMLElement, NodeData>(".node").transition().duration(200).style("opacity", 1)
+
+ d3.selectAll<HTMLElement, NodeData>(".node")
+ .filter((d) => !connectedNodes.includes(d.id))
+ .nodes()
+ .map((it) => d3.select(it.parentNode as HTMLElement).select("text"))
+ .forEach((it) => it.transition().duration(200).style("opacity", it.attr("opacityOld")))
+ }
const currentId = d.id
const linkNodes = d3
.selectAll(".link")
@@ -249,6 +282,13 @@
// @ts-ignore
.call(drag(simulation))
+ // make tags hollow circles
+ node
+ .filter((d) => d.id.startsWith("tags/"))
+ .attr("stroke", color)
+ .attr("stroke-width", 2)
+ .attr("fill", "var(--light)")
+
// draw labels
const labels = graphNode
.append("text")
@@ -321,10 +361,10 @@
document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
const slug = e.detail.url
- addToVisited(slug)
+ addToVisited(simplifySlug(slug))
await renderGraph("graph-container", slug)
const containerIcon = document.getElementById("global-graph-icon")
- containerIcon?.removeEventListener("click", renderGlobalGraph)
containerIcon?.addEventListener("click", renderGlobalGraph)
+ window.addCleanup(() => containerIcon?.removeEventListener("click", renderGlobalGraph))
})
--
Gitblit v1.10.0