From b4df8f75b9fa1ce0c0044e8968fa2b3570a22ba5 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 25 May 2025 23:00:53 +0300 Subject: [PATCH] fix(client/search): search broken due to highlighting --- .../widgets/view_widgets/list_or_grid_view.ts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/apps/client/src/widgets/view_widgets/list_or_grid_view.ts b/apps/client/src/widgets/view_widgets/list_or_grid_view.ts index e01fd0c4c..54b83b971 100644 --- a/apps/client/src/widgets/view_widgets/list_or_grid_view.ts +++ b/apps/client/src/widgets/view_widgets/list_or_grid_view.ts @@ -215,8 +215,6 @@ class ListOrGridView extends ViewMode { const highlightedTokens = this.parentNote.highlightedTokens || []; if (highlightedTokens.length > 0) { - await import("mark.js"); - const regex = highlightedTokens.map((token) => utils.escapeRegExp(token)).join("|"); this.highlightRegex = new RegExp(regex, "gi"); @@ -320,11 +318,10 @@ class ListOrGridView extends ViewMode { $expander.on("click", () => this.toggleContent($card, note, !$card.hasClass("expanded"))); if (this.highlightRegex) { - $card.find(".note-book-title").markRegExp(this.highlightRegex, { + const Mark = new (await import("mark.js")).default($card.find(".note-book-title")[0]); + Mark.markRegExp(this.highlightRegex, { element: "span", - className: "ck-find-result", - separateWordSearch: false, - caseSensitive: false + className: "ck-find-result" }); } @@ -362,11 +359,10 @@ class ListOrGridView extends ViewMode { }); if (this.highlightRegex) { - $renderedContent.markRegExp(this.highlightRegex, { + const Mark = new (await import("mark.js")).default($renderedContent[0]); + Mark.markRegExp(this.highlightRegex, { element: "span", - className: "ck-find-result", - separateWordSearch: false, - caseSensitive: false + className: "ck-find-result" }); }