From f6b61f494f3a378bbbd99e2981a1384c9014989c Mon Sep 17 00:00:00 2001
From: cagataycivici <cagatay.civici@gmail.com>
Date: Mon, 30 Dec 2019 12:57:22 +0300
Subject: [PATCH] Active router refactor

---
 src/components/steps/Steps.vue     | 6 +++---
 src/components/tabmenu/TabMenu.vue | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/steps/Steps.vue b/src/components/steps/Steps.vue
index 62ef56a86..2a87b6e2a 100644
--- a/src/components/steps/Steps.vue
+++ b/src/components/steps/Steps.vue
@@ -42,16 +42,16 @@ export default {
             }
         },
         isActive(item) {
-            return this.activeRoute === item.to;
+            return this.activeRoute === item.to || this.activeRoute === item.to + '/' ;
         },
         getItemClass(item) {
             return ['p-steps-item', item.class, {
-                'p-highlight p-steps-current': (this.activeRoute === item.to),
+                'p-highlight p-steps-current': this.isActive(item),
                 'p-disabled': this.isItemDisabled(item)
             }];
         },
         isItemDisabled(item) {
-            return (item.disabled || (this.readonly && this.activeRoute !== item.to));
+            return (item.disabled || (this.readonly && !this.isActive(item)));
         }
     },
     computed: {
diff --git a/src/components/tabmenu/TabMenu.vue b/src/components/tabmenu/TabMenu.vue
index e0019e2af..6fde8ceb0 100644
--- a/src/components/tabmenu/TabMenu.vue
+++ b/src/components/tabmenu/TabMenu.vue
@@ -40,10 +40,13 @@ export default {
             }
         },
         isActive(item) {
-            return this.activeRoute === item.to;
+            return this.activeRoute === item.to || this.activeRoute === item.to + '/' ;
         },
         getItemClass(item) {
-            return ['p-tabmenuitem', item.class, {'p-highlight': this.activeRoute === item.to, 'p-disabled': item.disabled}];
+            return ['p-tabmenuitem', item.class, {
+                'p-highlight': this.isActive(item),
+                'p-disabled': item.disabled
+            }];
         },
         getItemIcon(item) {
             return ['p-menuitem-icon', item.icon];