From f31cabbbf9b0d438710618a3edd2a4eaaae09d7d Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 15 Jan 2024 20:37:56 +0000
Subject: [PATCH] fix: dont use default callout title if theres additional title children left (closes #693)
---
quartz/util/path.ts | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/quartz/util/path.ts b/quartz/util/path.ts
index 5cf54b8..95acf11 100644
--- a/quartz/util/path.ts
+++ b/quartz/util/path.ts
@@ -1,5 +1,9 @@
-import { slug } from "github-slugger"
+import { slug as slugAnchor } from "github-slugger"
import type { Element as HastElement } from "hast"
+import rfdc from "rfdc"
+
+export const clone = rfdc()
+
// this file must be isomorphic so it can't use node libs (e.g. path)
export const QUARTZ = "quartz"
@@ -43,6 +47,16 @@
return res
}
+function sluggify(s: string): string {
+ return s
+ .split("/")
+ .map((segment) =>
+ segment.replace(/\s/g, "-").replace(/%/g, "-percent").replace(/\?/g, "-q").replace(/#/g, ""),
+ ) // slugify all segments
+ .join("/") // always use / as sep
+ .replace(/\/$/, "")
+}
+
export function slugifyFilePath(fp: FilePath, excludeExt?: boolean): FullSlug {
fp = _stripSlashes(fp) as FilePath
let ext = _getFileExtension(fp)
@@ -51,11 +65,7 @@
ext = ""
}
- let slug = withoutFileExt
- .split("/")
- .map((segment) => segment.replace(/\s/g, "-").replace(/%/g, "-percent").replace(/\?/g, "-q")) // slugify all segments
- .join("/") // always use / as sep
- .replace(/\/$/, "") // remove trailing slash
+ let slug = sluggify(withoutFileExt)
// treat _index as index
if (_endsWith(slug, "_index")) {
@@ -117,7 +127,8 @@
}
}
-export function normalizeHastElement(el: HastElement, curBase: FullSlug, newBase: FullSlug) {
+export function normalizeHastElement(rawEl: HastElement, curBase: FullSlug, newBase: FullSlug) {
+ const el = clone(rawEl) // clone so we dont modify the original page
_rebaseHastElement(el, "src", curBase, newBase)
_rebaseHastElement(el, "href", curBase, newBase)
if (el.children) {
@@ -156,14 +167,10 @@
return [fp, anchor]
}
-export function slugAnchor(anchor: string) {
- return slug(anchor)
-}
-
export function slugTag(tag: string) {
return tag
.split("/")
- .map((tagSegment) => slug(tagSegment))
+ .map((tagSegment) => sluggify(tagSegment))
.join("/")
}
--
Gitblit v1.10.0