From 3231ce6e7970dd0bc79c33aa8bc09cfa9ab59d09 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 02 Feb 2024 09:36:17 +0000
Subject: [PATCH] fix: search async ordering, scroll offset
---
quartz/components/styles/search.scss | 1 +
quartz/components/scripts/search.inline.ts | 16 ++++++++--------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index abdef06..ec55f96 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -224,6 +224,7 @@
if (currentHover) {
currentHover.classList.remove("focus")
+ currentHover.blur()
}
// If search is active, then we will render the first result and display accordingly
@@ -250,9 +251,9 @@
: (document.activeElement as HTMLInputElement | null)
const prevResult = currentResult?.previousElementSibling as HTMLInputElement | null
currentResult?.classList.remove("focus")
- await displayPreview(prevResult)
prevResult?.focus()
currentHover = prevResult
+ await displayPreview(prevResult)
}
} else if (e.key === "ArrowDown" || e.key === "Tab") {
e.preventDefault()
@@ -264,9 +265,9 @@
: (document.getElementsByClassName("result-card")[0] as HTMLInputElement | null)
const secondResult = firstResult?.nextElementSibling as HTMLInputElement | null
firstResult?.classList.remove("focus")
- await displayPreview(secondResult)
secondResult?.focus()
currentHover = secondResult
+ await displayPreview(secondResult)
} else {
// If an element in results-container already has focus, focus next one
const active = currentHover
@@ -274,9 +275,9 @@
: (document.activeElement as HTMLInputElement | null)
active?.classList.remove("focus")
const nextResult = active?.nextElementSibling as HTMLInputElement | null
- await displayPreview(nextResult)
nextResult?.focus()
currentHover = nextResult
+ await displayPreview(nextResult)
}
}
}
@@ -325,9 +326,9 @@
currentHover?.classList.remove("focus")
currentHover?.blur()
const target = ev.target as HTMLInputElement
- await displayPreview(target)
currentHover = target
currentHover.classList.add("focus")
+ await displayPreview(target)
}
async function onMouseLeave(ev: MouseEvent) {
@@ -405,12 +406,11 @@
async function displayPreview(el: HTMLElement | null) {
if (!searchLayout || !enablePreview || !el || !preview) return
const slug = el.id as FullSlug
- el.classList.add("focus")
- previewInner = document.createElement("div")
- previewInner.classList.add("preview-inner")
const innerDiv = await fetchContent(slug).then((contents) =>
contents.flatMap((el) => [...highlightHTML(currentSearchTerm, el as HTMLElement).children]),
)
+ previewInner = document.createElement("div")
+ previewInner.classList.add("preview-inner")
previewInner.append(...innerDiv)
preview.replaceChildren(previewInner)
@@ -418,7 +418,7 @@
const highlights = [...preview.querySelectorAll(".highlight")].sort(
(a, b) => b.innerHTML.length - a.innerHTML.length,
)
- highlights[0]?.scrollIntoView()
+ highlights[0]?.scrollIntoView({ block: "start" })
}
async function onType(e: HTMLElementEventMap["input"]) {
diff --git a/quartz/components/styles/search.scss b/quartz/components/styles/search.scss
index 7ede359..d6202b5 100644
--- a/quartz/components/styles/search.scss
+++ b/quartz/components/styles/search.scss
@@ -131,6 +131,7 @@
& .highlight {
background: color-mix(in srgb, var(--tertiary) 60%, transparent);
border-radius: 5px;
+ scroll-margin-top: 2rem;
}
& > #preview-container {
--
Gitblit v1.10.0