From 16987a029dec1797b028adb1b9f8ebb308d6538b Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Sun, 20 Aug 2023 20:47:07 -0700 Subject: [PATCH] fix: ctrl + k breaking after page nav --- quartz/components/scripts/search.inline.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts index 038566cb..12ee8f72 100644 --- a/quartz/components/scripts/search.inline.ts +++ b/quartz/components/scripts/search.inline.ts @@ -1,7 +1,7 @@ import { Document } from "flexsearch" import { ContentDetails } from "../../plugins/emitters/contentIndex" import { registerEscapeHandler, removeAllChildren } from "./util" -import { FullSlug, getFullSlug, resolveRelative, simplifySlug } from "../../util/path" +import { FullSlug, resolveRelative } from "../../util/path" interface Item { id: number @@ -58,12 +58,12 @@ function highlight(searchTerm: string, text: string, trim?: boolean) { }) .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 @@ -159,8 +159,12 @@ document.addEventListener("nav", async (e: unknown) => { 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)