From 462c8147a85f8d47848f3f9d0bcd4896b9475248 Mon Sep 17 00:00:00 2001
From: rudnovd <rudnov.d@gmail.com>
Date: Wed, 13 Apr 2022 21:06:07 +0500
Subject: [PATCH] fix(DamageCalculatorPage): fix tabs changing logic

---
 src/views/DamageCalculatorPage.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/DamageCalculatorPage.vue b/src/views/DamageCalculatorPage.vue
index 0cbb0e65..29f7ee3e 100644
--- a/src/views/DamageCalculatorPage.vue
+++ b/src/views/DamageCalculatorPage.vue
@@ -35,7 +35,7 @@
         <DamageCalculator
           v-for="(calculator, index) in calculators"
           v-show="activeIndex === index"
-          :key="`damage-calculator-tab-${index}`"
+          :key="`damage-calculator-tab-${index}-${Math.random()}`"
           :battle-value="calculator"
         />
       </TransitionGroup>
@@ -236,9 +236,14 @@ export default defineComponent({
 
       // If current calculator selected for delete
       if (activeIndex.value === index) {
-        // Switch to previous or first tab
-        activeIndex.value = calculators.value.length > 1 ? index - 1 : 0
-      } else {
+        if (index > 0 && index < calculators.value.length - 1) {
+          activeIndex.value = index + 1
+        } else if (index > 0 && index !== calculators.value.length - 1) {
+          activeIndex.value = index - 1
+        } else if (index < calculators.value.length - 1) {
+          activeIndex.value = 0
+        }
+      } else if (index < activeIndex.value) {
         activeIndex.value = calculators.value.length - 1
       }
     }