From c91e62c376d481534d89084e5c04846878dff6d3 Mon Sep 17 00:00:00 2001
From: Ben Schlegel <31989404+benschlegel@users.noreply.github.com>
Date: Sun, 27 Aug 2023 00:19:45 +0000
Subject: [PATCH] Fix search bar after navigate (#424)
---
quartz/components/scripts/search.inline.ts | 113 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 71 insertions(+), 42 deletions(-)
diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index 054d352..ef26ba3 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -1,26 +1,32 @@
import { Document } from "flexsearch"
import { ContentDetails } from "../../plugins/emitters/contentIndex"
-import { registerEscapeHandler, relative, removeAllChildren } from "./util"
+import { registerEscapeHandler, removeAllChildren } from "./util"
+import { FullSlug, resolveRelative } from "../../util/path"
interface Item {
- slug: string,
- title: string,
- content: string,
+ id: number
+ slug: FullSlug
+ title: string
+ content: string
}
+
let index: Document<Item> | undefined = undefined
const contextWindowWords = 30
+const numSearchResults = 5
function highlight(searchTerm: string, text: string, trim?: boolean) {
// try to highlight longest tokens first
- const tokenizedTerms = searchTerm.split(/\s+/).filter(t => t !== "").sort((a, b) => b.length - a.length)
- let tokenizedText = text
+ const tokenizedTerms = searchTerm
.split(/\s+/)
- .filter(t => t !== "")
+ .filter((t) => t !== "")
+ .sort((a, b) => b.length - a.length)
+ let tokenizedText = text.split(/\s+/).filter((t) => t !== "")
let startIndex = 0
let endIndex = tokenizedText.length - 1
if (trim) {
- const includesCheck = (tok: string) => tokenizedTerms.some((term) => tok.toLowerCase().startsWith(term.toLowerCase()))
+ const includesCheck = (tok: string) =>
+ tokenizedTerms.some((term) => tok.toLowerCase().startsWith(term.toLowerCase()))
const occurencesIndices = tokenizedText.map(includesCheck)
let bestSum = 0
@@ -39,42 +45,54 @@
tokenizedText = tokenizedText.slice(startIndex, endIndex)
}
- const slice = tokenizedText.map(tok => {
- // see if this tok is prefixed by any search terms
- for (const searchTok of tokenizedTerms) {
- if (tok.toLowerCase().includes(searchTok.toLowerCase())) {
- const regex = new RegExp(searchTok.toLowerCase(), "gi")
- return tok.replace(regex, `<span class="highlight">$&</span>`)
+ const slice = tokenizedText
+ .map((tok) => {
+ // see if this tok is prefixed by any search terms
+ for (const searchTok of tokenizedTerms) {
+ if (tok.toLowerCase().includes(searchTok.toLowerCase())) {
+ const regex = new RegExp(searchTok.toLowerCase(), "gi")
+ return tok.replace(regex, `<span class="highlight">$&</span>`)
+ }
}
- }
- return tok
- })
+ return tok
+ })
.join(" ")
- return `${startIndex === 0 ? "" : "..."}${slice}${endIndex === tokenizedText.length - 1 ? "" : "..."}`
+ return `${startIndex === 0 ? "" : "..."}${slice}${
+ endIndex === tokenizedText.length - 1 ? "" : "..."
+ }`
}
const encoder = (str: string) => str.toLowerCase().split(/([^a-z]|[^\x00-\x7F])/)
+let prevShortcutHandler: ((e: HTMLElementEventMap["keydown"]) => void) | undefined = undefined
document.addEventListener("nav", async (e: unknown) => {
const currentSlug = (e as CustomEventMap["nav"]).detail.url
const data = await fetchData
const container = document.getElementById("search-container")
+ const sidebar = container?.closest(".sidebar") as HTMLElement
const searchIcon = document.getElementById("search-icon")
const searchBar = document.getElementById("search-bar") as HTMLInputElement | null
const results = document.getElementById("results-container")
+ const idDataMap = Object.keys(data) as FullSlug[]
function hideSearch() {
container?.classList.remove("active")
if (searchBar) {
searchBar.value = "" // clear the input when we dismiss the search
}
+ if (sidebar) {
+ sidebar.style.zIndex = "unset"
+ }
if (results) {
removeAllChildren(results)
}
}
function showSearch() {
+ if (sidebar) {
+ sidebar.style.zIndex = "1"
+ }
container?.classList.add("active")
searchBar?.focus()
}
@@ -92,20 +110,25 @@
}
}
- const formatForDisplay = (term: string, slug: string) => ({
- slug,
- title: highlight(term, data[slug].title ?? ""),
- content: highlight(term, data[slug].content ?? "", true),
- })
+ const formatForDisplay = (term: string, id: number) => {
+ const slug = idDataMap[id]
+ return {
+ id,
+ slug,
+ title: highlight(term, data[slug].title ?? ""),
+ content: highlight(term, data[slug].content ?? "", true),
+ }
+ }
const resultToHTML = ({ slug, title, content }: Item) => {
const button = document.createElement("button")
button.classList.add("result-card")
button.id = slug
button.innerHTML = `<h3>${title}</h3><p>${content}</p>`
- button.addEventListener('click', () => {
- const targ = relative(currentSlug, slug)
- window.spaNavigate(new URL(targ))
+ button.addEventListener("click", () => {
+ const targ = resolveRelative(currentSlug, slug)
+ window.spaNavigate(new URL(targ, window.location.toString()))
+ hideSearch()
})
return button
}
@@ -122,58 +145,64 @@
} else {
results.append(...finalResults.map(resultToHTML))
}
-
}
- function onType(e: HTMLElementEventMap["input"]) {
+ async function onType(e: HTMLElementEventMap["input"]) {
const term = (e.target as HTMLInputElement).value
- const searchResults = index?.search(term, 5) ?? []
- const getByField = (field: string): string[] => {
+ const searchResults = (await index?.searchAsync(term, numSearchResults)) ?? []
+ const getByField = (field: string): number[] => {
const results = searchResults.filter((x) => x.field === field)
- return results.length === 0 ? [] : [...results[0].result] as string[]
+ return results.length === 0 ? [] : ([...results[0].result] as number[])
}
// order titles ahead of content
- const allIds: Set<string> = new Set([...getByField("title"), ...getByField("content")])
- const finalResults = [...allIds].map(id => formatForDisplay(term, id))
+ const allIds: Set<number> = new Set([...getByField("title"), ...getByField("content")])
+ const finalResults = [...allIds].map((id) => formatForDisplay(term, id))
displayResults(finalResults)
}
- document.removeEventListener("keydown", shortcutHandler)
+ if (prevShortcutHandler) {
+ document.removeEventListener("keydown", prevShortcutHandler)
+ }
+
document.addEventListener("keydown", shortcutHandler)
+ prevShortcutHandler = shortcutHandler
searchIcon?.removeEventListener("click", showSearch)
searchIcon?.addEventListener("click", showSearch)
searchBar?.removeEventListener("input", onType)
searchBar?.addEventListener("input", onType)
-
+
// setup index if it hasn't been already
if (!index) {
index = new Document({
cache: true,
- charset: 'latin:extra',
+ charset: "latin:extra",
optimize: true,
encode: encoder,
document: {
- id: "slug",
+ id: "id",
index: [
{
field: "title",
- tokenize: "forward",
+ tokenize: "reverse",
},
{
field: "content",
tokenize: "reverse",
},
- ]
+ ],
},
})
+ let id = 0
for (const [slug, fileData] of Object.entries<ContentDetails>(data)) {
- await index.addAsync(slug, {
- slug,
+ await index.addAsync(id, {
+ id,
+ slug: slug as FullSlug,
title: fileData.title,
- content: fileData.content
+ content: fileData.content,
})
+ id++
}
}
--
Gitblit v1.10.0