From 01d7d8e55448abe0a929d8730c735bed5d929048 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 20 Jul 2023 06:03:59 +0000
Subject: [PATCH] fix tag pages to emit to tag/index.html to override content and folder pages
---
quartz/components/scripts/graph.inline.ts | 82 +++++++++++++++++++++++++---------------
1 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/quartz/components/scripts/graph.inline.ts b/quartz/components/scripts/graph.inline.ts
index 1c1149d..ae4f40f 100644
--- a/quartz/components/scripts/graph.inline.ts
+++ b/quartz/components/scripts/graph.inline.ts
@@ -1,31 +1,32 @@
import { ContentDetails } from "../../plugins/emitters/contentIndex"
import * as d3 from 'd3'
-import { registerEscapeHandler } from "./handler"
+import { registerEscapeHandler, removeAllChildren } from "./util"
+import { CanonicalSlug, getCanonicalSlug, getClientSlug, resolveRelative } from "../../path"
type NodeData = {
- id: 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) {
+async function renderGraph(container: string, slug: CanonicalSlug) {
+ const visited = getVisited()
const graph = document.getElementById(container)
if (!graph) return
removeAllChildren(graph)
@@ -49,18 +50,17 @@
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")
@@ -72,11 +72,11 @@
}
}
} 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 ?? [] })),
+ 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))
}
@@ -110,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>) => {
@@ -162,12 +167,13 @@
.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 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")
@@ -177,7 +183,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
@@ -215,7 +226,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)
@@ -262,15 +273,22 @@
}
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"
+ }
+ renderGraph("global-graph-container", slug)
function hideGlobalGraph() {
container?.classList.remove("active")
const graph = document.getElementById("global-graph-container")
+ if (sidebar) {
+ sidebar.style.zIndex = "unset"
+ }
if (!graph) return
removeAllChildren(graph)
}
@@ -280,9 +298,11 @@
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