A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
web: fix html entities shown in match result (#9645)
01zulfi21f4b906d74b
diff --git a/apps/web/src/components/search-result/index.tsx b/apps/web/src/components/search-result/index.tsxindex 0bfc16598..4f54b2436 100644--- a/apps/web/src/components/search-result/index.tsx+++ b/apps/web/src/components/search-result/index.tsx@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import { HighlightedResult } from "@notesnook/core";+import { HighlightedResult, Match as TMatch } from "@notesnook/core";import { Button, Flex, Text } from "@theme-ui/components";import React, { Fragment, useState } from "react";import { useEditorStore } from "../../stores/editor-store";@@ -112,11 +112,7 @@ function SearchResult(props: SearchResultProps) {}}>{item.title.map((match) => (- <Fragment key={match.id}>- <span>{match.prefix}</span>- <span className="match">{match.match}</span>- {match.suffix ? <span>{match.suffix}</span> : null}- </Fragment>+ <Match match={match} />))}</Text>@@ -171,11 +167,7 @@ function SearchResult(props: SearchResultProps) {}}>{match.map((match) => (- <Fragment key={match.id}>- <span>{match.prefix}</span>- <span className="match">{match.match}</span>- {match.suffix ? <span>{match.suffix}</span> : null}- </Fragment>+ <Match match={match} />))}</Text>}@@ -193,6 +185,16 @@ function SearchResult(props: SearchResultProps) {export default React.memo(SearchResult);+function Match({ match }: { match: TMatch }) {+ return (+ <Fragment key={match.id}>+ <span>{match.prefix}</span>+ <span className="match">{match.match}</span>+ {match.suffix ? <span>{match.suffix}</span> : null}+ </Fragment>+ );+}+async function menuItems(item: HighlightedResult,ids?: string[]diff --git a/packages/core/__tests__/lookup.test.js b/packages/core/__tests__/lookup.test.jsindex ca9ab7188..0c646d8be 100644--- a/packages/core/__tests__/lookup.test.js+++ b/packages/core/__tests__/lookup.test.js@@ -141,6 +141,23 @@ test("search reminders", () =>}));describe("notesWithHighlighting", () => {+ test("search notes with nbsp in should decode html entities", () =>+ noteTest({+ title: "(with nbsp)",+ content: {+ type: "tiptap",+ data: "<p>hello i am a note</p>"+ }+ }).then(async ({ db }) => {+ const filtered = await db.lookup.notesWithHighlighting(+ "hello",+ db.notes.all+ );+ const item = await filtered.item(0);+ expect(item.item).toBeDefined();+ expect(item.item.content[0][0].suffix.includes(" ")).toBe(false);+ }));+test("search notes with parentheses in query should load the item", () =>noteTest({title: "(with parantheses)"diff --git a/packages/core/src/api/lookup.ts b/packages/core/src/api/lookup.tsindex 4b3489e92..d2506a17e 100644--- a/packages/core/src/api/lookup.ts+++ b/packages/core/src/api/lookup.ts@@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/import { match } from "fuzzyjs";+import { decodeHTML } from "entities";import Database from "./index.js";import {HighlightedResult,@@ -815,7 +816,7 @@ export function splitHighlightedMatch(text: string): Match[][] {}matches.push({- match,+ match: match,prefix: prefix.replace(/\s{2,}/gm, " ").trimStart(),suffix: suffix || "",id: matchId || undefined@@ -1053,7 +1054,7 @@ function highlightHtmlContent(html: string, queries: string[]): string {}},{- decodeEntities: false,+ decodeEntities: true,xmlMode: false});diff --git a/packages/core/src/utils/html-parser.ts b/packages/core/src/utils/html-parser.tsindex 9fbf876fe..46d02e169 100644--- a/packages/core/src/utils/html-parser.ts+++ b/packages/core/src/utils/html-parser.ts@@ -225,7 +225,7 @@ export function extractMatchingBlocks(html: string, matchTagName: string) {},{lowerCaseTags: false,- decodeEntities: false+ decodeEntities: true});parser.end(html);