🔧 Fix exit saving logic

SimonShiki · Jan 11, 2023 · 52af15f · 52af15f
1 parent aabc4d9
commit 52af15f
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 6 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -15,13 +15,23 @@ import { settingsJotai } from "./jotais/settings";
 import { useKeyPress, useInterval, useEventListener, useAsyncEffect, useUpdateLayoutEffect } from "ahooks";
 import { version as getVersion, type as getType } from '@tauri-apps/api/os';
 import About from "./components/About";
+import { save as saveFilePicker } from '@tauri-apps/api/dialog';
+import { documentDir } from '@tauri-apps/api/path';
 import { invoke } from '@tauri-apps/api/tauri';
 import FloatingToolbar from "./components/FloatingToolbar";
 import { Editor } from "@milkdown/core";
 
+const availbleExts = [{
+    name: 'Markdown',
+    extensions: ['md']
+}, {
+    name: 'Text file',
+    extensions: ['txt']
+}];
+
 function App() {
     const [content, setContent] = useAtom(contentJotai);
-    const [filePath] = useAtom(filePathJotai);
+    const [filePath, setFilePath] = useAtom(filePathJotai);
     const [loading] = useAtom(loadingJotai);
     const [, setToolbar] = useAtom(toolbarJotai);
     const [, setSaved] = useAtom(savedJotai);
@@ -49,8 +59,17 @@ function App() {
 
     // Shortcuts
     useKeyPress('ctrl.s', async () => {
-        if (filePath === null) return;
-        await writeTextFile({ path: filePath, contents: content });
+        let selected = filePath ?? '';
+        if (!selected) {
+            const _selected = await saveFilePicker({
+                defaultPath: await documentDir(),
+                filters: availbleExts
+            });
+            if (_selected === null) return;
+            selected = _selected;
+            setFilePath(selected as string);
+        }
+        await writeTextFile({ path: selected, contents: content });
         setSaved(true);
     });
     useKeyPress('ctrl.f', (e) => {

diff --git a/src/components/TitleBar/index.tsx b/src/components/TitleBar/index.tsx
@@ -6,6 +6,8 @@ import styles from './title-bar.module.scss';
 import { Add20Regular, ArrowDown20Regular, FullScreenMaximize20Regular } from '@fluentui/react-icons';
 import FileMenu from '../FileMenu';
 import EditMenu from '../EditMenu';
+import {  save as saveFilePicker } from '@tauri-apps/api/dialog';
+import { documentDir } from '@tauri-apps/api/path';
 import { useAtom } from 'jotai';
 import { aboutJotai, preferenceJotai } from '../../jotais/ui';
 import { Editor } from '@milkdown/core';
@@ -18,11 +20,19 @@ interface TitleBar {
     };
 }
 
+const availbleExts = [{
+    name: 'Markdown',
+    extensions: ['md']
+}, {
+    name: 'Text file',
+    extensions: ['txt']
+}];
+
 const TitleBar : React.FC<TitleBar> = ({editorInstance}) => {
     const [preference] = useAtom(preferenceJotai);
     const [about] = useAtom(aboutJotai);
     const [content] = useAtom(contentJotai);
-    const [filePath] = useAtom(filePathJotai);
+    const [filePath, setFilePath] = useAtom(filePathJotai);
     const [saved] = useAtom(savedJotai);
     return (
         <>
@@ -57,8 +67,19 @@ const TitleBar : React.FC<TitleBar> = ({editorInstance}) => {
                                     title: 'You haven\'t saved it yet',
                                     type: 'warning'
                                 });
-                                if (result && filePath !== null) {
-                                    await writeTextFile({ path: filePath, contents: content });
+
+                                if (result) {
+                                    let selected = filePath ?? '';
+                                    if (!selected) {
+                                        const _selected = await saveFilePicker({
+                                            defaultPath: await documentDir(),
+                                            filters: availbleExts
+                                        });
+                                        if (_selected === null) return;
+                                        selected = _selected;
+                                        setFilePath(selected as string);
+                                    }
+                                    await writeTextFile({ path: selected, contents: content });
                                 } else return;
                             }
                             await appWindow.close();