primevue 3.16.2 → 3.18.0

package/tieredmenu/tieredmenu.esm.js

@@ -1,341 +1,249 @@
-import { DomHandler, ZIndexUtils, ConnectedOverlayScrollHandler } from 'primevue/utils';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Portal from 'primevue/portal';
+import { ObjectUtils, ZIndexUtils, DomHandler, ConnectedOverlayScrollHandler, 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, createVNode, Transition, mergeProps } from 'vue';
+import { resolveComponent, resolveDirective, openBlock, createElementBlock, Fragment, renderList, normalizeStyle, normalizeClass, createElementVNode, createBlock, withCtx, withDirectives, createCommentVNode, toDisplayString, resolveDynamicComponent, createVNode, Transition, mergeProps } from 'vue';
 
 var script$1 = {
     name: 'TieredMenuSub',
-    emits: ['leaf-click', 'keydown-item'],
+    emits: ['item-click', 'item-mouseenter'],
     props: {
-        model: {
-            type: Array,
+        menuId: {
+            type: String,
             default: null
         },
-        root: {
-            type: Boolean,
-            default: false
+        focusedItemId: {
+            type: String,
+            default: null
         },
-        popup: {
-            type: Boolean,
-            default: false
+        items: {
+            type: Array,
+            default: null
         },
-        parentActive: {
-            type: Boolean,
-            default: false
+        level: {
+            type: Number,
+            default: 0
         },
         template: {
             type: Function,
             default: null
         },
+        activeItemPath: {
+            type: Object,
+            default: null
+        },
         exact: {
             type: Boolean,
             default: true
         }
     },
-    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();
-    },
     methods: {
-        onItemMouseEnter(event, item) {
-            if (this.disabled(item)) {
-                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:
-                    var nextItem = this.findNextItem(listItem);
-                    if (nextItem) {
-                        nextItem.children[0].focus();
-                    }
-
-                    event.preventDefault();
-                break;
-
-                //up
-                case 38:
-                    var prevItem = this.findPrevItem(listItem);
-                    if (prevItem) {
-                        prevItem.children[0].focus();
-                    }
-
-                    event.preventDefault();
-                break;
-
-                //right
-                case 39:
-                    if (item.items) {
-                        this.activeItem = item;
-
-                        setTimeout(() => {
-                            listItem.children[1].children[0].children[0].focus();
-                        }, 50);
-                    }
-
-                    event.preventDefault();
-                break;
-            }
-
-            this.$emit('keydown-item', {
-                originalEvent: event,
-                element: listItem
-            });
+        getItemLabel(processedItem) {
+            return this.getItemProp(processedItem, 'label');
         },
-        onChildItemKeyDown(event) {
-            //left
-            if (event.originalEvent.which === 37) {
-                this.activeItem = null;
-                event.element.parentElement.previousElementSibling.focus();
-            }
+        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;
+        },
+        isItemDisabled(processedItem) {
+            return this.getItemProp(processedItem, 'disabled');
         },
-        findPrevItem(item) {
-            let prevItem = item.previousElementSibling;
+        isItemFocused(processedItem) {
+            return this.focusedItemId === this.getItemId(processedItem);
+        },
+        isItemGroup(processedItem) {
+            return ObjectUtils.isNotEmpty(processedItem.items);
+        },
+        onItemClick(event, processedItem) {
+            const command = this.getItemProp(processedItem, 'command');
 
-            if (prevItem)
-                return DomHandler.hasClass(prevItem, 'p-disabled') || !DomHandler.hasClass(prevItem, 'p-menuitem') ? this.findPrevItem(prevItem) : prevItem;
-            else
-                return null;
+            command && command({ originalEvent: event, item: processedItem.item });
+            this.$emit('item-click', { originalEvent: event, processedItem, isFocus: true });
+        },
+        onItemMouseEnter(event, processedItem) {
+            this.$emit('item-mouseenter', { originalEvent: event, processedItem });
+        },
+        onItemActionClick(event, navigate) {
+            navigate && navigate(event);
         },
-        getItemClass(item) {
+        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(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;
-            }
+            ];
         },
-        visible(item) {
-            return (typeof item.visible === 'function' ? item.visible() : item.visible !== false);
+        getItemActionClass(processedItem, routerProps) {
+            return [
+                'p-menuitem-link',
+                {
+                    'router-link-active': routerProps && routerProps.isActive,
+                    'router-link-active-exact': this.exact && routerProps && routerProps.isExactActive
+                }
+            ];
         },
-        disabled(item) {
-            return (typeof item.disabled === 'function' ? item.disabled() : item.disabled);
+        getItemIconClass(processedItem) {
+            return ['p-menuitem-icon', this.getItemProp(processedItem, 'icon')];
         },
-        label(item) {
-            return (typeof item.label === 'function' ? item.label() : item.label);
-        }
-    },
-    computed: {
-        containerClass() {
-            return {'p-submenu-list': !this.root};
+        getSeparatorItemClass(processedItem) {
+            return ['p-menuitem-separator', this.getItemProp(processedItem, 'class')];
         }
     },
     directives: {
-        'ripple': Ripple
+        ripple: Ripple
     }
 };
 
-const _hoisted_1 = ["onMouseenter"];
-const _hoisted_2 = ["href", "onClick", "onKeydown"];
-const _hoisted_3 = { class: "p-menuitem-text" };
-const _hoisted_4 = ["href", "target", "aria-haspopup", "aria-expanded", "onClick", "onKeydown", "tabindex"];
-const _hoisted_5 = { class: "p-menuitem-text" };
-const _hoisted_6 = {
+const _hoisted_1$1 = ["id", "aria-label", "aria-disabled", "aria-expanded", "aria-haspopup", "aria-level", "aria-setsize", "aria-posinset"];
+const _hoisted_2 = ["onClick", "onMouseenter"];
+const _hoisted_3 = ["href", "onClick"];
+const _hoisted_4 = { class: "p-menuitem-text" };
+const _hoisted_5 = ["href", "target"];
+const _hoisted_6 = { class: "p-menuitem-text" };
+const _hoisted_7 = {
   key: 1,
   class: "p-submenu-icon pi pi-angle-right"
 };
+const _hoisted_8 = ["id"];
 
 function render$1(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_router_link = resolveComponent("router-link");
   const _component_TieredMenuSub = resolveComponent("TieredMenuSub", true);
   const _directive_ripple = resolveDirective("ripple");
 
-  return (openBlock(), createElementBlock("ul", {
-    ref: "element",
-    class: normalizeClass($options.containerClass),
-    role: "'menubar' : 'menu'",
-    "aria-orientation": "horizontal"
-  }, [
-    (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,
-              class: normalizeClass($options.getItemClass(item)),
-              style: normalizeStyle(item.style),
-              onMouseenter: $event => ($options.onItemMouseEnter($event, item)),
-              role: "none"
+              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_3, toDisplayString($options.label(item)), 1)
-                            ], 42, _hoisted_2)), [
-                              [_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_5, toDisplayString($options.label(item)), 1),
-                          (item.items)
-                            ? (openBlock(), createElementBlock("span", _hoisted_6))
-                            : createCommentVNode("", true)
-                        ], 42, _hoisted_4)), [
-                          [_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, toDisplayString($options.getItemLabel(processedItem)), 1)
+                              ], 10, _hoisted_3)), [
+                                [_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.isItemGroup(processedItem))
+                              ? (openBlock(), createElementBlock("span", _hoisted_7))
+                              : createCommentVNode("", true)
+                          ], 10, _hoisted_5)), [
+                            [_directive_ripple]
+                          ])
+                    ], 64))
+                  : (openBlock(), createBlock(resolveDynamicComponent($props.template), {
+                      key: 1,
+                      item: processedItem.item
+                    }, null, 8, ["item"]))
+              ], 40, _hoisted_2),
+              ($options.isItemVisible(processedItem) && $options.isItemGroup(processedItem))
                 ? (openBlock(), createBlock(_component_TieredMenuSub, {
-                    model: item.items,
-                    key: $options.label(item) + '_sub_',
+                    key: 0,
+                    id: $options.getItemId(processedItem) + '_list',
+                    role: "menu",
+                    class: "p-submenu-list",
+                    menuId: $props.menuId,
+                    focusedItemId: $props.focusedItemId,
+                    items: processedItem.items,
                     template: $props.template,
-                    onLeafClick: $options.onLeafClick,
-                    onKeydownItem: $options.onChildItemKeyDown,
-                    parentActive: item === $data.activeItem,
-                    exact: $props.exact
-                  }, null, 8, ["model", "template", "onLeafClick", "onKeydownItem", "parentActive", "exact"]))
+                    activeItemPath: $props.activeItemPath,
+                    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, ["id", "menuId", "focusedItemId", "items", "template", "activeItemPath", "exact", "level"]))
                 : createCommentVNode("", true)
-            ], 46, _hoisted_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_8))
           : createCommentVNode("", true)
       ], 64))
     }), 128))
-  ], 2))
+  ]))
 }
 
 script$1.render = render$1;
@@ -343,12 +251,13 @@ script$1.render = render$1;
 var script = {
     name: 'TieredMenu',
     inheritAttrs: false,
+    emits: ['focus', 'blur', 'before-show', 'before-hide', 'hide', 'show'],
     props: {
         popup: {
             type: Boolean,
             default: false
         },
-		model: {
+        model: {
             type: Array,
             default: null
         },
@@ -367,68 +276,365 @@ var script = {
         exact: {
             type: Boolean,
             default: true
+        },
+        disabled: {
+            type: Boolean,
+            default: false
+        },
+        tabindex: {
+            type: Number,
+            default: 0
+        },
+        'aria-labelledby': {
+            type: String,
+            default: null
+        },
+        'aria-label': {
+            type: String,
+            default: null
         }
     },
-    target: null,
-    container: null,
     outsideClickListener: null,
     scrollHandler: null,
     resizeListener: null,
+    target: null,
+    container: null,
+    menubar: null,
+    searchTimeout: null,
+    searchValue: null,
     data() {
         return {
-            visible: false
+            focused: false,
+            focusedItemInfo: { index: -1, level: 0, parentKey: '' },
+            activeItemPath: [],
+            visible: !this.popup,
+            dirty: false
         };
     },
+    watch: {
+        activeItemPath(newPath) {
+            if (!this.popup) {
+                if (ObjectUtils.isNotEmpty(newPath)) {
+                    this.bindOutsideClickListener();
+                    this.bindResizeListener();
+                } else {
+                    this.unbindOutsideClickListener();
+                    this.unbindResizeListener();
+                }
+            }
+        }
+    },
     beforeUnmount() {
-        this.unbindResizeListener();
         this.unbindOutsideClickListener();
+        this.unbindResizeListener();
 
         if (this.scrollHandler) {
             this.scrollHandler.destroy();
             this.scrollHandler = null;
         }
-        this.target = null;
+
         if (this.container && this.autoZIndex) {
             ZIndexUtils.clear(this.container);
         }
+
+        this.target = null;
         this.container = null;
     },
     methods: {
-        itemClick(event) {
-            const item = event.item;
-            if (item.command) {
-                item.command(event);
-                event.originalEvent.preventDefault();
-            }
-            this.hide();
+        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.visible)
-                this.hide();
-            else
-                this.show(event);
+            this.visible ? this.hide(event) : this.show(event);
+        },
+        show(event, isFocus) {
+            if (this.popup) {
+                this.$emit('before-show');
+                this.visible = true;
+                this.target = this.target || event.currentTarget;
+            }
+
+            this.focusedItemInfo = { index: this.findFirstFocusedItemIndex(), level: 0, parentKey: '' };
+
+            isFocus && DomHandler.focus(this.menubar);
+        },
+        hide(event, isFocus) {
+            if (this.popup) {
+                this.$emit('before-hide');
+                this.visible = false;
+            }
+
+            this.activeItemPath = [];
+            this.focusedItemInfo = { index: -1, level: 0, parentKey: '' };
+
+            isFocus && DomHandler.focus(this.target || 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) {
+            if (this.disabled) {
+                event.preventDefault();
+
+                return;
+            }
+
+            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);
+        },
+        onOverlayClick(event) {
+            OverlayEventBus.emit('overlay-click', {
+                originalEvent: event,
+                target: this.target
+            });
+        },
+        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 {
+                grouped ? this.onItemChange(event) : this.hide(originalEvent, !root);
+            }
+        },
+        onItemMouseEnter(event) {
+            if (this.dirty) {
+                this.onItemChange(event);
+            }
         },
-        show(event) {
-            this.visible = true;
-            this.target = event.currentTarget;
+        onArrowDownKey(event) {
+            const itemIndex = this.focusedItemInfo.index !== -1 ? this.findNextItemIndex(this.focusedItemInfo.index) : this.findFirstFocusedItemIndex();
+
+            this.changeFocusedItemIndex(event, itemIndex);
+            event.preventDefault();
+        },
+        onArrowUpKey(event) {
+            if (event.altKey) {
+                if (this.focusedItemInfo.index !== -1) {
+                    const processedItem = this.visibleItems[this.focusedItemInfo.index];
+                    const grouped = this.isProccessedItemGroup(processedItem);
+
+                    !grouped && this.onItemChange({ originalEvent: event, processedItem });
+                }
+
+                this.popup && this.hide(event, true);
+                event.preventDefault();
+            } 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 = this.activeItemPath.find((p) => p.key === processedItem.parentKey);
+            const root = ObjectUtils.isEmpty(processedItem.parent);
+
+            if (!root) {
+                this.focusedItemInfo = { index: -1, parentKey: parentItem ? parentItem.parentKey : '' };
+                this.searchValue = '';
+                this.onArrowDownKey(event);
+            }
+
+            this.activeItemPath = this.activeItemPath.filter((p) => p.parentKey !== this.focusedItemInfo.parentKey);
+
+            event.preventDefault();
+        },
+        onArrowRightKey(event) {
+            const processedItem = this.visibleItems[this.focusedItemInfo.index];
+            const grouped = this.isProccessedItemGroup(processedItem);
+
+            if (grouped) {
+                this.onItemChange({ originalEvent: event, processedItem });
+                this.focusedItemInfo = { index: -1, parentKey: processedItem.key };
+                this.searchValue = '';
+                this.onArrowDownKey(event);
+            }
+
+            event.preventDefault();
         },
-        hide() {
-            this.visible = false;
+        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();
+
+                if (!this.popup) {
+                    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.popup && (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();
         },
         onEnter(el) {
+            if (this.autoZIndex) {
+                ZIndexUtils.set('menu', el, this.baseZIndex + this.$primevue.config.zIndex.menu);
+            }
+
+            DomHandler.focus(this.menubar);
+
             this.alignOverlay();
+            this.scrollInView();
+        },
+        onAfterEnter() {
             this.bindOutsideClickListener();
-            this.bindResizeListener();
             this.bindScrollListener();
+            this.bindResizeListener();
 
-            if (this.autoZIndex) {
-                ZIndexUtils.set('menu', el, this.baseZIndex + this.$primevue.config.zIndex.menu);
-            }
+            this.$emit('show');
         },
         onLeave() {
             this.unbindOutsideClickListener();
-            this.unbindResizeListener();
             this.unbindScrollListener();
+            this.unbindResizeListener();
+
+            this.$emit('hide');
+            this.container = null;
+            this.dirty = false;
         },
         onAfterLeave(el) {
             if (this.autoZIndex) {
@@ -436,16 +642,20 @@ var script = {
             }
         },
         alignOverlay() {
-            DomHandler.absolutePosition(this.container, this.target);
             this.container.style.minWidth = DomHandler.getOuterWidth(this.target) + 'px';
+            DomHandler.absolutePosition(this.container, this.target);
         },
         bindOutsideClickListener() {
             if (!this.outsideClickListener) {
                 this.outsideClickListener = (event) => {
-                    if (this.visible && this.container && !this.container.contains(event.target) && !this.isTargetClicked(event)) {
+                    const isOutsideContainer = this.container && !this.container.contains(event.target);
+                    const isOutsideTarget = this.popup ? !(this.target && (this.target === event.target || this.target.contains(event.target))) : true;
+
+                    if (isOutsideContainer && isOutsideTarget) {
                         this.hide();
                     }
                 };
+
                 document.addEventListener('click', this.outsideClickListener);
             }
         },
@@ -457,10 +667,8 @@ var script = {
         },
         bindScrollListener() {
             if (!this.scrollHandler) {
-                this.scrollHandler = new ConnectedOverlayScrollHandler(this.target, () => {
-                    if (this.visible) {
-                        this.hide();
-                    }
+                this.scrollHandler = new ConnectedOverlayScrollHandler(this.target, (event) => {
+                    this.hide(event, true);
                 });
             }
 
@@ -473,11 +681,12 @@ var script = {
         },
         bindResizeListener() {
             if (!this.resizeListener) {
-                this.resizeListener = () => {
-                    if (this.visible && !DomHandler.isTouchDevice()) {
-                        this.hide();
+                this.resizeListener = (event) => {
+                    if (!DomHandler.isTouchDevice()) {
+                        this.hide(event, true);
                     }
                 };
+
                 window.addEventListener('resize', this.resizeListener);
             }
         },
@@ -487,39 +696,159 @@ var script = {
                 this.resizeListener = null;
             }
         },
-        isTargetClicked(event) {
-            return this.target && (this.target === event.target || this.target.contains(event.target));
+        isItemMatched(processedItem) {
+            return this.isValidItem(processedItem) && this.getProccessedItemLabel(processedItem).toLocaleLowerCase().startsWith(this.searchValue.toLocaleLowerCase());
         },
-        onLeafClick() {
-            if (this.popup) {
-                this.hide();
+        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;
         },
-        onOverlayClick(event) {
-            OverlayEventBus.emit('overlay-click', {
-                originalEvent: event,
-                target: this.target
-            });
+        menubarRef(el) {
+            this.menubar = el ? el.$el : undefined;
         }
     },
     computed: {
         containerClass() {
-            return ['p-tieredmenu p-component', {
-                'p-tieredmenu-overlay': this.popup,
-                'p-input-filled': this.$primevue.config.inputStyle === 'filled',
-                'p-ripple-disabled': this.$primevue.config.ripple === false
-            }];
+            return [
+                'p-tieredmenu p-component',
+                {
+                    'p-tieredmenu-overlay': this.popup,
+                    'p-input-filled': this.$primevue.config.inputStyle === 'filled',
+                    'p-ripple-disabled': this.$primevue.config.ripple === false
+                }
+            ];
+        },
+        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: {
-        'TieredMenuSub': script$1,
-        'Portal': Portal
+        TieredMenuSub: script$1,
+        Portal: Portal
     }
 };
 
+const _hoisted_1 = ["id"];
+
 function render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_TieredMenuSub = resolveComponent("TieredMenuSub");
   const _component_Portal = resolveComponent("Portal");
@@ -532,31 +861,48 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
       createVNode(Transition, {
         name: "p-connected-overlay",
         onEnter: $options.onEnter,
+        onAfterEnter: $options.onAfterEnter,
         onLeave: $options.onLeave,
         onAfterLeave: $options.onAfterLeave
       }, {
         default: withCtx(() => [
-          ($props.popup ? $data.visible : true)
+          ($data.visible)
             ? (openBlock(), createElementBlock("div", mergeProps({
                 key: 0,
                 ref: $options.containerRef,
-                class: $options.containerClass
-              }, _ctx.$attrs, {
+                id: $options.id,
+                class: $options.containerClass,
                 onClick: _cache[0] || (_cache[0] = (...args) => ($options.onOverlayClick && $options.onOverlayClick(...args)))
-              }), [
+              }, _ctx.$attrs), [
                 createVNode(_component_TieredMenuSub, {
-                  model: $props.model,
-                  root: true,
-                  popup: $props.popup,
-                  onLeafClick: $options.onLeafClick,
+                  ref: $options.menubarRef,
+                  id: $options.id + '_list',
+                  class: "p-tieredmenu-root-list",
+                  tabindex: !$props.disabled ? $props.tabindex : -1,
+                  role: "menubar",
+                  "aria-label": _ctx.ariaLabel,
+                  "aria-labelledby": _ctx.ariaLabelledby,
+                  "aria-disabled": $props.disabled || undefined,
+                  "aria-orientation": "vertical",
+                  "aria-activedescendant": $data.focused ? $options.focusedItemId : undefined,
+                  menuId: $options.id,
+                  focusedItemId: $data.focused ? $options.focusedItemId : undefined,
+                  items: $options.processedItems,
                   template: _ctx.$slots.item,
-                  exact: $props.exact
-                }, null, 8, ["model", "popup", "onLeafClick", "template", "exact"])
-              ], 16))
+                  activeItemPath: $data.activeItemPath,
+                  exact: $props.exact,
+                  level: 0,
+                  onFocus: $options.onFocus,
+                  onBlur: $options.onBlur,
+                  onKeydown: $options.onKeyDown,
+                  onItemClick: $options.onItemClick,
+                  onItemMouseenter: $options.onItemMouseEnter
+                }, null, 8, ["id", "tabindex", "aria-label", "aria-labelledby", "aria-disabled", "aria-activedescendant", "menuId", "focusedItemId", "items", "template", "activeItemPath", "exact", "onFocus", "onBlur", "onKeydown", "onItemClick", "onItemMouseenter"])
+              ], 16, _hoisted_1))
             : createCommentVNode("", true)
         ]),
         _: 1
-      }, 8, ["onEnter", "onLeave", "onAfterLeave"])
+      }, 8, ["onEnter", "onAfterEnter", "onLeave", "onAfterLeave"])
     ]),
     _: 1
   }, 8, ["appendTo", "disabled"]))