From 08f8e3b4a4879dd7c91c16fbce80c4f2bc5e357f Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 10 Jul 2023 02:32:24 +0000
Subject: [PATCH] docs + various polish
---
quartz/components/scripts/search.inline.ts | 72 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index f69d77d..57628f5 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -10,6 +10,7 @@
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)
@@ -58,39 +59,9 @@
document.addEventListener("nav", async (e: unknown) => {
const currentSlug = (e as CustomEventMap["nav"]).detail.url
- // setup index if it hasn't been already
const data = await fetchData
- if (!index) {
- index = new Document({
- cache: true,
- charset: 'latin:extra',
- optimize: true,
- encode: encoder,
- document: {
- id: "slug",
- index: [
- {
- field: "title",
- tokenize: "forward",
- },
- {
- field: "content",
- tokenize: "reverse",
- },
- ]
- },
- })
-
- for (const [slug, fileData] of Object.entries<ContentDetails>(data)) {
- await index.addAsync(slug, {
- slug,
- title: fileData.title,
- content: fileData.content
- })
- }
- }
-
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")
@@ -100,12 +71,18 @@
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()
}
@@ -158,7 +135,7 @@
function onType(e: HTMLElementEventMap["input"]) {
const term = (e.target as HTMLInputElement).value
- const searchResults = index?.search(term, 5) ?? []
+ const searchResults = index?.search(term, numSearchResults) ?? []
const getByField = (field: string): string[] => {
const results = searchResults.filter((x) => x.field === field)
return results.length === 0 ? [] : [...results[0].result] as string[]
@@ -177,6 +154,37 @@
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',
+ optimize: true,
+ encode: encoder,
+ document: {
+ id: "slug",
+ index: [
+ {
+ field: "title",
+ tokenize: "forward",
+ },
+ {
+ field: "content",
+ tokenize: "reverse",
+ },
+ ]
+ },
+ })
+
+ for (const [slug, fileData] of Object.entries<ContentDetails>(data)) {
+ await index.addAsync(slug, {
+ slug,
+ title: fileData.title,
+ content: fileData.content
+ })
+ }
+ }
+
// register handlers
registerEscapeHandler(container, hideSearch)
})
--
Gitblit v1.10.0