From 42640bceb57c450d5c2427bd2b449827468d0ede Mon Sep 17 00:00:00 2001
From: Paul Trotter <ptrotter1@users.noreply.github.com>
Date: Mon, 17 Jun 2024 05:33:28 +0000
Subject: [PATCH] Check link isExternal before adding target="_blank" (#1211)
---
quartz/components/scripts/graph.inline.ts | 86 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 22 deletions(-)
diff --git a/quartz/components/scripts/graph.inline.ts b/quartz/components/scripts/graph.inline.ts
index 1aff138..1a4140b 100644
--- a/quartz/components/scripts/graph.inline.ts
+++ b/quartz/components/scripts/graph.inline.ts
@@ -1,4 +1,4 @@
-import type { ContentDetails } from "../../plugins/emitters/contentIndex"
+import type { ContentDetails, ContentIndex } from "../../plugins/emitters/contentIndex"
import * as d3 from "d3"
import { registerEscapeHandler, removeAllChildren } from "./util"
import { FullSlug, SimpleSlug, getFullSlug, resolveRelative, simplifySlug } from "../../util/path"
@@ -44,22 +44,25 @@
opacityScale,
removeTags,
showTags,
+ focusOnHover,
} = JSON.parse(graph.dataset["cfg"]!)
- const data = await fetchData
-
+ const data: Map<SimpleSlug, ContentDetails> = new Map(
+ Object.entries<ContentDetails>(await fetchData).map(([k, v]) => [
+ simplifySlug(k as FullSlug),
+ v,
+ ]),
+ )
const links: LinkData[] = []
const tags: SimpleSlug[] = []
- const validLinks = new Set(Object.keys(data).map((slug) => simplifySlug(slug as FullSlug)))
-
- for (const [src, details] of Object.entries<ContentDetails>(data)) {
- const source = simplifySlug(src as FullSlug)
+ const validLinks = new Set(data.keys())
+ for (const [source, details] of data.entries()) {
const outgoing = details.links ?? []
for (const dest of outgoing) {
if (validLinks.has(dest)) {
- links.push({ source, target: dest })
+ links.push({ source: source, target: dest })
}
}
@@ -71,7 +74,7 @@
tags.push(...localTags.filter((tag) => !tags.includes(tag)))
for (const tag of localTags) {
- links.push({ source, target: tag })
+ links.push({ source: source, target: tag })
}
}
}
@@ -93,17 +96,17 @@
}
}
} else {
- Object.keys(data).forEach((id) => neighbourhood.add(simplifySlug(id as FullSlug)))
+ validLinks.forEach((id) => neighbourhood.add(id))
if (showTags) tags.forEach((tag) => neighbourhood.add(tag))
}
const graphData: { nodes: NodeData[]; links: LinkData[] } = {
nodes: [...neighbourhood].map((url) => {
- const text = url.startsWith("tags/") ? "#" + url.substring(5) : data[url]?.title ?? url
+ const text = url.startsWith("tags/") ? "#" + url.substring(5) : data.get(url)?.title ?? url
return {
id: url,
text: text,
- tags: data[url]?.tags ?? [],
+ tags: data.get(url)?.tags ?? [],
}
}),
links: links.filter((l) => neighbourhood.has(l.source) && neighbourhood.has(l.target)),
@@ -187,6 +190,8 @@
return 2 + Math.sqrt(numLinks)
}
+ let connectedNodes: SimpleSlug[] = []
+
// draw individual nodes
const node = graphNode
.append("circle")
@@ -200,17 +205,37 @@
window.spaNavigate(new URL(targ, window.location.toString()))
})
.on("mouseover", function (_, d) {
- const neighbours: SimpleSlug[] = data[fullSlug].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)
@@ -229,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")
@@ -247,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")
@@ -317,12 +359,12 @@
registerEscapeHandler(container, hideGlobalGraph)
}
-document.addEventListener("nav", async (e: unknown) => {
- const slug = (e as CustomEventMap["nav"]).detail.url
- addToVisited(slug)
+document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
+ const slug = e.detail.url
+ 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