From 0007663991eaa57542c9f8de8159f1c5d706fc70 Mon Sep 17 00:00:00 2001
From: cagataycivici <cagatay.civici@gmail.com>
Date: Fri, 7 Feb 2020 09:53:07 +0300
Subject: [PATCH] Fixed #173, Fixed #168, Fixed #169,

---
 src/components/contextmenu/ContextMenu.vue    |  1 +
 src/components/contextmenu/ContextMenuSub.vue | 10 ++++++----
 src/components/menubar/Menubar.vue            |  1 +
 src/components/menubar/MenubarSub.vue         |  9 ++++++---
 src/components/tieredmenu/TieredMenu.vue      |  1 +
 src/components/tieredmenu/TieredMenuSub.vue   |  9 ++++++---
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/components/contextmenu/ContextMenu.vue b/src/components/contextmenu/ContextMenu.vue
index fd0a4a0284..b41ba86f27 100644
--- a/src/components/contextmenu/ContextMenu.vue
+++ b/src/components/contextmenu/ContextMenu.vue
@@ -242,6 +242,7 @@ export default {
     padding: .25em;
     display: block;
     position: relative;
+    cursor: pointer;
 }
 
 .p-contextmenu .p-menuitem-icon {
diff --git a/src/components/contextmenu/ContextMenuSub.vue b/src/components/contextmenu/ContextMenuSub.vue
index c0bf2e9c21..6c842f264c 100644
--- a/src/components/contextmenu/ContextMenuSub.vue
+++ b/src/components/contextmenu/ContextMenuSub.vue
@@ -4,13 +4,12 @@
             <template v-for="(item, i) of model">
                 <li role="none" :class="getItemClass(item)" :style="item.style" v-if="item.visible !== false && !item.separator" :key="item.label + i"
                     @mouseenter="onItemMouseEnter($event, item)">
-                    <router-link v-if="item.to" :to="item.to" class="p-menuitem-link"
-                        @click.native="onItemClick($event, item)" role="menuitem">
+                    <router-link v-if="item.to" :to="item.to" :class="getLinkClass(item)" @click.native="onItemClick($event, item)" role="menuitem">
                         <span :class="['p-menuitem-icon', item.icon]"></span>
                         <span class="p-menuitem-text">{{item.label}}</span>
                     </router-link>
-                    <a v-else :href="item.url||'#'" class="p-menuitem-link" :target="item.target"
-                        @click="onItemClick($event, item)" :aria-haspopup="item.items != null" :aria-expanded="item === activeItem" role="menuitem">
+                    <a v-else :href="item.url" :class="getLinkClass(item)" :target="item.target" @click="onItemClick($event, item)"
+                         :aria-haspopup="item.items != null" :aria-expanded="item === activeItem" role="menuitem"  :tabindex="item.disabled ? null : '0'">
                         <span :class="['p-menuitem-icon', item.icon]"></span>
                         <span class="p-menuitem-text">{{item.label}}</span>
                         <span class="p-submenu-icon pi pi-fw pi-caret-right" v-if="item.items"></span>
@@ -115,6 +114,9 @@ export default {
                     'p-disabled': item.disabled,
                 }
             ]
+        },
+        getLinkClass(item) {
+            return ['p-menuitem-link', {'p-disabled': item.disabled}];
         }
     },
     computed: {
diff --git a/src/components/menubar/Menubar.vue b/src/components/menubar/Menubar.vue
index e6e0a9c022..712f57df57 100644
--- a/src/components/menubar/Menubar.vue
+++ b/src/components/menubar/Menubar.vue
@@ -49,6 +49,7 @@ export default {
     padding: .25em;
     position: relative;
     text-decoration: none;
+    cursor: pointer;
 }
 
 .p-menubar .p-menuitem-icon {
diff --git a/src/components/menubar/MenubarSub.vue b/src/components/menubar/MenubarSub.vue
index 369ca7eaf8..004faa5eca 100644
--- a/src/components/menubar/MenubarSub.vue
+++ b/src/components/menubar/MenubarSub.vue
@@ -3,13 +3,13 @@
         <template v-for="(item, i) of model">
             <li role="none" :class="getItemClass(item)" :style="item.style" v-if="item.visible !== false && !item.separator" :key="item.label + i"
                 @mouseenter="onItemMouseEnter($event, item)">
-                <router-link v-if="item.to" :to="item.to" class="p-menuitem-link"
+                <router-link v-if="item.to" :to="item.to" :class="getLinkClass(item)"
                     @click.native="onItemClick($event, item)" @keydown.native="onItemKeyDown($event, item)" role="menuitem">
                     <span :class="['p-menuitem-icon', item.icon]"></span>
                     <span class="p-menuitem-text">{{item.label}}</span>
                 </router-link>
-                <a v-else :href="item.url||'#'" class="p-menuitem-link" :target="item.target" :aria-haspopup="item.items != null" :aria-expanded="item === activeItem"
-                    @click="onItemClick($event, item)" @keydown="onItemKeyDown($event, item)" role="menuitem">
+                <a v-else :href="item.url" :class="getLinkClass(item)" :target="item.target" :aria-haspopup="item.items != null" :aria-expanded="item === activeItem"
+                    @click="onItemClick($event, item)" @keydown="onItemKeyDown($event, item)" role="menuitem" :tabindex="item.disabled ? null : '0'">
                     <span :class="['p-menuitem-icon', item.icon]"></span>
                     <span class="p-menuitem-text">{{item.label}}</span>
                     <span :class="getSubmenuIcon()" v-if="item.items"></span>
@@ -240,6 +240,9 @@ export default {
                 }
             ]
         },
+        getLinkClass(item) {
+            return ['p-menuitem-link', {'p-disabled': item.disabled}];
+        },
         bindDocumentClickListener() {
             if (!this.documentClickListener) {
                 this.documentClickListener = (event) => {
diff --git a/src/components/tieredmenu/TieredMenu.vue b/src/components/tieredmenu/TieredMenu.vue
index 43fdfd3687..67f36ef9f6 100644
--- a/src/components/tieredmenu/TieredMenu.vue
+++ b/src/components/tieredmenu/TieredMenu.vue
@@ -189,6 +189,7 @@ export default {
     display: block;
     position: relative;
     text-decoration: none;
+    cursor: pointer;
 }
 
 .p-tieredmenu .p-menuitem-icon {
diff --git a/src/components/tieredmenu/TieredMenuSub.vue b/src/components/tieredmenu/TieredMenuSub.vue
index 1ed84b45c2..4499555315 100644
--- a/src/components/tieredmenu/TieredMenuSub.vue
+++ b/src/components/tieredmenu/TieredMenuSub.vue
@@ -3,13 +3,13 @@
         <template v-for="(item, i) of model">
             <li :class="getItemClass(item)" :style="item.style" v-if="item.visible !== false && !item.separator" :key="item.label + i"
                 @mouseenter="onItemMouseEnter($event, item)" role="none">
-                <router-link v-if="item.to" :to="item.to" class="p-menuitem-link"
+                <router-link v-if="item.to" :to="item.to" :class="getLinkClass(item)"
                     @click.native="onItemClick($event, item)" @keydown.native="onItemKeyDown($event, item)" role="menuitem">
                     <span :class="['p-menuitem-icon', item.icon]"></span>
                     <span class="p-menuitem-text">{{item.label}}</span>
                 </router-link>
-                <a v-else :href="item.url||'#'" class="p-menuitem-link" :target="item.target" :aria-haspopup="item.items != null" :aria-expanded="item === activeItem"
-                    @click="onItemClick($event, item)" @keydown="onItemKeyDown($event, item)" role="menuitem">
+                <a v-else :href="item.url" :class="getLinkClass(item)" :target="item.target" :aria-haspopup="item.items != null" :aria-expanded="item === activeItem"
+                    @click="onItemClick($event, item)" @keydown="onItemKeyDown($event, item)" role="menuitem" :tabindex="item.disabled ? null : '0'">
                     <span :class="['p-menuitem-icon', item.icon]"></span>
                     <span class="p-menuitem-text">{{item.label}}</span>
                     <span class="p-submenu-icon pi pi-fw pi-caret-right" v-if="item.items"></span>
@@ -191,6 +191,9 @@ export default {
                 }
             ]
         },
+        getLinkClass(item) {
+            return ['p-menuitem-link', {'p-disabled': item.disabled}];
+        },
         bindDocumentClickListener() {
             if (!this.documentClickListener) {
                 this.documentClickListener = (event) => {