patch modals don't close after button press

Author: Ripwords

components.d.ts

@@ -5,9 +5,7 @@
 declare module 'vue' {
   export interface GlobalComponents {
     Content: typeof import('./src/components/Content.vue')['default']
-    Editor: typeof import('./src/components/Editor.vue')['default']
     ExportModal: typeof import('./src/components/exportModal.vue')['default']
-    HoverArea: typeof import('./src/components/HoverArea.vue')['default']
     HoverCorner: typeof import('./src/components/HoverCorner.vue')['default']
     'IGrommetIcons:documentWord': typeof import('~icons/grommet-icons/document-word')['default']
     'IMdi:arrowTopLeftThinCircleOutline': typeof import('~icons/mdi/arrow-top-left-thin-circle-outline')['default']
@@ -16,9 +14,6 @@ declare module 'vue' {
     'IMdi:spellcheck': typeof import('~icons/mdi/spellcheck')['default']
     'IMdi:themeLightDark': typeof import('~icons/mdi/theme-light-dark')['default']
     'IRi:settings3Line': typeof import('~icons/ri/settings3-line')['default']
-    NCard: typeof import('naive-ui')['NCard']
-    NDrawer: typeof import('naive-ui')['NDrawer']
-    NDrawerContent: typeof import('naive-ui')['NDrawerContent']
     NH2: typeof import('naive-ui')['NH2']
     NInput: typeof import('naive-ui')['NInput']
     NMessageProvider: typeof import('naive-ui')['NMessageProvider']
@@ -27,8 +22,8 @@ declare module 'vue' {
     NSwitch: typeof import('naive-ui')['NSwitch']
     NTooltip: typeof import('naive-ui')['NTooltip']
     Options: typeof import('./src/components/Options.vue')['default']
+    ShortcutModal: typeof import('./src/components/shortcutModal.vue')['default']
     Toolbar: typeof import('./src/components/Toolbar.vue')['default']
-    WordCount: typeof import('./src/components/WordCount.vue')['default']
   }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "window-reader",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "scripts": {
     "dev": "tauri dev",
     "build": "tauri build"

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "window_reader"
-version = "1.2.4"
+version = "1.2.5"
 description = "A transparent notepad-like app"
 authors = ["Ripwords"]
 license = ""

src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "window-reader",
-    "version": "1.2.4"
+    "version": "1.2.5"
   },
   "build": {
     "distDir": "../dist",

src-tauri/tauri.conf.json

@@ -227,8 +227,8 @@ await shortcutRegister()
     >
       <n-input type="text" v-model:value="store.exportName"></n-input>
       <div class="text-size-[30px] flex justify-end p-2">
-        <button :theme-overridess="store.themeOverrides"><i-mdi:file-pdf class="m-[0.7rem]" @click="export2PDF()"></i-mdi:file-pdf></button>
-        <button :theme-overridess="store.themeOverrides"><i-mdi:file-word class="m-[0.7rem]" @click="export2Word()"></i-mdi:file-word></button>
+        <button :theme-overridess="store.themeOverrides"><i-mdi:file-pdf class="m-[0.7rem]" @click="export2PDF(); shortcutModal = false"></i-mdi:file-pdf></button>
+        <button :theme-overridess="store.themeOverrides"><i-mdi:file-word class="m-[0.7rem]" @click="export2Word(); shortcutModal = false"></i-mdi:file-word></button>
       </div>
     </n-modal>
     <n-modal

src/components/Content.vue

@@ -5,7 +5,7 @@ const store = mainStore()
 const props = defineProps<{ 
   type: string, 
   show: boolean,
-  func: Function
+  func: any
 }>()
 const emit = defineEmits(["close"])
 const showModal = ref(props.show)
@@ -27,8 +27,8 @@ watch(props, () => {
     <n-input type="text" v-model:value="store.exportName"></n-input>
     <div class="text-size-[30px] flex justify-end p-2">
       <button :theme-overridess="store.themeOverrides">
-        <i-mdi:file-pdf v-if="props.type == 'pdf'" class="m-[0.7rem]" @click="func"></i-mdi:file-pdf>
-        <i-grommet-icons:document-word v-if="props.type == 'word'" class="m-[0.7rem]" @click="func"></i-grommet-icons:document-word>
+        <i-mdi:file-pdf v-if="props.type == 'pdf'" class="m-[0.7rem]" @click="props.func(); emit('close')"></i-mdi:file-pdf>
+        <i-grommet-icons:document-word v-if="props.type == 'word'" class="m-[0.7rem]" @click="props.func(); emit('close')"></i-grommet-icons:document-word>
       </button>
     </div>
   </n-modal>