@deque/cauldron-react 6.25.0 → 6.25.1

package/lib/components/ActionMenu/ActionMenu.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-type ActionMenuTriggerProps = Pick<React.HTMLAttributes<HTMLButtonElement>, 'children' | 'onClick' | 'onKeyDown' | 'aria-expanded' | 'aria-haspopup'> & {
+type ActionMenuTriggerProps = Pick<React.HTMLAttributes<HTMLButtonElement>, 'children' | 'onClick' | 'onKeyDown' | 'aria-expanded' | 'aria-haspopup' | 'aria-controls'> & {
     ref: React.RefObject<HTMLButtonElement>;
 };
 type ActionMenuTriggerFunction = (props: ActionMenuTriggerProps, open: boolean) => React.ReactElement;

package/lib/index.js

@@ -5317,6 +5317,7 @@ var ActionMenu = React.forwardRef(function (_a, ref) {
     var actionMenuRef = useSharedRef(ref);
     var actionMenuListRef = useSharedRef(actionMenuList.props.ref);
     var _f = tslib.__read(nextId.useId(1, 'menu-trigger'), 1), triggerId = _f[0];
+    var _g = tslib.__read(nextId.useId(1, 'menu'), 1), menuId = _g[0];
     var handleTriggerClick = React.useCallback(function (event) {
         // istanbul ignore else
         if (!event.defaultPrevented) {
@@ -5350,6 +5351,9 @@ var ActionMenu = React.forwardRef(function (_a, ref) {
             setOpen(false);
         }
     }, []);
+    var handleOverlayBlur = React.useCallback(function () {
+        setOpen(false);
+    }, []);
     var handleAction = React.useCallback(function (key, event) {
         // istanbul ignore else
         if (!event.defaultPrevented) {
@@ -5369,13 +5373,16 @@ var ActionMenu = React.forwardRef(function (_a, ref) {
             (_c = triggerRef.current) === null || _c === void 0 ? void 0 : _c.focus();
         }
     }, [open]);
-    var overlay = (React__default["default"].createElement(AnchoredOverlay, tslib.__assign({ ref: actionMenuRef, role: "presentation", className: classNames__default["default"]('ActionMenu', className), open: open, onOpenChange: setOpen, target: triggerRef, placement: placement, offset: 4, portal: portal, style: tslib.__assign({ display: !open ? 'none' : undefined }, style) }, props), React__default["default"].cloneElement(actionMenuList, {
+    var hidden = renderInTrigger && !open;
+    var overlay = (React__default["default"].createElement(AnchoredOverlay, tslib.__assign({ ref: actionMenuRef, role: "presentation", className: classNames__default["default"]('ActionMenu', className), open: open, onOpenChange: setOpen, target: triggerRef, placement: placement, offset: 4, portal: portal, style: tslib.__assign({ display: !open ? 'none' : undefined }, style), "aria-hidden": hidden, onBlur: handleOverlayBlur }, props), React__default["default"].cloneElement(actionMenuList, {
         ref: actionMenuListRef,
+        id: menuId,
         role: 'menu',
         onAction: handleAction,
         'aria-labelledby': triggerId,
         focusStrategy: focusStrategy,
-        focusDisabledOptions: true
+        focusDisabledOptions: true,
+        hidden: hidden
     })));
     var triggerProps = React.useMemo(function () {
         return {
@@ -5384,9 +5391,10 @@ var ActionMenu = React.forwardRef(function (_a, ref) {
             onClick: handleTriggerClick,
             onKeyDown: handleTriggerKeyDown,
             'aria-expanded': open,
-            'aria-haspopup': 'menu'
+            'aria-haspopup': 'menu',
+            'aria-controls': menuId
         };
-    }, [handleTriggerClick, open]);
+    }, [handleTriggerClick, open, menuId]);
     if (renderInTrigger) {
         // istanbul ignore next
         if (portal && process.env.NODE_ENV !== 'production') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deque/cauldron-react",
-  "version": "6.25.0",
+  "version": "6.25.1",
   "license": "MPL-2.0",
   "description": "Fully accessible react components library for Deque Cauldron",
   "homepage": "https://cauldron.dequelabs.com/",