Merge pull request #116 from solaoi/main

release
solaoi · Apr 4, 2024 · cc4a797 · cc4a797
2 parents 1b2a154 + bc740e3
commit cc4a797
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -56,10 +56,10 @@
     "windows": [
       {
         "fullscreen": false,
-        "height": 600,
+        "width": 1024,
+        "height": 768,
         "resizable": true,
-        "title": "Lycoris",
-        "width": 800
+        "title": "Lycoris"
       }
     ]
   }

diff --git a/src/components/organisms/NoteMain.tsx b/src/components/organisms/NoteMain.tsx
@@ -56,7 +56,13 @@ const NoteMain = (): JSX.Element => {
     }, [selectedNote]);
     useEffect(() => {
         if (recordingNote === selectedNote!.note_id) {
-            bottomRef.current?.scrollIntoView({ behavior: 'smooth' });
+            const rect = bottomRef.current?.getBoundingClientRect();
+            if (rect) {
+                const isInViewport = rect.top >= 0 && rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) + 144;  // 144(24px * 6 lines) is the margin of long note
+                if (isInViewport) {
+                    bottomRef.current?.scrollIntoView({ behavior: 'smooth' });
+                }
+            }
         }
     }, [histories, recordingNote]);
     useEffect(() => {
@@ -65,7 +71,6 @@ const NoteMain = (): JSX.Element => {
         const unlistenPartialText = listen('partialTextRecognized', event => {
             if (recordingNote === selectedNote!.note_id) {
                 const payload = event.payload as { content: string, is_desktop: boolean }
-                console.log(`is_desktop: ${payload.is_desktop}`)
                 if (payload.is_desktop) {
                     setPartialTextDesktop(payload.content)
                 } else {