fix: close notification entry expand, when close notification menu

Signed-off-by: Stefan Dej <[email protected]>
mainsail-crew · Apr 10, 2022 · b6bf2d6 · b6bf2d6
1 parent 2e6aa6f
commit b6bf2d6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/components/notifications/NotificationMenuEntry.vue b/src/components/notifications/NotificationMenuEntry.vue
@@ -96,7 +96,7 @@
 
 <script lang="ts">
 import BaseMixin from '@/components/mixins/base'
-import { Component, Mixins, Prop } from 'vue-property-decorator'
+import { Component, Mixins, Prop, Watch } from 'vue-property-decorator'
 import { mdiClose, mdiLinkVariant, mdiBellOffOutline } from '@mdi/js'
 import { GuiNotificationStateEntry } from '@/store/gui/notifications/types'
 
@@ -113,6 +113,9 @@ export default class NotificationMenuEntry extends Mixins(BaseMixin) {
     @Prop({ required: true })
     declare readonly entry: GuiNotificationStateEntry
 
+    @Prop({ default: true })
+    declare readonly parentState: boolean
+
     get formatedText() {
         return this.entry.description.replace(/\[([^\]]+)\]\(([^)]+)\)/, '<a href="$2" target="_blank">$1</a>')
     }
@@ -138,6 +141,11 @@ export default class NotificationMenuEntry extends Mixins(BaseMixin) {
     dismiss(type: 'time' | 'reboot', time: number | null) {
         this.$store.dispatch('gui/notifications/dismiss', { id: this.entry.id, type, time })
     }
+
+    @Watch('parentState')
+    parentStateUpdate(newVal: boolean) {
+        if (!newVal) this.expand = false
+    }
 }
 </script>
 

diff --git a/src/components/notifications/TheNotificationMenu.vue b/src/components/notifications/TheNotificationMenu.vue
@@ -1,5 +1,6 @@
 <template>
     <v-menu
+        v-model="boolMenu"
         bottom
         :left="!isMobile"
         offset-y
@@ -27,7 +28,8 @@
                             <notification-menu-entry
                                 :key="entry.id"
                                 :entry="entry"
-                                :class="index < notifications.length - 1 ? '' : 'mb-0'" />
+                                :class="index < notifications.length - 1 ? '' : 'mb-0'"
+                                :parent-state="boolMenu" />
                         </template>
                     </v-card-text>
                 </overlay-scrollbars>
@@ -66,6 +68,8 @@ export default class TheNotificationMenu extends Mixins(BaseMixin) {
     mdiBellOutline = mdiBellOutline
     mdiCloseBoxMultipleOutline = mdiCloseBoxMultipleOutline
 
+    private boolMenu = false
+
     get notifications() {
         return this.$store.getters['gui/notifications/getNotifications'] ?? []
     }