From 45b93a80f4538b43bf71993d05902308db786051 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 02 Feb 2024 06:22:06 +0000
Subject: [PATCH] fix: index setup, styling fixes
---
quartz/components/scripts/search.inline.ts | 125 +++++++++++++++++++++--------------------
1 files changed, 65 insertions(+), 60 deletions(-)
diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index 797685a..55919cd 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -24,14 +24,20 @@
const numSearchResults = 8
const numTagResults = 5
-const tokenizeTerm = (term: string) =>
- term
- .split(/\s+/)
- .filter((t) => t !== "")
- .sort((a, b) => b.length - a.length)
+const tokenizeTerm = (term: string) => {
+ const tokens = term.split(/\s+/).filter((t) => t.trim() !== "")
+
+ const tokenLen = tokens.length
+ if (tokenLen > 1) {
+ for (let i = 1; i < tokenLen; i++) {
+ tokens.push(tokens.slice(0, i + 1).join(" "))
+ }
+ }
+
+ return tokens.sort((a, b) => b.length - a.length) // always highlight longest terms first
+}
function highlight(searchTerm: string, text: string, trim?: boolean) {
- // try to highlight longest tokens first
const tokenizedTerms = tokenizeTerm(searchTerm)
let tokenizedText = text.split(/\s+/).filter((t) => t !== "")
@@ -69,7 +75,6 @@
}
return tok
})
- .slice(startIndex, endIndex + 1)
.join(" ")
return `${startIndex === 0 ? "" : "..."}${slice}${
@@ -89,29 +94,32 @@
return span
}
- const highlightTextNodes = (node: Node) => {
+ const highlightTextNodes = (node: Node, term: string) => {
if (node.nodeType === Node.TEXT_NODE) {
- let nodeText = node.nodeValue || ""
- tokenizedTerms.forEach((term) => {
- const regex = new RegExp(term.toLowerCase(), "gi")
- const matches = nodeText.match(regex)
- const spanContainer = document.createElement("span")
- let lastIndex = 0
- matches?.forEach((match) => {
- const matchIndex = nodeText.indexOf(match, lastIndex)
- spanContainer.appendChild(document.createTextNode(nodeText.slice(lastIndex, matchIndex)))
- spanContainer.appendChild(createHighlightSpan(match))
- lastIndex = matchIndex + match.length
- })
- spanContainer.appendChild(document.createTextNode(nodeText.slice(lastIndex)))
- node.parentNode?.replaceChild(spanContainer, node)
- })
+ const nodeText = node.nodeValue ?? ""
+ const regex = new RegExp(term.toLowerCase(), "gi")
+ const matches = nodeText.match(regex)
+ if (!matches || matches.length === 0) return
+ const spanContainer = document.createElement("span")
+ let lastIndex = 0
+ for (const match of matches) {
+ const matchIndex = nodeText.indexOf(match, lastIndex)
+ spanContainer.appendChild(document.createTextNode(nodeText.slice(lastIndex, matchIndex)))
+ spanContainer.appendChild(createHighlightSpan(match))
+ lastIndex = matchIndex + match.length
+ }
+ spanContainer.appendChild(document.createTextNode(nodeText.slice(lastIndex)))
+ node.parentNode?.replaceChild(spanContainer, node)
} else if (node.nodeType === Node.ELEMENT_NODE) {
- Array.from(node.childNodes).forEach(highlightTextNodes)
+ if ((node as HTMLElement).classList.contains("highlight")) return
+ Array.from(node.childNodes).forEach((child) => highlightTextNodes(child, term))
}
}
- highlightTextNodes(html.body)
+ for (const term of tokenizedTerms) {
+ highlightTextNodes(html.body, term)
+ }
+
return html.body
}
@@ -120,6 +128,7 @@
const data = await fetchData
const container = document.getElementById("search-container")
+ const searchSpace = document.getElementById("search-space")
const sidebar = container?.closest(".sidebar") as HTMLElement
const searchIcon = document.getElementById("search-icon")
const searchBar = document.getElementById("search-bar") as HTMLInputElement | null
@@ -137,13 +146,13 @@
let previewInner: HTMLDivElement | undefined = undefined
const results = document.createElement("div")
results.id = "results-container"
- results.style.flexBasis = enablePreview ? "30%" : "100%"
+ results.style.flexBasis = enablePreview ? "min(30%, 450px)" : "100%"
appendLayout(results)
if (enablePreview) {
preview = document.createElement("div")
preview.id = "preview-container"
- preview.style.flexBasis = "70%"
+ preview.style.flexBasis = "100%"
appendLayout(preview)
}
@@ -162,7 +171,7 @@
removeAllChildren(preview)
}
if (searchLayout) {
- searchLayout.style.opacity = "0"
+ searchLayout.style.visibility = "hidden"
}
searchType = "basic" // reset search type after closing
@@ -441,11 +450,11 @@
currentSearchTerm = (e.target as HTMLInputElement).value
if (searchLayout) {
- searchLayout.style.opacity = "1"
+ searchLayout.style.visibility = "visible"
}
if (term === "" && searchLayout) {
- searchLayout.style.opacity = "0"
+ searchLayout.style.visibility = "hidden"
}
if (term.toLowerCase().startsWith("#")) {
@@ -495,35 +504,8 @@
searchBar?.addEventListener("input", onType)
window.addCleanup(() => searchBar?.removeEventListener("input", onType))
- // setup index if it hasn't been already
- if (!index) {
- index = new FlexSearch.Document({
- charset: "latin:extra",
- encode: encoder,
- document: {
- id: "id",
- index: [
- {
- field: "title",
- tokenize: "forward",
- },
- {
- field: "content",
- tokenize: "forward",
- },
- {
- field: "tags",
- tokenize: "forward",
- },
- ],
- },
- })
-
- fillDocument(index, data)
- }
-
- // register handlers
- registerEscapeHandler(container, hideSearch)
+ index ??= await fillDocument(data)
+ registerEscapeHandler(searchSpace, hideSearch)
})
/**
@@ -531,7 +513,28 @@
* @param index index to fill
* @param data data to fill index with
*/
-async function fillDocument(index: FlexSearch.Document<Item, false>, data: any) {
+async function fillDocument(data: { [key: FullSlug]: ContentDetails }) {
+ const index = new FlexSearch.Document<Item>({
+ charset: "latin:extra",
+ encode: encoder,
+ document: {
+ id: "id",
+ index: [
+ {
+ field: "title",
+ tokenize: "forward",
+ },
+ {
+ field: "content",
+ tokenize: "forward",
+ },
+ {
+ field: "tags",
+ tokenize: "forward",
+ },
+ ],
+ },
+ })
let id = 0
for (const [slug, fileData] of Object.entries<ContentDetails>(data)) {
await index.addAsync(id++, {
@@ -542,4 +545,6 @@
tags: fileData.tags,
})
}
+
+ return index
}
--
Gitblit v1.10.0