Cleanup and Fix textSelectionToolBar

Removes unnecessary code and comments, and makes it so the textselection only leads to creating a new note

Author: Mast3Rei

src/lib/components/NoteDialog.svelte

@@ -3,31 +3,24 @@
 <script lang="ts">
     import Modal from './Modal.svelte';
     import { EditIcon } from '$lib/icons';
-    import { t, selectedVerses, bodyFontSize, currentFont, noteEditing } from '$lib/data/stores';
-    import { addNote } from '$lib/data/notes';
+    import { selectedVerses, bodyFontSize, currentFont } from '$lib/data/stores';
     import { goto } from '$app/navigation';
     import { base } from '$app/paths';
 
     export let note = undefined;
-    export let editing = false;
-    $: noteEditing.set(editing);
 
     let id = 'note';
     let modal;
-    let title: string;
     let text: string;
 
-    $: heading = editing ? note?.reference ?? '' : $t[title] ?? '';
+    $: heading = note?.reference ?? '';
 
-    export async function showNote() {
+    export async function showModal() {
         if (note !== undefined) {
             text = note.text;
-            editing = true;
-            title = 'Annotation_Note_Edit';
             modal.showModal();
         } else {
-            editing = false;
-            goto(`${base}/notes/new`);
+            console.log('No note available!')
         }
     }
 
@@ -36,24 +29,8 @@
         selectedVerses.reset();
     }
 
-    async function createNote() {
-         const newNote = await addNote({
-                docSet: $selectedVerses[0].docSet,
-                collection: $selectedVerses[0].collection,
-                book: $selectedVerses[0].book,
-                chapter: $selectedVerses[0].chapter,
-                verse: $selectedVerses[0].verse,
-                text,
-                reference: $selectedVerses[0].reference
-            });
-        note = newNote;
-    }
-
     async function onEditNote(){
-        if (note === undefined) {
-            await createNote();
-        }
-        goto(`${base}/notes/edit/${note.date}`);
+        if (note !== undefined) goto(`${base}/notes/edit/${note.date}`);
     }
 </script>
 

src/lib/components/TextSelectionToolbar.svelte

@@ -25,11 +25,8 @@ TODO:
     import { ImageIcon } from '$lib/icons/image';
     import config from '$lib/data/config';
     import {
-        t,
         s,
         refs,
-        modal,
-        MODAL_NOTE,
         selectedVerses,
         theme,
         themeColors,
@@ -40,6 +37,8 @@ TODO:
     import { shareText } from '$lib/data/share';
     import { play, seekToVerse } from '$lib/data/audio';
     import { getBook, logShareContent } from '$lib/data/analytics';
+    import { goto } from '$app/navigation';
+    import { base } from '$app/paths';
     const isAudioPlayable = config?.mainFeatures['text-select-play-audio'];
     const isRepeatableAudio = config?.mainFeatures['audio-repeat-selection-button'];
     const isTextOnImageEnabled = config?.mainFeatures['text-on-image'];
@@ -225,7 +224,7 @@ TODO:
                     </button>
                 {/if}
                 {#if isNotesEnabled}
-                    <button class="dy-btn-sm dy-btn-ghost" on:click={() => modal.open(MODAL_NOTE)}>
+                    <button class="dy-btn-sm dy-btn-ghost" on:click={() => goto(`${base}/notes/new`)}>
                         <NoteIcon color={barIconColor} />
                     </button>
                 {/if}

src/lib/data/stores/view.js

@@ -81,12 +81,6 @@ const createWindowSizeStore = () => {
     };
 };
 
-//------------------------------------------TEST---------------------------------
-/**a single store for indicating editing or adding a note*/
-export const noteEditing = writable(false);
-//-------------------------------------------------------------------------------
-
-
 export const windowSize = createWindowSizeStore();
 
 /**scrollTop of main window*/

src/routes/+layout.svelte

@@ -42,7 +42,7 @@
                         break;
                     case MODAL_NOTE:
                         noteDialog.note = data;
-                        noteDialog.showNote();
+                        noteDialog.showModal();
                         break;
                     case MODAL_TEXT_APPERANCE:
                         textAppearanceSelector.options = data;

src/routes/notes/edit/[noteid]/+page.svelte

@@ -1,17 +1,12 @@
 <script>
     import Navbar from '$lib/components/Navbar.svelte';
-    import { noteEditing, t } from '$lib/data/stores';
+    import { t } from '$lib/data/stores';
     import { DeleteIcon, CheckIcon } from '$lib/icons';
-    import { editNote,removeNote } from '$lib/data/notes';
+    import { editNote, removeNote } from '$lib/data/notes';
 
     export let data;
     let note = data.note;
     let text = note.text;
-    let editing;
-    noteEditing.subscribe((value) => {
-        editing = value;
-    });
-    
     const title = 'Annotation_Note_Edit';
 
     function goBack() {
@@ -32,7 +27,7 @@
         if (note !== undefined) {
             await editNote({
                 note: note,
-                newText:text
+                newText: text
             });
         }
         goBack();

src/routes/notes/new/+page.svelte

@@ -4,8 +4,7 @@
     import { DeleteIcon, CheckIcon } from '$lib/icons';
     import { addNote } from '$lib/data/notes';
 
-    let note = '';
-    let text = note.text;
+    let text = '';
     const title = 'Annotation_Note_Add';
 
     function goBack() {