primevue 3.16.2 → 3.18.0

package/menubar/menubar.esm.js

@@ -1,12 +1,12 @@
-import { DomHandler, ZIndexUtils } from 'primevue/utils';
+import { ObjectUtils, ZIndexUtils, DomHandler, UniqueComponentId } from 'primevue/utils';
 import Ripple from 'primevue/ripple';
-import { resolveComponent, resolveDirective, openBlock, createElementBlock, normalizeClass, Fragment, renderList, normalizeStyle, createBlock, withCtx, withDirectives, createCommentVNode, createElementVNode, toDisplayString, resolveDynamicComponent, renderSlot, createVNode } from 'vue';
+import { resolveComponent, resolveDirective, openBlock, createElementBlock, Fragment, renderList, normalizeStyle, normalizeClass, createElementVNode, createBlock, withCtx, withDirectives, createCommentVNode, toDisplayString, resolveDynamicComponent, renderSlot, mergeProps, createVNode } from 'vue';
 
 var script$1 = {
     name: 'MenubarSub',
-    emits: ['keydown-item', 'leaf-click'],
+    emits: ['item-mouseenter', 'item-click'],
     props: {
-        model: {
+        items: {
             type: Array,
             default: null
         },
@@ -18,10 +18,6 @@ var script$1 = {
             type: Boolean,
             default: false
         },
-        parentActive: {
-            type: Boolean,
-            default: false
-        },
         mobileActive: {
             type: Boolean,
             default: false
@@ -33,412 +29,619 @@ var script$1 = {
         exact: {
             type: Boolean,
             default: true
+        },
+        level: {
+            type: Number,
+            default: 0
+        },
+        menuId: {
+            type: String,
+            default: null
+        },
+        focusedItemId: {
+            type: String,
+            default: null
+        },
+        activeItemPath: {
+            type: Object,
+            default: null
         }
     },
-    documentClickListener: null,
-    watch: {
-        parentActive(newValue) {
-            if (!newValue) {
-                this.activeItem = null;
-            }
-        }
-    },
-    data() {
-        return {
-            activeItem: null
-        }
-    },
-    updated() {
-        if (this.root && this.activeItem) {
-            this.bindDocumentClickListener();
-        }
-    },
-    beforeUnmount() {
-        this.unbindDocumentClickListener();
-    },
+    list: null,
     methods: {
-        onItemMouseEnter(event, item) {
-            if (this.disabled(item) || this.mobileActive) {
-                event.preventDefault();
-                return;
-            }
-
-            if (this.root) {
-                if (this.activeItem || this.popup) {
-                    this.activeItem = item;
-                }
-            }
-            else {
-                this.activeItem = item;
-            }
+        getItemId(processedItem) {
+            return `${this.menuId}_${processedItem.key}`;
         },
-        onItemClick(event, item, navigate) {
-            if (this.disabled(item)) {
-                event.preventDefault();
-                return;
-            }
-
-            if (item.command) {
-                item.command({
-                    originalEvent: event,
-                    item: item
-                });
-            }
-
-            if (item.items) {
-                if (this.activeItem && item === this.activeItem)
-                    this.activeItem = null;
-                else
-                    this.activeItem = item;
-            }
-
-            if (!item.items) {
-                this.onLeafClick();
-            }
-
-            if (item.to && navigate) {
-                navigate(event);
-            }
+        getItemKey(processedItem) {
+            return this.getItemId(processedItem);
         },
-        onLeafClick() {
-            this.activeItem = null;
-            this.$emit('leaf-click');
+        getItemProp(processedItem, name) {
+            return processedItem && processedItem.item ? ObjectUtils.getItemValue(processedItem.item[name]) : undefined;
         },
-        onItemKeyDown(event, item) {
-            let listItem = event.currentTarget.parentElement;
-
-            switch(event.which) {
-                //down
-                case 40:
-                    if (this.root) {
-                        if (item.items) {
-                            this.expandSubmenu(item, listItem);
-                        }
-                    }
-                    else {
-                        this.navigateToNextItem(listItem);
-                    }
-
-                    event.preventDefault();
-                break;
-
-                //up
-                case 38:
-                    if (!this.root) {
-                        this.navigateToPrevItem(listItem);
-                    }
-
-                    event.preventDefault();
-                break;
-
-                //right
-                case 39:
-                    if (this.root) {
-                        var nextItem = this.findNextItem(listItem);
-                        if (nextItem) {
-                            nextItem.children[0].focus();
-                        }
-                    }
-                    else {
-                        if (item.items) {
-                            this.expandSubmenu(item, listItem);
-                        }
-                    }
-
-                    event.preventDefault();
-                break;
-
-                //left
-                case 37:
-                    if (this.root) {
-                        this.navigateToPrevItem(listItem);
-                    }
-
-                    event.preventDefault();
-                break;
-            }
-
-            this.$emit('keydown-item', {
-                originalEvent: event,
-                element: listItem
-            });
+        getItemLabel(processedItem) {
+            return this.getItemProp(processedItem, 'label');
         },
-        onChildItemKeyDown(event) {
-            if (this.root) {
-                //up
-                if (event.originalEvent.which === 38 && event.element.previousElementSibling == null) {
-                    this.collapseMenu(event.element);
-                }
-            }
-            else {
-                //left
-                if (event.originalEvent.which === 37) {
-                    this.collapseMenu(event.element);
-                }
-            }
+        isItemActive(processedItem) {
+            return this.activeItemPath.some((path) => path.key === processedItem.key);
         },
-        findNextItem(item) {
-            let nextItem = item.nextElementSibling;
-
-            if (nextItem)
-                return DomHandler.hasClass(nextItem, 'p-disabled') || !DomHandler.hasClass(nextItem, 'p-menuitem') ? this.findNextItem(nextItem) : nextItem;
-            else
-                return null;
+        isItemVisible(processedItem) {
+            return this.getItemProp(processedItem, 'visible') !== false;
         },
-        findPrevItem(item) {
-            let prevItem = item.previousElementSibling;
-
-            if (prevItem)
-                return DomHandler.hasClass(prevItem, 'p-disabled') || !DomHandler.hasClass(prevItem, 'p-menuitem') ? this.findPrevItem(prevItem) : prevItem;
-            else
-                return null;
+        isItemDisabled(processedItem) {
+            return this.getItemProp(processedItem, 'disabled');
+        },
+        isItemFocused(processedItem) {
+            return this.focusedItemId === this.getItemId(processedItem);
         },
-        expandSubmenu(item, listItem) {
-            this.activeItem = item;
+        isItemGroup(processedItem) {
+            return ObjectUtils.isNotEmpty(processedItem.items);
+        },
+        onItemClick(event, processedItem) {
+            const command = this.getItemProp(processedItem, 'command');
 
-            setTimeout(() => {
-                listItem.children[1].children[0].children[0].focus();
-            }, 50);
+            command && command({ originalEvent: event, item: processedItem.item });
+            this.$emit('item-click', { originalEvent: event, processedItem, isFocus: true });
         },
-        collapseMenu(listItem) {
-            this.activeItem = null;
-            listItem.parentElement.previousElementSibling.focus();
+        onItemMouseEnter(event, processedItem) {
+            this.$emit('item-mouseenter', { originalEvent: event, processedItem });
         },
-        navigateToNextItem(listItem) {
-            var nextItem = this.findNextItem(listItem);
-            if (nextItem) {
-                nextItem.children[0].focus();
-            }
+        onItemActionClick(event, navigate) {
+            navigate && navigate(event);
         },
-        navigateToPrevItem(listItem) {
-            var prevItem = this.findPrevItem(listItem);
-            if (prevItem) {
-                prevItem.children[0].focus();
-            }
+        getAriaSetSize() {
+            return this.items.filter((processedItem) => this.isItemVisible(processedItem) && !this.getItemProp(processedItem, 'separator')).length;
+        },
+        getAriaPosInset(index) {
+            return index - this.items.slice(0, index).filter((processedItem) => this.isItemVisible(processedItem) && this.getItemProp(processedItem, 'separator')).length + 1;
         },
-        getItemClass(item) {
+        getItemClass(processedItem) {
             return [
-                'p-menuitem', item.class, {
-                    'p-menuitem-active': this.activeItem === item
+                'p-menuitem',
+                this.getItemProp(processedItem, 'class'),
+                {
+                    'p-menuitem-active p-highlight': this.isItemActive(processedItem),
+                    'p-focus': this.isItemFocused(processedItem),
+                    'p-disabled': this.isItemDisabled(processedItem)
                 }
-            ]
-        },
-        linkClass(item, routerProps) {
-            return ['p-menuitem-link', {
-                'p-disabled': this.disabled(item),
-                'router-link-active': routerProps && routerProps.isActive,
-                'router-link-active-exact': this.exact && routerProps && routerProps.isExactActive
-            }];
-        },
-        bindDocumentClickListener() {
-            if (!this.documentClickListener) {
-                this.documentClickListener = (event) => {
-                    if (this.$el && !this.$el.contains(event.target)) {
-                        this.activeItem = null;
-                        this.unbindDocumentClickListener();
-                    }
-                };
-
-                document.addEventListener('click', this.documentClickListener);
-            }
-        },
-        unbindDocumentClickListener() {
-            if (this.documentClickListener) {
-                document.removeEventListener('click', this.documentClickListener);
-                this.documentClickListener = null;
-            }
+            ];
         },
-        getSubmenuIcon() {
+        getItemActionClass(processedItem, routerProps) {
             return [
-                'p-submenu-icon pi', {'pi-angle-right': !this.root, 'pi-angle-down': this.root}
+                'p-menuitem-link',
+                {
+                    'router-link-active': routerProps && routerProps.isActive,
+                    'router-link-active-exact': this.exact && routerProps && routerProps.isExactActive
+                }
             ];
         },
-        visible(item) {
-            return (typeof item.visible === 'function' ? item.visible() : item.visible !== false);
+        getItemIconClass(processedItem) {
+            return ['p-menuitem-icon', this.getItemProp(processedItem, 'icon')];
         },
-        disabled(item) {
-            return (typeof item.disabled === 'function' ? item.disabled() : item.disabled);
+        getSeparatorItemClass(processedItem) {
+            return ['p-menu-separator p-menuitem-separator', this.getItemProp(processedItem, 'class')]; // TODO: the 'p-menu-separator' class is deprecated since v3.18.0.
         },
-        label(item) {
-            return (typeof item.label === 'function' ? item.label() : item.label);
+        getSubmenuIcon() {
+            return ['p-submenu-icon pi', { 'pi-angle-right': !this.root, 'pi-angle-down': this.root }];
         }
     },
     computed: {
         containerClass() {
-            return {'p-submenu-list': !this.root, 'p-menubar-root-list': this.root};
+            return { 'p-submenu-list': !this.root, 'p-menubar-root-list': this.root };
         }
     },
     directives: {
-        'ripple': Ripple
+        ripple: Ripple
     }
 };
 
-const _hoisted_1$1 = ["role"];
-const _hoisted_2$1 = ["onMouseenter"];
-const _hoisted_3$1 = ["href", "onClick", "onKeydown"];
+const _hoisted_1$1 = ["id", "aria-label", "aria-disabled", "aria-expanded", "aria-haspopup", "aria-level", "aria-setsize", "aria-posinset"];
+const _hoisted_2$1 = ["onClick", "onMouseenter"];
+const _hoisted_3$1 = ["href", "onClick"];
 const _hoisted_4$1 = { class: "p-menuitem-text" };
-const _hoisted_5 = ["href", "target", "aria-haspopup", "aria-expanded", "onClick", "onKeydown", "tabindex"];
+const _hoisted_5$1 = ["href", "target"];
 const _hoisted_6 = { class: "p-menuitem-text" };
+const _hoisted_7 = ["id"];
 
 function render$1(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_router_link = resolveComponent("router-link");
   const _component_MenubarSub = resolveComponent("MenubarSub", true);
   const _directive_ripple = resolveDirective("ripple");
 
-  return (openBlock(), createElementBlock("ul", {
-    class: normalizeClass($options.containerClass),
-    role: $props.root ? 'menubar' : 'menu'
-  }, [
-    (openBlock(true), createElementBlock(Fragment, null, renderList($props.model, (item, i) => {
+  return (openBlock(), createElementBlock("ul", null, [
+    (openBlock(true), createElementBlock(Fragment, null, renderList($props.items, (processedItem, index) => {
       return (openBlock(), createElementBlock(Fragment, {
-        key: $options.label(item) + i.toString()
+        key: $options.getItemKey(processedItem)
       }, [
-        ($options.visible(item) && !item.separator)
+        ($options.isItemVisible(processedItem) && !$options.getItemProp(processedItem, 'separator'))
           ? (openBlock(), createElementBlock("li", {
               key: 0,
-              role: "none",
-              class: normalizeClass($options.getItemClass(item)),
-              style: normalizeStyle(item.style),
-              onMouseenter: $event => ($options.onItemMouseEnter($event, item))
+              id: $options.getItemId(processedItem),
+              style: normalizeStyle($options.getItemProp(processedItem, 'style')),
+              class: normalizeClass($options.getItemClass(processedItem)),
+              role: "menuitem",
+              "aria-label": $options.getItemLabel(processedItem),
+              "aria-disabled": $options.isItemDisabled(processedItem) || undefined,
+              "aria-expanded": $options.isItemGroup(processedItem) ? $options.isItemActive(processedItem) : undefined,
+              "aria-haspopup": $options.isItemGroup(processedItem) && !$options.getItemProp(processedItem, 'to') ? 'menu' : undefined,
+              "aria-level": $props.level + 1,
+              "aria-setsize": $options.getAriaSetSize(),
+              "aria-posinset": $options.getAriaPosInset(index)
             }, [
-              (!$props.template)
-                ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                    (item.to && !$options.disabled(item))
-                      ? (openBlock(), createBlock(_component_router_link, {
-                          key: 0,
-                          to: item.to,
-                          custom: ""
-                        }, {
-                          default: withCtx(({navigate, href, isActive, isExactActive}) => [
-                            withDirectives((openBlock(), createElementBlock("a", {
-                              href: href,
-                              onClick: $event => ($options.onItemClick($event, item, navigate)),
-                              class: normalizeClass($options.linkClass(item, {isActive, isExactActive})),
-                              onKeydown: $event => ($options.onItemKeyDown($event, item)),
-                              role: "menuitem"
-                            }, [
-                              (item.icon)
-                                ? (openBlock(), createElementBlock("span", {
-                                    key: 0,
-                                    class: normalizeClass(['p-menuitem-icon', item.icon])
-                                  }, null, 2))
-                                : createCommentVNode("", true),
-                              createElementVNode("span", _hoisted_4$1, toDisplayString($options.label(item)), 1)
-                            ], 42, _hoisted_3$1)), [
-                              [_directive_ripple]
-                            ])
-                          ]),
-                          _: 2
-                        }, 1032, ["to"]))
-                      : withDirectives((openBlock(), createElementBlock("a", {
-                          key: 1,
-                          href: item.url,
-                          class: normalizeClass($options.linkClass(item)),
-                          target: item.target,
-                          "aria-haspopup": item.items != null,
-                          "aria-expanded": item === $data.activeItem,
-                          onClick: $event => ($options.onItemClick($event, item)),
-                          onKeydown: $event => ($options.onItemKeyDown($event, item)),
-                          role: "menuitem",
-                          tabindex: $options.disabled(item) ? null : '0'
-                        }, [
-                          (item.icon)
-                            ? (openBlock(), createElementBlock("span", {
-                                key: 0,
-                                class: normalizeClass(['p-menuitem-icon', item.icon])
-                              }, null, 2))
-                            : createCommentVNode("", true),
-                          createElementVNode("span", _hoisted_6, toDisplayString($options.label(item)), 1),
-                          (item.items)
-                            ? (openBlock(), createElementBlock("span", {
-                                key: 1,
-                                class: normalizeClass($options.getSubmenuIcon())
-                              }, null, 2))
-                            : createCommentVNode("", true)
-                        ], 42, _hoisted_5)), [
-                          [_directive_ripple]
-                        ])
-                  ], 64))
-                : (openBlock(), createBlock(resolveDynamicComponent($props.template), {
-                    key: 1,
-                    item: item
-                  }, null, 8, ["item"])),
-              ($options.visible(item) && item.items)
+              createElementVNode("div", {
+                class: "p-menuitem-content",
+                onClick: $event => ($options.onItemClick($event, processedItem)),
+                onMouseenter: $event => ($options.onItemMouseEnter($event, processedItem))
+              }, [
+                (!$props.template)
+                  ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                      ($options.getItemProp(processedItem, 'to') && !$options.isItemDisabled(processedItem))
+                        ? (openBlock(), createBlock(_component_router_link, {
+                            key: 0,
+                            to: $options.getItemProp(processedItem, 'to'),
+                            custom: ""
+                          }, {
+                            default: withCtx(({ navigate, href, isActive, isExactActive }) => [
+                              withDirectives((openBlock(), createElementBlock("a", {
+                                href: href,
+                                class: normalizeClass($options.getItemActionClass(processedItem, { isActive, isExactActive })),
+                                tabindex: "-1",
+                                "aria-hidden": "true",
+                                onClick: $event => ($options.onItemActionClick($event, navigate))
+                              }, [
+                                ($options.getItemProp(processedItem, 'icon'))
+                                  ? (openBlock(), createElementBlock("span", {
+                                      key: 0,
+                                      class: normalizeClass($options.getItemIconClass(processedItem))
+                                    }, null, 2))
+                                  : createCommentVNode("", true),
+                                createElementVNode("span", _hoisted_4$1, toDisplayString($options.getItemLabel(processedItem)), 1)
+                              ], 10, _hoisted_3$1)), [
+                                [_directive_ripple]
+                              ])
+                            ]),
+                            _: 2
+                          }, 1032, ["to"]))
+                        : withDirectives((openBlock(), createElementBlock("a", {
+                            key: 1,
+                            href: $options.getItemProp(processedItem, 'url'),
+                            class: normalizeClass($options.getItemActionClass(processedItem)),
+                            target: $options.getItemProp(processedItem, 'target'),
+                            tabindex: "-1",
+                            "aria-hidden": "true"
+                          }, [
+                            ($options.getItemProp(processedItem, 'icon'))
+                              ? (openBlock(), createElementBlock("span", {
+                                  key: 0,
+                                  class: normalizeClass($options.getItemIconClass(processedItem))
+                                }, null, 2))
+                              : createCommentVNode("", true),
+                            createElementVNode("span", _hoisted_6, toDisplayString($options.getItemLabel(processedItem)), 1),
+                            ($options.getItemProp(processedItem, 'items'))
+                              ? (openBlock(), createElementBlock("span", {
+                                  key: 1,
+                                  class: normalizeClass($options.getSubmenuIcon())
+                                }, null, 2))
+                              : createCommentVNode("", true)
+                          ], 10, _hoisted_5$1)), [
+                            [_directive_ripple]
+                          ])
+                    ], 64))
+                  : (openBlock(), createBlock(resolveDynamicComponent($props.template), {
+                      key: 1,
+                      item: processedItem.item
+                    }, null, 8, ["item"]))
+              ], 40, _hoisted_2$1),
+              ($options.isItemVisible(processedItem) && $options.isItemGroup(processedItem))
                 ? (openBlock(), createBlock(_component_MenubarSub, {
-                    model: item.items,
-                    key: $options.label(item) + '_sub_',
+                    key: 0,
+                    menuId: $props.menuId,
+                    role: "menu",
+                    class: "p-submenu-list",
+                    focusedItemId: $props.focusedItemId,
+                    items: processedItem.items,
                     mobileActive: $props.mobileActive,
-                    onLeafClick: $options.onLeafClick,
-                    onKeydownItem: $options.onChildItemKeyDown,
-                    parentActive: item === $data.activeItem,
+                    activeItemPath: $props.activeItemPath,
                     template: $props.template,
-                    exact: $props.exact
-                  }, null, 8, ["model", "mobileActive", "onLeafClick", "onKeydownItem", "parentActive", "template", "exact"]))
+                    exact: $props.exact,
+                    level: $props.level + 1,
+                    onItemClick: _cache[0] || (_cache[0] = $event => (_ctx.$emit('item-click', $event))),
+                    onItemMouseenter: _cache[1] || (_cache[1] = $event => (_ctx.$emit('item-mouseenter', $event)))
+                  }, null, 8, ["menuId", "focusedItemId", "items", "mobileActive", "activeItemPath", "template", "exact", "level"]))
                 : createCommentVNode("", true)
-            ], 46, _hoisted_2$1))
+            ], 14, _hoisted_1$1))
           : createCommentVNode("", true),
-        ($options.visible(item) && item.separator)
+        ($options.isItemVisible(processedItem) && $options.getItemProp(processedItem, 'separator'))
           ? (openBlock(), createElementBlock("li", {
-              class: normalizeClass(['p-menu-separator', item.class]),
-              style: normalizeStyle(item.style),
-              key: 'separator' + i.toString(),
+              key: 1,
+              id: $options.getItemId(processedItem),
+              style: normalizeStyle($options.getItemProp(processedItem, 'style')),
+              class: normalizeClass($options.getSeparatorItemClass(processedItem)),
               role: "separator"
-            }, null, 6))
+            }, null, 14, _hoisted_7))
           : createCommentVNode("", true)
       ], 64))
     }), 128))
-  ], 10, _hoisted_1$1))
+  ]))
 }
 
 script$1.render = render$1;
 
 var script = {
     name: 'Menubar',
+    emits: ['focus', 'blur'],
     props: {
-		model: {
+        model: {
             type: Array,
             default: null
         },
         exact: {
             type: Boolean,
             default: true
+        },
+        buttonProps: {
+            type: null,
+            default: null
+        },
+        'aria-labelledby': {
+            type: String,
+            default: null
+        },
+        'aria-label': {
+            type: String,
+            default: null
         }
     },
     outsideClickListener: null,
+    container: null,
+    menubar: null,
     data() {
         return {
-            mobileActive: false
+            mobileActive: false,
+            focused: false,
+            focusedItemInfo: { index: -1, level: 0, parentKey: '' },
+            activeItemPath: [],
+            dirty: false
+        };
+    },
+    watch: {
+        activeItemPath(newPath) {
+            if (ObjectUtils.isNotEmpty(newPath)) {
+                this.bindOutsideClickListener();
+                this.bindResizeListener();
+            } else {
+                this.unbindOutsideClickListener();
+                this.unbindResizeListener();
+            }
         }
     },
     beforeUnmount() {
         this.mobileActive = false;
         this.unbindOutsideClickListener();
-        if (this.$refs.rootmenu && this.$refs.rootmenu.$el) {
-            ZIndexUtils.clear(this.$refs.rootmenu.$el);
+        this.unbindResizeListener();
+
+        if (this.container) {
+            ZIndexUtils.clear(this.container);
         }
+
+        this.container = null;
     },
     methods: {
+        getItemProp(item, name) {
+            return item ? ObjectUtils.getItemValue(item[name]) : undefined;
+        },
+        getItemLabel(item) {
+            return this.getItemProp(item, 'label');
+        },
+        isItemDisabled(item) {
+            return this.getItemProp(item, 'disabled');
+        },
+        isItemGroup(item) {
+            return ObjectUtils.isNotEmpty(this.getItemProp(item, 'items'));
+        },
+        isItemSeparator(item) {
+            return this.getItemProp(item, 'separator');
+        },
+        getProccessedItemLabel(processedItem) {
+            return processedItem ? this.getItemLabel(processedItem.item) : undefined;
+        },
+        isProccessedItemGroup(processedItem) {
+            return processedItem && ObjectUtils.isNotEmpty(processedItem.items);
+        },
         toggle(event) {
             if (this.mobileActive) {
                 this.mobileActive = false;
-                ZIndexUtils.clear(this.$refs.rootmenu.$el);
-            }
-            else {
+                ZIndexUtils.clear(this.menubar);
+                this.hide();
+            } else {
                 this.mobileActive = true;
-                ZIndexUtils.set('menu', this.$refs.rootmenu.$el, this.$primevue.config.zIndex.menu);
+                ZIndexUtils.set('menu', this.menubar, this.$primevue.config.zIndex.menu);
+                setTimeout(() => {
+                    this.show();
+                }, 0);
             }
 
             this.bindOutsideClickListener();
             event.preventDefault();
         },
+        show() {
+            this.focusedItemInfo = { index: this.findFirstFocusedItemIndex(), level: 0, parentKey: '' };
+
+            DomHandler.focus(this.menubar);
+        },
+        hide(event, isFocus) {
+            if (this.mobileActive) {
+                setTimeout(() => {
+                    DomHandler.focus(this.$refs.menubutton);
+                }, 0);
+            }
+
+            this.activeItemPath = [];
+            this.focusedItemInfo = { index: -1, level: 0, parentKey: '' };
+
+            isFocus && DomHandler.focus(this.menubar);
+            this.dirty = false;
+        },
+        onFocus(event) {
+            this.focused = true;
+            this.focusedItemInfo = this.focusedItemInfo.index !== -1 ? this.focusedItemInfo : { index: this.findFirstFocusedItemIndex(), level: 0, parentKey: '' };
+            this.$emit('focus', event);
+        },
+        onBlur(event) {
+            this.focused = false;
+            this.focusedItemInfo = { index: -1, level: 0, parentKey: '' };
+            this.searchValue = '';
+            this.dirty = false;
+            this.$emit('blur', event);
+        },
+        onKeyDown(event) {
+            const metaKey = event.metaKey || event.ctrlKey;
+
+            switch (event.code) {
+                case 'ArrowDown':
+                    this.onArrowDownKey(event);
+                    break;
+
+                case 'ArrowUp':
+                    this.onArrowUpKey(event);
+                    break;
+
+                case 'ArrowLeft':
+                    this.onArrowLeftKey(event);
+                    break;
+
+                case 'ArrowRight':
+                    this.onArrowRightKey(event);
+                    break;
+
+                case 'Home':
+                    this.onHomeKey(event);
+                    break;
+
+                case 'End':
+                    this.onEndKey(event);
+                    break;
+
+                case 'Space':
+                    this.onSpaceKey(event);
+                    break;
+
+                case 'Enter':
+                    this.onEnterKey(event);
+                    break;
+
+                case 'Escape':
+                    this.onEscapeKey(event);
+                    break;
+
+                case 'Tab':
+                    this.onTabKey(event);
+                    break;
+
+                case 'PageDown':
+                case 'PageUp':
+                case 'Backspace':
+                case 'ShiftLeft':
+                case 'ShiftRight':
+                    //NOOP
+                    break;
+
+                default:
+                    if (!metaKey && ObjectUtils.isPrintableCharacter(event.key)) {
+                        this.searchItems(event, event.key);
+                    }
+
+                    break;
+            }
+        },
+        onItemChange(event) {
+            const { processedItem, isFocus } = event;
+
+            if (ObjectUtils.isEmpty(processedItem)) return;
+
+            const { index, key, level, parentKey, items } = processedItem;
+            const grouped = ObjectUtils.isNotEmpty(items);
+            const activeItemPath = this.activeItemPath.filter((p) => p.parentKey !== parentKey && p.parentKey !== key);
+
+            grouped && activeItemPath.push(processedItem);
+
+            this.focusedItemInfo = { index, level, parentKey };
+            this.activeItemPath = activeItemPath;
+
+            grouped && (this.dirty = true);
+            isFocus && DomHandler.focus(this.menubar);
+        },
+        onItemClick(event) {
+            const { originalEvent, processedItem } = event;
+            const grouped = this.isProccessedItemGroup(processedItem);
+            const root = ObjectUtils.isEmpty(processedItem.parent);
+            const selected = this.isSelected(processedItem);
+
+            if (selected) {
+                const { index, key, level, parentKey } = processedItem;
+
+                this.activeItemPath = this.activeItemPath.filter((p) => key !== p.key && key.startsWith(p.key));
+                this.focusedItemInfo = { index, level, parentKey };
+
+                this.dirty = !root;
+                DomHandler.focus(this.menubar);
+            } else {
+                if (grouped) {
+                    this.onItemChange(event);
+                } else {
+                    this.hide(originalEvent, true);
+                    this.mobileActive = false;
+                }
+            }
+        },
+        onItemMouseEnter(event) {
+            if (!this.mobileActive && this.dirty) {
+                this.onItemChange(event);
+            }
+        },
+        menuButtonClick(event) {
+            this.toggle(event);
+        },
+        menuButtonKeydown(event) {
+            (event.code === 'Enter' || event.code === 'Space') && this.menuButtonClick(event);
+        },
+        onArrowDownKey(event) {
+            const processedItem = this.visibleItems[this.focusedItemInfo.index];
+            const root = processedItem ? ObjectUtils.isEmpty(processedItem.parent) : null;
+
+            if (root) {
+                const grouped = this.isProccessedItemGroup(processedItem);
+
+                if (grouped) {
+                    this.onItemChange({ originalEvent: event, processedItem });
+                    this.focusedItemInfo = { index: -1, parentKey: processedItem.key };
+                    this.onArrowRightKey(event);
+                }
+            } else {
+                const itemIndex = this.focusedItemInfo.index !== -1 ? this.findNextItemIndex(this.focusedItemInfo.index) : this.findFirstFocusedItemIndex();
+
+                this.changeFocusedItemIndex(event, itemIndex);
+                event.preventDefault();
+            }
+        },
+        onArrowUpKey(event) {
+            const processedItem = this.visibleItems[this.focusedItemInfo.index];
+            const root = ObjectUtils.isEmpty(processedItem.parent);
+
+            if (root) {
+                const grouped = this.isProccessedItemGroup(processedItem);
+
+                if (grouped) {
+                    this.onItemChange({ originalEvent: event, processedItem });
+                    this.focusedItemInfo = { index: -1, parentKey: processedItem.key };
+                    const itemIndex = this.findLastItemIndex();
+
+                    this.changeFocusedItemIndex(event, itemIndex);
+                }
+            } else {
+                const parentItem = this.activeItemPath.find((p) => p.key === processedItem.parentKey);
+
+                if (this.focusedItemInfo.index === 0) {
+                    this.focusedItemInfo = { index: -1, parentKey: parentItem ? parentItem.parentKey : '' };
+                    this.searchValue = '';
+                    this.onArrowLeftKey(event);
+                    this.activeItemPath = this.activeItemPath.filter((p) => p.parentKey !== this.focusedItemInfo.parentKey);
+                } else {
+                    const itemIndex = this.focusedItemInfo.index !== -1 ? this.findPrevItemIndex(this.focusedItemInfo.index) : this.findLastFocusedItemIndex();
+
+                    this.changeFocusedItemIndex(event, itemIndex);
+                }
+            }
+
+            event.preventDefault();
+        },
+        onArrowLeftKey(event) {
+            const processedItem = this.visibleItems[this.focusedItemInfo.index];
+            const parentItem = processedItem ? this.activeItemPath.find((p) => p.key === processedItem.parentKey) : null;
+
+            if (parentItem) {
+                this.onItemChange({ originalEvent: event, processedItem: parentItem });
+                this.activeItemPath = this.activeItemPath.filter((p) => p.parentKey !== this.focusedItemInfo.parentKey);
+
+                event.preventDefault();
+            } else {
+                const itemIndex = this.focusedItemInfo.index !== -1 ? this.findPrevItemIndex(this.focusedItemInfo.index) : this.findLastFocusedItemIndex();
+
+                this.changeFocusedItemIndex(event, itemIndex);
+                event.preventDefault();
+            }
+        },
+        onArrowRightKey(event) {
+            const processedItem = this.visibleItems[this.focusedItemInfo.index];
+            const parentItem = processedItem ? this.activeItemPath.find((p) => p.key === processedItem.parentKey) : null;
+
+            if (parentItem) {
+                const grouped = this.isProccessedItemGroup(processedItem);
+
+                if (grouped) {
+                    this.onItemChange({ originalEvent: event, processedItem });
+                    this.focusedItemInfo = { index: -1, parentKey: processedItem.key };
+                    this.onArrowDownKey(event);
+                }
+            } else {
+                const itemIndex = this.focusedItemInfo.index !== -1 ? this.findNextItemIndex(this.focusedItemInfo.index) : this.findFirstFocusedItemIndex();
+
+                this.changeFocusedItemIndex(event, itemIndex);
+                event.preventDefault();
+            }
+        },
+        onHomeKey(event) {
+            this.changeFocusedItemIndex(event, this.findFirstItemIndex());
+            event.preventDefault();
+        },
+        onEndKey(event) {
+            this.changeFocusedItemIndex(event, this.findLastItemIndex());
+            event.preventDefault();
+        },
+        onEnterKey(event) {
+            if (this.focusedItemInfo.index !== -1) {
+                const element = DomHandler.findSingle(this.menubar, `li[id="${`${this.focusedItemId}`}"]`);
+                const anchorElement = element && DomHandler.findSingle(element, '.p-menuitem-link');
+
+                anchorElement ? anchorElement.click() : element && element.click();
+
+                const processedItem = this.visibleItems[this.focusedItemInfo.index];
+                const grouped = this.isProccessedItemGroup(processedItem);
+
+                !grouped && (this.focusedItemInfo.index = this.findFirstFocusedItemIndex());
+            }
+
+            event.preventDefault();
+        },
+        onSpaceKey(event) {
+            this.onEnterKey(event);
+        },
+        onEscapeKey(event) {
+            this.hide(event, true);
+            this.focusedItemInfo.index = this.findFirstFocusedItemIndex();
+
+            event.preventDefault();
+        },
+        onTabKey(event) {
+            if (this.focusedItemInfo.index !== -1) {
+                const processedItem = this.visibleItems[this.focusedItemInfo.index];
+                const grouped = this.isProccessedItemGroup(processedItem);
+
+                !grouped && this.onItemChange({ originalEvent: event, processedItem });
+            }
+
+            this.hide();
+        },
         bindOutsideClickListener() {
             if (!this.outsideClickListener) {
                 this.outsideClickListener = (event) => {
-                    if (this.mobileActive && this.$refs.rootmenu.$el !== event.target && !this.$refs.rootmenu.$el.contains(event.target)
-                        && this.$refs.menubutton !== event.target && !this.$refs.menubutton.contains(event.target)) {
-                        this.mobileActive = false;
+                    const isOutsideContainer = this.menubar !== event.target && !this.menubar.contains(event.target);
+                    const isOutsideMenuButton = this.mobileActive && this.$refs.menubutton !== event.target && !this.$refs.menubutton.contains(event.target);
+
+                    if (isOutsideContainer) {
+                        isOutsideMenuButton ? (this.mobileActive = false) : this.hide();
                     }
                 };
+
                 document.addEventListener('click', this.outsideClickListener);
             }
         },
@@ -448,17 +651,165 @@ var script = {
                 this.outsideClickListener = null;
             }
         },
-        onLeafClick() {
-            this.mobileActive = false;
+        bindResizeListener() {
+            if (!this.resizeListener) {
+                this.resizeListener = (event) => {
+                    if (!DomHandler.isTouchDevice()) {
+                        this.hide(event, true);
+                    }
+
+                    this.mobileActive = false;
+                };
+
+                window.addEventListener('resize', this.resizeListener);
+            }
+        },
+        unbindResizeListener() {
+            if (this.resizeListener) {
+                window.removeEventListener('resize', this.resizeListener);
+                this.resizeListener = null;
+            }
+        },
+        isItemMatched(processedItem) {
+            return this.isValidItem(processedItem) && this.getProccessedItemLabel(processedItem).toLocaleLowerCase().startsWith(this.searchValue.toLocaleLowerCase());
+        },
+        isValidItem(processedItem) {
+            return !!processedItem && !this.isItemDisabled(processedItem.item) && !this.isItemSeparator(processedItem.item);
+        },
+        isValidSelectedItem(processedItem) {
+            return this.isValidItem(processedItem) && this.isSelected(processedItem);
+        },
+        isSelected(processedItem) {
+            return this.activeItemPath.some((p) => p.key === processedItem.key);
+        },
+        findFirstItemIndex() {
+            return this.visibleItems.findIndex((processedItem) => this.isValidItem(processedItem));
+        },
+        findLastItemIndex() {
+            return ObjectUtils.findLastIndex(this.visibleItems, (processedItem) => this.isValidItem(processedItem));
+        },
+        findNextItemIndex(index) {
+            const matchedItemIndex = index < this.visibleItems.length - 1 ? this.visibleItems.slice(index + 1).findIndex((processedItem) => this.isValidItem(processedItem)) : -1;
+
+            return matchedItemIndex > -1 ? matchedItemIndex + index + 1 : index;
+        },
+        findPrevItemIndex(index) {
+            const matchedItemIndex = index > 0 ? ObjectUtils.findLastIndex(this.visibleItems.slice(0, index), (processedItem) => this.isValidItem(processedItem)) : -1;
+
+            return matchedItemIndex > -1 ? matchedItemIndex : index;
+        },
+        findSelectedItemIndex() {
+            return this.visibleItems.findIndex((processedItem) => this.isValidSelectedItem(processedItem));
+        },
+        findFirstFocusedItemIndex() {
+            const selectedIndex = this.findSelectedItemIndex();
+
+            return selectedIndex < 0 ? this.findFirstItemIndex() : selectedIndex;
+        },
+        findLastFocusedItemIndex() {
+            const selectedIndex = this.findSelectedItemIndex();
+
+            return selectedIndex < 0 ? this.findLastItemIndex() : selectedIndex;
+        },
+        searchItems(event, char) {
+            this.searchValue = (this.searchValue || '') + char;
+
+            let itemIndex = -1;
+            let matched = false;
+
+            if (this.focusedItemInfo.index !== -1) {
+                itemIndex = this.visibleItems.slice(this.focusedItemInfo.index).findIndex((processedItem) => this.isItemMatched(processedItem));
+                itemIndex = itemIndex === -1 ? this.visibleItems.slice(0, this.focusedItemInfo.index).findIndex((processedItem) => this.isItemMatched(processedItem)) : itemIndex + this.focusedItemInfo.index;
+            } else {
+                itemIndex = this.visibleItems.findIndex((processedItem) => this.isItemMatched(processedItem));
+            }
+
+            if (itemIndex !== -1) {
+                matched = true;
+            }
+
+            if (itemIndex === -1 && this.focusedItemInfo.index === -1) {
+                itemIndex = this.findFirstFocusedItemIndex();
+            }
+
+            if (itemIndex !== -1) {
+                this.changeFocusedItemIndex(event, itemIndex);
+            }
+
+            if (this.searchTimeout) {
+                clearTimeout(this.searchTimeout);
+            }
+
+            this.searchTimeout = setTimeout(() => {
+                this.searchValue = '';
+                this.searchTimeout = null;
+            }, 500);
+
+            return matched;
+        },
+        changeFocusedItemIndex(event, index) {
+            if (this.focusedItemInfo.index !== index) {
+                this.focusedItemInfo.index = index;
+                this.scrollInView();
+            }
+        },
+        scrollInView(index = -1) {
+            const id = index !== -1 ? `${this.id}_${index}` : this.focusedItemId;
+            const element = DomHandler.findSingle(this.menubar, `li[id="${id}"]`);
+
+            if (element) {
+                element.scrollIntoView && element.scrollIntoView({ block: 'nearest', inline: 'start' });
+            }
+        },
+        createProcessedItems(items, level = 0, parent = {}, parentKey = '') {
+            const processedItems = [];
+
+            items &&
+                items.forEach((item, index) => {
+                    const key = (parentKey !== '' ? parentKey + '_' : '') + index;
+                    const newItem = {
+                        item,
+                        index,
+                        level,
+                        key,
+                        parent,
+                        parentKey
+                    };
+
+                    newItem['items'] = this.createProcessedItems(item.items, level + 1, newItem, key);
+                    processedItems.push(newItem);
+                });
+
+            return processedItems;
+        },
+        containerRef(el) {
+            this.container = el;
+        },
+        menubarRef(el) {
+            this.menubar = el ? el.$el : undefined;
         }
     },
     computed: {
         containerClass() {
-            return ['p-menubar p-component', {'p-menubar-mobile-active': this.mobileActive}];
+            return ['p-menubar p-component', { 'p-menubar-mobile-active': this.mobileActive }];
+        },
+        processedItems() {
+            return this.createProcessedItems(this.model || []);
+        },
+        visibleItems() {
+            const processedItem = this.activeItemPath.find((p) => p.key === this.focusedItemInfo.parentKey);
+
+            return processedItem ? processedItem.items : this.processedItems;
+        },
+        id() {
+            return this.$attrs.id || UniqueComponentId();
+        },
+        focusedItemId() {
+            return this.focusedItemInfo.index !== -1 ? `${this.id}${ObjectUtils.isNotEmpty(this.focusedItemInfo.parentKey) ? '_' + this.focusedItemInfo.parentKey : ''}_${this.focusedItemInfo.index}` : null;
         }
     },
     components: {
-        'MenubarSub': script$1
+        MenubarSub: script$1
     }
 };
 
@@ -466,11 +817,12 @@ const _hoisted_1 = {
   key: 0,
   class: "p-menubar-start"
 };
-const _hoisted_2 = /*#__PURE__*/createElementVNode("i", { class: "pi pi-bars" }, null, -1);
-const _hoisted_3 = [
-  _hoisted_2
+const _hoisted_2 = ["aria-haspopup", "aria-expanded", "aria-controls", "aria-label"];
+const _hoisted_3 = /*#__PURE__*/createElementVNode("i", { class: "pi pi-bars" }, null, -1);
+const _hoisted_4 = [
+  _hoisted_3
 ];
-const _hoisted_4 = {
+const _hoisted_5 = {
   key: 1,
   class: "p-menubar-end"
 };
@@ -479,6 +831,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_MenubarSub = resolveComponent("MenubarSub");
 
   return (openBlock(), createElementBlock("div", {
+    ref: $options.containerRef,
     class: normalizeClass($options.containerClass)
   }, [
     (_ctx.$slots.start)
@@ -486,23 +839,43 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
           renderSlot(_ctx.$slots, "start")
         ]))
       : createCommentVNode("", true),
-    createElementVNode("a", {
+    createElementVNode("a", mergeProps({
       ref: "menubutton",
+      role: "button",
       tabindex: "0",
       class: "p-menubar-button",
-      onClick: _cache[0] || (_cache[0] = $event => ($options.toggle($event)))
-    }, _hoisted_3, 512),
+      "aria-haspopup": $props.model.length && $props.model.length > 0 ? true : false,
+      "aria-expanded": $data.mobileActive,
+      "aria-controls": $options.id,
+      "aria-label": _ctx.$primevue.config.locale.aria.navigation,
+      onClick: _cache[0] || (_cache[0] = $event => ($options.menuButtonClick($event))),
+      onKeydown: _cache[1] || (_cache[1] = $event => ($options.menuButtonKeydown($event)))
+    }, $props.buttonProps), _hoisted_4, 16, _hoisted_2),
     createVNode(_component_MenubarSub, {
-      ref: "rootmenu",
-      model: $props.model,
+      ref: $options.menubarRef,
+      id: $options.id,
+      class: "p-menubar-root-list",
+      role: "menubar",
+      items: $options.processedItems,
       root: true,
       mobileActive: $data.mobileActive,
-      onLeafClick: $options.onLeafClick,
-      template: _ctx.$slots.item,
-      exact: $props.exact
-    }, null, 8, ["model", "mobileActive", "onLeafClick", "template", "exact"]),
+      tabindex: "0",
+      "aria-activedescendant": $data.focused ? $options.focusedItemId : undefined,
+      menuId: $options.id,
+      focusedItemId: $data.focused ? $options.focusedItemId : undefined,
+      activeItemPath: $data.activeItemPath,
+      exact: $props.exact,
+      level: 0,
+      "aria-labelledby": _ctx.ariaLabelledby,
+      "aria-label": _ctx.ariaLabel,
+      onFocus: $options.onFocus,
+      onBlur: $options.onBlur,
+      onKeydown: $options.onKeyDown,
+      onItemClick: $options.onItemClick,
+      onItemMouseenter: $options.onItemMouseEnter
+    }, null, 8, ["id", "items", "mobileActive", "aria-activedescendant", "menuId", "focusedItemId", "activeItemPath", "exact", "aria-labelledby", "aria-label", "onFocus", "onBlur", "onKeydown", "onItemClick", "onItemMouseenter"]),
     (_ctx.$slots.end)
-      ? (openBlock(), createElementBlock("div", _hoisted_4, [
+      ? (openBlock(), createElementBlock("div", _hoisted_5, [
           renderSlot(_ctx.$slots, "end")
         ]))
       : createCommentVNode("", true)
@@ -536,7 +909,7 @@ function styleInject(css, ref) {
   }
 }
 
-var css_248z = "\n.p-menubar {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n}\n.p-menubar ul {\n    margin: 0;\n    padding: 0;\n    list-style: none;\n}\n.p-menubar .p-menuitem-link {\n    cursor: pointer;\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    text-decoration: none;\n    overflow: hidden;\n    position: relative;\n}\n.p-menubar .p-menuitem-text {\n    line-height: 1;\n}\n.p-menubar .p-menuitem {\n    position: relative;\n}\n.p-menubar-root-list {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n}\n.p-menubar-root-list > li ul {\n    display: none;\n    z-index: 1;\n}\n.p-menubar-root-list > .p-menuitem-active > .p-submenu-list {\n    display: block;\n}\n.p-menubar .p-submenu-list {\n    display: none;\n    position: absolute;\n    z-index: 1;\n}\n.p-menubar .p-submenu-list > .p-menuitem-active > .p-submenu-list  {\n    display: block;\n    left: 100%;\n    top: 0;\n}\n.p-menubar .p-submenu-list .p-menuitem-link .p-submenu-icon {\n    margin-left: auto;\n}\n.p-menubar .p-menubar-custom,\n.p-menubar .p-menubar-end {\n    margin-left: auto;\n    -ms-flex-item-align: center;\n        align-self: center;\n}\n.p-menubar-button {\n    display: none;\n    cursor: pointer;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    text-decoration: none;\n}\n";
+var css_248z = "\n.p-menubar {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n}\n.p-menubar ul {\n    margin: 0;\n    padding: 0;\n    list-style: none;\n}\n.p-menubar .p-menuitem-link {\n    cursor: pointer;\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    text-decoration: none;\n    overflow: hidden;\n    position: relative;\n}\n.p-menubar .p-menuitem-text {\n    line-height: 1;\n}\n.p-menubar .p-menuitem {\n    position: relative;\n}\n.p-menubar-root-list {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -ms-flex-wrap: wrap;\n        flex-wrap: wrap;\n}\n.p-menubar-root-list > li ul {\n    display: none;\n    z-index: 1;\n}\n.p-menubar-root-list > .p-menuitem-active > .p-submenu-list {\n    display: block;\n}\n.p-menubar .p-submenu-list {\n    display: none;\n    position: absolute;\n    z-index: 1;\n}\n.p-menubar .p-submenu-list > .p-menuitem-active > .p-submenu-list {\n    display: block;\n    left: 100%;\n    top: 0;\n}\n.p-menubar .p-submenu-list .p-menuitem .p-menuitem-content .p-menuitem-link .p-submenu-icon {\n    margin-left: auto;\n}\n.p-menubar .p-menubar-end {\n    margin-left: auto;\n    -ms-flex-item-align: center;\n        align-self: center;\n}\n.p-menubar-button {\n    display: none;\n    cursor: pointer;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    text-decoration: none;\n}\n";
 styleInject(css_248z);
 
 script.render = render;