From 9b75843a9ddeaa1849c6a58f3a8f18db8957855f Mon Sep 17 00:00:00 2001
From: Marco Crapts <mcrapts@gmail.com>
Date: Sat, 13 May 2023 07:29:27 +0200
Subject: [PATCH] update active note

---
 src/components/Note.vue                |  3 ++-
 src/components/Note/NoteEditor.vue     |  4 ++--
 src/components/Note/NoteReferences.vue |  4 ++--
 src/components/Search/SearchBar.vue    |  4 ++--
 src/components/SideBar.vue             |  6 +++---
 src/composables/useNotes.ts            | 13 ++++++++-----
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/components/Note.vue b/src/components/Note.vue
index d97288e..40e5a98 100644
--- a/src/components/Note.vue
+++ b/src/components/Note.vue
@@ -7,6 +7,7 @@ import {
   deleteNote,
   rootNote,
   setRootNote,
+  setActiveNote,
 } from '@/composables/useNotes'
 
 const props = defineProps<{
@@ -39,7 +40,7 @@ const references = computed<Note[]>(() => {
 
 const del = async (closeModal: () => Promise<Boolean>) => {
   await closeModal()
-  activeNote.value = rootNote.value
+  setActiveNote(rootNote.value?.id)
   deleteNote(props.note.id)
 }
 
diff --git a/src/components/Note/NoteEditor.vue b/src/components/Note/NoteEditor.vue
index 2cf3006..2c4829e 100644
--- a/src/components/Note/NoteEditor.vue
+++ b/src/components/Note/NoteEditor.vue
@@ -13,7 +13,7 @@ import ListPlugin from '@ckeditor/ckeditor5-list/src/list'
 import AutoformatPlugin from '@ckeditor/ckeditor5-autoformat/src/autoformat'
 import ContextedPlugin from '@/ckeditor/ContextedPlugin'
 import { mdToHtml } from '@/utils/markdown'
-import { activeNote, getNoteByTitle } from '@/composables/useNotes'
+import { getNoteByTitle, setActiveNote } from '@/composables/useNotes'
 import Autocomplete from '@/components/Autocomplete.vue'
 
 const props = defineProps<{ note: Note }>()
@@ -58,7 +58,7 @@ const editorElement = ref<HTMLInputElement | null>(null)
 const handleClick = ({ data }: { data: any }) => {
   const noteTitle = data.domTarget.textContent as string
   const note = getNoteByTitle(noteTitle)
-  if (note) activeNote.value = note
+  if (note) setActiveNote(note.id)
 }
 
 const autocompleteRef = ref<InstanceType<typeof Autocomplete> | null>(null)
diff --git a/src/components/Note/NoteReferences.vue b/src/components/Note/NoteReferences.vue
index 7db1cbc..3cb55a1 100644
--- a/src/components/Note/NoteReferences.vue
+++ b/src/components/Note/NoteReferences.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { activeNote } from '@/composables/useNotes'
+import { setActiveNote } from '@/composables/useNotes'
 const props = defineProps<{
   references: Note[]
 }>()
@@ -15,7 +15,7 @@ const props = defineProps<{
           </span>
         </li>
         <li v-for="reference in props.references">
-          <a class="rounded-md" @click="activeNote = reference">
+          <a class="rounded-md" @click="setActiveNote(reference.id)">
             <i class="far fa-file-alt fa-fw" />
             {{ reference.title }}
           </a>
diff --git a/src/components/Search/SearchBar.vue b/src/components/Search/SearchBar.vue
index 416655b..a829744 100644
--- a/src/components/Search/SearchBar.vue
+++ b/src/components/Search/SearchBar.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { notes, findNotes, activeNote } from '@/composables/useNotes'
+import { notes, findNotes, setActiveNote } from '@/composables/useNotes'
 
 const active = ref(false)
 watch(active, () => {
@@ -15,7 +15,7 @@ const results = computed<Note[]>(() => {
 })
 
 const goToNote = (note: Note) => {
-  activeNote.value = note
+  setActiveNote(note.id)
   active.value = false
   if (queryElem.value) queryElem.value.blur()
 }
diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue
index 3d93959..06d2974 100644
--- a/src/components/SideBar.vue
+++ b/src/components/SideBar.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { rootNote, notes, activeNote } from '@/composables/useNotes'
+import { rootNote, notes, setActiveNote } from '@/composables/useNotes'
 
 const props = defineProps<{
   viewModes: ViewMode[]
@@ -20,7 +20,7 @@ const emit = defineEmits<{
       <template #items>
         <SideBarMenuItem
           icon="fas fa-fw fa-home"
-          @click="activeNote = rootNote"
+          @click="setActiveNote(rootNote?.id)"
           :title="rootNote?.title"
         >
           {{ rootNote?.title }}
@@ -49,7 +49,7 @@ const emit = defineEmits<{
         <SideBarMenuItem
           v-for="note in notes"
           icon="far fa-file-alt fa-fw"
-          @click="activeNote = note"
+          @click="setActiveNote(note.id)"
           :title="rootNote?.title"
         >
           {{ note.title }}
diff --git a/src/composables/useNotes.ts b/src/composables/useNotes.ts
index f872d69..4523abd 100644
--- a/src/composables/useNotes.ts
+++ b/src/composables/useNotes.ts
@@ -14,17 +14,20 @@ export const notes = computed<Note[]>(() => {
     .sort((a, b) => b.modified - a.modified) as Note[]
 })
 watch(notes, () => {
-  if (notes.value.length > 0 && !activeNote.value) activeNote.value = rootNote.value
+  if (notes.value.length > 0 && !activeNote.value) setActiveNote(rootNote.value?.id)
 })
 
-export const activeNote = ref<Note>()
+const activeNoteId = ref<string>()
+export const activeNote = computed(() =>
+  notes.value.find((note) => note.id === activeNoteId.value)
+)
 watch(activeNote, () => {
   if (activeNote.value) {
     useTitle(`${activeNote.value.title} | Contexted`)
   }
 })
-export const setActiveNote = (noteId: string) => {
-  activeNote.value = notes.value.find((note) => note.id === noteId)
+export const setActiveNote = (noteId: string | undefined) => {
+  if (noteId) activeNoteId.value = noteId
 }
 
 export const rootNote = computed<Note | undefined>(() => {
@@ -95,7 +98,7 @@ export const addNote = (title: string, content: string, goToNote: boolean = fals
     modified: new Date().getTime(),
   }
   baseNotes[id] = newNote
-  if (goToNote) activeNote.value = notes.value.find((note) => note.id === newNote.id)
+  if (goToNote) setActiveNote(id)
 }
 
 export const deleteNote = (noteId: string) => {