From fa8d87a23a85a6ccb4dd716f4930fb7f55f809e8 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 08 Jan 2026 01:04:56 +0000
Subject: [PATCH] docs: link fixes and cleanup
---
quartz/components/scripts/search.inline.ts | 75 ++++++++++++++++++++++++++++++-------
1 files changed, 60 insertions(+), 15 deletions(-)
diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index c9bbcce..717f17f 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -1,4 +1,4 @@
-import FlexSearch from "flexsearch"
+import FlexSearch, { DefaultDocumentSearchResults } from "flexsearch"
import { ContentDetails } from "../../plugins/emitters/contentIndex"
import { registerEscapeHandler, removeAllChildren } from "./util"
import { FullSlug, normalizeRelativeURLs, resolveRelative } from "../../util/path"
@@ -9,15 +9,59 @@
title: string
content: string
tags: string[]
+ [key: string]: any
}
// Can be expanded with things like "term" in the future
type SearchType = "basic" | "tags"
let searchType: SearchType = "basic"
let currentSearchTerm: string = ""
-const encoder = (str: string) => str.toLowerCase().split(/([^a-z]|[^\x00-\x7F])/)
+const encoder = (str: string): string[] => {
+ const tokens: string[] = []
+ let bufferStart = -1
+ let bufferEnd = -1
+ const lower = str.toLowerCase()
+
+ let i = 0
+ for (const char of lower) {
+ const code = char.codePointAt(0)!
+
+ const isCJK =
+ (code >= 0x3040 && code <= 0x309f) ||
+ (code >= 0x30a0 && code <= 0x30ff) ||
+ (code >= 0x4e00 && code <= 0x9fff) ||
+ (code >= 0xac00 && code <= 0xd7af) ||
+ (code >= 0x20000 && code <= 0x2a6df)
+
+ const isWhitespace = code === 32 || code === 9 || code === 10 || code === 13
+
+ if (isCJK) {
+ if (bufferStart !== -1) {
+ tokens.push(lower.slice(bufferStart, bufferEnd))
+ bufferStart = -1
+ }
+ tokens.push(char)
+ } else if (isWhitespace) {
+ if (bufferStart !== -1) {
+ tokens.push(lower.slice(bufferStart, bufferEnd))
+ bufferStart = -1
+ }
+ } else {
+ if (bufferStart === -1) bufferStart = i
+ bufferEnd = i + char.length
+ }
+
+ i += char.length
+ }
+
+ if (bufferStart !== -1) {
+ tokens.push(lower.slice(bufferStart))
+ }
+
+ return tokens
+}
+
let index = new FlexSearch.Document<Item>({
- charset: "latin:extra",
encode: encoder,
document: {
id: "id",
@@ -147,8 +191,7 @@
const container = searchElement.querySelector(".search-container") as HTMLElement
if (!container) return
- const sidebar = container.closest(".sidebar") as HTMLElement
- if (!sidebar) return
+ const sidebar = container.closest(".sidebar") as HTMLElement | null
const searchButton = searchElement.querySelector(".search-button") as HTMLButtonElement
if (!searchButton) return
@@ -180,7 +223,7 @@
function hideSearch() {
container.classList.remove("active")
searchBar.value = "" // clear the input when we dismiss the search
- sidebar.style.zIndex = ""
+ if (sidebar) sidebar.style.zIndex = ""
removeAllChildren(results)
if (preview) {
removeAllChildren(preview)
@@ -192,7 +235,7 @@
function showSearch(searchTypeNew: SearchType) {
searchType = searchTypeNew
- sidebar.style.zIndex = "1"
+ if (sidebar) sidebar.style.zIndex = "1"
container.classList.add("active")
searchBar.focus()
}
@@ -221,7 +264,7 @@
// If search is active, then we will render the first result and display accordingly
if (!container.classList.contains("active")) return
- if (e.key === "Enter") {
+ if (e.key === "Enter" && !e.isComposing) {
// If result has focus, navigate to that one, otherwise pick first result
if (results.contains(document.activeElement)) {
const active = document.activeElement as HTMLInputElement
@@ -301,9 +344,11 @@
itemTile.classList.add("result-card")
itemTile.id = slug
itemTile.href = resolveUrl(slug).toString()
- itemTile.innerHTML = `<h3>${title}</h3>${htmlTags}${
- enablePreview && window.innerWidth > 600 ? "" : `<p>${content}</p>`
- }`
+ itemTile.innerHTML = `
+ <h3 class="card-title">${title}</h3>
+ ${htmlTags}
+ <p class="card-description">${content}</p>
+ `
itemTile.addEventListener("click", (event) => {
if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) return
hideSearch()
@@ -384,7 +429,7 @@
preview.replaceChildren(previewInner)
// scroll to longest
- const highlights = [...preview.querySelectorAll(".highlight")].sort(
+ const highlights = [...preview.getElementsByClassName("highlight")].sort(
(a, b) => b.innerHTML.length - a.innerHTML.length,
)
highlights[0]?.scrollIntoView({ block: "start" })
@@ -396,7 +441,7 @@
searchLayout.classList.toggle("display-results", currentSearchTerm !== "")
searchType = currentSearchTerm.startsWith("#") ? "tags" : "basic"
- let searchResults: FlexSearch.SimpleDocumentSearchResultSetUnit[]
+ let searchResults: DefaultDocumentSearchResults<Item>
if (searchType === "tags") {
currentSearchTerm = currentSearchTerm.substring(1).trim()
const separatorIndex = currentSearchTerm.indexOf(" ")
@@ -409,7 +454,7 @@
// return at least 10000 documents, so it is enough to filter them by tag (implemented in flexsearch)
limit: Math.max(numSearchResults, 10000),
index: ["title", "content"],
- tag: tag,
+ tag: { tags: tag },
})
for (let searchResult of searchResults) {
searchResult.result = searchResult.result.slice(0, numSearchResults)
@@ -488,7 +533,7 @@
document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
const currentSlug = e.detail.url
const data = await fetchData
- const searchElement = document.querySelectorAll(".search")
+ const searchElement = document.getElementsByClassName("search")
for (const element of searchElement) {
await setupSearch(element, currentSlug, data)
}
--
Gitblit v1.10.0