@primer/components 0.0.0-2021111211759 → 0.0.0-2021111212257

package/lib/ActionList2/{MenuContext.d.ts → ActionListContainerContext.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 = {
-    parent?: string;
+    container?: string;
     listRole?: string;
     itemRole?: string;
-    afterSelect?: () => void;
+    afterSelect?: Function;
 };
-export declare const MenuContext: React.Context<ContextProps>;
+export declare const ActionListContainerContext: React.Context<ContextProps>;
 export {};

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

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MenuContext = void 0;
+exports.ActionListContainerContext = 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 MenuContext = /*#__PURE__*/_react.default.createContext({});
+const ActionListContainerContext = /*#__PURE__*/_react.default.createContext({});
 
-exports.MenuContext = MenuContext;
+exports.ActionListContainerContext = ActionListContainerContext;

package/lib/ActionList2/Item.js

@@ -21,7 +21,7 @@ var _createSlots = _interopRequireDefault(require("../utils/create-slots"));
 
 var _List = require("./List");
 
-var _MenuContext = require("./MenuContext");
+var _ActionListContainerContext = require("./ActionListContainerContext");
 
 var _Selection = require("./Selection");
 
@@ -96,7 +96,7 @@ const Item = /*#__PURE__*/_react.default.forwardRef(({
   const {
     itemRole,
     afterSelect
-  } = _react.default.useContext(_MenuContext.MenuContext);
+  } = _react.default.useContext(_ActionListContainerContext.ActionListContainerContext);
 
   const {
     theme
@@ -171,22 +171,20 @@ const Item = /*#__PURE__*/_react.default.forwardRef(({
   };
 
   const clickHandler = _react.default.useCallback(event => {
-    if (typeof onSelect !== 'function') return;
     if (disabled) return;
 
     if (!event.defaultPrevented) {
-      onSelect(event); // if this Item is inside a Menu, close the Menu
+      if (typeof onSelect === 'function') 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)) {
-      onSelect(event); // if this Item is inside a Menu, close the Menu
+      if (typeof onSelect === 'function') 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 _MenuContext = require("./MenuContext");
+var _ActionListContainerContext = require("./ActionListContainerContext");
 
 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(_MenuContext.MenuContext);
+  } = _react.default.useContext(_ActionListContainerContext.ActionListContainerContext);
 
   return /*#__PURE__*/_react.default.createElement(ListBox, _extends({
     sx: (0, _sx.merge)(styles, sxProp),

package/lib/ActionList2/Selection.js

@@ -13,7 +13,7 @@ var _List = require("./List");
 
 var _Group = require("./Group");
 
-var _MenuContext = require("./MenuContext");
+var _ActionListContainerContext = require("./ActionListContainerContext");
 
 var _Visuals = require("./Visuals");
 
@@ -31,8 +31,8 @@ const Selection = ({
   } = _react.default.useContext(_Group.GroupContext);
 
   const {
-    parent
-  } = _react.default.useContext(_MenuContext.MenuContext);
+    container
+  } = _react.default.useContext(_ActionListContainerContext.ActionListContainerContext);
   /** selectionVariant in Group can override the selectionVariant in List root */
 
 
@@ -44,7 +44,7 @@ const Selection = ({
     return null;
   }
 
-  if (parent === 'ActionMenu') {
+  if (container === '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,10 +1,12 @@
 import { ButtonProps } from './Button';
 import React from 'react';
+import { AnchoredOverlayProps } from './AnchoredOverlay';
 import { OverlayProps } from './Overlay';
-import { AnchoredOverlayWrapperAnchorProps } from './AnchoredOverlay/AnchoredOverlay';
-declare type ActionMenuBaseProps = {
+declare type MenuContextProps = Pick<AnchoredOverlayProps, 'anchorRef' | 'renderAnchor' | 'open' | 'onOpen' | 'onClose'>;
+export declare const MenuContext: React.Context<MenuContextProps>;
+export declare type ActionMenuProps = {
     /**
-     * Recommended: `ActionMenu.Button` or `ActionMenu.Anchor` with ActionList`
+     * Recommended: `ActionMenu.Button` or `ActionMenu.Anchor` with `ActionMenu.Overlay`
      */
     children: React.ReactElement[] | React.ReactElement;
     /**
@@ -15,17 +17,18 @@ declare type ActionMenuBaseProps = {
      * If defined, will control the open/closed state of the overlay. Must be used in conjuction with `open`.
      */
     onOpenChange?: (s: boolean) => void;
-    /**
-     * Props to be spread on the internal `Overlay` component.
-     */
-    overlayProps?: Partial<OverlayProps>;
-};
-export declare type ActionMenuProps = ActionMenuBaseProps & AnchoredOverlayWrapperAnchorProps;
+} & Pick<AnchoredOverlayProps, 'anchorRef'>;
 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;
@@ -305,6 +308,7 @@ export declare const ActionMenu: React.FC<ActionMenuProps> & {
         theme?: any;
     }, "color" | "translate" | "hidden" | "children" | "theme" | "value" | "form" | "slot" | "style" | "title" | "variant" | "role" | "sx" | "type" | "name" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "css" | "as" | "disabled" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget"> & 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 = void 0;
+exports.ActionMenu = exports.MenuContext = void 0;
 
 var _Button = _interopRequireDefault(require("./Button"));
 
@@ -11,59 +11,60 @@ var _react = _interopRequireDefault(require("react"));
 
 var _AnchoredOverlay = require("./AnchoredOverlay");
 
-var _useProvidedStateOrCreate = require("./hooks/useProvidedStateOrCreate");
-
 var _hooks = require("./hooks");
 
 var _Divider = require("./ActionList2/Divider");
 
-var _MenuContext = require("./ActionList2/MenuContext");
+var _ActionListContainerContext = require("./ActionList2/ActionListContainerContext");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const ActionMenuBase = ({
+const MenuContext = /*#__PURE__*/_react.default.createContext({
+  renderAnchor: null,
+  open: false
+});
+
+exports.MenuContext = MenuContext;
+
+const Menu = ({
   anchorRef: externalAnchorRef,
   open,
   onOpenChange,
-  overlayProps,
   children
 }) => {
-  const [combinedOpenState, setCombinedOpenState] = (0, _useProvidedStateOrCreate.useProvidedStateOrCreate)(open, onOpenChange, false);
-  const anchorRef = (0, _hooks.useProvidedRefOrCreate)(externalAnchorRef);
+  const [combinedOpenState, setCombinedOpenState] = (0, _hooks.useProvidedStateOrCreate)(open, onOpenChange, false);
 
   const onOpen = _react.default.useCallback(() => setCombinedOpenState(true), [setCombinedOpenState]);
 
   const onClose = _react.default.useCallback(() => setCombinedOpenState(false), [setCombinedOpenState]);
 
-  let renderAnchor = null;
-  const contents = [];
+  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
 
-  _react.default.Children.map(children, child => {
+  const contents = _react.default.Children.map(children, child => {
     if (child.type === MenuButton || child.type === Anchor) {
       renderAnchor = anchorProps => /*#__PURE__*/_react.default.cloneElement(child, anchorProps);
-    } else {
-      contents.push(child);
+
+      return null;
     }
+
+    return child;
   });
 
-  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, {
+  return /*#__PURE__*/_react.default.createElement(MenuContext.Provider, {
     value: {
-      parent: 'ActionMenu',
-      listRole: 'menu',
-      itemRole: 'menuitem',
-      afterSelect: onClose
+      anchorRef,
+      renderAnchor,
+      open: combinedOpenState,
+      onOpen,
+      onClose
     }
-  }, contents));
+  }, contents);
 };
 
-ActionMenuBase.displayName = "ActionMenuBase";
+Menu.displayName = "Menu";
 
 const Anchor = /*#__PURE__*/_react.default.forwardRef(({
   children,
@@ -82,10 +83,43 @@ const MenuButton = /*#__PURE__*/_react.default.forwardRef((props, anchorRef) =>
   }, /*#__PURE__*/_react.default.createElement(_Button.default, props));
 });
 
-ActionMenuBase.displayName = 'ActionMenu';
-const ActionMenu = Object.assign(ActionMenuBase, {
+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, {
   Button: MenuButton,
   Anchor,
+  Overlay,
   Divider: _Divider.Divider
 });
 exports.ActionMenu = ActionMenu;

package/lib/hooks/index.d.ts

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

package/lib-esm/ActionList2/{MenuContext.d.ts → ActionListContainerContext.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 = {
-    parent?: string;
+    container?: string;
     listRole?: string;
     itemRole?: string;
-    afterSelect?: () => void;
+    afterSelect?: Function;
 };
-export declare const MenuContext: React.Context<ContextProps>;
+export declare const ActionListContainerContext: React.Context<ContextProps>;
 export {};

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

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

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 { MenuContext } from './MenuContext';
+import { ActionListContainerContext } from './ActionListContainerContext';
 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(MenuContext);
+  } = React.useContext(ActionListContainerContext);
   const {
     theme
   } = useTheme();
@@ -139,21 +139,19 @@ export const Item = /*#__PURE__*/React.forwardRef(({
     }
   };
   const clickHandler = React.useCallback(event => {
-    if (typeof onSelect !== 'function') return;
     if (disabled) return;
 
     if (!event.defaultPrevented) {
-      onSelect(event); // if this Item is inside a Menu, close the Menu
+      if (typeof onSelect === 'function') 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)) {
-      onSelect(event); // if this Item is inside a Menu, close the Menu
+      if (typeof onSelect === 'function') 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 { MenuContext } from './MenuContext';
+import { ActionListContainerContext } from './ActionListContainerContext';
 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(MenuContext);
+  } = React.useContext(ActionListContainerContext);
   return /*#__PURE__*/React.createElement(ListBox, _extends({
     sx: merge(styles, sxProp),
     role: role || listRole

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 { MenuContext } from './MenuContext';
+import { ActionListContainerContext } from './ActionListContainerContext';
 import { LeadingVisualContainer } from './Visuals';
 export const Selection = ({
   selected
@@ -14,8 +14,8 @@ export const Selection = ({
     selectionVariant: groupSelectionVariant
   } = React.useContext(GroupContext);
   const {
-    parent
-  } = React.useContext(MenuContext);
+    container
+  } = React.useContext(ActionListContainerContext);
   /** 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 (parent === 'ActionMenu') {
+  if (container === '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,10 +1,12 @@
 import { ButtonProps } from './Button';
 import React from 'react';
+import { AnchoredOverlayProps } from './AnchoredOverlay';
 import { OverlayProps } from './Overlay';
-import { AnchoredOverlayWrapperAnchorProps } from './AnchoredOverlay/AnchoredOverlay';
-declare type ActionMenuBaseProps = {
+declare type MenuContextProps = Pick<AnchoredOverlayProps, 'anchorRef' | 'renderAnchor' | 'open' | 'onOpen' | 'onClose'>;
+export declare const MenuContext: React.Context<MenuContextProps>;
+export declare type ActionMenuProps = {
     /**
-     * Recommended: `ActionMenu.Button` or `ActionMenu.Anchor` with ActionList`
+     * Recommended: `ActionMenu.Button` or `ActionMenu.Anchor` with `ActionMenu.Overlay`
      */
     children: React.ReactElement[] | React.ReactElement;
     /**
@@ -15,17 +17,18 @@ declare type ActionMenuBaseProps = {
      * If defined, will control the open/closed state of the overlay. Must be used in conjuction with `open`.
      */
     onOpenChange?: (s: boolean) => void;
-    /**
-     * Props to be spread on the internal `Overlay` component.
-     */
-    overlayProps?: Partial<OverlayProps>;
-};
-export declare type ActionMenuProps = ActionMenuBaseProps & AnchoredOverlayWrapperAnchorProps;
+} & Pick<AnchoredOverlayProps, 'anchorRef'>;
 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;
@@ -305,6 +308,7 @@ export declare const ActionMenu: React.FC<ActionMenuProps> & {
         theme?: any;
     }, "color" | "translate" | "hidden" | "children" | "theme" | "value" | "form" | "slot" | "style" | "title" | "variant" | "role" | "sx" | "type" | "name" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "css" | "as" | "disabled" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget"> & 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 { useProvidedStateOrCreate } from './hooks/useProvidedStateOrCreate';
-import { useProvidedRefOrCreate } from './hooks';
+import { useProvidedRefOrCreate, useProvidedStateOrCreate } from './hooks';
 import { Divider } from './ActionList2/Divider';
-import { MenuContext as ActionListMenuContext } from './ActionList2/MenuContext';
+import { ActionListContainerContext } from './ActionList2/ActionListContainerContext';
+export const MenuContext = /*#__PURE__*/React.createContext({
+  renderAnchor: null,
+  open: false
+});
 
-const ActionMenuBase = ({
+const Menu = ({
   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]);
-  let renderAnchor = null;
-  const contents = [];
-  React.Children.map(children, child => {
+  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 => {
     if (child.type === MenuButton || child.type === Anchor) {
       renderAnchor = anchorProps => /*#__PURE__*/React.cloneElement(child, anchorProps);
-    } else {
-      contents.push(child);
+
+      return null;
     }
+
+    return child;
   });
-  return /*#__PURE__*/React.createElement(AnchoredOverlay, {
-    renderAnchor: renderAnchor,
-    anchorRef: anchorRef,
-    open: combinedOpenState,
-    onOpen: onOpen,
-    onClose: onClose,
-    overlayProps: overlayProps
-  }, /*#__PURE__*/React.createElement(ActionListMenuContext.Provider, {
+  return /*#__PURE__*/React.createElement(MenuContext.Provider, {
     value: {
-      parent: 'ActionMenu',
-      listRole: 'menu',
-      itemRole: 'menuitem',
-      afterSelect: onClose
+      anchorRef,
+      renderAnchor,
+      open: combinedOpenState,
+      onOpen,
+      onClose
     }
-  }, contents));
+  }, contents);
 };
 
-ActionMenuBase.displayName = "ActionMenuBase";
+Menu.displayName = "Menu";
 const Anchor = /*#__PURE__*/React.forwardRef(({
   children,
   ...anchorProps
@@ -59,9 +59,42 @@ const MenuButton = /*#__PURE__*/React.forwardRef((props, anchorRef) => {
     ref: anchorRef
   }, /*#__PURE__*/React.createElement(Button, props));
 });
-ActionMenuBase.displayName = 'ActionMenu';
-export const ActionMenu = Object.assign(ActionMenuBase, {
+
+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, {
   Button: MenuButton,
   Anchor,
+  Overlay,
   Divider
 });