primereact 10.2.1 → 10.3.1

package/tieredmenu/tieredmenu.js

@@ -40,6 +40,47 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
     return _extends.apply(this, arguments);
   }
 
+  function _typeof(o) {
+    "@babel/helpers - typeof";
+
+    return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+      return typeof o;
+    } : function (o) {
+      return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+    }, _typeof(o);
+  }
+
+  function _toPrimitive(input, hint) {
+    if (_typeof(input) !== "object" || input === null) return input;
+    var prim = input[Symbol.toPrimitive];
+    if (prim !== undefined) {
+      var res = prim.call(input, hint || "default");
+      if (_typeof(res) !== "object") return res;
+      throw new TypeError("@@toPrimitive must return a primitive value.");
+    }
+    return (hint === "string" ? String : Number)(input);
+  }
+
+  function _toPropertyKey(arg) {
+    var key = _toPrimitive(arg, "string");
+    return _typeof(key) === "symbol" ? key : String(key);
+  }
+
+  function _defineProperty(obj, key, value) {
+    key = _toPropertyKey(key);
+    if (key in obj) {
+      Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+    } else {
+      obj[key] = value;
+    }
+    return obj;
+  }
+
   function _arrayWithHoles(arr) {
     if (Array.isArray(arr)) return arr;
   }
@@ -105,49 +146,39 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
         'p-ripple-disabled': context && context.ripple === false || PrimeReact__default["default"].ripple === false
       }, props.className);
     },
-    separator: 'p-menu-separator',
+    separator: 'p-menuitem-separator',
     icon: function icon(_ref2) {
       var _icon = _ref2._icon;
       return utils.classNames('p-menuitem-icon', _icon);
     },
+    content: 'p-menuitem-content',
     label: 'p-menuitem-text',
     submenuIcon: 'p-submenu-icon',
-    action: function action(_ref3) {
-      var disabled = _ref3.disabled;
-      return utils.classNames('p-menuitem-link', {
-        'p-disabled': disabled
-      });
-    },
-    menuitem: function menuitem(_ref4) {
-      var _className = _ref4._className,
-        active = _ref4.active;
+    action: 'p-menuitem-link',
+    menuitem: function menuitem(_ref3) {
+      var _className = _ref3._className,
+        active = _ref3.active,
+        focused = _ref3.focused,
+        disabled = _ref3.disabled;
       return utils.classNames('p-menuitem', {
-        'p-menuitem-active': active
+        'p-menuitem-active p-highlight': active,
+        'p-focus': focused,
+        'p-disabled': disabled
       }, _className);
     },
-    menu: function menu(_ref5) {
-      var props = _ref5.subProps;
-      return utils.classNames({
-        'p-submenu-list': !props.root
-      });
-    },
-    submenu: function submenu(_ref6) {
-      var props = _ref6.subProps;
-      return utils.classNames({
-        'p-submenu-list': !props.root
-      });
-    },
+    menu: 'p-tieredmenu-root-list',
+    submenu: 'p-submenu-list',
     transition: 'p-connected-overlay'
   };
   var inlineStyles = {
-    submenu: function submenu(_ref7) {
-      var props = _ref7.subProps;
+    submenu: function submenu(_ref4) {
+      var props = _ref4.subProps;
       return {
         display: !props.root && props.parentActive ? 'block' : 'none'
       };
     }
   };
-  var styles = "\n@layer primereact {\n    .p-tieredmenu-overlay {\n        position: absolute;\n    }\n    \n    .p-tieredmenu ul {\n        margin: 0;\n        padding: 0;\n        list-style: none;\n    }\n    \n    .p-tieredmenu .p-submenu-list {\n        position: absolute;\n        min-width: 100%;\n        z-index: 1;\n        display: none;\n    }\n    \n    .p-tieredmenu .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-tieredmenu .p-menuitem-text {\n        line-height: 1;\n    }\n    \n    .p-tieredmenu .p-menuitem {\n        position: relative;\n    }\n    \n    .p-tieredmenu .p-menuitem-link .p-submenu-icon {\n        margin-left: auto;\n    }\n    \n    .p-tieredmenu .p-menuitem-active > .p-submenu-list {\n        display: block;\n        left: 100%;\n        top: 0;\n    }\n    \n    .p-tieredmenu .p-menuitem-active > .p-submenu-list-flipped {\n        left: -100%;\n    }\n}\n";
+  var styles = "\n@layer primereact {\n    .p-tieredmenu-overlay {\n        position: absolute;\n    }\n\n    .p-tieredmenu ul {\n        margin: 0;\n        padding: 0;\n        list-style: none;\n    }\n\n    .p-tieredmenu .p-submenu-list {\n        position: absolute;\n        min-width: 100%;\n        z-index: 1;\n        display: none;\n    }\n\n    .p-tieredmenu .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-tieredmenu .p-menuitem-text {\n        line-height: 1;\n    }\n\n    .p-tieredmenu .p-menuitem {\n        position: relative;\n    }\n\n    .p-tieredmenu .p-menuitem-link .p-submenu-icon {\n        margin-left: auto;\n    }\n\n    .p-tieredmenu .p-menuitem-active > .p-submenu-list {\n        display: block;\n        left: 100%;\n        top: 0;\n    }\n\n    .p-tieredmenu .p-menuitem-active > .p-submenu-list-flipped {\n        left: -100%;\n    }\n}\n";
   var TieredMenuBase = componentbase.ComponentBase.extend({
     defaultProps: {
       __TYPE: 'TieredMenu',
@@ -163,6 +194,8 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
       appendTo: null,
       transitionOptions: null,
       onShow: null,
+      onFocus: null,
+      onBlur: null,
       onHide: null,
       submenuIcon: null,
       children: undefined
@@ -174,54 +207,9 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
     }
   });
 
-  function _typeof(o) {
-    "@babel/helpers - typeof";
-
-    return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
-      return typeof o;
-    } : function (o) {
-      return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
-    }, _typeof(o);
-  }
-
-  function _toPrimitive(input, hint) {
-    if (_typeof(input) !== "object" || input === null) return input;
-    var prim = input[Symbol.toPrimitive];
-    if (prim !== undefined) {
-      var res = prim.call(input, hint || "default");
-      if (_typeof(res) !== "object") return res;
-      throw new TypeError("@@toPrimitive must return a primitive value.");
-    }
-    return (hint === "string" ? String : Number)(input);
-  }
-
-  function _toPropertyKey(arg) {
-    var key = _toPrimitive(arg, "string");
-    return _typeof(key) === "symbol" ? key : String(key);
-  }
-
-  function _defineProperty(obj, key, value) {
-    key = _toPropertyKey(key);
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-    return obj;
-  }
-
-  function ownKeys(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(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-  var TieredMenuSub = /*#__PURE__*/React__namespace.memo(function (props) {
-    var _React$useState = React__namespace.useState(null),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      activeItemState = _React$useState2[0],
-      setActiveItemState = _React$useState2[1];
+  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 TieredMenuSub = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
     var elementRef = React__namespace.useRef(null);
     var ptm = props.ptm,
       cx = props.cx,
@@ -230,27 +218,10 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
       return ptm(key, {
         hostName: props.hostName,
         context: {
-          active: activeItemState === item
+          active: isItemActive(item)
         }
       });
     };
-    var _useEventListener = hooks.useEventListener({
-        type: 'click',
-        listener: function listener(event) {
-          if (!props.isMobileMode && elementRef.current && !elementRef.current.contains(event.target)) {
-            setActiveItemState(null);
-          }
-        }
-      }),
-      _useEventListener2 = _slicedToArray(_useEventListener, 1),
-      bindDocumentClickListener = _useEventListener2[0];
-    var _useResizeListener = hooks.useResizeListener({
-        listener: function listener() {
-          !props.isMobileMode && setActiveItemState(null);
-        }
-      }),
-      _useResizeListener2 = _slicedToArray(_useResizeListener, 1),
-      bindDocumentResizeListener = _useResizeListener2[0];
     var position = function position() {
       if (elementRef.current) {
         var parentItem = elementRef.current.parentElement;
@@ -269,21 +240,9 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
         }
       }
     };
-    var onItemMouseEnter = function onItemMouseEnter(event, item) {
-      if (item.disabled || props.isMobileMode) {
-        event.preventDefault();
-        return;
-      }
-      if (props.root) {
-        if (activeItemState || props.popup) {
-          setActiveItemState(item);
-        }
-      } else {
-        setActiveItemState(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;
       }
@@ -296,82 +255,62 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
           item: item
         });
       }
-      if (props.root || props.isMobileMode) {
-        if (item.items) {
-          if (activeItemState && item === activeItemState) setActiveItemState(null);else setActiveItemState(item);
-        }
-      }
-      if (!item.items) {
-        onLeafClick(event);
-      }
+      props.onItemClick && props.onItemClick({
+        originalEvent: event,
+        processedItem: processedItem
+      });
     };
-    var onItemKeyDown = function onItemKeyDown(event, item) {
-      var listItem = event.currentTarget.parentElement;
-      switch (event.which) {
-        //down
-        case 40:
-          var nextItem = findNextItem(listItem);
-          nextItem && nextItem.children[0].focus();
-          event.preventDefault();
-          break;
-
-        //up
-        case 38:
-          var prevItem = findPrevItem(listItem);
-          prevItem && prevItem.children[0].focus();
-          event.preventDefault();
-          break;
-
-        //right
-        case 39:
-          if (item.items) {
-            setActiveItemState(item);
-            setTimeout(function () {
-              listItem.children[1].children[0].children[0].focus();
-            }, 50);
-          }
-          event.preventDefault();
-          break;
-      }
-      props.onKeyDown && props.onKeyDown(event, listItem);
+    var getItemId = function getItemId(processedItem) {
+      return "".concat(props.menuId, "_").concat(processedItem.key);
     };
-    var onChildItemKeyDown = function onChildItemKeyDown(event, childListItem) {
-      //left
-      if (event.which === 37) {
-        setActiveItemState(null);
-        childListItem.parentElement.previousElementSibling.focus();
-      }
+    var getItemProp = function getItemProp(processedItem, name, params) {
+      return processedItem && processedItem.item ? utils.ObjectUtils.getItemValue(processedItem.item[name], params) : undefined;
     };
-    var findNextItem = function findNextItem(item) {
-      var nextItem = item.nextElementSibling;
-      return nextItem ? utils.DomHandler.hasClass(nextItem, 'p-disabled') || !utils.DomHandler.hasClass(nextItem, 'p-menuitem') ? findNextItem(nextItem) : nextItem : null;
+    var isItemActive = function isItemActive(processedItem) {
+      return props.activeItemPath.some(function (path) {
+        return path.key === processedItem.key;
+      });
     };
-    var findPrevItem = function findPrevItem(item) {
-      var prevItem = item.previousElementSibling;
-      return prevItem ? utils.DomHandler.hasClass(prevItem, 'p-disabled') || !utils.DomHandler.hasClass(prevItem, 'p-menuitem') ? findPrevItem(prevItem) : prevItem : null;
+    var isItemVisible = function isItemVisible(processedItem) {
+      return getItemProp(processedItem, 'visible') !== false;
     };
-    var onLeafClick = function onLeafClick(event) {
-      if (!props.isMobileMode || props.popup) {
-        setActiveItemState(null);
-        props.onLeafClick && props.onLeafClick(event);
-        props.onHide && props.onHide(event);
-      }
+    var isItemDisabled = function isItemDisabled(processedItem) {
+      return getItemProp(processedItem, 'disabled');
+    };
+    var isItemFocused = function isItemFocused(processedItem) {
+      return props.focusedItemId === getItemId(processedItem);
+    };
+    var isItemGroup = function isItemGroup(processedItem) {
+      return utils.ObjectUtils.isNotEmpty(processedItem.items);
+    };
+    var onItemMouseEnter = function onItemMouseEnter(event, processedItem) {
+      props.onItemMouseEnter && props.onItemMouseEnter({
+        originalEvent: event,
+        processedItem: processedItem
+      });
+    };
+    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();
-      bindDocumentResizeListener();
-    });
     hooks.useUpdateEffect(function () {
-      if (!props.parentActive) {
-        setActiveItemState(null);
-      }
       if (!props.root && props.parentActive && !props.isMobileMode) {
         position();
       }
     }, [props.parentActive]);
-    hooks.useUpdateEffect(function () {
-      props.onItemToggle && props.onItemToggle();
-    }, [activeItemState]);
+    React__namespace.useImperativeHandle(ref, function () {
+      return {
+        getElement: function getElement() {
+          return elementRef.current;
+        }
+      };
+    });
     var createSeparator = function createSeparator(index) {
       var key = 'separator_' + index;
       var separatorProps = utils.mergeProps({
@@ -383,18 +322,22 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
       }));
       return /*#__PURE__*/React__namespace.createElement("li", separatorProps);
     };
-    var createSubmenu = function createSubmenu(item, index) {
-      if (item.items) {
+    var createSubmenu = function createSubmenu(processedItem, index) {
+      if (isItemGroup(processedItem)) {
         return /*#__PURE__*/React__namespace.createElement(TieredMenuSub, {
           id: props.id + '_' + index,
           menuProps: props.menuProps,
-          model: item.items,
-          onLeafClick: onLeafClick,
+          model: processedItem.items,
+          menuId: props.menuId,
+          ariaLabelledby: getItemId(item),
+          focusedItemId: props.focusedItemId,
+          activeItemPath: props.activeItemPath,
+          level: props.level + 1,
+          onItemClick: props.onItemClick,
           popup: props.popup,
-          onKeyDown: onChildItemKeyDown,
-          parentActive: item === activeItemState,
+          onItemMouseEnter: props.onItemMouseEnter,
+          parentActive: isItemActive(processedItem),
           isMobileMode: props.isMobileMode,
-          onItemToggle: props.onItemToggle,
           submenuIcon: props.submenuIcon,
           ptm: props.ptm,
           cx: cx,
@@ -403,71 +346,53 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
       }
       return null;
     };
-    var createMenuItem = function createMenuItem(item, index) {
-      if (item.visible === false) {
+    var createMenuItem = function createMenuItem(processedItem, index) {
+      if (isItemVisible(processedItem) === false) {
         return null;
       }
-      var id = item.id,
-        _className = item.className,
-        style = item.style,
-        disabled = item.disabled,
-        _icon = item.icon,
-        _label = item.label,
-        items = item.items,
-        target = item.target,
-        url = item.url,
-        template = item.template;
-      var key = id || props.id + '_' + index;
-      var active = activeItemState === item;
-      var linkClassName = utils.classNames('p-menuitem-link', {
-        'p-disabled': disabled
-      });
+      var item = processedItem.item;
+      var style = getItemProp(processedItem, 'style');
+      var _icon = getItemProp(processedItem, 'icon');
+      var target = getItemProp(processedItem, 'target');
+      var url = getItemProp(processedItem, 'url');
+      var key = getItemId(processedItem);
+      var focused = isItemFocused(processedItem);
+      var active = isItemActive(processedItem);
+      var disabled = isItemDisabled(processedItem);
+      var grouped = isItemGroup(processedItem);
+      var linkClassName = utils.classNames('p-menuitem-link');
       var iconClassName = utils.classNames('p-menuitem-icon', _icon);
       var iconProps = utils.mergeProps({
-        className: cx('icon', {
-          _icon: _icon
-        })
-      }, getPTOptions(item, 'icon'));
-      var icon = utils.IconUtils.getJSXIcon(_icon, _objectSpread({}, iconProps), {
+        className: utils.classNames(item.icon, 'p-menuitem-icon', 'icon')
+      }, getPTOptions(processedItem, 'icon'));
+      var icon = utils.IconUtils.getJSXIcon(_icon, _objectSpread$1({}, iconProps), {
         props: props.menuProps
       });
       var labelProps = utils.mergeProps({
         className: cx('label')
-      }, getPTOptions(item, 'label'));
-      var label = _label && /*#__PURE__*/React__namespace.createElement("span", labelProps, _label);
+      }, getPTOptions(processedItem, 'label'));
+      var label = item.label && /*#__PURE__*/React__namespace.createElement("span", labelProps, item.label);
       var submenuIconClassName = 'p-submenu-icon';
       var submenuIconProps = utils.mergeProps({
         className: cx('submenuIcon')
-      }, getPTOptions(item, 'submenuIcon'));
-      var submenuIcon = item.items && utils.IconUtils.getJSXIcon(props.submenuIcon || /*#__PURE__*/React__namespace.createElement(angleright.AngleRightIcon, submenuIconProps), _objectSpread({}, submenuIconProps), {
+      }, getPTOptions(processedItem, 'submenuIcon'));
+      var submenuIcon = grouped && utils.IconUtils.getJSXIcon(props.submenuIcon || /*#__PURE__*/React__namespace.createElement(angleright.AngleRightIcon, submenuIconProps), _objectSpread$1({}, submenuIconProps), {
         props: props.menuProps
       });
-      var submenu = createSubmenu(item, index);
+      var submenu = createSubmenu(processedItem, index);
       var actionProps = utils.mergeProps({
         href: url || '#',
-        className: cx('action', {
-          disabled: disabled
-        }),
-        target: target,
-        role: 'menuitem',
-        'aria-haspopup': items != null,
-        onClick: function onClick(event) {
-          return onItemClick(event, item);
-        },
-        onKeyDown: function onKeyDown(event) {
-          return onItemKeyDown(event, item);
+        'aria-hidden': true,
+        tabIndex: '-1',
+        onFocus: function onFocus(event) {
+          return event.stopPropagation();
         },
-        'aria-disabled': disabled
-      }, getPTOptions(item, 'action'));
+        className: cx('action'),
+        target: target
+      }, getPTOptions(processedItem, 'action'));
       var content = /*#__PURE__*/React__namespace.createElement("a", actionProps, icon, label, submenuIcon, /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null));
-      if (template) {
+      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,
@@ -477,25 +402,46 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
           active: active,
           disabled: disabled
         };
-        content = utils.ObjectUtils.getJSXElement(template, item, defaultContentOptions);
+        content = utils.ObjectUtils.getJSXElement(item.template, item, defaultContentOptions);
       }
+      var contentProps = utils.mergeProps({
+        onClick: function onClick(event) {
+          return onItemClick(event, processedItem);
+        },
+        onMouseEnter: function onMouseEnter(event) {
+          return onItemMouseEnter(event, processedItem);
+        },
+        className: cx('content')
+      }, getPTOptions(processedItem, 'content'));
       var menuitemProps = utils.mergeProps({
         key: key,
         id: key,
+        'aria-label': item.label,
+        'aria-disabled': disabled,
+        'aria-expanded': grouped ? active : undefined,
+        'aria-haspopup': grouped && !url ? 'menu' : undefined,
+        'aria-level': props.level + 1,
+        'aria-setsize': getAriaSetSize(),
+        'aria-posinset': getAriaPosInset(index),
+        'data-p-highlight': active,
+        'data-p-disabled': disabled,
+        'data-p-visited': focused,
         className: cx('menuitem', {
-          _className: _className,
-          active: active
+          className: item.className,
+          active: active,
+          focused: focused,
+          disabled: disabled
         }),
         style: style,
         onMouseEnter: function onMouseEnter(event) {
           return onItemMouseEnter(event, item);
         },
-        role: 'none'
-      }, getPTOptions(item, 'menuitem'));
-      return /*#__PURE__*/React__namespace.createElement("li", menuitemProps, content, submenu);
+        role: 'menuitem'
+      }, getPTOptions(processedItem, 'menuitem'));
+      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;
@@ -504,6 +450,11 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
     var ptKey = props.root ? 'menu' : 'submenu';
     var menuProps = utils.mergeProps({
       ref: elementRef,
+      id: props.id,
+      tabIndex: props.tabIndex,
+      onFocus: props.onFocus,
+      onBlur: props.onBlur,
+      onKeyDown: props.onKeyDown,
       className: cx(ptKey, {
         subProps: props
       }),
@@ -511,14 +462,19 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
         subProps: props
       }),
       role: props.root ? 'menubar' : 'menu',
-      'aria-orientation': 'horizontal'
+      'aria-label': props.ariaLabel,
+      'aria-labelledby': props.ariaLabelledby,
+      'aria-orientation': props.ariaOrientation,
+      'aria-activedescendant': props.focusedItemId
     }, ptm(ptKey, {
       hostName: props.hostName
     }));
     return /*#__PURE__*/React__namespace.createElement("ul", menuProps, submenu);
-  });
+  }));
   TieredMenuSub.displayName = 'TieredMenuSub';
 
+  function ownKeys(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(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
   var TieredMenu = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
     var context = React__namespace.useContext(PrimeReact.PrimeReactContext);
     var props = TieredMenuBase.getProps(inProps, context);
@@ -530,10 +486,46 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
       _React$useState4 = _slicedToArray(_React$useState3, 2),
       visibleState = _React$useState4[0],
       setVisibleState = _React$useState4[1];
-    var _React$useState5 = React__namespace.useState(null),
+    var _React$useState5 = React__namespace.useState([]),
       _React$useState6 = _slicedToArray(_React$useState5, 2),
-      attributeSelectorState = _React$useState6[0],
-      setAttributeSelectorState = _React$useState6[1];
+      activeItemPath = _React$useState6[0],
+      setActiveItemPath = _React$useState6[1];
+    var _React$useState7 = React__namespace.useState(false),
+      _React$useState8 = _slicedToArray(_React$useState7, 2),
+      focused = _React$useState8[0],
+      setFocused = _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({
+        index: -1,
+        level: 0,
+        parentKey: ''
+      }),
+      _React$useState12 = _slicedToArray(_React$useState11, 2),
+      focusedItemInfo = _React$useState12[0],
+      setFocusedItemInfo = _React$useState12[1];
+    var _React$useState13 = React__namespace.useState(false),
+      _React$useState14 = _slicedToArray(_React$useState13, 2),
+      dirty = _React$useState14[0],
+      setDirty = _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([]),
+      _React$useState18 = _slicedToArray(_React$useState17, 2),
+      visibleItems = _React$useState18[0],
+      setVisibleItems = _React$useState18[1];
+    var _React$useState19 = React__namespace.useState(false),
+      _React$useState20 = _slicedToArray(_React$useState19, 2),
+      focusTrigger = _React$useState20[0],
+      setFocusTrigger = _React$useState20[1];
+    var _React$useState21 = React__namespace.useState(null),
+      _React$useState22 = _slicedToArray(_React$useState21, 2),
+      attributeSelectorState = _React$useState22[0],
+      setAttributeSelectorState = _React$useState22[1];
     var _TieredMenuBase$setMe = TieredMenuBase.setMetaData({
         props: props,
         state: {
@@ -549,22 +541,35 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
     componentbase.useHandleStyle(TieredMenuBase.css.styles, isUnstyled, {
       name: 'tieredmenu'
     });
+    var containerRef = React__namespace.useRef(null);
     var menuRef = React__namespace.useRef(null);
     var targetRef = React__namespace.useRef(null);
+    var relatedTarget = React__namespace.useRef(null);
     var styleElementRef = React__namespace.useRef(null);
+    var searchValue = React__namespace.useRef(null);
+    var searchTimeout = React__namespace.useRef(null);
     var isMobileMode = hooks.useMatchMedia("screen and (max-width: ".concat(props.breakpoint, ")"), !!props.breakpoint);
-    var _useOverlayListener = hooks.useOverlayListener({
-        target: targetRef,
-        overlay: menuRef,
-        listener: function listener(event, _ref) {
-          var valid = _ref.valid;
-          valid && hide(event);
-        },
-        when: visibleState
+    var _useEventListener = hooks.useEventListener({
+        type: 'click',
+        listener: function listener(event) {
+          var isOutsideContainer = containerRef.current && !containerRef.current.contains(event.target);
+          var isOutsideTarget = props.popup ? !(targetRef.current && (targetRef.current === event.target || targetRef.current.contains(event.target))) : true;
+          if (isOutsideContainer && isOutsideTarget) {
+            hide(event, !props.popup);
+          }
+        }
+      }),
+      _useEventListener2 = _slicedToArray(_useEventListener, 2),
+      bindDocumentClickListener = _useEventListener2[0],
+      unbindDocumentClickListener = _useEventListener2[1];
+    var _useResizeListener = hooks.useResizeListener({
+        listener: function listener() {
+          !isMobileMode && hide(event, true);
+        }
       }),
-      _useOverlayListener2 = _slicedToArray(_useOverlayListener, 2),
-      bindOverlayListener = _useOverlayListener2[0],
-      unbindOverlayListener = _useOverlayListener2[1];
+      _useResizeListener2 = _slicedToArray(_useResizeListener, 2),
+      bindDocumentResizeListener = _useResizeListener2[0],
+      unbindDocumentResizeListener = _useResizeListener2[1];
     var onPanelClick = function onPanelClick(event) {
       if (props.popup) {
         overlayservice.OverlayService.emit('overlay-click', {
@@ -579,25 +584,436 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
       }
     };
     var show = function show(event) {
-      targetRef.current = event.currentTarget;
-      setVisibleState(true);
-      props.onShow && props.onShow(event);
-    };
-    var hide = function hide(event) {
       if (props.popup) {
         targetRef.current = event.currentTarget;
+        setVisibleState(true);
+        props.onShow && props.onShow(event);
+        relatedTarget.current = event.relatedTarget || null;
+      }
+      setFocusedItemInfo({
+        index: findFirstFocusedItemIndex(),
+        level: 0,
+        parentKey: ''
+      });
+    };
+    var hide = function hide(event, isFocus) {
+      if (props.popup) {
         setVisibleState(false);
         props.onHide && props.onHide(event);
       }
+      var menuElement = getMenuElement();
+      setActiveItemPath([]);
+      setFocusedItemInfo({
+        index: -1,
+        level: 0,
+        parentKey: ''
+      });
+      isFocus && utils.DomHandler.focus(relatedTarget.current || targetRef.current || menuElement);
+      setDirty(false);
+    };
+    var onFocus = function onFocus(event) {
+      setFocused(true);
+      setFocusedItemInfo(focusedItemInfo.index !== -1 ? focusedItemInfo : {
+        index: findFirstFocusedItemIndex(),
+        level: 0,
+        parentKey: ''
+      });
+      props.onFocus && props.onFocus(event);
     };
-    var onItemToggle = function onItemToggle() {
-      if (props.popup && isMobileMode) {
-        utils.DomHandler.absolutePosition(menuRef.current, targetRef.current);
+    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;
+      switch (event.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':
+          props.popup && utils.DomHandler.focus(targetRef.current);
+          onEscapeKey(event);
+          break;
+        case 'Tab':
+          onTabKey(event);
+          break;
+        case 'PageDown':
+        case 'PageUp':
+        case 'Backspace':
+        case 'ShiftLeft':
+        case 'ShiftRight':
+          //NOOP
+          break;
+        default:
+          if (!metaKey && utils.ObjectUtils.isPrintableCharacter(event.key)) {
+            searchItems(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;
+      });
+      if (grouped) {
+        _activeItemPath.push(processedItem);
+      }
+      setFocusedItemInfo({
+        index: index,
+        level: level,
+        parentKey: parentKey
+      });
+      setActiveItemPath(_activeItemPath);
+      grouped && setDirty(true);
+      isFocus && utils.DomHandler.focus(getMenuElement());
+    };
+    var onItemClick = function onItemClick(event) {
+      var originalEvent = event.originalEvent,
+        processedItem = event.processedItem;
+      if (isItemDisabled(processedItem) || props.isMobileMode) {
+        return;
+      }
+      var grouped = isProccessedItemGroup(processedItem);
+      var root = utils.ObjectUtils.isEmpty(processedItem.parent);
+      var selected = isSelected(processedItem);
+      var menuElement = getMenuElement();
+      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(menuElement);
+          if (grouped) {
+            setDirty(true);
+          }
+        }, 0);
+      } else {
+        if (grouped) {
+          utils.DomHandler.focus(menuElement);
+          onItemChange(event);
+        } else {
+          var rootProcessedItem = root ? processedItem : activeItemPath.find(function (p) {
+            return p.parentKey === '';
+          });
+          var rootProcessedItemIndex = rootProcessedItem ? rootProcessedItem.index : -1;
+          hide(originalEvent, true);
+          setFocusedItemInfo({
+            index: rootProcessedItemIndex,
+            parentKey: rootProcessedItem ? rootProcessedItem.parentKey : ''
+          });
+        }
+      }
+    };
+    var onItemMouseEnter = function onItemMouseEnter(event) {
+      var originalEvent = event.originalEvent,
+        processedItem = event.processedItem;
+      if (isItemDisabled(processedItem) || props.isMobileMode) {
+        originalEvent.preventDefault();
+        return;
+      }
+      if (dirty && !props.popup) {
+        onItemChange(event);
+      }
+    };
+    var onArrowDownKey = function onArrowDownKey(event) {
+      var itemIndex = focusedItemInfo.index !== -1 ? findNextItemIndex(focusedItemInfo.index) : findFirstFocusedItemIndex();
+      changeFocusedItemIndex(itemIndex);
+      event.preventDefault();
+    };
+    var onArrowUpKey = function onArrowUpKey(event) {
+      if (event.altKey) {
+        if (props.popup) {
+          utils.DomHandler.focus(targetRef.current);
+        }
+        if (focusedItemInfo.index !== -1) {
+          var processedItem = visibleItems[focusedItemInfo.index];
+          var grouped = isProccessedItemGroup(processedItem);
+          !grouped && onItemChange({
+            originalEvent: event,
+            processedItem: processedItem
+          });
+        }
+        props.popup && hide(event, true);
+        event.preventDefault();
+      } 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 = activeItemPath.find(function (p) {
+        return p.key === processedItem.parentKey;
+      });
+      var root = utils.ObjectUtils.isEmpty(processedItem.parent);
+      if (!root) {
+        setFocusedItemInfo({
+          index: -1,
+          parentKey: parentItem ? parentItem.parentKey : ''
+        });
+        searchValue.current = '';
+        setTimeout(function () {
+          return setFocusTrigger(true);
+        }, 0);
+      }
+      setActiveItemPath(activeItemPath.filter(function (p) {
+        return p.parentKey !== focusedItemInfo.parentKey;
+      }));
+      event.preventDefault();
+    };
+    var onArrowRightKey = function onArrowRightKey(event) {
+      var processedItem = visibleItems[focusedItemInfo.index];
+      var grouped = isProccessedItemGroup(processedItem);
+      if (grouped) {
+        onItemChange({
+          originalEvent: event,
+          processedItem: processedItem
+        });
+        setFocusedItemInfo({
+          index: -1,
+          parentKey: processedItem.key
+        });
+        searchValue.current = '';
+        setTimeout(function () {
+          return setFocusTrigger(true);
+        }, 0);
+      }
+      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(getMenuElement(), "li[id=\"".concat("".concat(focusedItemId), "\"]"));
+        var anchorElement = _element && utils.DomHandler.findSingle(_element, '[data-pc-section="action"]');
+        props.popup && utils.DomHandler.focus(targetRef.current);
+        anchorElement ? anchorElement.click() : _element && _element.click();
+      }
+      event.preventDefault();
+    };
+    var onSpaceKey = function onSpaceKey(event) {
+      onEnterKey(event);
+    };
+    var onEscapeKey = function onEscapeKey(event) {
+      hide(event, true);
+      !props.popup && setFocusedItemInfo(_objectSpread(_objectSpread({}, focusedItemInfo), {}, {
+        index: findFirstFocusedItemIndex()
+      }));
+      event.preventDefault();
+    };
+    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(event);
+    };
+    var getMenuElement = function getMenuElement() {
+      return menuRef.current.getElement() || null;
+    };
+    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 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(_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);
+      }
+      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(getMenuElement(), "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;
+    };
     var createStyle = function createStyle() {
       if (!styleElementRef.current) {
-        styleElementRef.current = utils.DomHandler.createInlineStyle(context && context.nonce || PrimeReact__default["default"].nonce);
+        styleElementRef.current = utils.DomHandler.createInlineStyle(context && context.nonce || PrimeReact__default["default"].nonce, context && context.styleContainer);
         var selector = "".concat(attributeSelectorState);
         var innerHTML = "\n@media screen and (max-width: ".concat(props.breakpoint, ") {\n    .p-tieredmenu[").concat(selector, "] > ul {\n        max-height: ").concat(props.scrollHeight, ";\n        overflow: ").concat(props.scrollHeight ? 'auto' : '', ";\n    }\n\n    .p-tieredmenu[").concat(selector, "] .p-submenu-list {\n        position: relative;\n    }\n\n    .p-tieredmenu[").concat(selector, "] .p-menuitem-active > .p-submenu-list {\n        left: 0;\n        box-shadow: none;\n        border-radius: 0;\n        padding: 0 0 0 calc(var(--inline-spacing) * 2); /* @todo */\n    }\n\n    .p-tieredmenu[").concat(selector, "] .p-menuitem-active > .p-menuitem-link > .p-submenu-icon {\n        transform: rotate(-180deg);\n    }\n\n    .p-tieredmenu[").concat(selector, "] .p-submenu-icon:before {\n        content: \"\\e930\";\n    }\n\n    ").concat(!props.popup ? ".p-tieredmenu[".concat(selector, "] { width: 100%; }") : '', "\n}\n");
         styleElementRef.current.innerHTML = innerHTML;
@@ -606,30 +1022,41 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
     var destroyStyle = function destroyStyle() {
       styleElementRef.current = utils.DomHandler.removeInlineStyle(styleElementRef.current);
     };
+    var alignOverlay = function alignOverlay() {
+      utils.DomHandler.absolutePosition(containerRef.current, targetRef.current);
+      var targetWidth = utils.DomHandler.getOuterWidth(targetRef.current);
+      if (targetWidth > utils.DomHandler.getOuterWidth(containerRef.current)) {
+        containerRef.current.style.minWidth = utils.DomHandler.getOuterWidth(targetRef.current) + 'px';
+      }
+    };
     var onEnter = function onEnter() {
       if (props.autoZIndex) {
-        utils.ZIndexUtils.set('menu', menuRef.current, context && context.autoZIndex || PrimeReact__default["default"].autoZIndex, props.baseZIndex || context && context.zIndex['menu'] || PrimeReact__default["default"].zIndex['menu']);
+        utils.ZIndexUtils.set('menu', containerRef.current, context && context.autoZIndex || PrimeReact__default["default"].autoZIndex, props.baseZIndex || context && context.zIndex['menu'] || PrimeReact__default["default"].zIndex['menu']);
       }
-      utils.DomHandler.addStyles(menuRef.current, {
+      utils.DomHandler.addStyles(containerRef.current, {
         position: 'absolute',
         top: '0',
         left: '0'
       });
-      utils.DomHandler.absolutePosition(menuRef.current, targetRef.current);
+      alignOverlay();
+      utils.DomHandler.focus(menuRef.current.getElement());
+      scrollInView();
       if (attributeSelectorState && props.breakpoint) {
-        menuRef.current.setAttribute(attributeSelectorState, '');
+        containerRef.current.setAttribute(attributeSelectorState, '');
         createStyle();
       }
     };
     var onEntered = function onEntered() {
-      bindOverlayListener();
+      bindDocumentClickListener();
+      bindDocumentResizeListener();
     };
     var onExit = function onExit() {
       targetRef.current = null;
-      unbindOverlayListener();
+      unbindDocumentClickListener();
+      unbindDocumentResizeListener();
     };
     var onExited = function onExited() {
-      utils.ZIndexUtils.clear(menuRef.current);
+      utils.ZIndexUtils.clear(containerRef.current);
       destroyStyle();
     };
     hooks.useMountEffect(function () {
@@ -640,8 +1067,45 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
       }
     });
     hooks.useUpdateEffect(function () {
-      if (attributeSelectorState && menuRef.current) {
-        menuRef.current.setAttribute(attributeSelectorState, '');
+      var itemsToProcess = props.model || [];
+      var processed = createProcessedItems(itemsToProcess);
+      setProcessedItems(processed);
+    }, props.model);
+    hooks.useUpdateEffect(function () {
+      var processedItem = activeItemPath.find(function (p) {
+        return p.key === focusedItemInfo.parentKey;
+      });
+      var processed = processedItem ? processedItem.items : processedItems;
+      setVisibleItems(processed);
+    }, [activeItemPath, focusedItemInfo, processedItems]);
+    hooks.useUpdateEffect(function () {
+      var focusedId = focusedItemInfo.index !== -1 ? "".concat(idState).concat(utils.ObjectUtils.isNotEmpty(focusedItemInfo.parentKey) ? '_' + focusedItemInfo.parentKey : '', "_").concat(focusedItemInfo.index) : null;
+      setFocusedItemId(focusedId);
+    }, [focusedItemInfo]);
+    hooks.useUpdateEffect(function () {
+      if (!props.popup) {
+        if (utils.ObjectUtils.isNotEmpty(activeItemPath)) {
+          bindDocumentClickListener();
+          bindDocumentResizeListener();
+        } else {
+          unbindDocumentClickListener();
+          unbindDocumentResizeListener();
+        }
+      }
+    }, [activeItemPath]);
+    hooks.useUpdateEffect(function () {
+      if (focusTrigger) {
+        var itemIndex = focusedItemInfo.index !== -1 ? findNextItemIndex(focusedItemInfo.index) : findFirstFocusedItemIndex();
+        changeFocusedItemIndex(itemIndex);
+        setActiveItemPath(activeItemPath.filter(function (p) {
+          return p.parentKey !== focusedItemInfo.parentKey;
+        }));
+        setFocusTrigger(false);
+      }
+    }, [focusTrigger]);
+    hooks.useUpdateEffect(function () {
+      if (attributeSelectorState && containerRef.current) {
+        containerRef.current.setAttribute(attributeSelectorState, '');
         createStyle();
       }
       return function () {
@@ -649,7 +1113,7 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
       };
     }, [attributeSelectorState, props.breakpoint]);
     hooks.useUnmountEffect(function () {
-      utils.ZIndexUtils.clear(menuRef.current);
+      utils.ZIndexUtils.clear(containerRef.current);
     });
     React__namespace.useImperativeHandle(ref, function () {
       return {
@@ -658,13 +1122,13 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
         show: show,
         hide: hide,
         getElement: function getElement() {
-          return menuRef.current;
+          return containerRef.current;
         }
       };
     });
     var createElement = function createElement() {
       var rootProps = utils.mergeProps({
-        ref: menuRef,
+        ref: containerRef,
         id: props.id,
         className: cx('root'),
         style: props.style,
@@ -685,17 +1149,31 @@ this.primereact.tieredmenu = (function (exports, React, PrimeReact, componentbas
         onExited: onExited
       }, ptm('transition'));
       return /*#__PURE__*/React__namespace.createElement(csstransition.CSSTransition, _extends({
-        nodeRef: menuRef
+        nodeRef: containerRef
       }, transitionProps), /*#__PURE__*/React__namespace.createElement("div", rootProps, /*#__PURE__*/React__namespace.createElement(TieredMenuSub, {
-        id: idState,
+        id: idState + '_list',
+        ref: menuRef,
         hostName: "TieredMenu",
         menuProps: props,
-        model: props.model,
+        tabIndex: 0,
+        model: processedItems,
+        ariaLabel: props.ariaLabel,
+        ariaLabelledBy: props.ariaLabelledBy,
+        ariaOrientation: "vertical",
+        ariaActiveDescendant: focused ? focusedItemId : undefined,
+        menuId: idState,
+        level: 0,
+        focusedItemId: focusedItemId,
+        activeItemPath: activeItemPath,
+        onFocus: onFocus,
+        onBlur: onBlur,
+        onKeyDown: onKeyDown,
+        onItemClick: onItemClick,
+        onItemMouseEnter: onItemMouseEnter,
         root: true,
         popup: props.popup,
         onHide: hide,
         isMobileMode: isMobileMode,
-        onItemToggle: onItemToggle,
         submenuIcon: props.submenuIcon,
         ptm: ptm,
         cx: cx,