Merge pull request #1454 from cozy/action-menu-improvs

ActionMenu improvements
cozy · Apr 30, 2020 · 4bdc571 · 4bdc571
2 parents 9495576 + d3b5125
commit 4bdc571
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/react/ActionMenu/index.jsx b/react/ActionMenu/index.jsx
@@ -129,14 +129,23 @@ ActionMenu.defaultProps = {
   autoclose: false
 }
 
-const ActionMenuHeader = ({ children }) => {
-  return <div className={styles['c-actionmenu-header']}>{children}</div>
+const ActionMenuHeader = ({ children, className }) => {
+  return (
+    <div className={cx(styles['c-actionmenu-header'], className)}>
+      {children}
+    </div>
+  )
+}
+
+ActionMenuHeader.propTypes = {
+  children: PropTypes.node,
+  className: PropTypes.string
 }
 
-const ActionMenuItem = ({ left, children, right, onClick }) => {
+const ActionMenuItem = ({ left, children, right, onClick, className }) => {
   return (
     <Media
-      className={styles['c-actionmenu-item']}
+      className={cx(styles['c-actionmenu-item'], className)}
       onClick={onClick}
       align="top"
     >
@@ -151,7 +160,8 @@ ActionMenuItem.propTypes = {
   left: PropTypes.node,
   right: PropTypes.node,
   children: PropTypes.node,
-  onClick: PropTypes.func
+  onClick: PropTypes.func,
+  className: PropTypes.string
 }
 export default withBreakpoints()(ActionMenu)
 export { ActionMenuHeader, ActionMenuItem }
diff --git a/stylus/components/action-menu.styl b/stylus/components/action-menu.styl
@@ -4,7 +4,7 @@
 
 $actionmenu
     @extend $popover
-
+    color var(--charcoalGrey)
     hr
         margin-top 0