From a5f2f874f75dd53c83b2db883e6871cb84eccf09 Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Aug 2024 09:07:05 +0000
Subject: [PATCH] chore(deps-dev): bump tsx from 4.16.2 to 4.17.0 (#1340)
---
quartz/components/scripts/search.inline.ts | 103 ++++++++++++++++++++++++++-------------------------
1 files changed, 52 insertions(+), 51 deletions(-)
diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index ec55f96..73e64b3 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -21,6 +21,7 @@
encode: encoder,
document: {
id: "id",
+ tag: "tags",
index: [
{
field: "title",
@@ -147,7 +148,7 @@
const data = await fetchData
const container = document.getElementById("search-container")
const sidebar = container?.closest(".sidebar") as HTMLElement
- const searchIcon = document.getElementById("search-icon")
+ const searchButton = document.getElementById("search-button")
const searchBar = document.getElementById("search-bar") as HTMLInputElement | null
const searchLayout = document.getElementById("search-layout")
const idDataMap = Object.keys(data) as FullSlug[]
@@ -163,13 +164,11 @@
let previewInner: HTMLDivElement | undefined = undefined
const results = document.createElement("div")
results.id = "results-container"
- results.style.flexBasis = enablePreview ? "min(30%, 450px)" : "100%"
appendLayout(results)
if (enablePreview) {
preview = document.createElement("div")
preview.id = "preview-container"
- preview.style.flexBasis = "100%"
appendLayout(preview)
}
@@ -192,6 +191,8 @@
}
searchType = "basic" // reset search type after closing
+
+ searchButton?.focus()
}
function showSearch(searchTypeNew: SearchType) {
@@ -224,12 +225,11 @@
if (currentHover) {
currentHover.classList.remove("focus")
- currentHover.blur()
}
// If search is active, then we will render the first result and display accordingly
if (!container?.classList.contains("active")) return
- else if (e.key === "Enter") {
+ if (e.key === "Enter") {
// If result has focus, navigate to that one, otherwise pick first result
if (results?.contains(document.activeElement)) {
const active = document.activeElement as HTMLInputElement
@@ -252,7 +252,7 @@
const prevResult = currentResult?.previousElementSibling as HTMLInputElement | null
currentResult?.classList.remove("focus")
prevResult?.focus()
- currentHover = prevResult
+ if (prevResult) currentHover = prevResult
await displayPreview(prevResult)
}
} else if (e.key === "ArrowDown" || e.key === "Tab") {
@@ -266,18 +266,8 @@
const secondResult = firstResult?.nextElementSibling as HTMLInputElement | null
firstResult?.classList.remove("focus")
secondResult?.focus()
- currentHover = secondResult
+ if (secondResult) currentHover = secondResult
await displayPreview(secondResult)
- } else {
- // If an element in results-container already has focus, focus next one
- const active = currentHover
- ? currentHover
- : (document.activeElement as HTMLInputElement | null)
- active?.classList.remove("focus")
- const nextResult = active?.nextElementSibling as HTMLInputElement | null
- nextResult?.focus()
- currentHover = nextResult
- await displayPreview(nextResult)
}
}
}
@@ -319,40 +309,29 @@
itemTile.classList.add("result-card")
itemTile.id = slug
itemTile.href = resolveUrl(slug).toString()
- itemTile.innerHTML = `<h3>${title}</h3>${htmlTags}<p class="preview">${content}</p>`
+ itemTile.innerHTML = `<h3>${title}</h3>${htmlTags}${
+ enablePreview && window.innerWidth > 600 ? "" : `<p>${content}</p>`
+ }`
+ itemTile.addEventListener("click", (event) => {
+ if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) return
+ hideSearch()
+ })
+
+ const handler = (event: MouseEvent) => {
+ if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) return
+ hideSearch()
+ }
async function onMouseEnter(ev: MouseEvent) {
if (!ev.target) return
- currentHover?.classList.remove("focus")
- currentHover?.blur()
const target = ev.target as HTMLInputElement
- currentHover = target
- currentHover.classList.add("focus")
await displayPreview(target)
}
- async function onMouseLeave(ev: MouseEvent) {
- if (!ev.target) return
- const target = ev.target as HTMLElement
- target.classList.remove("focus")
- }
-
- const events = [
- ["mouseenter", onMouseEnter],
- ["mouseleave", onMouseLeave],
- [
- "click",
- (event: MouseEvent) => {
- if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) return
- hideSearch()
- },
- ],
- ] as const
-
- events.forEach(([event, handler]) => {
- itemTile.addEventListener(event, handler)
- window.addCleanup(() => itemTile.removeEventListener(event, handler))
- })
+ itemTile.addEventListener("mouseenter", onMouseEnter)
+ window.addCleanup(() => itemTile.removeEventListener("mouseenter", onMouseEnter))
+ itemTile.addEventListener("click", handler)
+ window.addCleanup(() => itemTile.removeEventListener("click", handler))
return itemTile
}
@@ -429,11 +408,33 @@
let searchResults: FlexSearch.SimpleDocumentSearchResultSetUnit[]
if (searchType === "tags") {
- searchResults = await index.searchAsync({
- query: currentSearchTerm.substring(1),
- limit: numSearchResults,
- index: ["tags"],
- })
+ currentSearchTerm = currentSearchTerm.substring(1).trim()
+ const separatorIndex = currentSearchTerm.indexOf(" ")
+ if (separatorIndex != -1) {
+ // search by title and content index and then filter by tag (implemented in flexsearch)
+ const tag = currentSearchTerm.substring(0, separatorIndex)
+ const query = currentSearchTerm.substring(separatorIndex + 1).trim()
+ searchResults = await index.searchAsync({
+ query: query,
+ // 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,
+ })
+ for (let searchResult of searchResults) {
+ searchResult.result = searchResult.result.slice(0, numSearchResults)
+ }
+ // set search type to basic and remove tag from term for proper highlightning and scroll
+ searchType = "basic"
+ currentSearchTerm = query
+ } else {
+ // default search by tags index
+ searchResults = await index.searchAsync({
+ query: currentSearchTerm,
+ limit: numSearchResults,
+ index: ["tags"],
+ })
+ }
} else if (searchType === "basic") {
searchResults = await index.searchAsync({
query: currentSearchTerm,
@@ -459,8 +460,8 @@
document.addEventListener("keydown", shortcutHandler)
window.addCleanup(() => document.removeEventListener("keydown", shortcutHandler))
- searchIcon?.addEventListener("click", () => showSearch("basic"))
- window.addCleanup(() => searchIcon?.removeEventListener("click", () => showSearch("basic")))
+ searchButton?.addEventListener("click", () => showSearch("basic"))
+ window.addCleanup(() => searchButton?.removeEventListener("click", () => showSearch("basic")))
searchBar?.addEventListener("input", onType)
window.addCleanup(() => searchBar?.removeEventListener("input", onType))
--
Gitblit v1.10.0