From 38cff2d670ecf7fd325aaaf776a4c250a72cc661 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 04 Jul 2023 23:48:36 +0000
Subject: [PATCH] more visual polish, adjust colours and spacing
---
quartz/components/scripts/graph.inline.ts | 56 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/quartz/components/scripts/graph.inline.ts b/quartz/components/scripts/graph.inline.ts
index 40665ca..33e90c7 100644
--- a/quartz/components/scripts/graph.inline.ts
+++ b/quartz/components/scripts/graph.inline.ts
@@ -1,5 +1,6 @@
import { ContentDetails } from "../../plugins/emitters/contentIndex"
import * as d3 from 'd3'
+import { registerEscapeHandler, relative, removeAllChildren } from "./util"
type NodeData = {
id: string,
@@ -12,20 +13,21 @@
target: string
}
-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<string> {
+ return new Set(JSON.parse(localStorage.getItem(localStorageKey) ?? "[]"))
}
-function removeAllChildren(node: HTMLElement) {
- while (node.firstChild) {
- node.removeChild(node.firstChild)
- }
+function addToVisited(slug: string) {
+ const visited = getVisited()
+ visited.add(slug)
+ localStorage.setItem(localStorageKey, JSON.stringify([...visited]))
}
async function renderGraph(container: string, slug: string) {
- const graph = document.getElementById(container)!
+ const visited = getVisited()
+ const graph = document.getElementById(container)
+ if (!graph) return
removeAllChildren(graph)
let {
@@ -108,16 +110,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>) => {
@@ -175,7 +182,12 @@
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
@@ -213,7 +225,7 @@
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)
@@ -261,27 +273,27 @@
function renderGlobalGraph() {
const slug = document.body.dataset["slug"]!
- renderGraph("global-graph-container", slug)
const container = document.getElementById("global-graph-outer")
container?.classList.add("active")
+ renderGraph("global-graph-container", slug)
- function hideGlobalGraph(this: HTMLElement, e: HTMLElementEventMap["click"]) {
- if (e.target !== this) return
-
+ function hideGlobalGraph() {
container?.classList.remove("active")
- const graph = document.getElementById("global-graph-container")!
+ const graph = document.getElementById("global-graph-container")
+ 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")
containerIcon?.removeEventListener("click", renderGlobalGraph)
containerIcon?.addEventListener("click", renderGlobalGraph)
})
+
--
Gitblit v1.10.0