From 6b94437b8983d5f3f3d87517d6ad7da65357355f Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Mon, 19 Feb 2018 18:11:47 +0000
Subject: [PATCH] Fix modal backdrop still fading out when the first modal is
 closing even with additional modals on top

---
 client/src/ui/components/bd/BdModals.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/src/ui/components/bd/BdModals.vue b/client/src/ui/components/bd/BdModals.vue
index f6216014..60a85d32 100644
--- a/client/src/ui/components/bd/BdModals.vue
+++ b/client/src/ui/components/bd/BdModals.vue
@@ -10,11 +10,11 @@
 
 <template>
     <div class="bd-modals-container">
-        <div v-for="(modal, index) in modals.stack" :key="`bd-modal-${index}`">
-            <div class="bd-backdrop" :class="{'bd-backdrop-out': modal.closing}" :style="{opacity: index === 0 ? undefined : 0}"></div>
+        <div v-for="(modal, index) in modals.stack" :key="`bd-modal-${modal.id}`">
+            <div class="bd-backdrop" :class="{'bd-backdrop-out': closing}" :style="{opacity: index === 0 ? undefined : 0}"></div>
             <div class="bd-modal-wrap" :style="{transform: `scale(${downscale(index + 1, 0.2)})`, opacity: downscale(index + 1, 1)}">
                 <div class="bd-modal-close-area" @click="closeModal(modal)"></div>
-                <component :is="modal.component" />
+                <keep-alive><component :is="modal.component" /></keep-alive>
             </div>
         </div>
     </div>
@@ -37,6 +37,11 @@
                 eventListener: null
             };
         },
+        computed: {
+            closing() {
+                return !this.modals.stack.find(m => !m.closing);
+            }
+        },
         created() {
             Events.on('bd-refresh-modals', this.eventListener = () => {
                 this.$forceUpdate();