@primer/components 0.0.0-2021103011479 → 0.0.0-2021103011528

package/CHANGELOG.md

@@ -1,10 +1,6 @@
 # @primer/components
 
-## 0.0.0-2021103011479
-
-### Minor Changes
-
-- [#1619](https://github.com/primer/react/pull/1619) [`38e45b33`](https://github.com/primer/react/commit/38e45b33c5efe70134d2459e39ddcfb66941957d) Thanks [@siddharthkp](https://github.com/siddharthkp)! - Add composable `ActionMenu` to `@primer/components/drafts`
+## 0.0.0-2021103011528
 
 ### Patch Changes
 

package/lib/ActionList2/Divider.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
-import { SxProp } from '../sx';
+/// <reference types="react" />
 /**
  * Visually separates `Item`s or `Group`s in an `ActionList`.
  */
-export declare const Divider: React.FC<SxProp>;
+export declare function Divider(): JSX.Element;

package/lib/ActionList2/Divider.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Divider = void 0;
+exports.Divider = Divider;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -11,30 +11,25 @@ var _Box = _interopRequireDefault(require("../Box"));
 
 var _constants = require("../constants");
 
-var _sx = require("../sx");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
  * Visually separates `Item`s or `Group`s in an `ActionList`.
  */
-const Divider = ({
-  sx = {}
-}) => {
+function Divider() {
   return /*#__PURE__*/_react.default.createElement(_Box.default, {
     as: "li",
     role: "separator",
-    sx: (0, _sx.merge)({
+    sx: {
       height: 1,
       backgroundColor: 'actionListItem.inlineDivider',
       marginTop: theme => `calc(${(0, _constants.get)('space.2')(theme)} - 1px)`,
       marginBottom: 2,
       listStyle: 'none' // hide the ::marker inserted by browser's stylesheet
 
-    }, sx),
+    },
     "data-component": "ActionList.Divider"
   });
-};
+}
 
-exports.Divider = Divider;
 Divider.displayName = "Divider";

package/lib/ActionList2/Item.js

@@ -21,8 +21,6 @@ var _createSlots = _interopRequireDefault(require("../utils/create-slots"));
 
 var _List = require("./List");
 
-var _MenuContext = require("./MenuContext");
-
 var _Selection = require("./Selection");
 
 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); }
@@ -84,7 +82,6 @@ const Item = /*#__PURE__*/_react.default.forwardRef(({
   onSelect = () => null,
   sx: sxProp = {},
   id,
-  role,
   _PrivateItemWrapper,
   ...props
 }, forwardedRef) => {
@@ -93,11 +90,6 @@ const Item = /*#__PURE__*/_react.default.forwardRef(({
     showDividers
   } = _react.default.useContext(_List.ListContext);
 
-  const {
-    itemRole,
-    afterSelect
-  } = _react.default.useContext(_MenuContext.MenuContext);
-
   const {
     theme
   } = (0, _ThemeProvider.useTheme)();
@@ -172,23 +164,16 @@ const Item = /*#__PURE__*/_react.default.forwardRef(({
 
   const clickHandler = _react.default.useCallback(event => {
     if (disabled) return;
-
-    if (!event.defaultPrevented) {
-      onSelect(event); // if this Item is inside a Menu, close the Menu
-
-      if (typeof afterSelect === 'function') afterSelect();
-    }
-  }, [onSelect, disabled, afterSelect]);
+    if (!event.defaultPrevented) onSelect(event);
+  }, [onSelect, disabled]);
 
   const keyPressHandler = _react.default.useCallback(event => {
     if (disabled) return;
 
     if (!event.defaultPrevented && [' ', 'Enter'].includes(event.key)) {
-      onSelect(event); // if this Item is inside a Menu, close the Menu
-
-      if (typeof afterSelect === 'function') afterSelect();
+      onSelect(event);
     }
-  }, [onSelect, disabled, afterSelect]); // use props.id if provided, otherwise generate one.
+  }, [onSelect, disabled]); // use props.id if provided, otherwise generate one.
 
 
   const labelId = (0, _ssr.useSSRSafeId)(id);
@@ -211,8 +196,7 @@ const Item = /*#__PURE__*/_react.default.forwardRef(({
     "aria-disabled": disabled ? true : undefined,
     tabIndex: disabled || _PrivateItemWrapper ? undefined : 0,
     "aria-labelledby": `${labelId} ${slots.InlineDescription ? inlineDescriptionId : ''}`,
-    "aria-describedby": slots.BlockDescription ? blockDescriptionId : undefined,
-    role: role || itemRole
+    "aria-describedby": slots.BlockDescription ? blockDescriptionId : undefined
   }, props), /*#__PURE__*/_react.default.createElement(ItemWrapper, null, /*#__PURE__*/_react.default.createElement(_Selection.Selection, {
     selected: selected
   }), slots.LeadingVisual, /*#__PURE__*/_react.default.createElement(_Box.default, {

package/lib/ActionList2/List.js

@@ -11,8 +11,6 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _sx = _interopRequireWildcard(require("../sx"));
 
-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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -34,7 +32,6 @@ const List = /*#__PURE__*/_react.default.forwardRef(({
   variant = 'inset',
   selectionVariant,
   showDividers = false,
-  role,
   sx: sxProp = {},
   ...props
 }, forwardedRef) => {
@@ -44,15 +41,8 @@ const List = /*#__PURE__*/_react.default.forwardRef(({
     // reset ul styles
     paddingY: variant === 'inset' ? 2 : 0
   };
-  /** if list is inside a Menu, it will get a role from the Menu */
-
-  const {
-    listRole
-  } = _react.default.useContext(_MenuContext.MenuContext);
-
   return /*#__PURE__*/_react.default.createElement(ListBox, _extends({
-    sx: (0, _sx.merge)(styles, sxProp),
-    role: role || listRole
+    sx: (0, _sx.merge)(styles, sxProp)
   }, props, {
     ref: forwardedRef
   }), /*#__PURE__*/_react.default.createElement(ListContext.Provider, {

package/lib/ActionList2/Selection.js

@@ -13,8 +13,6 @@ var _List = require("./List");
 
 var _Group = require("./Group");
 
-var _MenuContext = require("./MenuContext");
-
 var _Visuals = require("./Visuals");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -29,10 +27,6 @@ const Selection = ({
   const {
     selectionVariant: groupSelectionVariant
   } = _react.default.useContext(_Group.GroupContext);
-
-  const {
-    parent
-  } = _react.default.useContext(_MenuContext.MenuContext);
   /** selectionVariant in Group can override the selectionVariant in List root */
 
 
@@ -44,11 +38,6 @@ const Selection = ({
     return null;
   }
 
-  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;
-  }
-
   if (selectionVariant === 'single') {
     return /*#__PURE__*/_react.default.createElement(_Visuals.LeadingVisualContainer, null, selected && /*#__PURE__*/_react.default.createElement(_octiconsReact.CheckIcon, null));
   }

package/lib/ActionList2/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { Divider } from './Divider';
 export type { ListProps as ActionListProps } from './List';
 export type { GroupProps } from './Group';
 export type { ItemProps } from './Item';
@@ -25,7 +26,7 @@ export declare const ActionList: import("@radix-ui/react-polymorphic").ForwardRe
         referrerPolicy?: import("react").HTMLAttributeReferrerPolicy | undefined;
     }>;
     /** Visually separates `Item`s or `Group`s in an `ActionList`. */
-    Divider: import("react").FC<import("../sx").SxProp>;
+    Divider: typeof Divider;
     /** Secondary text which provides additional information about an `Item`. */
     Description: import("react").FC<import("./Description").DescriptionProps>;
     /** Icon (or similar) positioned before `Item` text. */

package/lib/drafts.d.ts

@@ -6,4 +6,3 @@
  */
 export * from './ActionList2';
 export * from './NewButton';
-export * from './ActionMenu2';

package/lib/drafts.js

@@ -28,17 +28,4 @@ Object.keys(_NewButton).forEach(function (key) {
       return _NewButton[key];
     }
   });
-});
-
-var _ActionMenu = require("./ActionMenu2");
-
-Object.keys(_ActionMenu).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _ActionMenu[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _ActionMenu[key];
-    }
-  });
 });

package/lib-esm/ActionList2/Divider.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
-import { SxProp } from '../sx';
+/// <reference types="react" />
 /**
  * Visually separates `Item`s or `Group`s in an `ActionList`.
  */
-export declare const Divider: React.FC<SxProp>;
+export declare function Divider(): JSX.Element;

package/lib-esm/ActionList2/Divider.js

@@ -1,26 +1,23 @@
 import React from 'react';
 import Box from '../Box';
 import { get } from '../constants';
-import { merge } from '../sx';
+
 /**
  * Visually separates `Item`s or `Group`s in an `ActionList`.
  */
-
-export const Divider = ({
-  sx = {}
-}) => {
+export function Divider() {
   return /*#__PURE__*/React.createElement(Box, {
     as: "li",
     role: "separator",
-    sx: merge({
+    sx: {
       height: 1,
       backgroundColor: 'actionListItem.inlineDivider',
       marginTop: theme => `calc(${get('space.2')(theme)} - 1px)`,
       marginBottom: 2,
       listStyle: 'none' // hide the ::marker inserted by browser's stylesheet
 
-    }, sx),
+    },
     "data-component": "ActionList.Divider"
   });
-};
+}
 Divider.displayName = "Divider";

package/lib-esm/ActionList2/Item.js

@@ -8,7 +8,6 @@ import Box from '../Box';
 import sx, { merge } from '../sx';
 import createSlots from '../utils/create-slots';
 import { ListContext } from './List';
-import { MenuContext } from './MenuContext';
 import { Selection } from './Selection';
 export const getVariantStyles = (variant, disabled) => {
   if (disabled) {
@@ -55,7 +54,6 @@ export const Item = /*#__PURE__*/React.forwardRef(({
   onSelect = () => null,
   sx: sxProp = {},
   id,
-  role,
   _PrivateItemWrapper,
   ...props
 }, forwardedRef) => {
@@ -63,10 +61,6 @@ export const Item = /*#__PURE__*/React.forwardRef(({
     variant: listVariant,
     showDividers
   } = React.useContext(ListContext);
-  const {
-    itemRole,
-    afterSelect
-  } = React.useContext(MenuContext);
   const {
     theme
   } = useTheme();
@@ -140,22 +134,15 @@ export const Item = /*#__PURE__*/React.forwardRef(({
   };
   const clickHandler = React.useCallback(event => {
     if (disabled) return;
-
-    if (!event.defaultPrevented) {
-      onSelect(event); // if this Item is inside a Menu, close the Menu
-
-      if (typeof afterSelect === 'function') afterSelect();
-    }
-  }, [onSelect, disabled, afterSelect]);
+    if (!event.defaultPrevented) onSelect(event);
+  }, [onSelect, disabled]);
   const keyPressHandler = React.useCallback(event => {
     if (disabled) return;
 
     if (!event.defaultPrevented && [' ', 'Enter'].includes(event.key)) {
-      onSelect(event); // if this Item is inside a Menu, close the Menu
-
-      if (typeof afterSelect === 'function') afterSelect();
+      onSelect(event);
     }
-  }, [onSelect, disabled, afterSelect]); // use props.id if provided, otherwise generate one.
+  }, [onSelect, disabled]); // use props.id if provided, otherwise generate one.
 
   const labelId = useSSRSafeId(id);
   const inlineDescriptionId = useSSRSafeId(id && `${id}--inline-description`);
@@ -177,8 +164,7 @@ export const Item = /*#__PURE__*/React.forwardRef(({
     "aria-disabled": disabled ? true : undefined,
     tabIndex: disabled || _PrivateItemWrapper ? undefined : 0,
     "aria-labelledby": `${labelId} ${slots.InlineDescription ? inlineDescriptionId : ''}`,
-    "aria-describedby": slots.BlockDescription ? blockDescriptionId : undefined,
-    role: role || itemRole
+    "aria-describedby": slots.BlockDescription ? blockDescriptionId : undefined
   }, props), /*#__PURE__*/React.createElement(ItemWrapper, null, /*#__PURE__*/React.createElement(Selection, {
     selected: selected
   }), slots.LeadingVisual, /*#__PURE__*/React.createElement(Box, {

package/lib-esm/ActionList2/List.js

@@ -3,7 +3,6 @@ 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';
 export const ListContext = /*#__PURE__*/React.createContext({});
 const ListBox = styled.ul.withConfig({
   displayName: "List__ListBox",
@@ -13,7 +12,6 @@ export const List = /*#__PURE__*/React.forwardRef(({
   variant = 'inset',
   selectionVariant,
   showDividers = false,
-  role,
   sx: sxProp = {},
   ...props
 }, forwardedRef) => {
@@ -23,14 +21,8 @@ export const List = /*#__PURE__*/React.forwardRef(({
     // reset ul styles
     paddingY: variant === 'inset' ? 2 : 0
   };
-  /** if list is inside a Menu, it will get a role from the Menu */
-
-  const {
-    listRole
-  } = React.useContext(MenuContext);
   return /*#__PURE__*/React.createElement(ListBox, _extends({
-    sx: merge(styles, sxProp),
-    role: role || listRole
+    sx: merge(styles, sxProp)
   }, props, {
     ref: forwardedRef
   }), /*#__PURE__*/React.createElement(ListContext.Provider, {

package/lib-esm/ActionList2/Selection.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { CheckIcon } from '@primer/octicons-react';
 import { ListContext } from './List';
 import { GroupContext } from './Group';
-import { MenuContext } from './MenuContext';
 import { LeadingVisualContainer } from './Visuals';
 export const Selection = ({
   selected
@@ -13,9 +12,6 @@ export const Selection = ({
   const {
     selectionVariant: groupSelectionVariant
   } = React.useContext(GroupContext);
-  const {
-    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,11 +22,6 @@ export const Selection = ({
     return null;
   }
 
-  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;
-  }
-
   if (selectionVariant === 'single') {
     return /*#__PURE__*/React.createElement(LeadingVisualContainer, null, selected && /*#__PURE__*/React.createElement(CheckIcon, null));
   }

package/lib-esm/ActionList2/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { Divider } from './Divider';
 export type { ListProps as ActionListProps } from './List';
 export type { GroupProps } from './Group';
 export type { ItemProps } from './Item';
@@ -25,7 +26,7 @@ export declare const ActionList: import("@radix-ui/react-polymorphic").ForwardRe
         referrerPolicy?: import("react").HTMLAttributeReferrerPolicy | undefined;
     }>;
     /** Visually separates `Item`s or `Group`s in an `ActionList`. */
-    Divider: import("react").FC<import("../sx").SxProp>;
+    Divider: typeof Divider;
     /** Secondary text which provides additional information about an `Item`. */
     Description: import("react").FC<import("./Description").DescriptionProps>;
     /** Icon (or similar) positioned before `Item` text. */

package/lib-esm/drafts.d.ts

@@ -6,4 +6,3 @@
  */
 export * from './ActionList2';
 export * from './NewButton';
-export * from './ActionMenu2';

package/lib-esm/drafts.js

@@ -6,5 +6,4 @@
  */
 // Components
 export * from './ActionList2';
-export * from './NewButton';
-export * from './ActionMenu2';
+export * from './NewButton';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/components",
-  "version": "0.0.0-2021103011479",
+  "version": "0.0.0-2021103011528",
   "description": "Primer react components",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",
@@ -87,7 +87,7 @@
     "@testing-library/user-event": "13.1.9",
     "@types/chroma-js": "2.1.3",
     "@types/enzyme": "3.10.9",
-    "@types/jest": "26.0.23",
+    "@types/jest": "27.0.2",
     "@types/jest-axe": "3.5.3",
     "@types/lodash.isempty": "4.4.6",
     "@types/lodash.isobject": "3.0.6",
@@ -137,7 +137,8 @@
     "storybook-addon-performance": "0.16.1",
     "styled-components": "4.4.1",
     "ts-toolbelt": "9.6.0",
-    "typescript": "4.2.2"
+    "typescript": "4.2.2",
+    "front-matter": "4.0.2"
   },
   "peerDependencies": {
     "react": "^17.0.0",

package/lib/ActionList2/MenuContext.d.ts

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

package/lib/ActionList2/MenuContext.js

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-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 MenuContext = /*#__PURE__*/_react.default.createContext({});
-
-exports.MenuContext = MenuContext;