@vonage/vivid 3.5.0 → 3.7.0

package/shared/definition28.js

@@ -1,223 +1,191 @@
-import { F as FoundationElement, W as DOM, _ as __decorate, a as attr, o as observable, b as __metadata, h as html, r as registerFactory } from './index.js';
-import { i as iconRegistries } from './definition3.js';
-import { f as focusRegistries } from './definition4.js';
-import { b as AffixIcon, a as affixIconTemplateFactory } from './affix.js';
-import { S as StartEnd } from './start-end.js';
-import { D as Direction, g as getDirection } from './direction.js';
-import { a as applyMixins } from './apply-mixins.js';
-import { i as keyArrowLeft, h as keyArrowRight, e as keySpace, d as keyEnter } from './key-codes.js';
-import { f as focusTemplateFactory } from './focus2.js';
-import { w as when } from './when.js';
-import { c as classNames } from './class-names.js';
+import { F as FoundationElement, W as DOM, _ as __decorate, o as observable, a as attr, b as __metadata, h as html, r as registerFactory } from './index.js';
+import { P as Popup, p as popupRegistries } from './definition19.js';
+import { M as MenuItem, a as MenuItemRole, r as roleForMenuItem, m as menuItemRegistries } from './definition29.js';
+import { i as isHTMLElement } from './dom.js';
+import { a as keyHome, k as keyEnd, c as keyArrowUp, b as keyArrowDown } from './key-codes.js';
+import { s as slotted } from './slotted.js';
+import { r as ref } from './ref.js';
 
 /**
- * Menu items roles.
- * @public
- */
-const MenuItemRole = {
-    /**
-     * The menu item has a "menuitem" role
-     */
-    menuitem: "menuitem",
-    /**
-     * The menu item has a "menuitemcheckbox" role
-     */
-    menuitemcheckbox: "menuitemcheckbox",
-    /**
-     * The menu item has a "menuitemradio" role
-     */
-    menuitemradio: "menuitemradio",
-};
-/**
- * @internal
- */
-const roleForMenuItem = {
-    [MenuItemRole.menuitem]: "menuitem",
-    [MenuItemRole.menuitemcheckbox]: "menuitemcheckbox",
-    [MenuItemRole.menuitemradio]: "menuitemradio",
-};
-
-/**
- * A Switch Custom HTML Element.
- * Implements {@link https://www.w3.org/TR/wai-aria-1.1/#menuitem | ARIA menuitem }, {@link https://www.w3.org/TR/wai-aria-1.1/#menuitemcheckbox | ARIA menuitemcheckbox}, or {@link https://www.w3.org/TR/wai-aria-1.1/#menuitemradio | ARIA menuitemradio }.
+ * A Menu Custom HTML Element.
+ * Implements the {@link https://www.w3.org/TR/wai-aria-1.1/#menu | ARIA menu }.
  *
- * @slot checked-indicator - The checked indicator
- * @slot radio-indicator - The radio indicator
- * @slot start - Content which can be provided before the menu item content
- * @slot end - Content which can be provided after the menu item content
- * @slot - The default slot for menu item content
- * @slot expand-collapse-indicator - The expand/collapse indicator
- * @slot submenu - Used to nest menu's within menu items
- * @csspart input-container - The element representing the visual checked or radio indicator
- * @csspart checkbox - The element wrapping the `menuitemcheckbox` indicator
- * @csspart radio - The element wrapping the `menuitemradio` indicator
- * @csspart content - The element wrapping the menu item content
- * @csspart expand-collapse-glyph-container - The element wrapping the expand collapse element
- * @csspart expand-collapse - The expand/collapse element
- * @csspart submenu-region - The container for the submenu, used for positioning
- * @fires expanded-change - Fires a custom 'expanded-change' event when the expanded state changes
- * @fires change - Fires a custom 'change' event when a non-submenu item with a role of `menuitemcheckbox`, `menuitemradio`, or `menuitem` is invoked
+ * @slot - The default slot for the menu items
  *
  * @public
  */
-class MenuItem$1 extends FoundationElement {
+class Menu$1 extends FoundationElement {
     constructor() {
         super(...arguments);
+        this.expandedItem = null;
         /**
-         * The role of the element.
-         *
-         * @public
-         * @remarks
-         * HTML Attribute: role
-         */
-        this.role = MenuItemRole.menuitem;
-        /**
-         * @internal
+         * The index of the focusable element in the items array
+         * defaults to -1
          */
-        this.hasSubmenu = false;
+        this.focusIndex = -1;
         /**
-         * Track current direction to pass to the anchored region
-         *
          * @internal
          */
-        this.currentDirection = Direction.ltr;
-        this.focusSubmenuOnLoad = false;
+        this.isNestedMenu = () => {
+            return (this.parentElement !== null &&
+                isHTMLElement(this.parentElement) &&
+                this.parentElement.getAttribute("role") === "menuitem");
+        };
         /**
+         * if focus is moving out of the menu, reset to a stable initial state
          * @internal
          */
-        this.handleMenuItemKeyDown = (e) => {
-            if (e.defaultPrevented) {
-                return false;
-            }
-            switch (e.key) {
-                case keyEnter:
-                case keySpace:
-                    this.invoke();
-                    return false;
-                case keyArrowRight:
-                    //open/focus on submenu
-                    this.expandAndFocus();
-                    return false;
-                case keyArrowLeft:
-                    //close submenu
-                    if (this.expanded) {
-                        this.expanded = false;
-                        this.focus();
-                        return false;
-                    }
+        this.handleFocusOut = (e) => {
+            if (!this.contains(e.relatedTarget) && this.menuItems !== undefined) {
+                this.collapseExpandedItem();
+                // find our first focusable element
+                const focusIndex = this.menuItems.findIndex(this.isFocusableElement);
+                // set the current focus index's tabindex to -1
+                this.menuItems[this.focusIndex].setAttribute("tabindex", "-1");
+                // set the first focusable element tabindex to 0
+                this.menuItems[focusIndex].setAttribute("tabindex", "0");
+                // set the focus index
+                this.focusIndex = focusIndex;
             }
-            return true;
         };
-        /**
-         * @internal
-         */
-        this.handleMenuItemClick = (e) => {
-            if (e.defaultPrevented || this.disabled) {
-                return false;
+        this.handleItemFocus = (e) => {
+            const targetItem = e.target;
+            if (this.menuItems !== undefined &&
+                targetItem !== this.menuItems[this.focusIndex]) {
+                this.menuItems[this.focusIndex].setAttribute("tabindex", "-1");
+                this.focusIndex = this.menuItems.indexOf(targetItem);
+                targetItem.setAttribute("tabindex", "0");
             }
-            this.invoke();
-            return false;
         };
-        /**
-         * @internal
-         */
-        this.submenuLoaded = () => {
-            if (!this.focusSubmenuOnLoad) {
+        this.handleExpandedChanged = (e) => {
+            if (e.defaultPrevented ||
+                e.target === null ||
+                this.menuItems === undefined ||
+                this.menuItems.indexOf(e.target) < 0) {
+                return;
+            }
+            e.preventDefault();
+            const changedItem = e.target;
+            // closing an expanded item without opening another
+            if (this.expandedItem !== null &&
+                changedItem === this.expandedItem &&
+                changedItem.expanded === false) {
+                this.expandedItem = null;
                 return;
             }
-            this.focusSubmenuOnLoad = false;
-            if (this.hasSubmenu) {
-                this.submenu.focus();
-                this.setAttribute("tabindex", "-1");
+            if (changedItem.expanded) {
+                if (this.expandedItem !== null && this.expandedItem !== changedItem) {
+                    this.expandedItem.expanded = false;
+                }
+                this.menuItems[this.focusIndex].setAttribute("tabindex", "-1");
+                this.expandedItem = changedItem;
+                this.focusIndex = this.menuItems.indexOf(changedItem);
+                changedItem.setAttribute("tabindex", "0");
             }
         };
-        /**
-         * @internal
-         */
-        this.handleMouseOver = (e) => {
-            if (this.disabled || !this.hasSubmenu || this.expanded) {
-                return false;
+        this.removeItemListeners = () => {
+            if (this.menuItems !== undefined) {
+                this.menuItems.forEach((item) => {
+                    item.removeEventListener("expanded-change", this.handleExpandedChanged);
+                    item.removeEventListener("focus", this.handleItemFocus);
+                });
             }
-            this.expanded = true;
-            return false;
         };
-        /**
-         * @internal
-         */
-        this.handleMouseOut = (e) => {
-            if (!this.expanded || this.contains(document.activeElement)) {
-                return false;
+        this.setItems = () => {
+            const newItems = this.domChildren();
+            this.removeItemListeners();
+            this.menuItems = newItems;
+            const menuItems = this.menuItems.filter(this.isMenuItemElement);
+            // if our focus index is not -1 we have items
+            if (menuItems.length) {
+                this.focusIndex = 0;
             }
-            this.expanded = false;
-            return false;
+            function elementIndent(el) {
+                const role = el.getAttribute("role");
+                const startSlot = el.querySelector("[slot=start]");
+                if (role !== MenuItemRole.menuitem && startSlot === null) {
+                    return 1;
+                }
+                else if (role === MenuItemRole.menuitem && startSlot !== null) {
+                    return 1;
+                }
+                else if (role !== MenuItemRole.menuitem && startSlot !== null) {
+                    return 2;
+                }
+                else {
+                    return 0;
+                }
+            }
+            const indent = menuItems.reduce((accum, current) => {
+                const elementValue = elementIndent(current);
+                return accum > elementValue ? accum : elementValue;
+            }, 0);
+            menuItems.forEach((item, index) => {
+                item.setAttribute("tabindex", index === 0 ? "0" : "-1");
+                item.addEventListener("expanded-change", this.handleExpandedChanged);
+                item.addEventListener("focus", this.handleItemFocus);
+                if (item instanceof MenuItem) {
+                    item.startColumnCount = indent;
+                }
+            });
         };
         /**
-         * @internal
+         * handle change from child element
          */
-        this.expandAndFocus = () => {
-            if (!this.hasSubmenu) {
+        this.changeHandler = (e) => {
+            if (this.menuItems === undefined) {
                 return;
             }
-            this.focusSubmenuOnLoad = true;
-            this.expanded = true;
-        };
-        /**
-         * @internal
-         */
-        this.invoke = () => {
-            if (this.disabled) {
+            const changedMenuItem = e.target;
+            const changeItemIndex = this.menuItems.indexOf(changedMenuItem);
+            if (changeItemIndex === -1) {
                 return;
             }
-            switch (this.role) {
-                case MenuItemRole.menuitemcheckbox:
-                    this.checked = !this.checked;
-                    break;
-                case MenuItemRole.menuitem:
-                    // update submenu
-                    this.updateSubmenu();
-                    if (this.hasSubmenu) {
-                        this.expandAndFocus();
+            if (changedMenuItem.role === "menuitemradio" &&
+                changedMenuItem.checked === true) {
+                for (let i = changeItemIndex - 1; i >= 0; --i) {
+                    const item = this.menuItems[i];
+                    const role = item.getAttribute("role");
+                    if (role === MenuItemRole.menuitemradio) {
+                        item.checked = false;
+                    }
+                    if (role === "separator") {
+                        break;
                     }
-                    else {
-                        this.$emit("change");
+                }
+                const maxIndex = this.menuItems.length - 1;
+                for (let i = changeItemIndex + 1; i <= maxIndex; ++i) {
+                    const item = this.menuItems[i];
+                    const role = item.getAttribute("role");
+                    if (role === MenuItemRole.menuitemradio) {
+                        item.checked = false;
                     }
-                    break;
-                case MenuItemRole.menuitemradio:
-                    if (!this.checked) {
-                        this.checked = true;
+                    if (role === "separator") {
+                        break;
                     }
-                    break;
+                }
             }
         };
         /**
-         * Gets the submenu element if any
-         *
-         * @internal
+         * check if the item is a menu item
          */
-        this.updateSubmenu = () => {
-            this.submenu = this.domChildren().find((element) => {
-                return element.getAttribute("role") === "menu";
-            });
-            this.hasSubmenu = this.submenu === undefined ? false : true;
+        this.isMenuItemElement = (el) => {
+            return (isHTMLElement(el) &&
+                Menu$1.focusableElementRoles.hasOwnProperty(el.getAttribute("role")));
+        };
+        /**
+         * check if the item is focusable
+         */
+        this.isFocusableElement = (el) => {
+            return this.isMenuItemElement(el);
         };
     }
-    expandedChanged(oldValue) {
-        if (this.$fastController.isConnected) {
-            if (this.submenu === undefined) {
-                return;
-            }
-            if (this.expanded === false) {
-                this.submenu.collapseExpandedItem();
-            }
-            else {
-                this.currentDirection = getDirection(this);
-            }
-            this.$emit("expanded-change", this, { bubbles: false });
-        }
-    }
-    checkedChanged(oldValue, newValue) {
-        if (this.$fastController.isConnected) {
-            this.$emit("change");
+    itemsChanged(oldValue, newValue) {
+        // only update children after the component is connected and
+        // the setItems has run on connectedCallback
+        // (menuItems is undefined until then)
+        if (this.$fastController.isConnected && this.menuItems !== undefined) {
+            this.setItems();
         }
     }
     /**
@@ -226,22 +194,67 @@ class MenuItem$1 extends FoundationElement {
     connectedCallback() {
         super.connectedCallback();
         DOM.queueUpdate(() => {
-            this.updateSubmenu();
+            // wait until children have had a chance to
+            // connect before setting/checking their props/attributes
+            this.setItems();
         });
-        if (!this.startColumnCount) {
-            this.startColumnCount = 1;
-        }
-        this.observer = new MutationObserver(this.updateSubmenu);
+        this.addEventListener("change", this.changeHandler);
     }
     /**
      * @internal
      */
     disconnectedCallback() {
         super.disconnectedCallback();
-        this.submenu = undefined;
-        if (this.observer !== undefined) {
-            this.observer.disconnect();
-            this.observer = undefined;
+        this.removeItemListeners();
+        this.menuItems = undefined;
+        this.removeEventListener("change", this.changeHandler);
+    }
+    /**
+     * Focuses the first item in the menu.
+     *
+     * @public
+     */
+    focus() {
+        this.setFocus(0, 1);
+    }
+    /**
+     * Collapses any expanded menu items.
+     *
+     * @public
+     */
+    collapseExpandedItem() {
+        if (this.expandedItem !== null) {
+            this.expandedItem.expanded = false;
+            this.expandedItem = null;
+        }
+    }
+    /**
+     * @internal
+     */
+    handleMenuKeyDown(e) {
+        if (e.defaultPrevented || this.menuItems === undefined) {
+            return;
+        }
+        switch (e.key) {
+            case keyArrowDown:
+                // go forward one index
+                this.setFocus(this.focusIndex + 1, 1);
+                return;
+            case keyArrowUp:
+                // go back one index
+                this.setFocus(this.focusIndex - 1, -1);
+                return;
+            case keyEnd:
+                // set focus on last item
+                this.setFocus(this.menuItems.length - 1, -1);
+                return;
+            case keyHome:
+                // set focus on first item
+                this.setFocus(0, 1);
+                return;
+            default:
+                // if we are not handling the event, do not prevent default
+                return true;
         }
     }
     /**
@@ -250,114 +263,92 @@ class MenuItem$1 extends FoundationElement {
     domChildren() {
         return Array.from(this.children).filter(child => !child.hasAttribute("hidden"));
     }
+    setFocus(focusIndex, adjustment) {
+        if (this.menuItems === undefined) {
+            return;
+        }
+        while (focusIndex >= 0 && focusIndex < this.menuItems.length) {
+            const child = this.menuItems[focusIndex];
+            if (this.isFocusableElement(child)) {
+                // change the previous index to -1
+                if (this.focusIndex > -1 &&
+                    this.menuItems.length >= this.focusIndex - 1) {
+                    this.menuItems[this.focusIndex].setAttribute("tabindex", "-1");
+                }
+                // update the focus index
+                this.focusIndex = focusIndex;
+                // update the tabindex of next focusable element
+                child.setAttribute("tabindex", "0");
+                // focus the element
+                child.focus();
+                break;
+            }
+            focusIndex += adjustment;
+        }
+    }
 }
-__decorate([
-    attr({ mode: "boolean" })
-], MenuItem$1.prototype, "disabled", void 0);
-__decorate([
-    attr({ mode: "boolean" })
-], MenuItem$1.prototype, "expanded", void 0);
-__decorate([
-    observable
-], MenuItem$1.prototype, "startColumnCount", void 0);
-__decorate([
-    attr
-], MenuItem$1.prototype, "role", void 0);
-__decorate([
-    attr({ mode: "boolean" })
-], MenuItem$1.prototype, "checked", void 0);
-__decorate([
-    observable
-], MenuItem$1.prototype, "submenuRegion", void 0);
-__decorate([
-    observable
-], MenuItem$1.prototype, "hasSubmenu", void 0);
-__decorate([
-    observable
-], MenuItem$1.prototype, "currentDirection", void 0);
+Menu$1.focusableElementRoles = roleForMenuItem;
 __decorate([
     observable
-], MenuItem$1.prototype, "submenu", void 0);
-applyMixins(MenuItem$1, StartEnd);
+], Menu$1.prototype, "items", void 0);
 
-var css_248z = "/**\n * Do not edit directly\n * Generated on Mon, 27 Mar 2023 07:48:02 GMT\n */\n@supports selector(:focus-visible) {\n  :host(:focus) {\n    outline: none;\n  }\n}\n.base {\n  position: relative;\n  display: flex;\n  box-sizing: border-box;\n  align-items: center;\n  background-color: var(--_appearance-color-fill);\n  box-shadow: inset 0 0 0 1px var(--_appearance-color-outline);\n  gap: 12px;\n  inline-size: 100%;\n  padding-inline: 16px;\n}\n.base {\n  --_appearance-color-text: var(--_connotation-color-primary);\n  --_appearance-color-fill: transparent;\n  --_appearance-color-outline: transparent;\n}\n.base:where(:hover, .hover):where(:not(:disabled, .disabled, .readonly)) {\n  --_appearance-color-text: var(--_connotation-color-primary);\n  --_appearance-color-fill: var(--_connotation-color-faint);\n  --_appearance-color-outline: transparent;\n}\n.base:where(:disabled, .disabled) {\n  --_appearance-color-text: var(--vvd-color-neutral-400);\n  --_appearance-color-fill: transparent;\n  --_appearance-color-outline: transparent;\n}\n.base:where(:active, .active):where(:not(:disabled, .disabled)) {\n  --_appearance-color-text: var(--_connotation-color-primary);\n  --_appearance-color-fill: var(--_connotation-color-soft);\n  --_appearance-color-outline: transparent;\n}\n.base:where(.selected, [aria-current]):where(:not(:disabled, .disabled, :hover, .hover)) {\n  --_appearance-color-text: var(--_connotation-color-primary-text);\n  --_appearance-color-fill: var(--_connotation-color-primary);\n  --_appearance-color-outline: transparent;\n}\n.base:where(.selected, [aria-current]):where(:hover, .hover) {\n  --_appearance-color-text: var(--_connotation-color-primary-text);\n  --_appearance-color-fill: var(--_connotation-color-primary-increment);\n  --_appearance-color-outline: transparent;\n}\n.base {\n  --_connotation-color-primary: var(--vvd-color-canvas-text);\n  --_connotation-color-primary-text: var(--vvd-color-canvas);\n  --_connotation-color-primary-increment: var(--vvd-color-neutral-800);\n  --_connotation-color-faint: var(--vvd-color-neutral-50);\n  --_connotation-color-soft: var(--vvd-color-neutral-100);\n}\n.base:not(.two-lines) {\n  block-size: calc(1px * (40 + 4 * clamp(-1, var(--vvd-size-density, 0), 2)));\n}\n.base.two-lines {\n  block-size: calc(calc(1px * (40 + 4 * clamp(-1, var(--vvd-size-density, 0), 2))) + calc(1px * (40 + 4 * clamp(-1, var(--vvd-size-density, 0), 2) - 16)));\n}\n@supports (user-select: none) {\n  .base {\n    user-select: none;\n  }\n}\n.base:not(.disabled) {\n  cursor: pointer;\n}\n.base.disabled {\n  cursor: not-allowed;\n  pointer-events: none;\n}\n\n.focus-indicator {\n  border-radius: 6px;\n}\n:host(:not(:focus-visible)) .focus-indicator {\n  display: none;\n}\n\n.icon {\n  font-size: calc(calc(1px * (40 + 4 * clamp(-1, var(--vvd-size-density, 0), 2))) / 2);\n}\n.base:not(.disabled, .item-checkbox, .item-radio) .icon {\n  color: var(--vvd-color-neutral-600);\n}\n.base:is(.disabled, .item-checkbox, .item-radio) .icon {\n  color: var(--_appearance-color-text);\n}\n\n.text {\n  display: flex;\n  overflow: hidden;\n  flex-direction: column;\n}\n\n.text-primary,\n.text-secondary {\n  overflow: hidden;\n  color: var(--_appearance-color-text);\n  font: var(--vvd-typography-base);\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n\n.base.two-lines .text-primary {\n  font: var(--vvd-typography-base-bold);\n}\n\n.base.two-lines .text-secondary {\n  color: var(--vvd-color-neutral-600);\n}";
+var css_248z = ".base {\n  max-inline-size: var(--menu-max-inline-size, 100%);\n  min-inline-size: var(--menu-max-inline-size);\n  padding-block: 8px;\n}";
 
-class MenuItem extends MenuItem$1 {}
-__decorate([attr, __metadata("design:type", String)], MenuItem.prototype, "text", void 0);
+class Menu extends Menu$1 {
+  constructor() {
+    super(...arguments);
+    this.open = false;
+    this.popupOpenChanged = () => {
+      this.open = this._popup.open;
+    };
+  }
+  anchorChanged(prevAnchor, newAnchor) {
+    const prevAnchorEl = document.getElementById(prevAnchor);
+    const newAnchorEl = document.getElementById(newAnchor);
+    prevAnchorEl === null || prevAnchorEl === void 0 ? void 0 : prevAnchorEl.removeAttribute('aria-haspopup');
+    newAnchorEl === null || newAnchorEl === void 0 ? void 0 : newAnchorEl.setAttribute('aria-haspopup', 'menu');
+  }
+}
 __decorate([attr({
-  attribute: 'text-secondary'
-}), __metadata("design:type", String)], MenuItem.prototype, "textSecondary", void 0);
-applyMixins(MenuItem, AffixIcon);
+  mode: 'boolean'
+}), __metadata("design:type", Object)], Menu.prototype, "open", void 0);
+__decorate([attr, __metadata("design:type", String)], Menu.prototype, "placement", void 0);
+__decorate([attr, __metadata("design:type", String)], Menu.prototype, "anchor", void 0);
 
 let _ = t => t,
-  _t,
-  _t2,
-  _t3,
-  _t4,
-  _t5,
-  _t6,
-  _t7,
-  _t8;
-const getClasses = ({
-  disabled,
-  checked,
-  expanded,
-  role,
-  text,
-  textSecondary
-}) => classNames('base', ['disabled', Boolean(disabled)], ['selected', role !== MenuItemRole.menuitem && Boolean(checked)], ['expanded', Boolean(expanded)], ['item-checkbox', role === MenuItemRole.menuitemcheckbox], ['item-radio', role === MenuItemRole.menuitemradio], ['two-lines', Boolean(text === null || text === void 0 ? void 0 : text.length) && Boolean(textSecondary === null || textSecondary === void 0 ? void 0 : textSecondary.length)]);
-const MenuItemTemplate = (context, definition) => {
-  const affixIconTemplate = affixIconTemplateFactory(context);
-  const focusTemplate = focusTemplateFactory(context);
+  _t;
+const MenuTemplate = context => {
+  const popupTag = context.tagFor(Popup);
   return html(_t || (_t = _`
-	<template
-		aria-checked="${0}"
-		aria-disabled="${0}"
-		aria-expanded="${0}"
-		@keydown="${0}"
-		@click="${0}"
-		@mouseover="${0}"
-		@mouseout="${0}"
-	>
-		<div class="${0}">
-
-				${0}
-			${0}
-
-			${0}
-
-			${0}
-
-			${0}
-
-			${0}
-
-
-
-		</div>
-	</template>
-	`), x => x.role !== MenuItemRole.menuitem ? x.checked : void 0, x => x.disabled, x => x.expanded, (x, c) => x.handleMenuItemKeyDown(c.event), (x, c) => x.handleMenuItemClick(c.event), (x, c) => x.handleMouseOver(c.event), (x, c) => x.handleMouseOut(c.event), getClasses, when(x => x.hasSubmenu, html(_t2 || (_t2 = _`
-								<div
-										class="expand-collapse-glyph-container"
-								>
-										<span class="expand-collapse">
-												<slot name="expand-collapse-indicator">
-														${0}
-												</slot>
-										</span>
-								</div>
-						`), definition.expandCollapseGlyph || '')), () => focusTemplate, when(x => x.role === MenuItemRole.menuitemcheckbox, html(_t3 || (_t3 = _`${0}`), x => affixIconTemplate(x.checked ? 'checkbox-checked-line' : 'checkbox-unchecked-line'))), when(x => x.role === MenuItemRole.menuitemradio, html(_t4 || (_t4 = _`${0}`), x => affixIconTemplate(x.checked ? 'radio-checked-line' : 'radio-unchecked-line'))), when(x => x.role === MenuItemRole.menuitem && x.icon, html(_t5 || (_t5 = _`${0}`), x => affixIconTemplate(x.icon))), when(x => x.text || x.textSecondary, html(_t6 || (_t6 = _`<span class="text">
-				${0}
+		<template
+			slot="${0}"
+		>
+			<${0}
+				:placement=${0}
+				:open=${0}
+				:anchor=${0}
+				@open="${0}"
+				@close="${0}"
 				${0}
-			</span>`), when(x => x.text, html(_t7 || (_t7 = _`<span class="text-primary">${0}</span>`), x => x.text)), when(x => x.textSecondary, html(_t8 || (_t8 = _`<span class="text-secondary">${0}</span>`), x => x.textSecondary)))));
+			>
+				<div
+					class="base"
+					role="menu"
+					@keydown="${0}"
+					@focusout="${0}"
+				>
+					<slot ${0}></slot>
+				</div>
+		</${0}>
+	</template>`), x => x.slot || x.isNestedMenu() ? 'submenu' : void 0, popupTag, x => x.placement, x => x.open, x => x.anchor, x => x.popupOpenChanged(), x => x.popupOpenChanged(), ref('_popup'), (x, c) => x.handleMenuKeyDown(c.event), (x, c) => x.handleFocusOut(c.event), slotted('items'), popupTag);
 };
 
-const menuItemDefinition = MenuItem.compose({
-  baseName: 'menu-item',
-  template: MenuItemTemplate,
+const menuDefinition = Menu.compose({
+  baseName: 'menu',
+  template: MenuTemplate,
   styles: css_248z
 });
-const menuItemRegistries = [menuItemDefinition(), ...iconRegistries, ...focusRegistries];
-const registerMenuItem = registerFactory(menuItemRegistries);
+const menuRegistries = [menuDefinition(), ...popupRegistries, ...menuItemRegistries];
+const registerMenu = registerFactory(menuRegistries);
 
-export { MenuItem$1 as M, MenuItemRole as a, registerMenuItem as b, menuItemDefinition as c, menuItemRegistries as m, roleForMenuItem as r };
+export { menuRegistries as a, menuDefinition as m, registerMenu as r };