From 7db2eda76cf51fd631d385c12a7b411339406067 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 23 Jul 2023 00:27:41 +0000
Subject: [PATCH] run prettier
---
quartz/components/scripts/graph.inline.ts | 147 +++++++++++++++++++++++++++---------------------
1 files changed, 83 insertions(+), 64 deletions(-)
diff --git a/quartz/components/scripts/graph.inline.ts b/quartz/components/scripts/graph.inline.ts
index 40665ca..bd57f7d 100644
--- a/quartz/components/scripts/graph.inline.ts
+++ b/quartz/components/scripts/graph.inline.ts
@@ -1,31 +1,34 @@
import { ContentDetails } from "../../plugins/emitters/contentIndex"
-import * as d3 from 'd3'
+import * as d3 from "d3"
+import { registerEscapeHandler, removeAllChildren } from "./util"
+import { CanonicalSlug, getCanonicalSlug, getClientSlug, resolveRelative } from "../../path"
type NodeData = {
- id: string,
- text: string,
+ id: CanonicalSlug
+ text: string
tags: string[]
} & d3.SimulationNodeDatum
type LinkData = {
- source: string,
- target: string
+ source: CanonicalSlug
+ target: CanonicalSlug
}
-function relative(from: string, to: string) {
- const pieces = [location.protocol, '//', location.host, location.pathname]
- const url = pieces.join('').slice(0, -from.length) + to
- return url
+const localStorageKey = "graph-visited"
+function getVisited(): Set<CanonicalSlug> {
+ return new Set(JSON.parse(localStorage.getItem(localStorageKey) ?? "[]"))
}
-function removeAllChildren(node: HTMLElement) {
- while (node.firstChild) {
- node.removeChild(node.firstChild)
- }
+function addToVisited(slug: CanonicalSlug) {
+ const visited = getVisited()
+ visited.add(slug)
+ localStorage.setItem(localStorageKey, JSON.stringify([...visited]))
}
-async function renderGraph(container: string, slug: string) {
- const graph = document.getElementById(container)!
+async function renderGraph(container: string, slug: CanonicalSlug) {
+ const visited = getVisited()
+ const graph = document.getElementById(container)
+ if (!graph) return
removeAllChildren(graph)
let {
@@ -37,7 +40,7 @@
centerForce,
linkDistance,
fontSize,
- opacityScale
+ opacityScale,
} = JSON.parse(graph.dataset["cfg"]!)
const data = await fetchData
@@ -47,35 +50,38 @@
const outgoing = details.links ?? []
for (const dest of outgoing) {
if (src in data && dest in data) {
- links.push({ source: src, target: dest })
+ links.push({ source: src as CanonicalSlug, target: dest })
}
}
}
- const neighbourhood = new Set()
-
- const wl = [slug, "__SENTINEL"]
+ const neighbourhood = new Set<CanonicalSlug>()
+ const wl: (CanonicalSlug | "__SENTINEL")[] = [slug, "__SENTINEL"]
if (depth >= 0) {
while (depth >= 0 && wl.length > 0) {
// compute neighbours
- const cur = wl.shift()
+ const cur = wl.shift()!
if (cur === "__SENTINEL") {
depth--
wl.push("__SENTINEL")
} else {
neighbourhood.add(cur)
- const outgoing = links.filter(l => l.source === cur)
- const incoming = links.filter(l => l.target === cur)
+ const outgoing = links.filter((l) => l.source === cur)
+ const incoming = links.filter((l) => l.target === cur)
wl.push(...outgoing.map((l) => l.target), ...incoming.map((l) => l.source))
}
}
} else {
- links.flatMap(l => [l.source, l.target]).forEach((id) => neighbourhood.add(id))
+ Object.keys(data).forEach((id) => neighbourhood.add(id as CanonicalSlug))
}
- const graphData: { nodes: NodeData[], links: LinkData[] } = {
- nodes: Object.keys(data).filter(id => neighbourhood.has(id)).map(url => ({ id: url, text: data[url]?.title ?? url, tags: data[url]?.tags ?? [] })),
- links: links.filter((l) => neighbourhood.has(l.source) && neighbourhood.has(l.target))
+ const graphData: { nodes: NodeData[]; links: LinkData[] } = {
+ nodes: [...neighbourhood].map((url) => ({
+ id: url,
+ text: data[url]?.title ?? url,
+ tags: data[url]?.tags ?? [],
+ })),
+ links: links.filter((l) => neighbourhood.has(l.source) && neighbourhood.has(l.target)),
}
const simulation: d3.Simulation<NodeData, LinkData> = d3
@@ -94,11 +100,11 @@
const width = graph.offsetWidth
const svg = d3
- .select<HTMLElement, NodeData>('#' + container)
+ .select<HTMLElement, NodeData>("#" + container)
.append("svg")
.attr("width", width)
.attr("height", height)
- .attr('viewBox', [-width / 2 / scale, -height / 2 / scale, width / scale, height / scale])
+ .attr("viewBox", [-width / 2 / scale, -height / 2 / scale, width / scale, height / scale])
// draw links between nodes
const link = svg
@@ -108,16 +114,21 @@
.join("line")
.attr("class", "link")
.attr("stroke", "var(--lightgray)")
- .attr("stroke-width", 2)
+ .attr("stroke-width", 1)
// svg groups
const graphNode = svg.append("g").selectAll("g").data(graphData.nodes).enter().append("g")
- // calculate radius
+ // calculate color
const color = (d: NodeData) => {
- // TODO: does this handle the index page
const isCurrent = d.id === slug
- return isCurrent ? "var(--secondary)" : "var(--gray)"
+ if (isCurrent) {
+ return "var(--secondary)"
+ } else if (visited.has(d.id)) {
+ return "var(--tertiary)"
+ } else {
+ return "var(--gray)"
+ }
}
const drag = (simulation: d3.Simulation<NodeData, LinkData>) => {
@@ -138,7 +149,7 @@
d.fy = null
}
- const noop = () => { }
+ const noop = () => {}
return d3
.drag<Element, NodeData>()
.on("start", enableDrag ? dragstarted : noop)
@@ -160,12 +171,15 @@
.attr("fill", color)
.style("cursor", "pointer")
.on("click", (_, d) => {
- const targ = relative(slug, d.id)
- window.spaNavigate(new URL(targ))
+ const targ = resolveRelative(slug, d.id)
+ window.spaNavigate(new URL(targ, getClientSlug(window)))
})
- .on("mouseover", function(_, d) {
- const neighbours: string[] = data[slug].links ?? []
- const neighbourNodes = d3.selectAll<HTMLElement, NodeData>(".node").filter((d) => neighbours.includes(d.id))
+ .on("mouseover", function (_, d) {
+ const neighbours: CanonicalSlug[] = data[slug].links ?? []
+ const neighbourNodes = d3
+ .selectAll<HTMLElement, NodeData>(".node")
+ .filter((d) => neighbours.includes(d.id))
+ console.log(neighbourNodes)
const currentId = d.id
const linkNodes = d3
.selectAll(".link")
@@ -175,7 +189,7 @@
neighbourNodes.transition().duration(200).attr("fill", color)
// highlight links
- linkNodes.transition().duration(200).attr("stroke", "var(--gray)")
+ linkNodes.transition().duration(200).attr("stroke", "var(--gray)").attr("stroke-width", 1)
const bigFont = fontSize * 1.5
@@ -186,11 +200,11 @@
.select("text")
.transition()
.duration(200)
- .attr('opacityOld', d3.select(parent).select('text').style("opacity"))
- .style('opacity', 1)
- .style('font-size', bigFont + 'em')
+ .attr("opacityOld", d3.select(parent).select("text").style("opacity"))
+ .style("opacity", 1)
+ .style("font-size", bigFont + "em")
})
- .on("mouseleave", function(_, d) {
+ .on("mouseleave", function (_, d) {
const currentId = d.id
const linkNodes = d3
.selectAll(".link")
@@ -203,8 +217,8 @@
.select("text")
.transition()
.duration(200)
- .style('opacity', d3.select(parent).select('text').attr("opacityOld"))
- .style('font-size', fontSize + 'em')
+ .style("opacity", d3.select(parent).select("text").attr("opacityOld"))
+ .style("font-size", fontSize + "em")
})
// @ts-ignore
.call(drag(simulation))
@@ -213,12 +227,14 @@
const labels = graphNode
.append("text")
.attr("dx", 0)
- .attr("dy", (d) => nodeRadius(d) + 8 + "px")
+ .attr("dy", (d) => -nodeRadius(d) + "px")
.attr("text-anchor", "middle")
- .text((d) => data[d.id]?.title || (d.id.charAt(1).toUpperCase() + d.id.slice(2)).replace("-", " "))
- .style('opacity', (opacityScale - 1) / 3.75)
+ .text(
+ (d) => data[d.id]?.title || (d.id.charAt(1).toUpperCase() + d.id.slice(2)).replace("-", " "),
+ )
+ .style("opacity", (opacityScale - 1) / 3.75)
.style("pointer-events", "none")
- .style('font-size', fontSize + 'em')
+ .style("font-size", fontSize + "em")
.raise()
// @ts-ignore
.call(drag(simulation))
@@ -236,7 +252,7 @@
.on("zoom", ({ transform }) => {
link.attr("transform", transform)
node.attr("transform", transform)
- const scale = transform.k * opacityScale;
+ const scale = transform.k * opacityScale
const scaledOpacity = Math.max((scale - 1) / 3.75, 0)
labels.attr("transform", transform).style("opacity", scaledOpacity)
}),
@@ -250,35 +266,38 @@
.attr("y1", (d: any) => d.source.y)
.attr("x2", (d: any) => d.target.x)
.attr("y2", (d: any) => d.target.y)
- node
- .attr("cx", (d: any) => d.x)
- .attr("cy", (d: any) => d.y)
- labels
- .attr("x", (d: any) => d.x)
- .attr("y", (d: any) => d.y)
+ node.attr("cx", (d: any) => d.x).attr("cy", (d: any) => d.y)
+ labels.attr("x", (d: any) => d.x).attr("y", (d: any) => d.y)
})
}
function renderGlobalGraph() {
- const slug = document.body.dataset["slug"]!
- renderGraph("global-graph-container", slug)
+ const slug = getCanonicalSlug(window)
const container = document.getElementById("global-graph-outer")
+ const sidebar = container?.closest(".sidebar") as HTMLElement
container?.classList.add("active")
+ if (sidebar) {
+ sidebar.style.zIndex = "1"
+ }
- function hideGlobalGraph(this: HTMLElement, e: HTMLElementEventMap["click"]) {
- if (e.target !== this) return
+ renderGraph("global-graph-container", slug)
+ function hideGlobalGraph() {
container?.classList.remove("active")
- const graph = document.getElementById("global-graph-container")!
+ const graph = document.getElementById("global-graph-container")
+ if (sidebar) {
+ sidebar.style.zIndex = "unset"
+ }
+ if (!graph) return
removeAllChildren(graph)
}
- container?.removeEventListener("click", hideGlobalGraph)
- container?.addEventListener("click", hideGlobalGraph)
+ registerEscapeHandler(container, hideGlobalGraph)
}
document.addEventListener("nav", async (e: unknown) => {
const slug = (e as CustomEventMap["nav"]).detail.url
+ addToVisited(slug)
await renderGraph("graph-container", slug)
const containerIcon = document.getElementById("global-graph-icon")
--
Gitblit v1.10.0