From df02ea20d7e12e8b9ffdd2968afaf5893c433488 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 11 Aug 2023 04:32:11 +0000
Subject: [PATCH] spacing fix
---
quartz/components/scripts/search.inline.ts | 144 ++++++++++++++++++++++++-----------------------
1 files changed, 74 insertions(+), 70 deletions(-)
diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index b1c6265..40d0bc2 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -1,35 +1,31 @@
import { Document } from "flexsearch"
import { ContentDetails } from "../../plugins/emitters/contentIndex"
-import { registerEscapeHandler } from "./handler"
+import { registerEscapeHandler, removeAllChildren } from "./util"
+import { CanonicalSlug, getClientSlug, resolveRelative } from "../../path"
interface Item {
- slug: string,
- title: string,
- content: string,
+ slug: CanonicalSlug
+ title: string
+ content: string
}
+
let index: Document<Item> | undefined = undefined
-function relative(from: string, to: string) {
- const pieces = [location.protocol, '//', location.host, location.pathname]
- const url = pieces.join('').slice(0, -from.length) + to
- return url
-}
-
-function removeAllChildren(node: HTMLElement) {
- node.innerHTML = ``
-}
-
const contextWindowWords = 30
+const numSearchResults = 5
function highlight(searchTerm: string, text: string, trim?: boolean) {
- const tokenizedTerms = searchTerm.split(/\s+/).filter(t => t !== "")
- let tokenizedText = text
+ // try to highlight longest tokens first
+ 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
@@ -48,58 +44,31 @@
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, "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])/)
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)) {
- index.add({
- 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")
@@ -109,12 +78,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()
}
@@ -132,7 +107,7 @@
}
}
- const formatForDisplay = (term: string, slug: string) => ({
+ const formatForDisplay = (term: string, slug: CanonicalSlug) => ({
slug,
title: highlight(term, data[slug].title ?? ""),
content: highlight(term, data[slug].content ?? "", true),
@@ -143,9 +118,9 @@
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, getClientSlug(window)))
})
return button
}
@@ -162,24 +137,22 @@
} else {
results.append(...finalResults.map(resultToHTML))
}
-
}
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 = index?.search(term, numSearchResults) ?? []
+ const getByField = (field: string): CanonicalSlug[] => {
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 CanonicalSlug[])
}
// 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<CanonicalSlug> = new Set([...getByField("title"), ...getByField("content")])
+ const finalResults = [...allIds].map((id) => formatForDisplay(term, id))
displayResults(finalResults)
}
-
document.removeEventListener("keydown", shortcutHandler)
document.addEventListener("keydown", shortcutHandler)
searchIcon?.removeEventListener("click", showSearch)
@@ -187,6 +160,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: slug as CanonicalSlug,
+ title: fileData.title,
+ content: fileData.content,
+ })
+ }
+ }
+
// register handlers
registerEscapeHandler(container, hideSearch)
})
--
Gitblit v1.10.0