@primer/components 0.0.0-2021926103714 → 0.0.0-202192613168

package/lib/ActionList/Item.d.ts

@@ -28,13 +28,19 @@ export interface ItemProps extends SxProp {
      */
     leadingVisual?: React.FunctionComponent<IconProps>;
     /**
+     * @deprecated Use `trailingVisual` instead
      * Icon (or similar) positioned after `Item` text.
      */
     trailingIcon?: React.FunctionComponent<IconProps>;
     /**
+     * @deprecated Use `trailingVisual` instead
      * Text positioned after `Item` text and optional trailing icon.
      */
     trailingText?: string;
+    /**
+     * Icon or text positioned after `Item` text.
+     */
+    trailingVisual?: React.ReactNode;
     /**
      * Style variations associated with various `Item` types.
      *

package/lib/ActionList/Item.js

@@ -187,6 +187,7 @@ const Item = /*#__PURE__*/_react.default.forwardRef((itemProps, ref) => {
     selectionVariant,
     leadingVisual: LeadingVisual,
     trailingIcon: TrailingIcon,
+    trailingVisual: TrailingVisual,
     trailingText,
     variant = 'default',
     showDivider,
@@ -278,7 +279,10 @@ const Item = /*#__PURE__*/_react.default.forwardRef((itemProps, ref) => {
     title: description,
     inline: true,
     maxWidth: "100%"
-  }, description)) : null), TrailingIcon || trailingText ? /*#__PURE__*/_react.default.createElement(TrailingContent, {
+  }, description)) : null), TrailingVisual ? /*#__PURE__*/_react.default.createElement(TrailingContent, {
+    variant: variant,
+    disabled: disabled
+  }, typeof TrailingVisual === 'function' ? /*#__PURE__*/_react.default.createElement(TrailingVisual, null) : TrailingVisual) : TrailingIcon || trailingText ? /*#__PURE__*/_react.default.createElement(TrailingContent, {
     variant: variant,
     disabled: disabled
   }, trailingText, TrailingIcon && /*#__PURE__*/_react.default.createElement(TrailingIcon, null)) : null));

package/lib/index.d.ts

@@ -22,7 +22,6 @@ export { useOnEscapePress } from './hooks/useOnEscapePress';
 export { useOverlay } from './hooks/useOverlay';
 export { useConfirm } from './Dialog/ConfirmationDialog';
 export { ActionList } from './ActionList';
-export { ActionList as ActionList2 } from './ActionList2';
 export { ActionMenu } from './ActionMenu';
 export type { ActionMenuProps } from './ActionMenu';
 export { default as Autocomplete } from './Autocomplete';

package/lib/index.js

@@ -147,12 +147,6 @@ Object.defineProperty(exports, "ActionList", {
     return _ActionList.ActionList;
   }
 });
-Object.defineProperty(exports, "ActionList2", {
-  enumerable: true,
-  get: function () {
-    return _ActionList2.ActionList;
-  }
-});
 Object.defineProperty(exports, "ActionMenu", {
   enumerable: true,
   get: function () {
@@ -542,8 +536,6 @@ var _ConfirmationDialog = require("./Dialog/ConfirmationDialog");
 
 var _ActionList = require("./ActionList");
 
-var _ActionList2 = require("./ActionList2");
-
 var _ActionMenu = require("./ActionMenu");
 
 var _Autocomplete = _interopRequireDefault(require("./Autocomplete"));

package/lib/sx.d.ts

@@ -1,8 +1,6 @@
 import { SystemStyleObject } from '@styled-system/css';
-import merge from 'deepmerge';
 export interface SxProp {
     sx?: SystemStyleObject;
 }
 declare const sx: (props: SxProp) => import("@styled-system/css").CssFunctionReturnType;
 export default sx;
-export { merge };

package/lib/sx.js

@@ -3,18 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "merge", {
-  enumerable: true,
-  get: function () {
-    return _deepmerge.default;
-  }
-});
 exports.default = void 0;
 
 var _css = _interopRequireDefault(require("@styled-system/css"));
 
-var _deepmerge = _interopRequireDefault(require("deepmerge"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const sx = props => (0, _css.default)(props.sx);

package/lib-esm/ActionList/Item.d.ts

@@ -28,13 +28,19 @@ export interface ItemProps extends SxProp {
      */
     leadingVisual?: React.FunctionComponent<IconProps>;
     /**
+     * @deprecated Use `trailingVisual` instead
      * Icon (or similar) positioned after `Item` text.
      */
     trailingIcon?: React.FunctionComponent<IconProps>;
     /**
+     * @deprecated Use `trailingVisual` instead
      * Text positioned after `Item` text and optional trailing icon.
      */
     trailingText?: string;
+    /**
+     * Icon or text positioned after `Item` text.
+     */
+    trailingVisual?: React.ReactNode;
     /**
      * Style variations associated with various `Item` types.
      *

package/lib-esm/ActionList/Item.js

@@ -154,6 +154,7 @@ export const Item = /*#__PURE__*/React.forwardRef((itemProps, ref) => {
     selectionVariant,
     leadingVisual: LeadingVisual,
     trailingIcon: TrailingIcon,
+    trailingVisual: TrailingVisual,
     trailingText,
     variant = 'default',
     showDivider,
@@ -245,7 +246,10 @@ export const Item = /*#__PURE__*/React.forwardRef((itemProps, ref) => {
     title: description,
     inline: true,
     maxWidth: "100%"
-  }, description)) : null), TrailingIcon || trailingText ? /*#__PURE__*/React.createElement(TrailingContent, {
+  }, description)) : null), TrailingVisual ? /*#__PURE__*/React.createElement(TrailingContent, {
+    variant: variant,
+    disabled: disabled
+  }, typeof TrailingVisual === 'function' ? /*#__PURE__*/React.createElement(TrailingVisual, null) : TrailingVisual) : TrailingIcon || trailingText ? /*#__PURE__*/React.createElement(TrailingContent, {
     variant: variant,
     disabled: disabled
   }, trailingText, TrailingIcon && /*#__PURE__*/React.createElement(TrailingIcon, null)) : null));

package/lib-esm/index.d.ts

@@ -22,7 +22,6 @@ export { useOnEscapePress } from './hooks/useOnEscapePress';
 export { useOverlay } from './hooks/useOverlay';
 export { useConfirm } from './Dialog/ConfirmationDialog';
 export { ActionList } from './ActionList';
-export { ActionList as ActionList2 } from './ActionList2';
 export { ActionMenu } from './ActionMenu';
 export type { ActionMenuProps } from './ActionMenu';
 export { default as Autocomplete } from './Autocomplete';

package/lib-esm/index.js

@@ -18,7 +18,6 @@ export { useOverlay } from './hooks/useOverlay';
 export { useConfirm } from './Dialog/ConfirmationDialog'; // Components
 
 export { ActionList } from './ActionList';
-export { ActionList as ActionList2 } from './ActionList2';
 export { ActionMenu } from './ActionMenu';
 export { default as Autocomplete } from './Autocomplete';
 export { default as Avatar } from './Avatar';

package/lib-esm/sx.d.ts

@@ -1,8 +1,6 @@
 import { SystemStyleObject } from '@styled-system/css';
-import merge from 'deepmerge';
 export interface SxProp {
     sx?: SystemStyleObject;
 }
 declare const sx: (props: SxProp) => import("@styled-system/css").CssFunctionReturnType;
 export default sx;
-export { merge };

package/lib-esm/sx.js

@@ -1,7 +1,5 @@
 import css from '@styled-system/css';
-import merge from 'deepmerge';
 
 const sx = props => css(props.sx);
 
-export default sx;
-export { merge };
+export default sx;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/components",
-  "version": "0.0.0-2021926103714",
+  "version": "0.0.0-202192613168",
   "description": "Primer react components",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",
@@ -76,11 +76,11 @@
     "@rollup/plugin-commonjs": "19.0.2",
     "@rollup/plugin-node-resolve": "13.0.5",
     "@size-limit/preset-big-lib": "5.0.2",
-    "@storybook/addon-a11y": "6.3.4",
-    "@storybook/addon-actions": "^6.2.9",
-    "@storybook/addon-essentials": "6.2.9",
-    "@storybook/addon-links": "^6.2.9",
-    "@storybook/react": "6.3.8",
+    "@storybook/addon-a11y": "6.3.12",
+    "@storybook/addon-actions": "^6.3.12",
+    "@storybook/addon-essentials": "6.3.12",
+    "@storybook/addon-links": "^6.3.12",
+    "@storybook/react": "6.3.12",
     "@testing-library/dom": "7.31.2",
     "@testing-library/react": "11.2.7",
     "@testing-library/react-hooks": "7.0.2",

package/lib/ActionList2/Description.d.ts

@@ -1,6 +0,0 @@
-import React from 'react';
-import { SxProp } from '../sx';
-export declare type DescriptionProps = {
-    variant?: 'inline' | 'block';
-} & SxProp;
-export declare const Description: React.FC<DescriptionProps>;

package/lib/ActionList2/Description.js

@@ -1,53 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Description = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _Box = _interopRequireDefault(require("../Box"));
-
-var _sx = require("../sx");
-
-var _Truncate = _interopRequireDefault(require("../Truncate"));
-
-var _Item = require("./Item");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const Description = ({
-  variant = 'inline',
-  sx = {},
-  ...props
-}) => {
-  const styles = {
-    color: 'fg.muted',
-    fontSize: 0,
-    lineHeight: '16px',
-    flexGrow: 1,
-    flexBasis: 0,
-    minWidth: 0,
-    marginLeft: variant === 'block' ? 0 : 2
-  };
-  return /*#__PURE__*/_react.default.createElement(_Item.Slot, {
-    name: variant === 'block' ? 'BlockDescription' : 'InlineDescription'
-  }, ({
-    blockDescriptionId,
-    inlineDescriptionId
-  }) => variant === 'block' ? /*#__PURE__*/_react.default.createElement(_Box.default, {
-    as: "span",
-    sx: (0, _sx.merge)(styles, sx),
-    id: blockDescriptionId
-  }, props.children) : /*#__PURE__*/_react.default.createElement(_Truncate.default, {
-    id: inlineDescriptionId,
-    sx: (0, _sx.merge)(styles, sx),
-    title: props.children,
-    inline: true,
-    maxWidth: "100%"
-  }, props.children));
-};
-
-exports.Description = Description;
-Description.displayName = "Description";

package/lib/ActionList2/Divider.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="react" />
-/**
- * Visually separates `Item`s or `Group`s in an `ActionList`.
- */
-export declare function Divider(): JSX.Element;
-export declare namespace Divider {
-    var renderItem: typeof Divider;
-}

package/lib/ActionList2/Divider.js

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Divider = Divider;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _Box = _interopRequireDefault(require("../Box"));
-
-var _constants = require("../constants");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/**
- * Visually separates `Item`s or `Group`s in an `ActionList`.
- */
-function Divider() {
-  return /*#__PURE__*/_react.default.createElement(_Box.default, {
-    as: "hr",
-    sx: {
-      border: 'none',
-      // override browser styles
-      height: 1,
-      backgroundColor: 'border.muted',
-      marginTop: theme => `calc(${(0, _constants.get)('space.2')(theme)} - 1px)`,
-      marginBottom: 2
-    },
-    "data-component": "ActionList.Divider"
-  });
-}
-
-Divider.displayName = "Divider";
-
-/**
- * `Divider` fulfills the `ItemPropsWithCustomRenderer` contract,
- * so it can be used inline in an `ActionList`’s `items` prop.
- * In other words, `items={[ActionList.Divider]}` is supported as a concise
- * alternative to `items={[{renderItem: () => <ActionList.Divider />}]}`.
- */
-Divider.renderItem = Divider;

package/lib/ActionList2/Group.d.ts

@@ -1,8 +0,0 @@
-/**
- * show item dividers
- */
-/// <reference types="react" />
-import { SxProp } from '../sx';
-import { HeaderProps } from './Header';
-export declare type GroupProps = HeaderProps & SxProp;
-export declare function Group({ title, variant, auxiliaryText, sx, ...props }: GroupProps): JSX.Element;

package/lib/ActionList2/Group.js

@@ -1,39 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Group = Group;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _Box = _interopRequireDefault(require("../Box"));
-
-var _Header = require("./Header");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function Group({
-  title,
-  variant,
-  auxiliaryText,
-  sx = {},
-  ...props
-}) {
-  return /*#__PURE__*/_react.default.createElement(_Box.default, _extends({
-    sx: {
-      '&:not(:first-child)': {
-        marginTop: 2
-      },
-      ...sx
-    }
-  }, props), title && /*#__PURE__*/_react.default.createElement(_Header.Header, {
-    title: title,
-    variant: variant,
-    auxiliaryText: auxiliaryText
-  }), props.children);
-}
-
-Group.displayName = "Group";

package/lib/ActionList2/Header.d.ts

@@ -1,26 +0,0 @@
-import React from 'react';
-import { SxProp } from '../sx';
-/**
- * Contract for props passed to the `Header` component.
- */
-export interface HeaderProps extends React.ComponentPropsWithoutRef<'div'>, SxProp {
-    /**
-     * Style variations. Usage is discretionary.
-     *
-     * - `"filled"` - Superimposed on a background, offset from nearby content
-     * - `"subtle"` - Relatively less offset from nearby content
-     */
-    variant?: 'subtle' | 'filled';
-    /**
-     * Primary text which names a `Group`.
-     */
-    title?: string;
-    /**
-     * Secondary text which provides additional information about a `Group`.
-     */
-    auxiliaryText?: string;
-}
-/**
- * Displays the name and description of a `Group`.
- */
-export declare function Header({ variant, title, auxiliaryText, children: _children, sx, ...props }: HeaderProps): JSX.Element;

package/lib/ActionList2/Header.js

@@ -1,55 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Header = Header;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _Box = _interopRequireDefault(require("../Box"));
-
-var _List = require("./List");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-/**
- * Displays the name and description of a `Group`.
- */
-function Header({
-  variant = 'subtle',
-  title,
-  auxiliaryText,
-  children: _children,
-  sx = {},
-  ...props
-}) {
-  const {
-    variant: listVariant
-  } = _react.default.useContext(_List.ListContext);
-
-  const styles = {
-    paddingY: '6px',
-    paddingX: listVariant === 'full' ? 2 : 3,
-    fontSize: 0,
-    fontWeight: 'bold',
-    color: 'fg.muted',
-    ...(variant === 'filled' && {
-      backgroundColor: 'canvas.subtle',
-      marginX: 0,
-      marginBottom: 2,
-      borderTop: '1px solid',
-      borderBottom: '1px solid',
-      borderColor: 'neutral.muted'
-    }),
-    ...sx
-  };
-  return /*#__PURE__*/_react.default.createElement(_Box.default, _extends({
-    sx: styles,
-    role: "heading"
-  }, props), title, auxiliaryText && /*#__PURE__*/_react.default.createElement("span", null, "auxiliaryText"));
-}
-
-Header.displayName = "Header";

package/lib/ActionList2/Item.d.ts

@@ -1,49 +0,0 @@
-/**
- * minimize number of divs
- * docs
- * docs for types
- * test suite!
- * ref unhappy with polymorphic
- *
- * check height with divider
- * questions:
- * nicer name for showDivider?
- * change as= li | div based on context of menu or not?
- * should selectionVariant be single by default or nothing. ask for explicit choice?
- * selection api - if one item has selected, should we give all of them selected without the need to pass prop?
- * move custom item themes to primitives?
- * padding: 8 or 6?
- * different size for icon and avatar, range?
- * ActionList.Selection or ActionList.Item selected?
- * aria-describedby empty value bad? also, 2 description = 2 values?
- *
- * activeDescendantAttribute (for actionMenu)
- */
-import React from 'react';
-import { ForwardRefComponent as PolymorphicForwardRefComponent } from '@radix-ui/react-polymorphic';
-import { SxProp } from '../sx';
-import { AriaRole } from '../utils/types';
-export declare const getVariantStyles: (variant: ItemProps['variant'], disabled: ItemProps['disabled']) => {
-    color: string;
-    iconColor: string;
-    annotationColor: string;
-};
-export declare type ItemProps = {
-    children: React.ReactNode;
-    onAction?: (event: React.MouseEvent<HTMLLIElement> | React.KeyboardEvent<HTMLLIElement>) => void;
-    selected?: boolean;
-    variant?: 'default' | 'danger';
-    disabled?: boolean;
-    showDivider?: boolean;
-    role?: AriaRole;
-} & SxProp;
-declare const Slot: React.FC<{
-    name: "LeadingVisual" | "InlineDescription" | "BlockDescription" | "TrailingVisual";
-    children: React.ReactNode | ((context: Record<string, unknown>) => React.ReactNode);
-}>;
-export { Slot };
-export declare type ItemContext = Pick<ItemProps, 'variant' | 'disabled'> & {
-    inlineDescriptionId: string;
-    blockDescriptionId: string;
-};
-export declare const Item: PolymorphicForwardRefComponent<"li", ItemProps>;