From 22cb2f182940e45998a471e3091ef1739f11ace1 Mon Sep 17 00:00:00 2001 From: Abdullah Atta Date: Mon, 18 Dec 2023 15:13:00 +0500 Subject: [PATCH] web: fix notes search in tags, favorites etc --- apps/web/src/stores/note-store.ts | 2 +- apps/web/src/views/notes.tsx | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/web/src/stores/note-store.ts b/apps/web/src/stores/note-store.ts index 4740268d5..a956e1504 100644 --- a/apps/web/src/stores/note-store.ts +++ b/apps/web/src/stores/note-store.ts @@ -168,7 +168,7 @@ class NoteStore extends BaseStore { const [useStore, store] = createStore(NoteStore); export { useStore, store }; -function notesFromContext(context: Context) { +export function notesFromContext(context: Context) { switch (context.type) { case "notebook": case "tag": diff --git a/apps/web/src/views/notes.tsx b/apps/web/src/views/notes.tsx index 45188409d..90cca32d6 100644 --- a/apps/web/src/views/notes.tsx +++ b/apps/web/src/views/notes.tsx @@ -19,7 +19,10 @@ along with this program. If not, see . import { useEffect } from "react"; import ListContainer from "../components/list-container"; -import { useStore as useNotesStore } from "../stores/note-store"; +import { + notesFromContext, + useStore as useNotesStore +} from "../stores/note-store"; import { hashNavigate, navigate } from "../navigation"; import Placeholder from "../components/placeholders"; import { useSearch } from "../hooks/use-search"; @@ -35,7 +38,8 @@ function Notes() { "notes", (query) => { if (!context || !contextNotes) return; - return db.lookup.notes(query, contextNotes.ungrouped).sorted(); + const notes = notesFromContext(context); + return db.lookup.notes(query, notes).sorted(); }, [context, contextNotes] );