@primer/components 0.0.0-2021116182158 → 0.0.0-2021116202431

package/lib/ActionList2/Item.js

@@ -21,7 +21,7 @@ var _createSlots = _interopRequireDefault(require("../utils/create-slots"));
 
 var _List = require("./List");
 
-var _ActionListContainerContext = require("./ActionListContainerContext");
+var _MenuContext = require("./MenuContext");
 
 var _Selection = require("./Selection");
 
@@ -96,7 +96,7 @@ const Item = /*#__PURE__*/_react.default.forwardRef(({
   const {
     itemRole,
     afterSelect
-  } = _react.default.useContext(_ActionListContainerContext.ActionListContainerContext);
+  } = _react.default.useContext(_MenuContext.MenuContext);
 
   const {
     theme
@@ -171,20 +171,22 @@ const Item = /*#__PURE__*/_react.default.forwardRef(({
   };
 
   const clickHandler = _react.default.useCallback(event => {
+    if (typeof onSelect !== 'function') return;
     if (disabled) return;
 
     if (!event.defaultPrevented) {
-      if (typeof onSelect === 'function') onSelect(event); // if this Item is inside a Menu, close the Menu
+      onSelect(event); // if this Item is inside a Menu, close the Menu
 
       if (typeof afterSelect === 'function') afterSelect();
     }
   }, [onSelect, disabled, afterSelect]);
 
   const keyPressHandler = _react.default.useCallback(event => {
+    if (typeof onSelect !== 'function') return;
     if (disabled) return;
 
     if (!event.defaultPrevented && [' ', 'Enter'].includes(event.key)) {
-      if (typeof onSelect === 'function') onSelect(event); // if this Item is inside a Menu, close the Menu
+      onSelect(event); // if this Item is inside a Menu, close the Menu
 
       if (typeof afterSelect === 'function') afterSelect();
     }

package/lib/ActionList2/List.js

@@ -11,7 +11,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _sx = _interopRequireWildcard(require("../sx"));
 
-var _ActionListContainerContext = require("./ActionListContainerContext");
+var _MenuContext = require("./MenuContext");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -48,7 +48,7 @@ const List = /*#__PURE__*/_react.default.forwardRef(({
 
   const {
     listRole
-  } = _react.default.useContext(_ActionListContainerContext.ActionListContainerContext);
+  } = _react.default.useContext(_MenuContext.MenuContext);
 
   return /*#__PURE__*/_react.default.createElement(ListBox, _extends({
     sx: (0, _sx.merge)(styles, sxProp),

package/lib/ActionList2/{ActionListContainerContext.d.ts → MenuContext.d.ts}

@@ -1,10 +1,10 @@
 /** This context can be used by components that compose ActionList inside a Menu */
 import React from 'react';
 declare type ContextProps = {
-    container?: string;
+    parent?: string;
     listRole?: string;
     itemRole?: string;
-    afterSelect?: Function;
+    afterSelect?: () => void;
 };
-export declare const ActionListContainerContext: React.Context<ContextProps>;
+export declare const MenuContext: React.Context<ContextProps>;
 export {};

package/lib/ActionList2/{ActionListContainerContext.js → MenuContext.js}

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ActionListContainerContext = void 0;
+exports.MenuContext = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /** This context can be used by components that compose ActionList inside a Menu */
-const ActionListContainerContext = /*#__PURE__*/_react.default.createContext({});
+const MenuContext = /*#__PURE__*/_react.default.createContext({});
 
-exports.ActionListContainerContext = ActionListContainerContext;
+exports.MenuContext = MenuContext;

package/lib/ActionList2/Selection.js

@@ -13,7 +13,7 @@ var _List = require("./List");
 
 var _Group = require("./Group");
 
-var _ActionListContainerContext = require("./ActionListContainerContext");
+var _MenuContext = require("./MenuContext");
 
 var _Visuals = require("./Visuals");
 
@@ -31,8 +31,8 @@ const Selection = ({
   } = _react.default.useContext(_Group.GroupContext);
 
   const {
-    container
-  } = _react.default.useContext(_ActionListContainerContext.ActionListContainerContext);
+    parent
+  } = _react.default.useContext(_MenuContext.MenuContext);
   /** selectionVariant in Group can override the selectionVariant in List root */
 
 
@@ -44,7 +44,7 @@ const Selection = ({
     return null;
   }
 
-  if (container === 'ActionMenu') {
+  if (parent === 'ActionMenu') {
     throw new Error('ActionList cannot have a selectionVariant inside ActionMenu, please use DropdownMenu or SelectPanel instead. More information: https://primer.style/design/components/action-list#application');
     return null;
   }

package/lib/ActionMenu2.d.ts

@@ -1,12 +1,10 @@
 import { ButtonProps } from './Button';
 import React from 'react';
-import { AnchoredOverlayProps } from './AnchoredOverlay';
 import { OverlayProps } from './Overlay';
-declare type MenuContextProps = Pick<AnchoredOverlayProps, 'anchorRef' | 'renderAnchor' | 'open' | 'onOpen' | 'onClose'>;
-export declare const MenuContext: React.Context<MenuContextProps>;
-export declare type ActionMenuProps = {
+import { AnchoredOverlayWrapperAnchorProps } from './AnchoredOverlay/AnchoredOverlay';
+declare type ActionMenuBaseProps = {
     /**
-     * Recommended: `ActionMenu.Button` or `ActionMenu.Anchor` with `ActionMenu.Overlay`
+     * Recommended: `ActionMenu.Button` or `ActionMenu.Anchor` with ActionList`
      */
     children: React.ReactElement[] | React.ReactElement;
     /**
@@ -17,18 +15,17 @@ export declare type ActionMenuProps = {
      * If defined, will control the open/closed state of the overlay. Must be used in conjuction with `open`.
      */
     onOpenChange?: (s: boolean) => void;
-} & Pick<AnchoredOverlayProps, 'anchorRef'>;
+    /**
+     * Props to be spread on the internal `Overlay` component.
+     */
+    overlayProps?: Partial<OverlayProps>;
+};
+export declare type ActionMenuProps = ActionMenuBaseProps & AnchoredOverlayWrapperAnchorProps;
 export declare type MenuAnchorProps = {
     children: React.ReactElement;
 };
 /** this component is syntactical sugar 🍭 */
 export declare type MenuButtonProps = ButtonProps;
-declare type MenuOverlayProps = Partial<OverlayProps> & {
-    /**
-     * Recommended: `ActionList`
-     */
-    children: React.ReactElement[] | React.ReactElement;
-};
 export declare const ActionMenu: React.FC<ActionMenuProps> & {
     Button: React.ForwardRefExoticComponent<Pick<{
         color?: string | undefined;
@@ -311,7 +308,6 @@ export declare const ActionMenu: React.FC<ActionMenuProps> & {
         variant?: "small" | "medium" | "large" | undefined;
     }> & React.RefAttributes<React.RefObject<HTMLElement> | undefined>>;
     Anchor: React.ForwardRefExoticComponent<MenuAnchorProps & React.RefAttributes<React.RefObject<HTMLElement> | undefined>>;
-    Overlay: React.FC<MenuOverlayProps>;
     Divider: React.FC<import("./sx").SxProp>;
 };
 export {};

package/lib/ActionMenu2.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ActionMenu = exports.MenuContext = void 0;
+exports.ActionMenu = void 0;
 
 var _Button = _interopRequireDefault(require("./Button"));
 
@@ -11,60 +11,59 @@ var _react = _interopRequireDefault(require("react"));
 
 var _AnchoredOverlay = require("./AnchoredOverlay");
 
+var _useProvidedStateOrCreate = require("./hooks/useProvidedStateOrCreate");
+
 var _hooks = require("./hooks");
 
 var _Divider = require("./ActionList2/Divider");
 
-var _ActionListContainerContext = require("./ActionList2/ActionListContainerContext");
+var _MenuContext = require("./ActionList2/MenuContext");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const MenuContext = /*#__PURE__*/_react.default.createContext({
-  renderAnchor: null,
-  open: false
-});
-
-exports.MenuContext = MenuContext;
-
-const Menu = ({
+const ActionMenuBase = ({
   anchorRef: externalAnchorRef,
   open,
   onOpenChange,
+  overlayProps,
   children
 }) => {
-  const [combinedOpenState, setCombinedOpenState] = (0, _hooks.useProvidedStateOrCreate)(open, onOpenChange, false);
+  const [combinedOpenState, setCombinedOpenState] = (0, _useProvidedStateOrCreate.useProvidedStateOrCreate)(open, onOpenChange, false);
+  const anchorRef = (0, _hooks.useProvidedRefOrCreate)(externalAnchorRef);
 
   const onOpen = _react.default.useCallback(() => setCombinedOpenState(true), [setCombinedOpenState]);
 
   const onClose = _react.default.useCallback(() => setCombinedOpenState(false), [setCombinedOpenState]);
 
-  const anchorRef = (0, _hooks.useProvidedRefOrCreate)(externalAnchorRef);
-  let renderAnchor = null; // 🚨 Hack for good API!
-  // we strip out Anchor from children and pass it to AnchoredOverlay to render
-  // with additional props for accessibility
+  let renderAnchor = null;
+  const contents = [];
 
-  const contents = _react.default.Children.map(children, child => {
+  _react.default.Children.map(children, child => {
     if (child.type === MenuButton || child.type === Anchor) {
       renderAnchor = anchorProps => /*#__PURE__*/_react.default.cloneElement(child, anchorProps);
-
-      return null;
+    } else {
+      contents.push(child);
     }
-
-    return child;
   });
 
-  return /*#__PURE__*/_react.default.createElement(MenuContext.Provider, {
+  return /*#__PURE__*/_react.default.createElement(_AnchoredOverlay.AnchoredOverlay, {
+    renderAnchor: renderAnchor,
+    anchorRef: anchorRef,
+    open: combinedOpenState,
+    onOpen: onOpen,
+    onClose: onClose,
+    overlayProps: overlayProps
+  }, /*#__PURE__*/_react.default.createElement(_MenuContext.MenuContext.Provider, {
     value: {
-      anchorRef,
-      renderAnchor,
-      open: combinedOpenState,
-      onOpen,
-      onClose
+      parent: 'ActionMenu',
+      listRole: 'menu',
+      itemRole: 'menuitem',
+      afterSelect: onClose
     }
-  }, contents);
+  }, contents));
 };
 
-Menu.displayName = "Menu";
+ActionMenuBase.displayName = "ActionMenuBase";
 
 const Anchor = /*#__PURE__*/_react.default.forwardRef(({
   children,
@@ -83,43 +82,10 @@ const MenuButton = /*#__PURE__*/_react.default.forwardRef((props, anchorRef) =>
   }, /*#__PURE__*/_react.default.createElement(_Button.default, props));
 });
 
-const Overlay = ({
-  children,
-  ...overlayProps
-}) => {
-  // we typecast anchorRef as required instead of optional
-  // because we know that we're setting it in context in Menu
-  const {
-    anchorRef,
-    renderAnchor,
-    open,
-    onOpen,
-    onClose
-  } = _react.default.useContext(MenuContext);
-
-  return /*#__PURE__*/_react.default.createElement(_AnchoredOverlay.AnchoredOverlay, {
-    anchorRef: anchorRef,
-    renderAnchor: renderAnchor,
-    open: open,
-    onOpen: onOpen,
-    onClose: onClose,
-    overlayProps: overlayProps
-  }, /*#__PURE__*/_react.default.createElement(_ActionListContainerContext.ActionListContainerContext.Provider, {
-    value: {
-      container: 'ActionMenu',
-      listRole: 'menu',
-      itemRole: 'menuitem',
-      afterSelect: onClose
-    }
-  }, children));
-};
-
-Overlay.displayName = "Overlay";
-Menu.displayName = 'ActionMenu';
-const ActionMenu = Object.assign(Menu, {
+ActionMenuBase.displayName = 'ActionMenu';
+const ActionMenu = Object.assign(ActionMenuBase, {
   Button: MenuButton,
   Anchor,
-  Overlay,
   Divider: _Divider.Divider
 });
 exports.ActionMenu = ActionMenu;

package/lib/Checkbox.d.ts

@@ -25,5 +25,5 @@ export declare type CheckboxProps = {
 /**
  * An accessible, native checkbox component
  */
-declare const Checkbox: React.ForwardRefExoticComponent<Pick<CheckboxProps, "sx" | keyof React.InputHTMLAttributes<HTMLInputElement> | "validationStatus" | "indeterminate"> & React.RefAttributes<HTMLInputElement>>;
+declare const Checkbox: React.ForwardRefExoticComponent<Pick<CheckboxProps, "sx" | keyof React.InputHTMLAttributes<HTMLInputElement> | "indeterminate" | "validationStatus"> & React.RefAttributes<HTMLInputElement>>;
 export default Checkbox;

package/lib/hooks/index.d.ts

@@ -9,4 +9,3 @@ export { useAnchoredPosition } from './useAnchoredPosition';
 export { useOverlay } from './useOverlay';
 export type { UseOverlaySettings } from './useOverlay';
 export { useRenderForcingRef } from './useRenderForcingRef';
-export { useProvidedStateOrCreate } from './useProvidedStateOrCreate';

package/lib/hooks/index.js

@@ -45,12 +45,6 @@ Object.defineProperty(exports, "useRenderForcingRef", {
     return _useRenderForcingRef.useRenderForcingRef;
   }
 });
-Object.defineProperty(exports, "useProvidedStateOrCreate", {
-  enumerable: true,
-  get: function () {
-    return _useProvidedStateOrCreate.useProvidedStateOrCreate;
-  }
-});
 
 var _useOnOutsideClick = require("./useOnOutsideClick");
 
@@ -64,6 +58,4 @@ var _useAnchoredPosition = require("./useAnchoredPosition");
 
 var _useOverlay = require("./useOverlay");
 
-var _useRenderForcingRef = require("./useRenderForcingRef");
-
-var _useProvidedStateOrCreate = require("./useProvidedStateOrCreate");
+var _useRenderForcingRef = require("./useRenderForcingRef");

package/lib/index.d.ts

@@ -21,8 +21,6 @@ export { useOpenAndCloseFocus } from './hooks/useOpenAndCloseFocus';
 export { useOnEscapePress } from './hooks/useOnEscapePress';
 export { useOverlay } from './hooks/useOverlay';
 export { useConfirm } from './Dialog/ConfirmationDialog';
-export { default as Radio } from './Radio';
-export type { RadioProps } from './Radio';
 export { ActionList } from './ActionList';
 export { ActionMenu } from './ActionMenu';
 export type { ActionMenuProps } from './ActionMenu';

package/lib/index.js

@@ -141,12 +141,6 @@ Object.defineProperty(exports, "ConfirmationDialog", {
     return _ConfirmationDialog.ConfirmationDialog;
   }
 });
-Object.defineProperty(exports, "Radio", {
-  enumerable: true,
-  get: function () {
-    return _Radio.default;
-  }
-});
 Object.defineProperty(exports, "ActionList", {
   enumerable: true,
   get: function () {
@@ -552,8 +546,6 @@ var _useOverlay = require("./hooks/useOverlay");
 
 var _ConfirmationDialog = require("./Dialog/ConfirmationDialog");
 
-var _Radio = _interopRequireDefault(require("./Radio"));
-
 var _ActionList = require("./ActionList");
 
 var _ActionMenu = require("./ActionMenu");

package/lib-esm/ActionList2/Item.js

@@ -8,7 +8,7 @@ import Box from '../Box';
 import sx, { merge } from '../sx';
 import createSlots from '../utils/create-slots';
 import { ListContext } from './List';
-import { ActionListContainerContext } from './ActionListContainerContext';
+import { MenuContext } from './MenuContext';
 import { Selection } from './Selection';
 export const getVariantStyles = (variant, disabled) => {
   if (disabled) {
@@ -66,7 +66,7 @@ export const Item = /*#__PURE__*/React.forwardRef(({
   const {
     itemRole,
     afterSelect
-  } = React.useContext(ActionListContainerContext);
+  } = React.useContext(MenuContext);
   const {
     theme
   } = useTheme();
@@ -139,19 +139,21 @@ export const Item = /*#__PURE__*/React.forwardRef(({
     }
   };
   const clickHandler = React.useCallback(event => {
+    if (typeof onSelect !== 'function') return;
     if (disabled) return;
 
     if (!event.defaultPrevented) {
-      if (typeof onSelect === 'function') onSelect(event); // if this Item is inside a Menu, close the Menu
+      onSelect(event); // if this Item is inside a Menu, close the Menu
 
       if (typeof afterSelect === 'function') afterSelect();
     }
   }, [onSelect, disabled, afterSelect]);
   const keyPressHandler = React.useCallback(event => {
+    if (typeof onSelect !== 'function') return;
     if (disabled) return;
 
     if (!event.defaultPrevented && [' ', 'Enter'].includes(event.key)) {
-      if (typeof onSelect === 'function') onSelect(event); // if this Item is inside a Menu, close the Menu
+      onSelect(event); // if this Item is inside a Menu, close the Menu
 
       if (typeof afterSelect === 'function') afterSelect();
     }

package/lib-esm/ActionList2/List.js

@@ -3,7 +3,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 import React from 'react';
 import styled from 'styled-components';
 import sx, { merge } from '../sx';
-import { ActionListContainerContext } from './ActionListContainerContext';
+import { MenuContext } from './MenuContext';
 export const ListContext = /*#__PURE__*/React.createContext({});
 const ListBox = styled.ul.withConfig({
   displayName: "List__ListBox",
@@ -27,7 +27,7 @@ export const List = /*#__PURE__*/React.forwardRef(({
 
   const {
     listRole
-  } = React.useContext(ActionListContainerContext);
+  } = React.useContext(MenuContext);
   return /*#__PURE__*/React.createElement(ListBox, _extends({
     sx: merge(styles, sxProp),
     role: role || listRole

package/lib-esm/ActionList2/{ActionListContainerContext.d.ts → MenuContext.d.ts}

@@ -1,10 +1,10 @@
 /** This context can be used by components that compose ActionList inside a Menu */
 import React from 'react';
 declare type ContextProps = {
-    container?: string;
+    parent?: string;
     listRole?: string;
     itemRole?: string;
-    afterSelect?: Function;
+    afterSelect?: () => void;
 };
-export declare const ActionListContainerContext: React.Context<ContextProps>;
+export declare const MenuContext: React.Context<ContextProps>;
 export {};

package/lib-esm/ActionList2/{ActionListContainerContext.js → MenuContext.js}

@@ -1,3 +1,3 @@
 /** This context can be used by components that compose ActionList inside a Menu */
 import React from 'react';
-export const ActionListContainerContext = /*#__PURE__*/React.createContext({});
+export const MenuContext = /*#__PURE__*/React.createContext({});

package/lib-esm/ActionList2/Selection.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { CheckIcon } from '@primer/octicons-react';
 import { ListContext } from './List';
 import { GroupContext } from './Group';
-import { ActionListContainerContext } from './ActionListContainerContext';
+import { MenuContext } from './MenuContext';
 import { LeadingVisualContainer } from './Visuals';
 export const Selection = ({
   selected
@@ -14,8 +14,8 @@ export const Selection = ({
     selectionVariant: groupSelectionVariant
   } = React.useContext(GroupContext);
   const {
-    container
-  } = React.useContext(ActionListContainerContext);
+    parent
+  } = React.useContext(MenuContext);
   /** selectionVariant in Group can override the selectionVariant in List root */
 
   const selectionVariant = typeof groupSelectionVariant !== 'undefined' ? groupSelectionVariant : listSelectionVariant; // if selectionVariant is not set on List, don't show selection
@@ -26,7 +26,7 @@ export const Selection = ({
     return null;
   }
 
-  if (container === 'ActionMenu') {
+  if (parent === 'ActionMenu') {
     throw new Error('ActionList cannot have a selectionVariant inside ActionMenu, please use DropdownMenu or SelectPanel instead. More information: https://primer.style/design/components/action-list#application');
     return null;
   }

package/lib-esm/ActionMenu2.d.ts

@@ -1,12 +1,10 @@
 import { ButtonProps } from './Button';
 import React from 'react';
-import { AnchoredOverlayProps } from './AnchoredOverlay';
 import { OverlayProps } from './Overlay';
-declare type MenuContextProps = Pick<AnchoredOverlayProps, 'anchorRef' | 'renderAnchor' | 'open' | 'onOpen' | 'onClose'>;
-export declare const MenuContext: React.Context<MenuContextProps>;
-export declare type ActionMenuProps = {
+import { AnchoredOverlayWrapperAnchorProps } from './AnchoredOverlay/AnchoredOverlay';
+declare type ActionMenuBaseProps = {
     /**
-     * Recommended: `ActionMenu.Button` or `ActionMenu.Anchor` with `ActionMenu.Overlay`
+     * Recommended: `ActionMenu.Button` or `ActionMenu.Anchor` with ActionList`
      */
     children: React.ReactElement[] | React.ReactElement;
     /**
@@ -17,18 +15,17 @@ export declare type ActionMenuProps = {
      * If defined, will control the open/closed state of the overlay. Must be used in conjuction with `open`.
      */
     onOpenChange?: (s: boolean) => void;
-} & Pick<AnchoredOverlayProps, 'anchorRef'>;
+    /**
+     * Props to be spread on the internal `Overlay` component.
+     */
+    overlayProps?: Partial<OverlayProps>;
+};
+export declare type ActionMenuProps = ActionMenuBaseProps & AnchoredOverlayWrapperAnchorProps;
 export declare type MenuAnchorProps = {
     children: React.ReactElement;
 };
 /** this component is syntactical sugar 🍭 */
 export declare type MenuButtonProps = ButtonProps;
-declare type MenuOverlayProps = Partial<OverlayProps> & {
-    /**
-     * Recommended: `ActionList`
-     */
-    children: React.ReactElement[] | React.ReactElement;
-};
 export declare const ActionMenu: React.FC<ActionMenuProps> & {
     Button: React.ForwardRefExoticComponent<Pick<{
         color?: string | undefined;
@@ -311,7 +308,6 @@ export declare const ActionMenu: React.FC<ActionMenuProps> & {
         variant?: "small" | "medium" | "large" | undefined;
     }> & React.RefAttributes<React.RefObject<HTMLElement> | undefined>>;
     Anchor: React.ForwardRefExoticComponent<MenuAnchorProps & React.RefAttributes<React.RefObject<HTMLElement> | undefined>>;
-    Overlay: React.FC<MenuOverlayProps>;
     Divider: React.FC<import("./sx").SxProp>;
 };
 export {};

package/lib-esm/ActionMenu2.js

@@ -1,49 +1,49 @@
 import Button from './Button';
 import React from 'react';
 import { AnchoredOverlay } from './AnchoredOverlay';
-import { useProvidedRefOrCreate, useProvidedStateOrCreate } from './hooks';
+import { useProvidedStateOrCreate } from './hooks/useProvidedStateOrCreate';
+import { useProvidedRefOrCreate } from './hooks';
 import { Divider } from './ActionList2/Divider';
-import { ActionListContainerContext } from './ActionList2/ActionListContainerContext';
-export const MenuContext = /*#__PURE__*/React.createContext({
-  renderAnchor: null,
-  open: false
-});
+import { MenuContext as ActionListMenuContext } from './ActionList2/MenuContext';
 
-const Menu = ({
+const ActionMenuBase = ({
   anchorRef: externalAnchorRef,
   open,
   onOpenChange,
+  overlayProps,
   children
 }) => {
   const [combinedOpenState, setCombinedOpenState] = useProvidedStateOrCreate(open, onOpenChange, false);
+  const anchorRef = useProvidedRefOrCreate(externalAnchorRef);
   const onOpen = React.useCallback(() => setCombinedOpenState(true), [setCombinedOpenState]);
   const onClose = React.useCallback(() => setCombinedOpenState(false), [setCombinedOpenState]);
-  const anchorRef = useProvidedRefOrCreate(externalAnchorRef);
-  let renderAnchor = null; // 🚨 Hack for good API!
-  // we strip out Anchor from children and pass it to AnchoredOverlay to render
-  // with additional props for accessibility
-
-  const contents = React.Children.map(children, child => {
+  let renderAnchor = null;
+  const contents = [];
+  React.Children.map(children, child => {
     if (child.type === MenuButton || child.type === Anchor) {
       renderAnchor = anchorProps => /*#__PURE__*/React.cloneElement(child, anchorProps);
-
-      return null;
+    } else {
+      contents.push(child);
     }
-
-    return child;
   });
-  return /*#__PURE__*/React.createElement(MenuContext.Provider, {
+  return /*#__PURE__*/React.createElement(AnchoredOverlay, {
+    renderAnchor: renderAnchor,
+    anchorRef: anchorRef,
+    open: combinedOpenState,
+    onOpen: onOpen,
+    onClose: onClose,
+    overlayProps: overlayProps
+  }, /*#__PURE__*/React.createElement(ActionListMenuContext.Provider, {
     value: {
-      anchorRef,
-      renderAnchor,
-      open: combinedOpenState,
-      onOpen,
-      onClose
+      parent: 'ActionMenu',
+      listRole: 'menu',
+      itemRole: 'menuitem',
+      afterSelect: onClose
     }
-  }, contents);
+  }, contents));
 };
 
-Menu.displayName = "Menu";
+ActionMenuBase.displayName = "ActionMenuBase";
 const Anchor = /*#__PURE__*/React.forwardRef(({
   children,
   ...anchorProps
@@ -59,42 +59,9 @@ const MenuButton = /*#__PURE__*/React.forwardRef((props, anchorRef) => {
     ref: anchorRef
   }, /*#__PURE__*/React.createElement(Button, props));
 });
-
-const Overlay = ({
-  children,
-  ...overlayProps
-}) => {
-  // we typecast anchorRef as required instead of optional
-  // because we know that we're setting it in context in Menu
-  const {
-    anchorRef,
-    renderAnchor,
-    open,
-    onOpen,
-    onClose
-  } = React.useContext(MenuContext);
-  return /*#__PURE__*/React.createElement(AnchoredOverlay, {
-    anchorRef: anchorRef,
-    renderAnchor: renderAnchor,
-    open: open,
-    onOpen: onOpen,
-    onClose: onClose,
-    overlayProps: overlayProps
-  }, /*#__PURE__*/React.createElement(ActionListContainerContext.Provider, {
-    value: {
-      container: 'ActionMenu',
-      listRole: 'menu',
-      itemRole: 'menuitem',
-      afterSelect: onClose
-    }
-  }, children));
-};
-
-Overlay.displayName = "Overlay";
-Menu.displayName = 'ActionMenu';
-export const ActionMenu = Object.assign(Menu, {
+ActionMenuBase.displayName = 'ActionMenu';
+export const ActionMenu = Object.assign(ActionMenuBase, {
   Button: MenuButton,
   Anchor,
-  Overlay,
   Divider
 });