Notivue, NotivueKeyboard - Force unmount when not running

smastrom · Apr 14, 2024 · 7dceff6 · 7dceff6
1 parent e41bf3b
commit 7dceff6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/packages/notivue/Notivue/Notivue.vue b/packages/notivue/Notivue/Notivue.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
+import { useNotivueInstance } from '@/core/useStore'
 import { DEFAULT_PROPS } from './constants'
+
 import { NotivueClientOnly } from '@/shared/ClientOnly'
 
 import NotivueImpl from './NotivueImpl.vue'
@@ -8,12 +10,14 @@ import type { NotivueComponentSlot, NotivueProps } from 'notivue'
 
 const props = withDefaults(defineProps<NotivueProps>(), DEFAULT_PROPS)
 
+const { isRunning } = useNotivueInstance()
+
 defineSlots<NotivueComponentSlot>()
 </script>
 
 <template>
    <NotivueClientOnly>
-      <NotivueImpl v-bind="props" v-slot="item">
+      <NotivueImpl v-bind="props" v-slot="item" v-if="isRunning">
          <slot v-bind="item" />
       </NotivueImpl>
    </NotivueClientOnly>

diff --git a/packages/notivue/NotivueKeyboard/NotivueKeyboard.vue b/packages/notivue/NotivueKeyboard/NotivueKeyboard.vue
@@ -1,19 +1,27 @@
 <script setup lang="ts">
-import { NotivueClientOnly } from '@/shared/ClientOnly'
+import { useNotivueInstance } from '@/core/useStore'
 import { DEFAULT_PROPS } from './constants'
 
+import { NotivueClientOnly } from '@/shared/ClientOnly'
+
 import NotivueKeyboardImpl from './NotivueKeyboardImpl.vue'
 
-import type { NotivueKeyboardSlot, NotivueKeyboardProps } from 'notivue'
+import { type NotivueKeyboardSlot, type NotivueKeyboardProps } from 'notivue'
 
 const props = withDefaults(defineProps<NotivueKeyboardProps>(), DEFAULT_PROPS)
 
+const { isRunning } = useNotivueInstance()
+
 defineSlots<NotivueKeyboardSlot>()
 </script>
 
 <template>
    <NotivueClientOnly>
-      <NotivueKeyboardImpl v-bind="props" v-slot="{ containersTabIndex, elementsTabIndex }">
+      <NotivueKeyboardImpl
+         v-bind="props"
+         v-slot="{ containersTabIndex, elementsTabIndex }"
+         v-if="isRunning"
+      >
          <slot v-bind="{ containersTabIndex, elementsTabIndex }" />
       </NotivueKeyboardImpl>
    </NotivueClientOnly>