From ebcc4758457ce4456b7da6fd032176e70c158849 Mon Sep 17 00:00:00 2001
From: Rob Snow <rsnow@adobe.com>
Date: Thu, 23 Sep 2021 10:52:42 -0500
Subject: [PATCH 1/2] add rest of style props to action menu

---
 packages/@react-spectrum/menu/src/ActionMenu.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/@react-spectrum/menu/src/ActionMenu.tsx b/packages/@react-spectrum/menu/src/ActionMenu.tsx
index 0e1c454d377..19bc9211240 100644
--- a/packages/@react-spectrum/menu/src/ActionMenu.tsx
+++ b/packages/@react-spectrum/menu/src/ActionMenu.tsx
@@ -21,7 +21,7 @@ import More from '@spectrum-icons/workflow/More';
 import React from 'react';
 import {SpectrumActionMenuProps} from '@react-types/menu';
 import {useMessageFormatter} from '@react-aria/i18n';
-import {useSlotProps} from '@react-spectrum/utils';
+import {useSlotProps, useStyleProps} from '@react-spectrum/utils';
 
 function ActionMenu<T extends object>(props: SpectrumActionMenuProps<T>, ref: FocusableRef<HTMLButtonElement>) {
   props = useSlotProps(props, 'actionmenu');
@@ -30,6 +30,7 @@ function ActionMenu<T extends object>(props: SpectrumActionMenuProps<T>, ref: Fo
   if (buttonProps['aria-label'] === undefined) {
     buttonProps['aria-label'] = formatMessage('moreActions');
   }
+  let {styleProps} = useStyleProps(props);
 
   return (
     <MenuTrigger
@@ -40,7 +41,8 @@ function ActionMenu<T extends object>(props: SpectrumActionMenuProps<T>, ref: Fo
       <ActionButton
         ref={ref}
         {...buttonProps}
-        UNSAFE_className={props.UNSAFE_className}
+        UNSAFE_className={styleProps.className}
+        UNSAFE_style={styleProps.style}
         isDisabled={props.isDisabled}
         isQuiet={props.isQuiet}
         autoFocus={props.autoFocus}>

From 863bcab3be26dc948837784031d33926d8f18369 Mon Sep 17 00:00:00 2001
From: Rob Snow <rsnow@adobe.com>
Date: Thu, 23 Sep 2021 12:48:26 -0500
Subject: [PATCH 2/2] we mostly pass props to the outermost element

---
 packages/@react-spectrum/menu/src/ActionMenu.tsx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/@react-spectrum/menu/src/ActionMenu.tsx b/packages/@react-spectrum/menu/src/ActionMenu.tsx
index 19bc9211240..47ace5106d0 100644
--- a/packages/@react-spectrum/menu/src/ActionMenu.tsx
+++ b/packages/@react-spectrum/menu/src/ActionMenu.tsx
@@ -21,7 +21,7 @@ import More from '@spectrum-icons/workflow/More';
 import React from 'react';
 import {SpectrumActionMenuProps} from '@react-types/menu';
 import {useMessageFormatter} from '@react-aria/i18n';
-import {useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {useSlotProps} from '@react-spectrum/utils';
 
 function ActionMenu<T extends object>(props: SpectrumActionMenuProps<T>, ref: FocusableRef<HTMLButtonElement>) {
   props = useSlotProps(props, 'actionmenu');
@@ -30,7 +30,6 @@ function ActionMenu<T extends object>(props: SpectrumActionMenuProps<T>, ref: Fo
   if (buttonProps['aria-label'] === undefined) {
     buttonProps['aria-label'] = formatMessage('moreActions');
   }
-  let {styleProps} = useStyleProps(props);
 
   return (
     <MenuTrigger
@@ -40,12 +39,8 @@ function ActionMenu<T extends object>(props: SpectrumActionMenuProps<T>, ref: Fo
       shouldFlip={props.shouldFlip}>
       <ActionButton
         ref={ref}
-        {...buttonProps}
-        UNSAFE_className={styleProps.className}
-        UNSAFE_style={styleProps.style}
-        isDisabled={props.isDisabled}
-        isQuiet={props.isQuiet}
-        autoFocus={props.autoFocus}>
+        {...props}
+        {...buttonProps}>
         <More />
       </ActionButton>
       <Menu