@instructure/ui-menu 11.7.3-snapshot-7 → 11.7.3-snapshot-26

package/lib/Menu/v2/index.js

@@ -40,7 +40,7 @@ var _emotion = require("@instructure/emotion");
 var _styles = _interopRequireDefault(require("./styles"));
 var _props = require("./props");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
-var _dec, _dec2, _class, _Menu;
+var _dec, _dec2, _class;
 /*
  * The MIT License (MIT)
  *
@@ -69,158 +69,178 @@ var _dec, _dec2, _class, _Menu;
 category: components
 ---
 **/
-let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default), _dec(_class = _dec2(_class = (_Menu = class Menu extends _react.Component {
+let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default), _dec(_class = _dec2(_class = class Menu extends _react.Component {
+  static displayName = "Menu";
+  static componentId = 'Menu';
+  static allowedProps = _props.allowedProps;
+  static defaultProps = {
+    label: null,
+    disabled: false,
+    trigger: null,
+    placement: 'bottom center',
+    defaultShow: false,
+    mountNode: null,
+    constrain: 'window',
+    shouldHideOnSelect: true,
+    shouldFocusTriggerOnClose: true,
+    withArrow: true,
+    offsetX: 0,
+    offsetY: 0
+  };
+  static Item = _MenuItem.MenuItem;
+  static Group = _MenuItemGroup.MenuItemGroup;
+  static Separator = _MenuItemSeparator.MenuItemSeparator;
+  state = {
+    hasFocus: false
+  };
+  _rootNode = null;
+  _menuItems = [];
+  _popover = null;
+  _trigger = null;
+  _menu = null;
+  _labelId = this.props.deterministicId('Menu__label');
+  _activeSubMenu;
+  _id;
+  ref = null;
+  handleRef = el => {
+    const {
+      menuRef
+    } = this.props;
+    this._menu = el;
+    if (typeof menuRef === 'function') {
+      menuRef(el);
+    }
+    // If there is no trigger `<ul>` is the ref, otherwise the trigger
+    if (!this.props.trigger) {
+      this.ref = el;
+    }
+  };
   constructor(props) {
     super(props);
-    this.state = {
-      hasFocus: false
-    };
-    this._rootNode = null;
-    this._menuItems = [];
-    this._popover = null;
-    this._trigger = null;
-    this._menu = null;
-    this._labelId = this.props.deterministicId('Menu__label');
-    this._activeSubMenu = void 0;
-    this._id = void 0;
-    this.ref = null;
-    this.handleRef = el => {
-      const menuRef = this.props.menuRef;
-      this._menu = el;
-      if (typeof menuRef === 'function') {
-        menuRef(el);
-      }
-      // If there is no trigger `<ul>` is the ref, otherwise the trigger
-      if (!this.props.trigger) {
-        this.ref = el;
-      }
-    };
-    this.registerMenuItem = item => {
-      this._menuItems.push(item);
-    };
-    this.removeMenuItem = item => {
-      const index = this.getMenuItemIndex(item);
-      (0, _console.logError)(index >= 0, '[Menu] Could not find registered menu item.');
-      if (index >= 0) {
-        this._menuItems.splice(index, 1);
-      }
-    };
-    this.getMenuItemIndex = item => {
-      return this._menuItems.findIndex(i => i === item);
-    };
-    this.handleTriggerKeyDown = event => {
-      if (this.props.type === 'flyout' && event.keyCode === _keycode.default.codes.right) {
-        event.persist();
-        this.show(event);
-      }
-    };
-    this.handleTriggerMouseOver = event => {
-      if (this.props.type === 'flyout') {
-        this.show(event);
-      }
-    };
-    this.handleToggle = shown => {
-      if (typeof this.props.onToggle === 'function') {
-        this.props.onToggle(shown, this);
-      }
-    };
-    this.handleMenuKeyDown = event => {
-      const key = event && event.keyCode;
-      const _keycode$codes = _keycode.default.codes,
-        down = _keycode$codes.down,
-        up = _keycode$codes.up,
-        tab = _keycode$codes.tab,
-        left = _keycode$codes.left;
-      const pgdn = _keycode.default.codes['page down'];
-      const pgup = _keycode.default.codes['page up'];
-      if (key === down || key === pgdn) {
-        event.preventDefault();
-        event.stopPropagation();
-        this.moveFocus(1);
-        this.hideActiveSubMenu(event);
-      } else if (key === up || key === pgup) {
-        event.preventDefault();
-        event.stopPropagation();
-        this.moveFocus(-1);
-        this.hideActiveSubMenu(event);
-      } else if (key === tab || key === left) {
-        event.persist();
-        this.hide(event);
-      }
-      if (typeof this.props.onKeyDown === 'function') {
-        this.props.onKeyDown(event);
-      }
-    };
-    this.handleMenuItemSelect = (event, value, selected, item) => {
-      if (this.props.shouldHideOnSelect) {
-        this.hide(event);
-      }
-      if (typeof this.props.onSelect === 'function') {
-        this.props.onSelect(event, value, selected, item);
-      }
-    };
-    this.handleMenuItemFocus = () => {
-      this.setState({
-        hasFocus: true
-      });
-    };
-    this.handleMenuItemBlur = () => {
-      this.setState({
-        hasFocus: this.focusedIndex >= 0
-      });
-    };
-    this.handleMenuItemMouseOver = (event, menuItem) => {
-      if (this._activeSubMenu && menuItem !== this._activeSubMenu._trigger) {
-        this.hideActiveSubMenu(event);
-      }
-    };
-    this.hideActiveSubMenu = event => {
-      if (this._activeSubMenu) {
-        this._activeSubMenu.hide(event);
-        this._activeSubMenu = null;
-      }
-    };
-    this.handleSubMenuToggle = (shown, subMenu) => {
-      if (shown) {
-        this._activeSubMenu = subMenu;
-      }
-    };
-    this.handleSubMenuDismiss = (event, documentClick) => {
-      if (event && event.keyCode === _keycode.default.codes.tab || documentClick) {
-        this.hide(event);
-      }
-    };
-    this.hide = event => {
-      if (this._popover) {
-        this._popover.hide(event);
-      }
-    };
-    this.show = event => {
-      if (this._popover) {
-        this._popover.show(event);
-      }
-    };
     this._id = this.props.id || props.deterministicId();
   }
   componentDidMount() {
-    var _this$props$makeStyle, _this$props;
-    (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
+    this.props.makeStyles?.();
   }
   componentDidUpdate() {
-    var _this$props$makeStyle2, _this$props2;
-    (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
+    this.props.makeStyles?.();
   }
+  static contextType = _MenuContext.MenuContext;
+  registerMenuItem = item => {
+    this._menuItems.push(item);
+  };
+  removeMenuItem = item => {
+    const index = this.getMenuItemIndex(item);
+    (0, _console.logError)(index >= 0, '[Menu] Could not find registered menu item.');
+    if (index >= 0) {
+      this._menuItems.splice(index, 1);
+    }
+  };
   get menuItems() {
     return this._menuItems;
   }
+  getMenuItemIndex = item => {
+    return this._menuItems.findIndex(i => i === item);
+  };
+  handleTriggerKeyDown = event => {
+    if (this.props.type === 'flyout' && event.keyCode === _keycode.default.codes.right) {
+      event.persist();
+      this.show(event);
+    }
+  };
+  handleTriggerMouseOver = event => {
+    if (this.props.type === 'flyout') {
+      this.show(event);
+    }
+  };
+  handleToggle = shown => {
+    if (typeof this.props.onToggle === 'function') {
+      this.props.onToggle(shown, this);
+    }
+  };
+  handleMenuKeyDown = event => {
+    const key = event && event.keyCode;
+    const {
+      down,
+      up,
+      tab,
+      left
+    } = _keycode.default.codes;
+    const pgdn = _keycode.default.codes['page down'];
+    const pgup = _keycode.default.codes['page up'];
+    if (key === down || key === pgdn) {
+      event.preventDefault();
+      event.stopPropagation();
+      this.moveFocus(1);
+      this.hideActiveSubMenu(event);
+    } else if (key === up || key === pgup) {
+      event.preventDefault();
+      event.stopPropagation();
+      this.moveFocus(-1);
+      this.hideActiveSubMenu(event);
+    } else if (key === tab || key === left) {
+      event.persist();
+      this.hide(event);
+    }
+    if (typeof this.props.onKeyDown === 'function') {
+      this.props.onKeyDown(event);
+    }
+  };
+  handleMenuItemSelect = (event, value, selected, item) => {
+    if (this.props.shouldHideOnSelect) {
+      this.hide(event);
+    }
+    if (typeof this.props.onSelect === 'function') {
+      this.props.onSelect(event, value, selected, item);
+    }
+  };
+  handleMenuItemFocus = () => {
+    this.setState({
+      hasFocus: true
+    });
+  };
+  handleMenuItemBlur = () => {
+    this.setState({
+      hasFocus: this.focusedIndex >= 0
+    });
+  };
+  handleMenuItemMouseOver = (event, menuItem) => {
+    if (this._activeSubMenu && menuItem !== this._activeSubMenu._trigger) {
+      this.hideActiveSubMenu(event);
+    }
+  };
+  hideActiveSubMenu = event => {
+    if (this._activeSubMenu) {
+      this._activeSubMenu.hide(event);
+      this._activeSubMenu = null;
+    }
+  };
+  handleSubMenuToggle = (shown, subMenu) => {
+    if (shown) {
+      this._activeSubMenu = subMenu;
+    }
+  };
+  handleSubMenuDismiss = (event, documentClick) => {
+    if (event && event.keyCode === _keycode.default.codes.tab || documentClick) {
+      this.hide(event);
+    }
+  };
+  hide = event => {
+    if (this._popover) {
+      this._popover.hide(event);
+    }
+  };
+  show = event => {
+    if (this._popover) {
+      this._popover.show(event);
+    }
+  };
   focus() {
     if (this.shown) {
-      var _this$_menu;
-      (0, _console.logError)(!!((_this$_menu = this._menu) !== null && _this$_menu !== void 0 && _this$_menu.focus), '[Menu] Could not focus the menu.');
+      (0, _console.logError)(!!this._menu?.focus, '[Menu] Could not focus the menu.');
       this._menu.focus();
     } else {
-      var _this$_trigger;
-      (0, _console.logError)(!!((_this$_trigger = this._trigger) !== null && _this$_trigger !== void 0 && _this$_trigger.focus), '[Menu] Could not focus the trigger.');
+      (0, _console.logError)(!!this._trigger?.focus, '[Menu] Could not focus the trigger.');
       this._trigger.focus();
     }
   }
@@ -250,9 +270,10 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
     return this._popover ? this._popover.shown : true;
   }
   renderChildren() {
-    const _this$props3 = this.props,
-      children = _this$props3.children,
-      disabled = _this$props3.disabled;
+    const {
+      children,
+      disabled
+    } = this.props;
     let count = 0;
     return _react.Children.map(children, child => {
       if (!(0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItemSeparator', 'MenuItem', 'MenuItemGroup', 'Menu'])) {
@@ -318,12 +339,12 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
     });
   }
   renderMenu() {
-    var _this$props$styles;
-    const _this$props4 = this.props,
-      disabled = _this$props4.disabled,
-      label = _this$props4.label,
-      trigger = _this$props4.trigger,
-      onKeyUp = _this$props4.onKeyUp;
+    const {
+      disabled,
+      label,
+      trigger,
+      onKeyUp
+    } = this.props;
     const labelledBy = this.props['aria-labelledby'];
     const controls = this.props['aria-controls'];
     return (0, _jsxRuntime.jsx)(_MenuContext.MenuContext.Provider, {
@@ -335,10 +356,10 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
         role: "menu",
         "aria-label": label,
         tabIndex: 0,
-        css: (_this$props$styles = this.props.styles) === null || _this$props$styles === void 0 ? void 0 : _this$props$styles.menu,
-        "aria-labelledby": labelledBy || (trigger ? this._labelId : void 0),
+        css: this.props.styles?.menu,
+        "aria-labelledby": labelledBy || (trigger ? this._labelId : undefined),
         "aria-controls": controls,
-        "aria-disabled": disabled ? 'true' : void 0,
+        "aria-disabled": disabled ? 'true' : undefined,
         onKeyDown: this.handleMenuKeyDown,
         onKeyUp: onKeyUp,
         ref: this.handleRef,
@@ -348,21 +369,22 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
     });
   }
   render() {
-    const _this$props5 = this.props,
-      show = _this$props5.show,
-      defaultShow = _this$props5.defaultShow,
-      placement = _this$props5.placement,
-      withArrow = _this$props5.withArrow,
-      trigger = _this$props5.trigger,
-      mountNode = _this$props5.mountNode,
-      popoverRef = _this$props5.popoverRef,
-      disabled = _this$props5.disabled,
-      onDismiss = _this$props5.onDismiss,
-      onFocus = _this$props5.onFocus,
-      onMouseOver = _this$props5.onMouseOver,
-      positionContainerDisplay = _this$props5.positionContainerDisplay,
-      offsetX = _this$props5.offsetX,
-      offsetY = _this$props5.offsetY;
+    const {
+      show,
+      defaultShow,
+      placement,
+      withArrow,
+      trigger,
+      mountNode,
+      popoverRef,
+      disabled,
+      onDismiss,
+      onFocus,
+      onMouseOver,
+      positionContainerDisplay,
+      offsetX,
+      offsetY
+    } = this.props;
     return trigger ? (0, _jsxRuntime.jsx)(_latest.Popover, {
       "data-cid": "Menu",
       isShowingContent: show,
@@ -407,25 +429,9 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
         onKeyDown: this.handleTriggerKeyDown,
         disabled: trigger.props.disabled || disabled
       }),
-      defaultFocusElement: () => {
-        var _this$_popover, _this$_popover$_conte;
-        return (_this$_popover = this._popover) === null || _this$_popover === void 0 ? void 0 : (_this$_popover$_conte = _this$_popover._contentElement) === null || _this$_popover$_conte === void 0 ? void 0 : _this$_popover$_conte.querySelector('[class$="menuItem"]');
-      },
+      defaultFocusElement: () => this._popover?._contentElement?.querySelector('[class$="menuItem"]'),
       children: this.renderMenu()
     }) : this.renderMenu();
   }
-}, _Menu.displayName = "Menu", _Menu.componentId = 'Menu', _Menu.allowedProps = _props.allowedProps, _Menu.defaultProps = {
-  label: null,
-  disabled: false,
-  trigger: null,
-  placement: 'bottom center',
-  defaultShow: false,
-  mountNode: null,
-  constrain: 'window',
-  shouldHideOnSelect: true,
-  shouldFocusTriggerOnClose: true,
-  withArrow: true,
-  offsetX: 0,
-  offsetY: 0
-}, _Menu.Item = _MenuItem.MenuItem, _Menu.Group = _MenuItemGroup.MenuItemGroup, _Menu.Separator = _MenuItemSeparator.MenuItemSeparator, _Menu.contextType = _MenuContext.MenuContext, _Menu)) || _class) || _class);
+}) || _class) || _class);
 var _default = exports.default = Menu;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-menu",
-  "version": "11.7.3-snapshot-7",
+  "version": "11.7.3-snapshot-26",
   "description": "A dropdown menu component",
   "author": "Instructure, Inc. Engineering and Product Design",
   "module": "./es/index.js",
@@ -14,29 +14,29 @@
   "bugs": "https://github.com/instructure/instructure-ui/issues",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.27.6",
+    "@babel/runtime": "^7.29.2",
     "keycode": "^2",
-    "@instructure/console": "11.7.3-snapshot-7",
-    "@instructure/ui-dom-utils": "11.7.3-snapshot-7",
-    "@instructure/shared-types": "11.7.3-snapshot-7",
-    "@instructure/ui-a11y-utils": "11.7.3-snapshot-7",
-    "@instructure/emotion": "11.7.3-snapshot-7",
-    "@instructure/ui-popover": "11.7.3-snapshot-7",
-    "@instructure/ui-position": "11.7.3-snapshot-7",
-    "@instructure/ui-react-utils": "11.7.3-snapshot-7",
-    "@instructure/ui-icons": "11.7.3-snapshot-7",
-    "@instructure/ui-themes": "11.7.3-snapshot-7",
-    "@instructure/ui-utils": "11.7.3-snapshot-7",
-    "@instructure/ui-view": "11.7.3-snapshot-7"
+    "@instructure/console": "11.7.3-snapshot-26",
+    "@instructure/ui-a11y-utils": "11.7.3-snapshot-26",
+    "@instructure/ui-dom-utils": "11.7.3-snapshot-26",
+    "@instructure/emotion": "11.7.3-snapshot-26",
+    "@instructure/shared-types": "11.7.3-snapshot-26",
+    "@instructure/ui-icons": "11.7.3-snapshot-26",
+    "@instructure/ui-popover": "11.7.3-snapshot-26",
+    "@instructure/ui-position": "11.7.3-snapshot-26",
+    "@instructure/ui-react-utils": "11.7.3-snapshot-26",
+    "@instructure/ui-themes": "11.7.3-snapshot-26",
+    "@instructure/ui-utils": "11.7.3-snapshot-26",
+    "@instructure/ui-view": "11.7.3-snapshot-26"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "15.0.7",
     "@testing-library/user-event": "^14.6.1",
     "vitest": "^3.2.2",
-    "@instructure/ui-axe-check": "11.7.3-snapshot-7",
-    "@instructure/ui-babel-preset": "11.7.3-snapshot-7",
-    "@instructure/ui-color-utils": "11.7.3-snapshot-7"
+    "@instructure/ui-babel-preset": "11.7.3-snapshot-26",
+    "@instructure/ui-color-utils": "11.7.3-snapshot-26",
+    "@instructure/ui-axe-check": "11.7.3-snapshot-26"
   },
   "peerDependencies": {
     "react": ">=18 <=19"