primereact 10.2.1 → 10.3.1

package/menubar/menubar.cjs.js

@@ -142,27 +142,31 @@ var classes = {
       'p-menubar-mobile-active': mobileActiveState
     });
   },
-  separator: 'p-menu-separator',
+  separator: 'p-menuitem-separator',
   icon: 'p-menuitem-icon',
   label: 'p-menuitem-text',
   submenuIcon: 'p-submenu-icon',
   menuitem: function menuitem(_ref2) {
-    var item = _ref2.item,
-      activeItemState = _ref2.activeItemState;
+    var active = _ref2.active,
+      focused = _ref2.focused,
+      disabled = _ref2.disabled;
     return utils.classNames('p-menuitem', {
-      'p-menuitem-active': activeItemState === item
+      'p-menuitem-active p-highlight': active,
+      'p-focus': focused,
+      'p-disabled': disabled
     });
   },
   menu: 'p-menubar-root-list',
+  content: 'p-menuitem-content',
   submenu: 'p-submenu-list',
   action: function action(_ref3) {
-    var item = _ref3.item;
+    var disabled = _ref3.disabled;
     return utils.classNames('p-menuitem-link', {
-      'p-disabled': item.disabled
+      'p-disabled': disabled
     });
   }
 };
-var styles = "\n@layer primereact {\n    .p-menubar {\n        display: flex;\n        align-items: center;\n    }\n    \n    .p-menubar ul {\n        margin: 0;\n        padding: 0;\n        list-style: none;\n    }\n    \n    .p-menubar .p-menuitem-link {\n        cursor: pointer;\n        display: flex;\n        align-items: center;\n        text-decoration: none;\n        overflow: hidden;\n        position: relative;\n    }\n    \n    .p-menubar .p-menuitem-text {\n        line-height: 1;\n    }\n    \n    .p-menubar .p-menuitem {\n        position: relative;\n    }\n    \n    .p-menubar-root-list {\n        display: flex;\n        align-items: center;\n        flex-wrap: wrap;\n    }\n    \n    .p-menubar-root-list > li ul {\n        display: none;\n        z-index: 1;\n    }\n    \n    .p-menubar-root-list > .p-menuitem-active > .p-submenu-list {\n        display: block;\n    }\n    \n    .p-menubar .p-submenu-list {\n        display: none;\n        position: absolute;\n        z-index: 1;\n    }\n    \n    .p-menubar .p-submenu-list > .p-menuitem-active > .p-submenu-list {\n        display: block;\n        left: 100%;\n        top: 0;\n    }\n    \n    .p-menubar .p-submenu-list .p-menuitem-link .p-submenu-icon {\n        margin-left: auto;\n    }\n    \n    .p-menubar .p-menubar-custom,\n    .p-menubar .p-menubar-end {\n        margin-left: auto;\n        align-self: center;\n    }\n    \n    .p-menubar-button {\n        display: none;\n        cursor: pointer;\n        align-items: center;\n        justify-content: center;\n        text-decoration: none;\n    }\n}\n";
+var styles = "\n@layer primereact {\n    .p-menubar {\n        display: flex;\n        align-items: center;\n    }\n\n    .p-menubar ul {\n        margin: 0;\n        padding: 0;\n        list-style: none;\n    }\n\n    .p-menubar .p-menuitem-link {\n        cursor: pointer;\n        display: flex;\n        align-items: center;\n        text-decoration: none;\n        overflow: hidden;\n        position: relative;\n    }\n\n    .p-menubar .p-menuitem-text {\n        line-height: 1;\n    }\n\n    .p-menubar .p-menuitem {\n        position: relative;\n    }\n\n    .p-menubar-root-list {\n        display: flex;\n        align-items: center;\n        flex-wrap: wrap;\n    }\n\n    .p-menubar-root-list > li ul {\n        display: none;\n        z-index: 1;\n    }\n\n    .p-menubar-root-list > .p-menuitem-active > .p-submenu-list {\n        display: block;\n    }\n\n    .p-menubar .p-submenu-list {\n        display: none;\n        position: absolute;\n        z-index: 1;\n    }\n\n    .p-menubar .p-submenu-list > .p-menuitem-active > .p-submenu-list {\n        display: block;\n        left: 100%;\n        top: 0;\n    }\n\n    .p-menubar .p-submenu-list .p-menuitem .p-menuitem-content .p-menuitem-link .p-submenu-icon {\n        margin-left: auto;\n    }\n\n    .p-menubar .p-menubar-end {\n        margin-left: auto;\n        align-self: center;\n    }\n\n    .p-menubar-button {\n        display: none;\n        cursor: pointer;\n        align-items: center;\n        justify-content: center;\n        text-decoration: none;\n    }\n}\n";
 var MenubarBase = componentbase.ComponentBase.extend({
   defaultProps: {
     __TYPE: 'Menubar',
@@ -171,6 +175,10 @@ var MenubarBase = componentbase.ComponentBase.extend({
     style: null,
     className: null,
     start: null,
+    ariaLabel: null,
+    ariaLabelledBy: null,
+    onFocus: null,
+    onBlur: null,
     submenuIcon: null,
     menuIcon: null,
     end: null,
@@ -185,46 +193,35 @@ var MenubarBase = componentbase.ComponentBase.extend({
 function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MenubarSub = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
-  var _React$useState = React__namespace.useState(null),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    activeItemState = _React$useState2[0],
-    setActiveItemState = _React$useState2[1];
   var ptm = props.ptm,
     cx = props.cx;
-  var getPTOptions = function getPTOptions(item, key) {
+  var getPTOptions = function getPTOptions(processedItem, key, index) {
     return ptm(key, {
       props: props,
       hostName: props.hostName,
       context: {
-        active: activeItemState === item
+        item: processedItem,
+        index: index,
+        active: isItemActive(processedItem),
+        focused: isItemFocused(processedItem),
+        disabled: isItemDisabled(processedItem),
+        level: props.level
       }
     });
   };
-  var _useEventListener = hooks.useEventListener({
-      type: 'click',
-      listener: function listener(event) {
-        if (ref && ref.current && !ref.current.contains(event.target)) {
-          setActiveItemState(null);
-        }
-      }
-    }),
-    _useEventListener2 = _slicedToArray(_useEventListener, 1),
-    bindDocumentClickListener = _useEventListener2[0];
   var onItemMouseEnter = function onItemMouseEnter(event, item) {
-    if (item.disabled || props.mobileActive) {
+    if (isItemDisabled(item) || props.mobileActive) {
       event.preventDefault();
       return;
     }
-    if (props.root) {
-      if (activeItemState || props.popup) {
-        setActiveItemState(item);
-      }
-    } else {
-      setActiveItemState(item);
-    }
+    props.onItemMouseEnter && props.onItemMouseEnter({
+      originalEvent: event,
+      processedItem: item
+    });
   };
-  var onItemClick = function onItemClick(event, item) {
-    if (item.disabled) {
+  var onItemClick = function onItemClick(event, processedItem) {
+    var item = processedItem.item;
+    if (isItemDisabled(processedItem)) {
       event.preventDefault();
       return;
     }
@@ -237,91 +234,48 @@ var MenubarSub = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespa
         item: item
       });
     }
-    if (item.items) activeItemState && item === activeItemState ? setActiveItemState(null) : setActiveItemState(item);else onLeafClick();
+    onLeafClick({
+      originalEvent: event,
+      processedItem: processedItem,
+      isFocus: true
+    });
   };
-  var onItemKeyDown = function onItemKeyDown(event, item) {
-    var listItem = event.currentTarget.parentElement;
-    switch (event.which) {
-      //down
-      case 40:
-        if (props.root) item.items && expandSubmenu(item, listItem);else navigateToNextItem(listItem);
-        event.preventDefault();
-        break;
-
-      //up
-      case 38:
-        !props.root && navigateToPrevItem(listItem);
-        event.preventDefault();
-        break;
-
-      //right
-      case 39:
-        if (props.root) {
-          var nextItem = findNextItem(listItem);
-          nextItem && nextItem.children[0].focus();
-        } else {
-          item.items && expandSubmenu(item, listItem);
-        }
-        event.preventDefault();
-        break;
-
-      //left
-      case 37:
-        props.root && navigateToPrevItem(listItem);
-        event.preventDefault();
-        break;
-    }
-    props.onKeyDown && props.onKeyDown(event, listItem);
+  var onLeafClick = function onLeafClick(event) {
+    props.onLeafClick && props.onLeafClick(event);
   };
-  var onChildItemKeyDown = function onChildItemKeyDown(event, childListItem) {
-    if (props.root) {
-      //up
-      if (event.which === 38 && childListItem.previousElementSibling == null) {
-        collapseMenu(childListItem);
-      }
-    } else {
-      //left
-      if (event.which === 37) {
-        collapseMenu(childListItem);
-      }
-    }
+  var getItemId = function getItemId(processedItem) {
+    return "".concat(props.id, "_").concat(processedItem.key);
   };
-  var expandSubmenu = function expandSubmenu(item, listItem) {
-    setActiveItemState(item);
-    setTimeout(function () {
-      listItem.children[1].children[0].children[0].focus();
-    }, 50);
+  var getItemProp = function getItemProp(processedItem, name, params) {
+    return processedItem && processedItem.item ? utils.ObjectUtils.getItemValue(processedItem.item[name], params) : undefined;
   };
-  var collapseMenu = function collapseMenu(listItem) {
-    setActiveItemState(null);
-    listItem.parentElement.previousElementSibling.focus();
+  var isItemActive = function isItemActive(processedItem) {
+    return props.activeItemPath.some(function (path) {
+      return path.key === processedItem.key;
+    });
   };
-  var navigateToNextItem = function navigateToNextItem(listItem) {
-    var nextItem = findNextItem(listItem);
-    nextItem && nextItem.children[0].focus();
+  var isItemVisible = function isItemVisible(processedItem) {
+    return getItemProp(processedItem, 'visible') !== false;
   };
-  var navigateToPrevItem = function navigateToPrevItem(listItem) {
-    var prevItem = findPrevItem(listItem);
-    prevItem && prevItem.children[0].focus();
+  var isItemDisabled = function isItemDisabled(processedItem) {
+    return getItemProp(processedItem, 'disabled');
   };
-  var findNextItem = function findNextItem(item) {
-    var nextItem = item.nextElementSibling;
-    return nextItem ? utils.DomHandler.getAttribute(nextItem, '[data-p-disabled="true"]') || !utils.DomHandler.getAttribute(nextItem, '[data-pc-section="menuitem"]') ? findNextItem(nextItem) : nextItem : null;
+  var isItemFocused = function isItemFocused(processedItem) {
+    return props.focusedItemId === getItemId(processedItem);
   };
-  var findPrevItem = function findPrevItem(item) {
-    var prevItem = item.previousElementSibling;
-    return prevItem ? utils.DomHandler.getAttribute(prevItem, '[data-p-disabled="true"]') || !utils.DomHandler.getAttribute(prevItem, '[data-pc-section="menuitem"]') ? findPrevItem(prevItem) : prevItem : null;
+  var isItemGroup = function isItemGroup(processedItem) {
+    return utils.ObjectUtils.isNotEmpty(processedItem.items);
   };
-  var onLeafClick = function onLeafClick() {
-    setActiveItemState(null);
-    props.onLeafClick && props.onLeafClick();
+  var getAriaSetSize = function getAriaSetSize() {
+    return props.model.filter(function (processedItem) {
+      return isItemVisible(processedItem) && !getItemProp(processedItem, 'separator');
+    }).length;
+  };
+  var getAriaPosInset = function getAriaPosInset(index) {
+    return index - props.model.slice(0, index).filter(function (processedItem) {
+      return isItemVisible(processedItem) && getItemProp(processedItem, 'separator');
+    }).length + 1;
   };
-  hooks.useMountEffect(function () {
-    bindDocumentClickListener();
-  });
-  hooks.useUpdateEffect(function () {
-    !props.parentActive && setActiveItemState(null);
-  }, [props.parentActive]);
   var createSeparator = function createSeparator(index) {
     var key = props.id + '_separator_' + index;
     var separatorProps = utils.mergeProps({
@@ -334,77 +288,80 @@ var MenubarSub = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespa
     }));
     return /*#__PURE__*/React__namespace.createElement("li", separatorProps);
   };
-  var createSubmenu = function createSubmenu(item, index) {
-    if (item.items) {
+  var createSubmenu = function createSubmenu(processedItem) {
+    var items = processedItem && processedItem.items;
+    if (items) {
       return /*#__PURE__*/React__namespace.createElement(MenubarSub, {
-        id: props.id + '_' + index,
+        id: props.id,
         hostName: props.hostName,
         menuProps: props.menuProps,
-        model: item.items,
-        mobileActive: props.mobileActive,
+        level: props.level + 1,
+        model: items,
+        activeItemPath: props.activeItemPath,
+        focusedItemId: props.focusedItemId,
         onLeafClick: onLeafClick,
-        onKeyDown: onChildItemKeyDown,
-        parentActive: item === activeItemState,
+        onItemMouseEnter: props.onItemMouseEnter,
         submenuIcon: props.submenuIcon,
         ptm: ptm,
+        style: {
+          display: isItemActive(processedItem) ? 'block' : 'none'
+        },
         cx: cx
       });
     }
     return null;
   };
-  var createMenuitem = function createMenuitem(item, index) {
-    if (item.visible === false) {
+  var createMenuitem = function createMenuitem(processedItem, index) {
+    var item = processedItem.item;
+    if (!isItemVisible(processedItem)) {
       return null;
     }
-    var key = item.id || props.id + '_' + index;
+    var key = getItemId(processedItem);
+    var active = isItemActive(processedItem);
+    var focused = isItemFocused(processedItem);
+    var disabled = isItemDisabled(processedItem) || false;
+    var group = isItemGroup(processedItem);
     var linkClassName = utils.classNames('p-menuitem-link', {
-      'p-disabled': item.disabled
+      'p-disabled': disabled
     });
-    var iconClassName = utils.classNames('p-menuitem-icon', item.icon);
+    var iconClassName = utils.classNames('p-menuitem-icon', getItemProp(processedItem, 'icon'));
     var iconProps = utils.mergeProps({
       className: cx('icon')
-    }, getPTOptions(item, 'icon'));
+    }, getPTOptions(processedItem, 'icon', index));
     var icon = utils.IconUtils.getJSXIcon(item.icon, _objectSpread$1({}, iconProps), {
       props: props.menuProps
     });
     var labelProps = utils.mergeProps({
       className: cx('label')
-    }, getPTOptions(item, 'label'));
+    }, getPTOptions(processedItem, 'label', index));
     var label = item.label && /*#__PURE__*/React__namespace.createElement("span", labelProps, item.label);
+    var items = getItemProp(processedItem, 'items');
     var submenuIconClassName = 'p-submenu-icon';
     var submenuIconProps = utils.mergeProps({
       className: cx('submenuIcon')
-    }, getPTOptions(item, 'submenuIcon'));
-    var submenuIcon = item.items && utils.IconUtils.getJSXIcon(!props.root ? props.submenuIcon || /*#__PURE__*/React__namespace.createElement(angleright.AngleRightIcon, submenuIconProps) : props.submenuIcon || /*#__PURE__*/React__namespace.createElement(angledown.AngleDownIcon, submenuIconProps), _objectSpread$1({}, submenuIconProps), {
+    }, getPTOptions(processedItem, 'submenuIcon', index));
+    var submenuIcon = items && utils.IconUtils.getJSXIcon(!props.root ? props.submenuIcon || /*#__PURE__*/React__namespace.createElement(angleright.AngleRightIcon, submenuIconProps) : props.submenuIcon || /*#__PURE__*/React__namespace.createElement(angledown.AngleDownIcon, submenuIconProps), _objectSpread$1({}, submenuIconProps), {
       props: _objectSpread$1({
         menuProps: props.menuProps
       }, props)
     });
-    var submenu = createSubmenu(item, index);
+    var submenu = createSubmenu(processedItem);
     var actionProps = utils.mergeProps({
       href: item.url || '#',
-      role: 'menuitem',
+      tabIndex: '-1',
+      'aria-hidden': 'true',
       className: cx('action', {
-        item: item
+        disabled: disabled
       }),
-      target: item.target,
-      'aria-haspopup': item.items != null,
-      onClick: function onClick(event) {
-        return onItemClick(event, item);
+      onFocus: function onFocus(event) {
+        return event.stopPropagation();
       },
-      onKeyDown: function onKeyDown(event) {
-        return onItemKeyDown(event, item);
-      }
-    }, getPTOptions(item, 'action'));
+      target: getItemProp(processedItem, 'target'),
+      'aria-haspopup': items != null
+    }, getPTOptions(processedItem, 'action', index));
     var content = /*#__PURE__*/React__namespace.createElement("a", actionProps, icon, label, submenuIcon, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null));
     if (item.template) {
       var defaultContentOptions = {
-        onClick: function onClick(event) {
-          return onItemClick(event, item);
-        },
-        onKeyDown: function onKeyDown(event) {
-          return onItemKeyDown(event, item);
-        },
         className: linkClassName,
         labelClassName: 'p-menuitem-text',
         iconClassName: iconClassName,
@@ -414,36 +371,59 @@ var MenubarSub = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespa
       };
       content = utils.ObjectUtils.getJSXElement(item.template, item, defaultContentOptions);
     }
-    var menuitemProps = utils.mergeProps({
-      id: key,
-      key: key,
-      role: 'none',
-      className: utils.classNames(item.className, cx('menuitem', {
-        item: item,
-        activeItemState: activeItemState
-      })),
+    var contentProps = utils.mergeProps({
+      onClick: function onClick(event) {
+        return onItemClick(event, processedItem);
+      },
       onMouseEnter: function onMouseEnter(event) {
-        return onItemMouseEnter(event, item);
+        return onItemMouseEnter(event, processedItem);
       },
-      'data-p-disabled': item.disabled || false
-    }, getPTOptions(item, 'menuitem'));
-    return /*#__PURE__*/React__namespace.createElement("li", menuitemProps, content, submenu);
+      className: cx('content')
+    }, getPTOptions(processedItem, 'content', index));
+    var itemClassName = getItemProp(processedItem, 'className');
+    var menuitemProps = utils.mergeProps(_defineProperty({
+      id: key,
+      key: key,
+      role: 'menuitem',
+      'aria-label': item.label,
+      'aria-disabled': disabled,
+      'aria-expanded': group ? active : undefined,
+      'aria-haspopup': group && !item.url ? 'menu' : undefined,
+      'aria-level': props.level + 1,
+      'aria-setsize': getAriaSetSize(),
+      'aria-posinset': getAriaPosInset(index),
+      'data-p-highlight': active,
+      'data-p-focused': focused,
+      'data-p-disabled': disabled,
+      className: utils.classNames(itemClassName, cx('menuitem', {
+        active: active,
+        focused: focused,
+        disabled: disabled
+      }))
+    }, "data-p-disabled", disabled || false), getPTOptions(processedItem, 'menuitem', index));
+    return /*#__PURE__*/React__namespace.createElement("li", menuitemProps, /*#__PURE__*/React__namespace.createElement("div", contentProps, content), submenu);
   };
-  var createItem = function createItem(item, index) {
-    return item.separator ? createSeparator(index) : createMenuitem(item, index);
+  var createItem = function createItem(processedItem, index) {
+    return getItemProp(processedItem, 'separator') ? createSeparator(index) : createMenuitem(processedItem, index);
   };
   var createMenu = function createMenu() {
     return props.model ? props.model.map(createItem) : null;
   };
   var role = props.root ? 'menubar' : 'menu';
   var ptKey = props.root ? 'menu' : 'submenu';
+  var tabIndex = props.root ? '0' : null;
   var submenu = createMenu();
   var menuProps = utils.mergeProps({
     ref: ref,
     className: cx(ptKey),
-    style: !props.root && {
-      display: props.parentActive ? 'block' : 'none'
-    },
+    level: props.level,
+    onFocus: props.onFocus,
+    onBlur: props.onBlur,
+    onKeyDown: props.onKeyDown,
+    id: props.id,
+    tabIndex: tabIndex,
+    'aria-activedescendant': props.ariaActivedescendant,
+    style: props.style,
     role: role
   }, ptm(ptKey));
   return /*#__PURE__*/React__namespace.createElement("ul", menuProps, submenu);
@@ -463,9 +443,48 @@ var Menubar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     mobileActiveState = _React$useState4[0],
     setMobileActiveState = _React$useState4[1];
+  var _React$useState5 = React__namespace.useState(false),
+    _React$useState6 = _slicedToArray(_React$useState5, 2),
+    focused = _React$useState6[0],
+    setFocused = _React$useState6[1];
+  var _React$useState7 = React__namespace.useState({
+      index: -1,
+      level: 0,
+      parentKey: ''
+    }),
+    _React$useState8 = _slicedToArray(_React$useState7, 2),
+    focusedItemInfo = _React$useState8[0],
+    setFocusedItemInfo = _React$useState8[1];
+  var _React$useState9 = React__namespace.useState(null),
+    _React$useState10 = _slicedToArray(_React$useState9, 2),
+    focusedItemId = _React$useState10[0],
+    setFocusedItemId = _React$useState10[1];
+  var _React$useState11 = React__namespace.useState([]),
+    _React$useState12 = _slicedToArray(_React$useState11, 2),
+    activeItemPath = _React$useState12[0],
+    setActiveItemPath = _React$useState12[1];
+  var _React$useState13 = React__namespace.useState([]),
+    _React$useState14 = _slicedToArray(_React$useState13, 2),
+    visibleItems = _React$useState14[0],
+    setVisibleItems = _React$useState14[1];
+  var _React$useState15 = React__namespace.useState([]),
+    _React$useState16 = _slicedToArray(_React$useState15, 2),
+    processedItems = _React$useState16[0],
+    setProcessedItems = _React$useState16[1];
+  var _React$useState17 = React__namespace.useState(false),
+    _React$useState18 = _slicedToArray(_React$useState17, 2),
+    focusTrigger = _React$useState18[0],
+    setFocusTrigger = _React$useState18[1];
+  var _React$useState19 = React__namespace.useState(false),
+    _React$useState20 = _slicedToArray(_React$useState19, 2),
+    dirty = _React$useState20[0],
+    setDirty = _React$useState20[1];
   var elementRef = React__namespace.useRef(null);
   var rootMenuRef = React__namespace.useRef(null);
   var menuButtonRef = React__namespace.useRef(null);
+  var searchValue = React__namespace.useRef('');
+  var searchTimeout = React__namespace.useRef(null);
+  var reverseTrigger = React__namespace.useRef(false);
   var _MenubarBase$setMetaD = MenubarBase.setMetaData({
       props: props,
       state: {
@@ -482,26 +501,496 @@ var Menubar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
   var _useEventListener = hooks.useEventListener({
       type: 'click',
       listener: function listener(event) {
-        if (mobileActiveState && isOutsideClicked(event)) {
-          setMobileActiveState(false);
+        if (isOutsideClicked(event)) {
+          var isOutsideContainer = elementRef.current && !elementRef.current.contains(event.target);
+          if (isOutsideContainer) {
+            hide();
+          }
         }
       }
     }),
     _useEventListener2 = _slicedToArray(_useEventListener, 2),
-    bindDocumentClickListener = _useEventListener2[0],
-    unbindDocumentClickListener = _useEventListener2[1];
+    bindOutsideClickListener = _useEventListener2[0],
+    unbindOutsideClickListener = _useEventListener2[1];
+  var _useResizeListener = hooks.useResizeListener({
+      listener: function listener(event) {
+        if (!utils.DomHandler.isTouchDevice()) {
+          hide(event);
+        }
+      }
+    }),
+    _useResizeListener2 = _slicedToArray(_useResizeListener, 2),
+    bindResizeListener = _useResizeListener2[0],
+    unbindResizeListener = _useResizeListener2[1];
   var toggle = function toggle(event) {
+    if (mobileActiveState) {
+      setMobileActiveState(false);
+      hide();
+    } else {
+      setMobileActiveState(true);
+      setTimeout(function () {
+        show();
+      }, 1);
+    }
     event.preventDefault();
-    setMobileActiveState(function (prevMobileActive) {
-      return !prevMobileActive;
+  };
+  var show = function show() {
+    setFocusedItemInfo({
+      index: findFirstFocusedItemIndex(),
+      level: 0,
+      parentKey: ''
+    });
+    utils.DomHandler.focus(rootMenuRef.current);
+  };
+  var hide = function hide(isFocus) {
+    if (mobileActiveState) {
+      setMobileActiveState(false);
+      setTimeout(function () {
+        utils.DomHandler.focus(menuButtonRef.current);
+      }, 0);
+    }
+    setActiveItemPath([]);
+    setFocusedItemInfo({
+      index: -1,
+      level: 0,
+      parentKey: ''
     });
+    isFocus && utils.DomHandler.focus(rootMenuRef.current);
+    setDirty(false);
   };
-  var onLeafClick = function onLeafClick() {
-    setMobileActiveState(false);
+  var menuButtonKeydown = function menuButtonKeydown(event) {
+    (event.code === 'Enter' || event.code === 'Space') && toggle(event);
   };
   var isOutsideClicked = function isOutsideClicked(event) {
     return rootMenuRef.current !== event.target && !rootMenuRef.current.contains(event.target) && menuButtonRef.current !== event.target && !menuButtonRef.current.contains(event.target);
   };
+  var getItemProp = function getItemProp(item, name) {
+    return item ? utils.ObjectUtils.getItemValue(item[name]) : undefined;
+  };
+  var getItemLabel = function getItemLabel(item) {
+    return getItemProp(item, 'label');
+  };
+  var isItemDisabled = function isItemDisabled(item) {
+    return getItemProp(item, 'disabled');
+  };
+  var isItemSeparator = function isItemSeparator(item) {
+    return getItemProp(item, 'separator');
+  };
+  var getProccessedItemLabel = function getProccessedItemLabel(processedItem) {
+    return processedItem ? getItemLabel(processedItem.item) : undefined;
+  };
+  var isProccessedItemGroup = function isProccessedItemGroup(processedItem) {
+    return processedItem && utils.ObjectUtils.isNotEmpty(processedItem.items);
+  };
+  var onFocus = function onFocus(event) {
+    setFocused(true);
+    setFocusedItemInfo(focusedItemInfo.index !== -1 ? focusedItemInfo : {
+      index: findFirstFocusedItemIndex(),
+      level: 0,
+      parentKey: ''
+    });
+    props.onFocus && props.onFocus(event);
+  };
+  var onBlur = function onBlur(event) {
+    setFocused(false);
+    setFocusedItemInfo({
+      index: -1,
+      level: 0,
+      parentKey: ''
+    });
+    searchValue.current = '';
+    setDirty(false);
+    props.onBlur && props.onBlur(event);
+  };
+  var onKeyDown = function onKeyDown(event) {
+    var metaKey = event.metaKey || event.ctrlKey;
+    var code = event.code;
+    switch (code) {
+      case 'ArrowDown':
+        onArrowDownKey(event);
+        break;
+      case 'ArrowUp':
+        onArrowUpKey(event);
+        break;
+      case 'ArrowLeft':
+        onArrowLeftKey(event);
+        break;
+      case 'ArrowRight':
+        onArrowRightKey(event);
+        break;
+      case 'Home':
+        onHomeKey(event);
+        break;
+      case 'End':
+        onEndKey(event);
+        break;
+      case 'Space':
+        onSpaceKey(event);
+        break;
+      case 'Enter':
+        onEnterKey(event);
+        break;
+      case 'Escape':
+        onEscapeKey();
+        break;
+      case 'Tab':
+        onTabKey(event);
+        break;
+      case 'PageDown':
+      case 'PageUp':
+      case 'Backspace':
+      case 'ShiftLeft':
+      case 'ShiftRight':
+        break;
+      default:
+        if (!metaKey && utils.ObjectUtils.isPrintableCharacter(event.key)) {
+          searchItems(event, event.key);
+        }
+        break;
+    }
+  };
+  var onItemChange = function onItemChange(event) {
+    var processedItem = event.processedItem,
+      isFocus = event.isFocus;
+    if (utils.ObjectUtils.isEmpty(processedItem)) return;
+    var index = processedItem.index,
+      key = processedItem.key,
+      level = processedItem.level,
+      parentKey = processedItem.parentKey,
+      items = processedItem.items;
+    var grouped = utils.ObjectUtils.isNotEmpty(items);
+    var _activeItemPath = activeItemPath.filter(function (p) {
+      return p.parentKey !== parentKey && p.parentKey !== key;
+    });
+    grouped && _activeItemPath.push(processedItem);
+    setFocusedItemInfo({
+      index: index,
+      level: level,
+      parentKey: parentKey
+    });
+    setActiveItemPath(_activeItemPath);
+    grouped && setDirty(true);
+    isFocus && utils.DomHandler.focus(rootMenuRef.current);
+  };
+  var onItemClick = function onItemClick(event) {
+    var originalEvent = event.originalEvent,
+      processedItem = event.processedItem;
+    var grouped = isProccessedItemGroup(processedItem);
+    var root = utils.ObjectUtils.isEmpty(processedItem.parent);
+    var selected = isSelected(processedItem);
+    if (selected) {
+      var index = processedItem.index,
+        key = processedItem.key,
+        level = processedItem.level,
+        parentKey = processedItem.parentKey;
+      setActiveItemPath(activeItemPath.filter(function (p) {
+        return key !== p.key && key.startsWith(p.key);
+      }));
+      setFocusedItemInfo({
+        index: index,
+        level: level,
+        parentKey: parentKey
+      });
+      if (!grouped) {
+        setDirty(!root);
+      }
+      setTimeout(function () {
+        utils.DomHandler.focus(rootMenuRef.current);
+        if (grouped) {
+          setDirty(true);
+        }
+      }, 0);
+    } else {
+      if (grouped) {
+        utils.DomHandler.focus(rootMenuRef.current);
+        onItemChange({
+          originalEvent: originalEvent,
+          processedItem: processedItem
+        });
+      } else {
+        var rootProcessedItem = root ? processedItem : activeItemPath.find(function (p) {
+          return p.parentKey === '';
+        });
+        var rootProcessedItemIndex = rootProcessedItem ? rootProcessedItem.index : -1;
+        hide(originalEvent);
+        setFocusedItemInfo({
+          index: rootProcessedItemIndex,
+          parentKey: rootProcessedItem ? rootProcessedItem.parentKey : ''
+        });
+        setMobileActiveState(false);
+      }
+    }
+  };
+  var onItemMouseEnter = function onItemMouseEnter(event) {
+    if (!mobileActiveState && dirty) {
+      onItemChange(event);
+    }
+  };
+  var onArrowDownKey = function onArrowDownKey(event) {
+    var processedItem = visibleItems[focusedItemInfo.index];
+    var root = processedItem ? utils.ObjectUtils.isEmpty(processedItem.parent) : null;
+    if (root) {
+      var grouped = isProccessedItemGroup(processedItem);
+      if (grouped) {
+        onItemChange({
+          originalEvent: event,
+          processedItem: processedItem
+        });
+        setFocusedItemInfo({
+          index: -1,
+          parentKey: processedItem.key
+        });
+        setTimeout(function () {
+          return setFocusTrigger(true);
+        }, 0);
+      }
+    } else {
+      var itemIndex = focusedItemInfo.index !== -1 ? findNextItemIndex(focusedItemInfo.index) : findFirstFocusedItemIndex();
+      changeFocusedItemIndex(itemIndex);
+    }
+    event.preventDefault();
+  };
+  var onArrowUpKey = function onArrowUpKey(event) {
+    var processedItem = visibleItems[focusedItemInfo.index];
+    var root = utils.ObjectUtils.isEmpty(processedItem.parent);
+    if (root) {
+      var grouped = isProccessedItemGroup(processedItem);
+      if (grouped) {
+        onItemChange({
+          originalEvent: event,
+          processedItem: processedItem
+        });
+        setFocusedItemInfo({
+          index: -1,
+          parentKey: processedItem.key
+        });
+        reverseTrigger.current = true;
+        setTimeout(function () {
+          return setFocusTrigger(true);
+        }, 0);
+      }
+    } else {
+      var parentItem = activeItemPath.find(function (p) {
+        return p.key === processedItem.parentKey;
+      });
+      if (focusedItemInfo.index === 0 && parentItem && parentItem.parentKey === '') {
+        setFocusedItemInfo({
+          index: -1,
+          parentKey: parentItem ? parentItem.parentKey : ''
+        });
+        searchValue.current = '';
+        onArrowLeftKey(event);
+      } else {
+        var itemIndex = focusedItemInfo.index !== -1 ? findPrevItemIndex(focusedItemInfo.index) : findLastFocusedItemIndex();
+        changeFocusedItemIndex(itemIndex);
+      }
+    }
+    event.preventDefault();
+  };
+  var onArrowLeftKey = function onArrowLeftKey(event) {
+    var processedItem = visibleItems[focusedItemInfo.index];
+    var parentItem = processedItem ? activeItemPath.find(function (p) {
+      return p.key === processedItem.parentKey;
+    }) : null;
+    if (parentItem) {
+      onItemChange({
+        originalEvent: event,
+        processedItem: parentItem
+      });
+      setActiveItemPath(activeItemPath.filter(function (p) {
+        return p.key !== parentItem.key;
+      }));
+    } else {
+      var itemIndex = focusedItemInfo.index !== -1 ? findPrevItemIndex(focusedItemInfo.index) : findLastFocusedItemIndex();
+      changeFocusedItemIndex(itemIndex);
+    }
+    event.preventDefault();
+  };
+  var onArrowRightKey = function onArrowRightKey(event) {
+    var processedItem = visibleItems[focusedItemInfo.index];
+    var parentItem = processedItem ? activeItemPath.find(function (p) {
+      return p.key === processedItem.parentKey;
+    }) : null;
+    if (parentItem) {
+      var grouped = isProccessedItemGroup(processedItem);
+      if (grouped) {
+        onItemChange({
+          originalEvent: event,
+          processedItem: processedItem
+        });
+        setFocusedItemInfo({
+          index: -1,
+          parentKey: processedItem.key
+        });
+        setTimeout(function () {
+          return setFocusTrigger(true);
+        }, 0);
+      }
+    } else {
+      var itemIndex = focusedItemInfo.index !== -1 ? findNextItemIndex(focusedItemInfo.index) : findFirstFocusedItemIndex();
+      changeFocusedItemIndex(itemIndex);
+    }
+    event.preventDefault();
+  };
+  var onHomeKey = function onHomeKey(event) {
+    changeFocusedItemIndex(findFirstItemIndex());
+    event.preventDefault();
+  };
+  var onEndKey = function onEndKey(event) {
+    changeFocusedItemIndex(findLastItemIndex());
+    event.preventDefault();
+  };
+  var onEnterKey = function onEnterKey(event) {
+    if (focusedItemInfo.index !== -1) {
+      var element = utils.DomHandler.findSingle(rootMenuRef.current, "li[id=\"".concat("".concat(focusedItemId), "\"]"));
+      var anchorElement = element && utils.DomHandler.findSingle(element, 'a[data-pc-section="action"]');
+      anchorElement ? anchorElement.click() : element && element.click();
+    }
+    event.preventDefault();
+  };
+  var onSpaceKey = function onSpaceKey(event) {
+    onEnterKey(event);
+  };
+  var onEscapeKey = function onEscapeKey(event) {
+    hide(true);
+    setFocusedItemInfo({
+      focusedItemInfo: focusedItemInfo,
+      index: findFirstFocusedItemIndex()
+    });
+  };
+  var onTabKey = function onTabKey(event) {
+    if (focusedItemInfo.index !== -1) {
+      var processedItem = visibleItems[focusedItemInfo.index];
+      var grouped = isProccessedItemGroup(processedItem);
+      !grouped && onItemChange({
+        originalEvent: event,
+        processedItem: processedItem
+      });
+    }
+    hide();
+  };
+  var isItemMatched = function isItemMatched(processedItem) {
+    return isValidItem(processedItem) && getProccessedItemLabel(processedItem).toLocaleLowerCase().startsWith(searchValue.current.toLocaleLowerCase());
+  };
+  var isValidItem = function isValidItem(processedItem) {
+    return !!processedItem && !isItemDisabled(processedItem.item) && !isItemSeparator(processedItem.item);
+  };
+  var isValidSelectedItem = function isValidSelectedItem(processedItem) {
+    return isValidItem(processedItem) && isSelected(processedItem);
+  };
+  var isSelected = function isSelected(processedItem) {
+    return activeItemPath.some(function (p) {
+      return p.key === processedItem.key;
+    });
+  };
+  var findFirstItemIndex = function findFirstItemIndex() {
+    return visibleItems.findIndex(function (processedItem) {
+      return isValidItem(processedItem);
+    });
+  };
+  var findLastItemIndex = function findLastItemIndex() {
+    return utils.ObjectUtils.findLastIndex(visibleItems, function (processedItem) {
+      return isValidItem(processedItem);
+    });
+  };
+  var findNextItemIndex = function findNextItemIndex(index) {
+    var matchedItemIndex = index < visibleItems.length - 1 ? visibleItems.slice(index + 1).findIndex(function (processedItem) {
+      return isValidItem(processedItem);
+    }) : -1;
+    return matchedItemIndex > -1 ? matchedItemIndex + index + 1 : index;
+  };
+  var findPrevItemIndex = function findPrevItemIndex(index) {
+    var matchedItemIndex = index > 0 ? utils.ObjectUtils.findLastIndex(visibleItems.slice(0, index), function (processedItem) {
+      return isValidItem(processedItem);
+    }) : -1;
+    return matchedItemIndex > -1 ? matchedItemIndex : index;
+  };
+  var findSelectedItemIndex = function findSelectedItemIndex() {
+    return visibleItems.findIndex(function (processedItem) {
+      return isValidSelectedItem(processedItem);
+    });
+  };
+  var findFirstFocusedItemIndex = function findFirstFocusedItemIndex() {
+    var selectedIndex = findSelectedItemIndex();
+    return selectedIndex < 0 ? findFirstItemIndex() : selectedIndex;
+  };
+  var findLastFocusedItemIndex = function findLastFocusedItemIndex() {
+    var selectedIndex = findSelectedItemIndex();
+    return selectedIndex < 0 ? findLastItemIndex() : selectedIndex;
+  };
+  var searchItems = function searchItems(event, _char) {
+    searchValue.current = (searchValue.current || '') + _char;
+    var itemIndex = -1;
+    var matched = false;
+    if (focusedItemInfo.index !== -1) {
+      itemIndex = visibleItems.slice(focusedItemInfo.index).findIndex(function (processedItem) {
+        return isItemMatched(processedItem);
+      });
+      itemIndex = itemIndex === -1 ? visibleItems.slice(0, focusedItemInfo.index).findIndex(function (processedItem) {
+        return isItemMatched(processedItem);
+      }) : itemIndex + focusedItemInfo.index;
+    } else {
+      itemIndex = visibleItems.findIndex(function (processedItem) {
+        return isItemMatched(processedItem);
+      });
+    }
+    if (itemIndex !== -1) {
+      matched = true;
+    }
+    if (itemIndex === -1 && focusedItemInfo.index === -1) {
+      itemIndex = findFirstFocusedItemIndex();
+    }
+    if (itemIndex !== -1) {
+      changeFocusedItemIndex(itemIndex);
+    }
+    if (searchTimeout.current) {
+      clearTimeout(searchTimeout.current);
+    }
+    searchTimeout.current = setTimeout(function () {
+      searchValue.current = '';
+      searchTimeout.current = null;
+    }, 500);
+    return matched;
+  };
+  var changeFocusedItemIndex = function changeFocusedItemIndex(index) {
+    if (focusedItemInfo.index !== index) {
+      setFocusedItemInfo(_objectSpread(_objectSpread({}, focusedItemInfo), {}, {
+        index: index
+      }));
+      scrollInView();
+    }
+  };
+  var scrollInView = function scrollInView() {
+    var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
+    var id = index !== -1 ? "".concat(idState, "_").concat(index) : focusedItemId;
+    var element = utils.DomHandler.findSingle(rootMenuRef.current, "li[id=\"".concat(id, "\"]"));
+    if (element) {
+      element.scrollIntoView && element.scrollIntoView({
+        block: 'nearest',
+        inline: 'start'
+      });
+    }
+  };
+  var createProcessedItems = function createProcessedItems(items) {
+    var level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    var parent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var parentKey = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
+    var _processedItems = [];
+    items && items.forEach(function (item, index) {
+      var key = (parentKey !== '' ? parentKey + '_' : '') + index;
+      var newItem = {
+        item: item,
+        index: index,
+        level: level,
+        key: key,
+        parent: parent,
+        parentKey: parentKey
+      };
+      newItem['items'] = createProcessedItems(item.items, level + 1, newItem, key);
+      _processedItems.push(newItem);
+    });
+    return _processedItems;
+  };
   hooks.useMountEffect(function () {
     if (!idState) {
       setIdState(utils.UniqueComponentId());
@@ -509,13 +998,47 @@ var Menubar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
   });
   hooks.useUpdateEffect(function () {
     if (mobileActiveState) {
+      bindOutsideClickListener();
+      bindResizeListener();
       utils.ZIndexUtils.set('menu', rootMenuRef.current, context && context.autoZIndex || PrimeReact__default["default"].autoZIndex, context && context.zIndex['menu'] || PrimeReact__default["default"].zIndex['menu']);
-      bindDocumentClickListener();
     } else {
-      unbindDocumentClickListener();
+      unbindResizeListener();
+      unbindOutsideClickListener();
       utils.ZIndexUtils.clear(rootMenuRef.current);
     }
   }, [mobileActiveState]);
+  hooks.useUpdateEffect(function () {
+    var itemsToProcess = props.model || [];
+    var processed = createProcessedItems(itemsToProcess, 0, null, '');
+    setProcessedItems(processed);
+  }, [props.model]);
+  hooks.useUpdateEffect(function () {
+    var processedItem = activeItemPath.find(function (p) {
+      return p.key === focusedItemInfo.parentKey;
+    });
+    var _processedItems = processedItem ? processedItem.items : processedItems;
+    setVisibleItems(_processedItems);
+  }, [activeItemPath, focusedItemInfo, processedItems]);
+  hooks.useUpdateEffect(function () {
+    if (utils.ObjectUtils.isNotEmpty(activeItemPath)) {
+      bindOutsideClickListener();
+      bindResizeListener();
+    } else {
+      unbindOutsideClickListener();
+      unbindResizeListener();
+    }
+  }, [activeItemPath]);
+  hooks.useUpdateEffect(function () {
+    if (focusTrigger) {
+      var itemIndex = focusedItemInfo.index !== -1 ? findNextItemIndex(focusedItemInfo.index) : reverseTrigger.current ? findLastItemIndex() : findFirstFocusedItemIndex();
+      changeFocusedItemIndex(itemIndex);
+      reverseTrigger.current = false;
+      setFocusTrigger(false);
+    }
+  }, [focusTrigger]);
+  hooks.useUpdateEffect(function () {
+    setFocusedItemId(focusedItemInfo.index !== -1 ? "".concat(idState).concat(utils.ObjectUtils.isNotEmpty(focusedItemInfo.parentKey) ? '_' + focusedItemInfo.parentKey : '', "_").concat(focusedItemInfo.index) : null);
+  }, [focusedItemInfo]);
   hooks.useUnmountEffect(function () {
     utils.ZIndexUtils.clear(rootMenuRef.current);
   });
@@ -558,16 +1081,20 @@ var Menubar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
     if (props.model && props.model.length < 1) {
       return null;
     }
-    var buttonProps = utils.mergeProps({
+    var buttonProps = utils.mergeProps(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
       ref: menuButtonRef,
       href: '#',
-      role: 'button',
-      tabIndex: 0,
-      className: cx('button'),
-      onClick: function onClick(e) {
-        return toggle(e);
-      }
-    }, ptm('button'));
+      tabIndex: '0',
+      'aria-haspopup': mobileActiveState && props.model && props.model.lentgh > 0 ? true : false,
+      'aria-expanded': mobileActiveState,
+      'aria-label': PrimeReact.ariaLabel('navigation'),
+      'aria-controls': idState,
+      role: 'button'
+    }, "tabIndex", 0), "className", cx('button')), "onKeyDown", function onKeyDown(e) {
+      return menuButtonKeydown(e);
+    }), "onClick", function onClick(e) {
+      return toggle(e);
+    }), ptm('button'));
     var popupIconProps = utils.mergeProps(ptm('popupIcon'));
     var icon = props.menuIcon || /*#__PURE__*/React__namespace.createElement(bars.BarsIcon, popupIconProps);
     var menuIcon = utils.IconUtils.getJSXIcon(icon, _objectSpread({}, popupIconProps), {
@@ -585,19 +1112,27 @@ var Menubar = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
   var menuButton = createMenuButton();
   var submenu = /*#__PURE__*/React__namespace.createElement(MenubarSub, {
     hostName: "Menubar",
+    ariaActivedescendant: focused ? focusedItemId : undefined,
+    level: 0,
     id: idState,
     ref: rootMenuRef,
     menuProps: props,
-    model: props.model,
+    model: processedItems,
+    onLeafClick: onItemClick,
+    onItemMouseEnter: onItemMouseEnter,
+    onFocus: onFocus,
+    onBlur: onBlur,
+    onKeyDown: onKeyDown,
     root: true,
-    mobileActive: mobileActiveState,
-    onLeafClick: onLeafClick,
+    activeItemPath: activeItemPath,
+    focusedItemId: focused ? focusedItemId : undefined,
     submenuIcon: props.submenuIcon,
     ptm: ptm,
     cx: cx
   });
   var rootProps = utils.mergeProps({
     id: props.id,
+    ref: elementRef,
     className: utils.classNames(props.className, cx('root', {
       mobileActiveState: mobileActiveState
     })),