@instructure/ui-menu 11.7.9-snapshot-0 → 11.7.9-snapshot-2

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [11.7.9-snapshot-0](https://github.com/instructure/instructure-ui/compare/v11.7.8...v11.7.9-snapshot-0) (2026-10-05)
+## [11.7.9-snapshot-2](https://github.com/instructure/instructure-ui/compare/v11.7.8...v11.7.9-snapshot-2) (2026-10-12)
 
 **Note:** Version bump only for package @instructure/ui-menu
 

package/lib/Menu/v1/MenuItem/index.js

@@ -7,16 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.MenuItem = void 0;
 var _react = require("react");
 var _keycode = _interopRequireDefault(require("keycode"));
-var _IconCheckSolid = require("@instructure/ui-icons/lib/generated/IconCheckSolid.js");
-var _IconArrowOpenEndSolid = require("@instructure/ui-icons/lib/generated/IconArrowOpenEndSolid.js");
-var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
-var _getElementType = require("@instructure/ui-react-utils/lib/getElementType.js");
-var _withDeterministicId = require("@instructure/ui-react-utils/lib/DeterministicIdContext/withDeterministicId.js");
-var _callRenderProp = require("@instructure/ui-react-utils/lib/callRenderProp.js");
-var _createChainedFunction = require("@instructure/ui-utils/lib/createChainedFunction.js");
-var _safeLinkProps = require("@instructure/ui-utils/lib/safeLinkProps.js");
-var _isActiveElement = require("@instructure/ui-dom-utils/lib/isActiveElement.js");
-var _findDOMNode = require("@instructure/ui-dom-utils/lib/findDOMNode.js");
+var _uiIcons = require("@instructure/ui-icons");
+var _uiReactUtils = require("@instructure/ui-react-utils");
+var _uiUtils = require("@instructure/ui-utils");
+var _uiDomUtils = require("@instructure/ui-dom-utils");
 var _emotion = require("@instructure/emotion");
 var _MenuContext = require("../../../utils/v1/MenuContext.js");
 var _styles = _interopRequireDefault(require("./styles.js"));
@@ -53,7 +47,7 @@ parent: Menu
 id: Menu.Item
 ---
 **/
-let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = _dec2(_class = class MenuItem extends _react.Component {
+let MenuItem = exports.MenuItem = (_dec = (0, _uiReactUtils.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = _dec2(_class = class MenuItem extends _react.Component {
   static displayName = 'MenuItem';
   static componentId = 'Menu.Item';
   static allowedProps = _props.allowedProps;
@@ -128,7 +122,7 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
       e.stopPropagation();
       if (enterKey) {
         // handle space key on keyUp for FF
-        const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
+        const refNode = (0, _uiDomUtils.findDOMNode)(this.ref);
         refNode.click();
       }
     }
@@ -140,7 +134,7 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
       e.preventDefault();
       e.stopPropagation();
       if (spaceKey) {
-        const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
+        const refNode = (0, _uiDomUtils.findDOMNode)(this.ref);
         refNode.click();
       }
     }
@@ -154,7 +148,7 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
     }
   };
   get elementType() {
-    return (0, _getElementType.getElementType)(MenuItem, this.props);
+    return (0, _uiReactUtils.getElementType)(MenuItem, this.props);
   }
   get role() {
     switch (this.props.type) {
@@ -170,10 +164,10 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
     return typeof this.props.selected === 'undefined' ? this.state.selected : this.props.selected;
   }
   get focused() {
-    return (0, _isActiveElement.isActiveElement)(this.ref);
+    return (0, _uiDomUtils.isActiveElement)(this.ref);
   }
   focus() {
-    const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
+    const refNode = (0, _uiDomUtils.findDOMNode)(this.ref);
     refNode.focus();
   }
   renderContent() {
@@ -185,17 +179,17 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
     return (0, _jsxRuntime.jsxs)("span", {
       children: [(type === 'checkbox' || type === 'radio') && (0, _jsxRuntime.jsx)("span", {
         css: this.props.styles?.icon,
-        children: this.selected && (0, _jsxRuntime.jsx)(_IconCheckSolid.IconCheckSolid, {})
+        children: this.selected && (0, _jsxRuntime.jsx)(_uiIcons.IconCheckSolid, {})
       }), (0, _jsxRuntime.jsx)("span", {
         css: this.props.styles?.label,
         id: this.labelId,
         children: children
       }), type === 'flyout' && (0, _jsxRuntime.jsx)("span", {
         css: this.props.styles?.icon,
-        children: (0, _jsxRuntime.jsx)(_IconArrowOpenEndSolid.IconArrowOpenEndSolid, {})
+        children: (0, _jsxRuntime.jsx)(_uiIcons.IconArrowOpenEndSolid, {})
       }), renderLabelInfo && (0, _jsxRuntime.jsx)("span", {
         css: this.props.styles?.labelInfo,
-        children: (0, _callRenderProp.callRenderProp)(renderLabelInfo)
+        children: (0, _uiReactUtils.callRenderProp)(renderLabelInfo)
       })]
     });
   }
@@ -209,12 +203,12 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
       href: rawHref,
       target
     } = this.props;
-    const props = (0, _omitProps.omitProps)(this.props, MenuItem.allowedProps);
+    const props = (0, _uiReactUtils.omitProps)(this.props, MenuItem.allowedProps);
     const ElementType = this.elementType;
     const {
       href,
       rel
-    } = (0, _safeLinkProps.safeLinkProps)({
+    } = (0, _uiUtils.safeLinkProps)({
       tag: typeof ElementType === 'string' ? ElementType : 'a',
       attr: 'href',
       href: rawHref,
@@ -234,8 +228,8 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
       "aria-controls": controls,
       "aria-checked": type === 'checkbox' || type === 'radio' ? this.selected ? 'true' : 'false' : undefined,
       onClick: this.handleClick,
-      onKeyUp: (0, _createChainedFunction.createChainedFunction)(onKeyUp, this.handleKeyUp),
-      onKeyDown: (0, _createChainedFunction.createChainedFunction)(onKeyDown, this.handleKeyDown),
+      onKeyUp: (0, _uiUtils.createChainedFunction)(onKeyUp, this.handleKeyUp),
+      onKeyDown: (0, _uiUtils.createChainedFunction)(onKeyDown, this.handleKeyDown),
       ref: this.handleRef,
       css: this.props.styles?.menuItem,
       onMouseOver: this.handleMouseOver,

package/lib/Menu/v1/MenuItemGroup/index.js

@@ -7,11 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.MenuItemGroup = void 0;
 var _react = require("react");
 var _emotion = require("@instructure/emotion");
-var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
-var _safeCloneElement = require("@instructure/ui-react-utils/lib/safeCloneElement.js");
-var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
-var _withDeterministicId = require("@instructure/ui-react-utils/lib/DeterministicIdContext/withDeterministicId.js");
-var _hasVisibleChildren = require("@instructure/ui-a11y-utils/lib/hasVisibleChildren.js");
+var _uiReactUtils = require("@instructure/ui-react-utils");
+var _uiA11yUtils = require("@instructure/ui-a11y-utils");
 var _index = require("../MenuItem/index.js");
 var _styles = _interopRequireDefault(require("./styles.js"));
 var _theme = _interopRequireDefault(require("./theme.js"));
@@ -47,7 +44,7 @@ parent: Menu
 id: Menu.Group
 ---
 **/
-let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = _dec2(_class = class MenuItemGroup extends _react.Component {
+let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _uiReactUtils.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = _dec2(_class = class MenuItemGroup extends _react.Component {
   static displayName = 'MenuItemGroup';
   static componentId = 'Menu.Group';
   static allowedProps = _props.allowedProps;
@@ -117,7 +114,7 @@ let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.wit
     } = props;
     const selected = [];
     const items = _react.Children.toArray(children).filter(child => {
-      return (0, _matchComponentTypes.matchComponentTypes)(child, [_index.MenuItem]);
+      return (0, _uiReactUtils.matchComponentTypes)(child, [_index.MenuItem]);
     });
     items.forEach((item, index) => {
       if ((selected.length === 0 || allowMultiple) && (item.props.selected || item.props.defaultSelected)) {
@@ -137,7 +134,7 @@ let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.wit
     const {
       label
     } = this.props;
-    return (0, _hasVisibleChildren.hasVisibleChildren)(label) ? (0, _jsxRuntime.jsx)("span", {
+    return (0, _uiA11yUtils.hasVisibleChildren)(label) ? (0, _jsxRuntime.jsx)("span", {
       css: this.props.styles?.label,
       children: label
     }) : label;
@@ -153,10 +150,10 @@ let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.wit
     const children = this.props.children;
     let index = -1;
     return _react.Children.map(children, child => {
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, [_index.MenuItem])) {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, [_index.MenuItem])) {
         ++index;
         const value = child.props.value || index;
-        return (0, _safeCloneElement.safeCloneElement)(child, {
+        return (0, _uiReactUtils.safeCloneElement)(child, {
           tabIndex: isTabbable && index === 0 ? 0 : -1,
           controls,
           value,
@@ -174,7 +171,7 @@ let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.wit
     });
   }
   render() {
-    const props = (0, _omitProps.omitProps)(this.props, MenuItemGroup.allowedProps);
+    const props = (0, _uiReactUtils.omitProps)(this.props, MenuItemGroup.allowedProps);
     return (0, _jsxRuntime.jsxs)("span", {
       ...props,
       css: this.props.styles?.menuItemGroup,

package/lib/Menu/v1/MenuItemSeparator/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.MenuItemSeparator = void 0;
 var _react = require("react");
 var _emotion = require("@instructure/emotion");
-var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
+var _uiReactUtils = require("@instructure/ui-react-utils");
 var _styles = _interopRequireDefault(require("./styles.js"));
 var _theme = _interopRequireDefault(require("./theme.js"));
 var _props = require("./props.js");
@@ -58,7 +58,7 @@ let MenuItemSeparator = exports.MenuItemSeparator = (_dec = (0, _emotion.withSty
     this.props.makeStyles?.();
   }
   render() {
-    const props = (0, _omitProps.omitProps)(this.props, MenuItemSeparator.allowedProps);
+    const props = (0, _uiReactUtils.omitProps)(this.props, MenuItemSeparator.allowedProps);
     // role="separator" would fit better here, but it causes NVDA to stop the
     // MenuItem count after it
     return (0, _jsxRuntime.jsx)("div", {

package/lib/Menu/v1/index.js

@@ -27,11 +27,9 @@ exports.default = void 0;
 var _react = require("react");
 var _keycode = _interopRequireDefault(require("keycode"));
 var _v11_ = require("@instructure/ui-popover/v11_6");
-var _safeCloneElement = require("@instructure/ui-react-utils/lib/safeCloneElement.js");
-var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
-var _withDeterministicId = require("@instructure/ui-react-utils/lib/DeterministicIdContext/withDeterministicId.js");
+var _uiReactUtils = require("@instructure/ui-react-utils");
 var _console = require("@instructure/console");
-var _containsActiveElement = require("@instructure/ui-dom-utils/lib/containsActiveElement.js");
+var _uiDomUtils = require("@instructure/ui-dom-utils");
 var _MenuContext = require("../../utils/v1/MenuContext.js");
 var _index = require("./MenuItem/index.js");
 var _index2 = require("./MenuItemGroup/index.js");
@@ -70,7 +68,7 @@ var _dec, _dec2, _class;
 category: components
 ---
 **/
-let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = _dec2(_class = class Menu extends _react.Component {
+let Menu = exports.Menu = (_dec = (0, _uiReactUtils.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = _dec2(_class = class Menu extends _react.Component {
   static displayName = 'Menu';
   static componentId = 'Menu';
   static allowedProps = _props.allowedProps;
@@ -247,9 +245,9 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
   }
   focused() {
     if (this.shown) {
-      return (0, _containsActiveElement.containsActiveElement)(this._menu) || this.state.hasFocus;
+      return (0, _uiDomUtils.containsActiveElement)(this._menu) || this.state.hasFocus;
     } else {
-      return (0, _containsActiveElement.containsActiveElement)(this._trigger);
+      return (0, _uiDomUtils.containsActiveElement)(this._trigger);
     }
   }
   get focusedIndex() {
@@ -277,18 +275,18 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
     } = this.props;
     let count = 0;
     return _react.Children.map(children, child => {
-      if (!(0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItemSeparator', 'MenuItem', 'MenuItemGroup', 'Menu'])) {
+      if (!(0, _uiReactUtils.matchComponentTypes)(child, ['MenuItemSeparator', 'MenuItem', 'MenuItemGroup', 'Menu'])) {
         return;
       }
       count += 1;
       const isTabbable = !this.state.hasFocus && count === 1;
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItemSeparator'])) {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, ['MenuItemSeparator'])) {
         return child;
       }
       const menuItemChild = child;
       const controls = menuItemChild.props['aria-controls'] || menuItemChild.props.controls || this.props['aria-controls'] || this.props.controls;
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItem'])) {
-        return (0, _safeCloneElement.safeCloneElement)(child, {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, ['MenuItem'])) {
+        return (0, _uiReactUtils.safeCloneElement)(child, {
           controls,
           children: child.props.children,
           disabled: disabled || child.props.disabled,
@@ -299,8 +297,8 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
           tabIndex: isTabbable ? 0 : -1
         });
       }
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItemGroup'])) {
-        return (0, _safeCloneElement.safeCloneElement)(child, {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, ['MenuItemGroup'])) {
+        return (0, _uiReactUtils.safeCloneElement)(child, {
           label: child.props.label,
           controls,
           disabled: disabled || child.props.disabled,
@@ -311,9 +309,9 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
           isTabbable
         });
       }
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, ['Menu'])) {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, ['Menu'])) {
         const submenuDisabled = disabled || child.props.disabled;
-        return (0, _safeCloneElement.safeCloneElement)(child, {
+        return (0, _uiReactUtils.safeCloneElement)(child, {
           type: 'flyout',
           controls,
           disabled: submenuDisabled,
@@ -420,7 +418,7 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
           popoverRef(el);
         }
       },
-      renderTrigger: (0, _safeCloneElement.safeCloneElement)(trigger, {
+      renderTrigger: (0, _uiReactUtils.safeCloneElement)(trigger, {
         ref: el => {
           this._trigger = el;
         },

package/lib/Menu/v2/MenuItem/index.js

@@ -8,14 +8,9 @@ exports.default = exports.MenuItem = void 0;
 var _react = require("react");
 var _keycode = _interopRequireDefault(require("keycode"));
 var _uiIcons = require("@instructure/ui-icons");
-var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
-var _getElementType = require("@instructure/ui-react-utils/lib/getElementType.js");
-var _withDeterministicId = require("@instructure/ui-react-utils/lib/DeterministicIdContext/withDeterministicId.js");
-var _callRenderProp = require("@instructure/ui-react-utils/lib/callRenderProp.js");
-var _createChainedFunction = require("@instructure/ui-utils/lib/createChainedFunction.js");
-var _safeLinkProps = require("@instructure/ui-utils/lib/safeLinkProps.js");
-var _isActiveElement = require("@instructure/ui-dom-utils/lib/isActiveElement.js");
-var _findDOMNode = require("@instructure/ui-dom-utils/lib/findDOMNode.js");
+var _uiReactUtils = require("@instructure/ui-react-utils");
+var _uiUtils = require("@instructure/ui-utils");
+var _uiDomUtils = require("@instructure/ui-dom-utils");
 var _emotion = require("@instructure/emotion");
 var _MenuContext = require("../../../utils/v1/MenuContext.js");
 var _styles = _interopRequireDefault(require("./styles.js"));
@@ -51,7 +46,7 @@ parent: Menu
 id: Menu.Item
 ---
 **/
-let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyleNew)(_styles.default), _dec(_class = _dec2(_class = class MenuItem extends _react.Component {
+let MenuItem = exports.MenuItem = (_dec = (0, _uiReactUtils.withDeterministicId)(), _dec2 = (0, _emotion.withStyleNew)(_styles.default), _dec(_class = _dec2(_class = class MenuItem extends _react.Component {
   static displayName = 'MenuItem';
   static componentId = 'Menu.Item';
   static allowedProps = _props.allowedProps;
@@ -126,7 +121,7 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
       e.stopPropagation();
       if (enterKey) {
         // handle space key on keyUp for FF
-        const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
+        const refNode = (0, _uiDomUtils.findDOMNode)(this.ref);
         refNode.click();
       }
     }
@@ -138,7 +133,7 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
       e.preventDefault();
       e.stopPropagation();
       if (spaceKey) {
-        const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
+        const refNode = (0, _uiDomUtils.findDOMNode)(this.ref);
         refNode.click();
       }
     }
@@ -181,7 +176,7 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
     return this.selected ? 'inverseColor' : 'baseColor';
   };
   get elementType() {
-    return (0, _getElementType.getElementType)(MenuItem, this.props);
+    return (0, _uiReactUtils.getElementType)(MenuItem, this.props);
   }
   get role() {
     switch (this.props.type) {
@@ -197,10 +192,10 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
     return typeof this.props.selected === 'undefined' ? this.state.selected : this.props.selected;
   }
   get focused() {
-    return (0, _isActiveElement.isActiveElement)(this.ref);
+    return (0, _uiDomUtils.isActiveElement)(this.ref);
   }
   focus() {
-    const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
+    const refNode = (0, _uiDomUtils.findDOMNode)(this.ref);
     refNode.focus();
   }
   renderContent() {
@@ -228,7 +223,7 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
         })
       }), renderLabelInfo && (0, _jsxRuntime.jsx)("span", {
         css: this.props.styles?.labelInfo,
-        children: (0, _callRenderProp.callRenderProp)(renderLabelInfo)
+        children: (0, _uiReactUtils.callRenderProp)(renderLabelInfo)
       })]
     });
   }
@@ -244,12 +239,12 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
       href: rawHref,
       target
     } = this.props;
-    const props = (0, _omitProps.omitProps)(this.props, MenuItem.allowedProps);
+    const props = (0, _uiReactUtils.omitProps)(this.props, MenuItem.allowedProps);
     const ElementType = this.elementType;
     const {
       href,
       rel
-    } = (0, _safeLinkProps.safeLinkProps)({
+    } = (0, _uiUtils.safeLinkProps)({
       tag: typeof ElementType === 'string' ? ElementType : 'a',
       attr: 'href',
       href: rawHref,
@@ -269,15 +264,15 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
       "aria-controls": controls,
       "aria-checked": type === 'checkbox' || type === 'radio' ? this.selected ? 'true' : 'false' : undefined,
       onClick: this.handleClick,
-      onKeyUp: (0, _createChainedFunction.createChainedFunction)(onKeyUp, this.handleKeyUp),
-      onKeyDown: (0, _createChainedFunction.createChainedFunction)(onKeyDown, this.handleKeyDown),
+      onKeyUp: (0, _uiUtils.createChainedFunction)(onKeyUp, this.handleKeyUp),
+      onKeyDown: (0, _uiUtils.createChainedFunction)(onKeyDown, this.handleKeyDown),
       ref: this.handleRef,
       css: this.props.styles?.menuItem,
       onMouseOver: this.handleMouseOver,
       onMouseEnter: this.handleMouseEnter,
       onMouseLeave: this.handleMouseLeave,
-      onFocus: (0, _createChainedFunction.createChainedFunction)(onFocus, this.handleFocusEvent),
-      onBlur: (0, _createChainedFunction.createChainedFunction)(onBlur, this.handleBlurEvent),
+      onFocus: (0, _uiUtils.createChainedFunction)(onFocus, this.handleFocusEvent),
+      onBlur: (0, _uiUtils.createChainedFunction)(onBlur, this.handleBlurEvent),
       "data-cid": "MenuItem",
       children: this.renderContent()
     });

package/lib/Menu/v2/MenuItemGroup/index.js

@@ -7,11 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.MenuItemGroup = void 0;
 var _react = require("react");
 var _emotion = require("@instructure/emotion");
-var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
-var _safeCloneElement = require("@instructure/ui-react-utils/lib/safeCloneElement.js");
-var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
-var _withDeterministicId = require("@instructure/ui-react-utils/lib/DeterministicIdContext/withDeterministicId.js");
-var _hasVisibleChildren = require("@instructure/ui-a11y-utils/lib/hasVisibleChildren.js");
+var _uiReactUtils = require("@instructure/ui-react-utils");
+var _uiA11yUtils = require("@instructure/ui-a11y-utils");
 var _index = require("../MenuItem/index.js");
 var _styles = _interopRequireDefault(require("./styles.js"));
 var _props = require("./props.js");
@@ -46,7 +43,7 @@ parent: Menu
 id: Menu.Group
 ---
 **/
-let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyleNew)(_styles.default), _dec(_class = _dec2(_class = class MenuItemGroup extends _react.Component {
+let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _uiReactUtils.withDeterministicId)(), _dec2 = (0, _emotion.withStyleNew)(_styles.default), _dec(_class = _dec2(_class = class MenuItemGroup extends _react.Component {
   static displayName = 'MenuItemGroup';
   static componentId = 'Menu.Group';
   static allowedProps = _props.allowedProps;
@@ -116,7 +113,7 @@ let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.wit
     } = props;
     const selected = [];
     const items = _react.Children.toArray(children).filter(child => {
-      return (0, _matchComponentTypes.matchComponentTypes)(child, [_index.MenuItem]);
+      return (0, _uiReactUtils.matchComponentTypes)(child, [_index.MenuItem]);
     });
     items.forEach((item, index) => {
       if ((selected.length === 0 || allowMultiple) && (item.props.selected || item.props.defaultSelected)) {
@@ -136,7 +133,7 @@ let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.wit
     const {
       label
     } = this.props;
-    return (0, _hasVisibleChildren.hasVisibleChildren)(label) ? (0, _jsxRuntime.jsx)("span", {
+    return (0, _uiA11yUtils.hasVisibleChildren)(label) ? (0, _jsxRuntime.jsx)("span", {
       css: this.props.styles?.label,
       children: label
     }) : label;
@@ -152,10 +149,10 @@ let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.wit
     const children = this.props.children;
     let index = -1;
     return _react.Children.map(children, child => {
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, [_index.MenuItem])) {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, [_index.MenuItem])) {
         ++index;
         const value = child.props.value || index;
-        return (0, _safeCloneElement.safeCloneElement)(child, {
+        return (0, _uiReactUtils.safeCloneElement)(child, {
           tabIndex: isTabbable && index === 0 ? 0 : -1,
           controls,
           value,
@@ -173,7 +170,7 @@ let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.wit
     });
   }
   render() {
-    const props = (0, _omitProps.omitProps)(this.props, MenuItemGroup.allowedProps);
+    const props = (0, _uiReactUtils.omitProps)(this.props, MenuItemGroup.allowedProps);
     return (0, _jsxRuntime.jsxs)("span", {
       ...props,
       css: this.props.styles?.menuItemGroup,

package/lib/Menu/v2/MenuItemSeparator/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.MenuItemSeparator = void 0;
 var _react = require("react");
 var _emotion = require("@instructure/emotion");
-var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
+var _uiReactUtils = require("@instructure/ui-react-utils");
 var _styles = _interopRequireDefault(require("./styles.js"));
 var _props = require("./props.js");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
@@ -57,7 +57,7 @@ let MenuItemSeparator = exports.MenuItemSeparator = (_dec = (0, _emotion.withSty
     this.props.makeStyles?.();
   }
   render() {
-    const props = (0, _omitProps.omitProps)(this.props, MenuItemSeparator.allowedProps);
+    const props = (0, _uiReactUtils.omitProps)(this.props, MenuItemSeparator.allowedProps);
     // role="separator" would fit better here, but it causes NVDA to stop the
     // MenuItem count after it
     return (0, _jsxRuntime.jsx)("div", {

package/lib/Menu/v2/index.js

@@ -27,11 +27,9 @@ exports.default = void 0;
 var _react = require("react");
 var _keycode = _interopRequireDefault(require("keycode"));
 var _latest = require("@instructure/ui-popover/latest");
-var _safeCloneElement = require("@instructure/ui-react-utils/lib/safeCloneElement.js");
-var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
-var _withDeterministicId = require("@instructure/ui-react-utils/lib/DeterministicIdContext/withDeterministicId.js");
+var _uiReactUtils = require("@instructure/ui-react-utils");
 var _console = require("@instructure/console");
-var _containsActiveElement = require("@instructure/ui-dom-utils/lib/containsActiveElement.js");
+var _uiDomUtils = require("@instructure/ui-dom-utils");
 var _MenuContext = require("../../utils/v1/MenuContext.js");
 var _index = require("./MenuItem/index.js");
 var _index2 = require("./MenuItemGroup/index.js");
@@ -69,7 +67,7 @@ var _dec, _dec2, _class;
 category: components
 ---
 **/
-let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyleNew)(_styles.default), _dec(_class = _dec2(_class = class Menu extends _react.Component {
+let Menu = exports.Menu = (_dec = (0, _uiReactUtils.withDeterministicId)(), _dec2 = (0, _emotion.withStyleNew)(_styles.default), _dec(_class = _dec2(_class = class Menu extends _react.Component {
   static displayName = 'Menu';
   static componentId = 'Menu';
   static allowedProps = _props.allowedProps;
@@ -246,9 +244,9 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
   }
   focused() {
     if (this.shown) {
-      return (0, _containsActiveElement.containsActiveElement)(this._menu) || this.state.hasFocus;
+      return (0, _uiDomUtils.containsActiveElement)(this._menu) || this.state.hasFocus;
     } else {
-      return (0, _containsActiveElement.containsActiveElement)(this._trigger);
+      return (0, _uiDomUtils.containsActiveElement)(this._trigger);
     }
   }
   get focusedIndex() {
@@ -276,18 +274,18 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
     } = this.props;
     let count = 0;
     return _react.Children.map(children, child => {
-      if (!(0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItemSeparator', 'MenuItem', 'MenuItemGroup', 'Menu'])) {
+      if (!(0, _uiReactUtils.matchComponentTypes)(child, ['MenuItemSeparator', 'MenuItem', 'MenuItemGroup', 'Menu'])) {
         return;
       }
       count += 1;
       const isTabbable = !this.state.hasFocus && count === 1;
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItemSeparator'])) {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, ['MenuItemSeparator'])) {
         return child;
       }
       const menuItemChild = child;
       const controls = menuItemChild.props['aria-controls'] || menuItemChild.props.controls || this.props['aria-controls'] || this.props.controls;
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItem'])) {
-        return (0, _safeCloneElement.safeCloneElement)(child, {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, ['MenuItem'])) {
+        return (0, _uiReactUtils.safeCloneElement)(child, {
           controls,
           children: child.props.children,
           disabled: disabled || child.props.disabled,
@@ -298,8 +296,8 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
           tabIndex: isTabbable ? 0 : -1
         });
       }
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItemGroup'])) {
-        return (0, _safeCloneElement.safeCloneElement)(child, {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, ['MenuItemGroup'])) {
+        return (0, _uiReactUtils.safeCloneElement)(child, {
           label: child.props.label,
           controls,
           disabled: disabled || child.props.disabled,
@@ -310,9 +308,9 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
           isTabbable
         });
       }
-      if ((0, _matchComponentTypes.matchComponentTypes)(child, ['Menu'])) {
+      if ((0, _uiReactUtils.matchComponentTypes)(child, ['Menu'])) {
         const submenuDisabled = disabled || child.props.disabled;
-        return (0, _safeCloneElement.safeCloneElement)(child, {
+        return (0, _uiReactUtils.safeCloneElement)(child, {
           type: 'flyout',
           controls,
           disabled: submenuDisabled,
@@ -419,7 +417,7 @@ let Menu = exports.Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(
           popoverRef(el);
         }
       },
-      renderTrigger: (0, _safeCloneElement.safeCloneElement)(trigger, {
+      renderTrigger: (0, _uiReactUtils.safeCloneElement)(trigger, {
         ref: el => {
           this._trigger = el;
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-menu",
-  "version": "11.7.9-snapshot-0",
+  "version": "11.7.9-snapshot-2",
   "description": "A dropdown menu component",
   "author": "Instructure, Inc. Engineering and Product Design",
   "module": "./es/index.js",
@@ -15,25 +15,25 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.29.7",
-    "keycode": "^2",
-    "@instructure/console": "11.7.9-snapshot-0",
-    "@instructure/emotion": "11.7.9-snapshot-0",
-    "@instructure/shared-types": "11.7.9-snapshot-0",
-    "@instructure/ui-dom-utils": "11.7.9-snapshot-0",
-    "@instructure/ui-a11y-utils": "11.7.9-snapshot-0",
-    "@instructure/ui-icons": "11.7.9-snapshot-0",
-    "@instructure/ui-popover": "11.7.9-snapshot-0",
-    "@instructure/ui-position": "11.7.9-snapshot-0",
-    "@instructure/ui-react-utils": "11.7.9-snapshot-0",
-    "@instructure/ui-themes": "11.7.9-snapshot-0",
-    "@instructure/ui-utils": "11.7.9-snapshot-0",
-    "@instructure/ui-view": "11.7.9-snapshot-0"
+    "@instructure/console": "11.7.9-snapshot-2",
+    "@instructure/emotion": "11.7.9-snapshot-2",
+    "@instructure/shared-types": "11.7.9-snapshot-2",
+    "@instructure/ui-a11y-utils": "11.7.9-snapshot-2",
+    "@instructure/ui-dom-utils": "11.7.9-snapshot-2",
+    "@instructure/ui-icons": "11.7.9-snapshot-2",
+    "@instructure/ui-popover": "11.7.9-snapshot-2",
+    "@instructure/ui-position": "11.7.9-snapshot-2",
+    "@instructure/ui-react-utils": "11.7.9-snapshot-2",
+    "@instructure/ui-themes": "11.7.9-snapshot-2",
+    "@instructure/ui-utils": "11.7.9-snapshot-2",
+    "@instructure/ui-view": "11.7.9-snapshot-2",
+    "keycode": "^2"
   },
   "devDependencies": {
-    "vitest": "^5.0.0",
-    "@instructure/ui-axe-check": "11.7.9-snapshot-0",
-    "@instructure/ui-babel-preset": "11.7.9-snapshot-0",
-    "@instructure/ui-color-utils": "11.7.9-snapshot-0"
+    "@instructure/ui-axe-check": "11.7.9-snapshot-2",
+    "@instructure/ui-babel-preset": "11.7.9-snapshot-2",
+    "@instructure/ui-color-utils": "11.7.9-snapshot-2",
+    "vitest": "^5.0.0"
   },
   "peerDependencies": {
     "react": ">=18 <=19"