@primer/components 0.0.0-202111845030 → 0.0.0-202111885047

package/lib/Autocomplete/AutocompleteMenu.js

@@ -17,13 +17,9 @@ var _AutocompleteContext = require("./AutocompleteContext");
 
 var _octiconsReact = require("@primer/octicons-react");
 
-var _scrollIntoViewingArea = require("../behaviors/scrollIntoViewingArea");
-
-var _VisuallyHidden = _interopRequireDefault(require("../_VisuallyHidden"));
+var _uniqueId = require("../utils/uniqueId");
 
-var _ssr = require("@react-aria/ssr");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _scrollIntoViewingArea = require("../behaviors/scrollIntoViewingArea");
 
 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); }
 
@@ -94,7 +90,6 @@ function AutocompleteMenu(props) {
   const [sortedItemIds, setSortedItemIds] = (0, _react.useState)(items.map(({
     id: itemId
   }) => itemId));
-  const generatedUniqueId = (0, _ssr.useSSRSafeId)(id);
   const selectableItems = (0, _react.useMemo)(() => items.map(selectableItem => {
     return { ...selectableItem,
       role: 'option',
@@ -130,7 +125,7 @@ function AutocompleteMenu(props) {
     onAction: item => {
       // TODO: make it possible to pass a leadingVisual when using `addNewItem`
       addNewItem.handleAddItem({ ...item,
-        id: item.id || generatedUniqueId,
+        id: item.id || (0, _uniqueId.uniqueId)(),
         leadingVisual: undefined
       });
 
@@ -139,7 +134,7 @@ function AutocompleteMenu(props) {
         setAutocompleteSuggestion('');
       }
     }
-  }] : [])], [sortedAndFilteredItemsToRender, addNewItem, setAutocompleteSuggestion, selectionVariant, setInputValue, generatedUniqueId]);
+  }] : [])], [sortedAndFilteredItemsToRender, addNewItem, setAutocompleteSuggestion, selectionVariant, setInputValue]);
   (0, _useFocusZone.useFocusZone)({
     containerRef: listContainerRef,
     focusOutBehavior: 'wrap',
@@ -187,8 +182,19 @@ function AutocompleteMenu(props) {
       setSelectedItemLength(selectedItemIds.length);
     }
   }, [selectedItemIds, setSelectedItemLength]);
-  return /*#__PURE__*/_react.default.createElement(_VisuallyHidden.default, {
-    isVisible: showMenu
+  return /*#__PURE__*/_react.default.createElement(_.Box, {
+    sx: !showMenu ? {
+      // visually hides this label for sighted users
+      position: 'absolute',
+      width: '1px',
+      height: '1px',
+      padding: '0',
+      margin: '-1px',
+      overflow: 'hidden',
+      clip: 'rect(0, 0, 0, 0)',
+      whiteSpace: 'nowrap',
+      borderWidth: '0'
+    } : {}
   }, loading ? /*#__PURE__*/_react.default.createElement(_.Box, {
     p: 3,
     display: "flex",

package/lib/BranchName.js

@@ -16,7 +16,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const BranchName = _styledComponents.default.a.withConfig({
   displayName: "BranchName",
   componentId: "sc-167ouzm-0"
-})(["display:inline-block;padding:2px 6px;font-size:", ";font-family:", ";color:", ";background-color:", ";border-radius:", ";", ";"], (0, _constants.get)('fontSizes.0'), (0, _constants.get)('fonts.mono'), (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('colors.accent.subtle'), (0, _constants.get)('radii.2'), _sx.default);
+})(["display:inline-block;padding:2px 6px;font-size:", ";font-family:", ";color:", ";background-color:", ";border-radius:", ";text-decoration:none;", ";"], (0, _constants.get)('fontSizes.0'), (0, _constants.get)('fonts.mono'), (0, _constants.get)('colors.accent.fg'), (0, _constants.get)('colors.accent.subtle'), (0, _constants.get)('radii.2'), _sx.default);
 
 var _default = BranchName;
 exports.default = _default;

package/lib/NewButton/button-base.d.ts

@@ -0,0 +1,6 @@
+import { ComponentPropsWithRef } from 'react';
+import { ForwardRefComponent as PolymorphicForwardRefComponent } from '@radix-ui/react-polymorphic';
+import { ButtonProps } from './types';
+declare const ButtonBase: PolymorphicForwardRefComponent<"a" | "button", ButtonProps>;
+export declare type ButtonBaseProps = ComponentPropsWithRef<typeof ButtonBase>;
+export default ButtonBase;

package/lib/NewButton/button-base.js

@@ -0,0 +1,69 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _Box = _interopRequireDefault(require("../Box"));
+
+var _sx = require("../sx");
+
+var _ThemeProvider = require("../ThemeProvider");
+
+var _types = require("./types");
+
+var _styles = require("./styles");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+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); }
+
+const ButtonBase = /*#__PURE__*/(0, _react.forwardRef)(({
+  children,
+  as: Component = 'button',
+  sx: sxProp = {},
+  ...props
+}, forwardedRef) => {
+  const {
+    leadingIcon: LeadingIcon,
+    trailingIcon: TrailingIcon,
+    variant = 'default',
+    size = 'medium'
+  } = props;
+  const {
+    theme
+  } = (0, _ThemeProvider.useTheme)();
+  const iconWrapStyles = {
+    display: 'inline-block'
+  };
+
+  const sxStyles = _sx.merge.all([(0, _styles.getButtonStyles)(theme), (0, _styles.getSizeStyles)(size, variant, false), (0, _styles.getVariantStyles)(variant, theme), sxProp]);
+
+  return /*#__PURE__*/_react.default.createElement(_types.StyledButton, _extends({
+    as: Component,
+    sx: sxStyles
+  }, props, {
+    ref: forwardedRef
+  }), LeadingIcon && /*#__PURE__*/_react.default.createElement(_Box.default, {
+    as: "span",
+    "data-component": "leadingIcon",
+    sx: iconWrapStyles
+  }, /*#__PURE__*/_react.default.createElement(LeadingIcon, null)), /*#__PURE__*/_react.default.createElement("span", {
+    "data-component": "text"
+  }, children), TrailingIcon && /*#__PURE__*/_react.default.createElement(_Box.default, {
+    as: "span",
+    "data-component": "trailingIcon",
+    sx: { ...iconWrapStyles,
+      ml: 2
+    }
+  }, /*#__PURE__*/_react.default.createElement(TrailingIcon, null)));
+});
+var _default = ButtonBase;
+exports.default = _default;

package/lib/NewButton/button-link.d.ts

@@ -0,0 +1,27 @@
+import React from 'react';
+import { ForwardRefComponent as PolymorphicForwardRefComponent } from '@radix-ui/react-polymorphic';
+declare const LinkButton: PolymorphicForwardRefComponent<"a", Omit<(Pick<React.DetailedHTMLProps<React.AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>, "key" | keyof React.AnchorHTMLAttributes<HTMLAnchorElement>> & {
+    ref?: ((instance: HTMLAnchorElement | null) => void) | React.RefObject<HTMLAnchorElement> | null | undefined;
+}) | (Pick<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, "key" | keyof React.ButtonHTMLAttributes<HTMLButtonElement>> & {
+    ref?: ((instance: HTMLButtonElement | null) => void) | React.RefObject<HTMLButtonElement> | null | undefined;
+}), string | number | symbol> & {
+    leadingIcon?: React.FunctionComponent<import("@primer/octicons-react/dist/icons").IconProps> | undefined;
+    trailingIcon?: React.FunctionComponent<import("@primer/octicons-react/dist/icons").IconProps> | undefined;
+    children: React.ReactNode;
+} & {
+    variant?: import("./types").VariantType | undefined;
+    size?: import("./types").Size | undefined;
+    disabled?: boolean | undefined;
+} & import("../sx").SxProp & React.HTMLAttributes<HTMLButtonElement> & {
+    [x: string]: any;
+    [x: number]: any;
+    [x: symbol]: any;
+} & {
+    theme?: any;
+} & {
+    as?: string | React.ComponentType<any> | undefined;
+    forwardedAs?: string | React.ComponentType<any> | undefined;
+} & {
+    as?: "a" | "button" | undefined;
+}>;
+export default LinkButton;

package/lib/{ChoiceFieldset/ChoiceFieldLabel.js → NewButton/button-link.js}

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _ChoiceFieldsetListContext = _interopRequireDefault(require("./ChoiceFieldsetListContext"));
+var _buttonBase = _interopRequireDefault(require("./button-base"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -15,21 +15,17 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
-const ChoiceFieldLabel = ({
-  children
-}) => {
-  const choiceFieldsetListContext = (0, _react.useContext)(_ChoiceFieldsetListContext.default);
-
-  if (choiceFieldsetListContext === null) {
-    throw new Error('ChoiceFieldsetListContext returned null');
-  }
-
-  const {
-    fieldComponent: FieldComponent
-  } = choiceFieldsetListContext;
-  return /*#__PURE__*/_react.default.createElement(FieldComponent.Label, null, children);
-};
-
-ChoiceFieldLabel.displayName = "ChoiceFieldLabel";
-var _default = ChoiceFieldLabel;
+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); }
+
+const LinkButton = /*#__PURE__*/(0, _react.forwardRef)(({
+  children,
+  as: Component = 'a',
+  ...props
+}, forwardedRef) => {
+  return /*#__PURE__*/_react.default.createElement(_buttonBase.default, _extends({
+    as: Component,
+    ref: forwardedRef
+  }, props), children);
+});
+var _default = LinkButton;
 exports.default = _default;

package/lib/NewButton/button.d.ts

@@ -1,13 +1,4 @@
 import React from 'react';
-import { SxProp } from '../sx';
-import { VariantType } from './types';
-declare const Button: React.ForwardRefExoticComponent<{
-    variant?: VariantType | undefined;
-    size?: import("./types").Size | undefined;
-    icon?: React.FunctionComponent<import("@primer/octicons-react/dist/icons").IconProps> | undefined;
-    leadingIcon?: React.FunctionComponent<import("@primer/octicons-react/dist/icons").IconProps> | undefined;
-    trailingIcon?: React.FunctionComponent<import("@primer/octicons-react/dist/icons").IconProps> | undefined;
-    disabled?: boolean | undefined;
-    children: React.ReactNode;
-} & SxProp & React.HTMLAttributes<HTMLButtonElement> & React.RefAttributes<HTMLButtonElement>>;
+import { ButtonProps } from './types';
+declare const Button: React.ForwardRefExoticComponent<Pick<ButtonProps, string | number | symbol> & React.RefAttributes<HTMLButtonElement>>;
 export { Button };

package/lib/NewButton/button.js

@@ -7,13 +7,7 @@ exports.Button = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _Box = _interopRequireDefault(require("../Box"));
-
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-
-var _sx = _interopRequireWildcard(require("../sx"));
-
-var _ThemeProvider = require("../ThemeProvider");
+var _buttonBase = _interopRequireDefault(require("./button-base"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -23,286 +17,15 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && 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); }
 
-const TEXT_ROW_HEIGHT = '20px'; // custom value off the scale
-
-const getVariantStyles = (variant = 'default', theme) => {
-  const style = {
-    default: {
-      color: 'btn.text',
-      backgroundColor: 'btn.bg',
-      boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.shadow}, ${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.insetShadow}`,
-      '&:hover:not([disabled])': {
-        backgroundColor: 'btn.hoverBg'
-      },
-      // focus must come before :active so that the active box shadow overrides
-      '&:focus:not([disabled])': {
-        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.focusShadow}`
-      },
-      '&:active:not([disabled])': {
-        backgroundColor: 'btn.selectedBg',
-        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.shadowActive}`
-      },
-      '&:disabled': {
-        color: 'primer.fg.disabled',
-        backgroundColor: 'btn.disabledBg'
-      }
-    },
-    primary: {
-      color: 'btn.primary.text',
-      backgroundColor: 'btn.primary.bg',
-      borderColor: 'border.subtle',
-      boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.primary.shadow}`,
-      '&:hover:not([disabled])': {
-        color: 'btn.primary.hoverText',
-        backgroundColor: 'btn.primary.hoverBg'
-      },
-      // focus must come before :active so that the active box shadow overrides
-      '&:focus:not([disabled])': {
-        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.primary.focusShadow}`
-      },
-      '&:active:not([disabled])': {
-        backgroundColor: 'btn.primary.selectedBg',
-        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.primary.selectedShadow}`
-      },
-      '&:disabled': {
-        color: 'btn.primary.disabledText',
-        backgroundColor: 'btn.primary.disabledBg'
-      },
-      '[data-component="ButtonCounter"]': {
-        backgroundColor: 'btn.primary.counterBg',
-        color: 'btn.primary.text'
-      }
-    },
-    danger: {
-      color: 'btn.danger.text',
-      backgroundColor: 'btn.bg',
-      boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.shadow}`,
-      '&:hover:not([disabled])': {
-        color: 'btn.danger.hoverText',
-        backgroundColor: 'btn.danger.hoverBg',
-        borderColor: 'btn.danger.hoverBorder',
-        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.danger.hoverShadow}`,
-        '[data-component="ButtonCounter"]': {
-          backgroundColor: 'btn.danger.hoverCounterBg',
-          color: 'btn.danger.hoverText'
-        }
-      },
-      // focus must come before :active so that the active box shadow overrides
-      '&:focus:not([disabled])': {
-        borderColor: 'btn.danger.focusBorder',
-        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.danger.focusShadow}`
-      },
-      '&:active:not([disabled])': {
-        color: 'btn.danger.selectedText',
-        backgroundColor: 'btn.danger.selectedBg',
-        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.danger.selectedShadow}`,
-        borderColor: 'btn.danger.selectedBorder'
-      },
-      '&:disabled': {
-        color: 'btn.danger.disabledText',
-        backgroundColor: 'btn.danger.disabledBg',
-        borderColor: 'btn.danger.disabledBorder',
-        '[data-component="ButtonCounter"]': {
-          backgroundColor: 'btn.danger.disabledCounterBg'
-        }
-      },
-      '[data-component="ButtonCounter"]': {
-        color: 'btn.danger.text',
-        backgroundColor: 'btn.danger.counterBg'
-      }
-    },
-    invisible: {
-      color: 'accent.fg',
-      backgroundColor: 'transparent',
-      border: '0',
-      boxShadow: 'none',
-      '&:hover:not([disabled])': {
-        backgroundColor: 'btn.hoverBg'
-      },
-      // focus must come before :active so that the active box shadow overrides
-      '&:focus:not([disabled])': {
-        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.focusShadow}`
-      },
-      '&:active:not([disabled])': {
-        backgroundColor: 'btn.selectedBg'
-      },
-      '&:disabled': {
-        color: 'primer.fg.disabled'
-      }
-    },
-    outline: {
-      color: 'btn.outline.text',
-      boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.shadow}`,
-      '&:hover': {
-        color: 'btn.outline.hoverText',
-        backgroundColor: 'btn.outline.hoverBg',
-        borderColor: 'outline.hoverBorder',
-        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.outline.hoverShadow}`,
-        '[data-component="ButtonCounter"]': {
-          backgroundColor: 'btn.outline.hoverCounterBg',
-          color: 'btn.outline.hoverText'
-        }
-      },
-      // focus must come before :active so that the active box shadow overrides
-      '&:focus': {
-        borderColor: 'btn.outline.focusBorder',
-        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.outline.focusShadow}`
-      },
-      '&:active:not([disabled])': {
-        color: 'btn.outline.selectedText',
-        backgroundColor: 'btn.outline.selectedBg',
-        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.outline.selectedShadow}`,
-        borderColor: 'btn.outline.selectedBorder'
-      },
-      '&:disabled': {
-        color: 'btn.outline.disabledText',
-        backgroundColor: 'btn.outline.disabledBg',
-        borderColor: 'btn.border',
-        '[data-component="ButtonCounter"]': {
-          backgroundColor: 'btn.outline.disabledCounterBg'
-        }
-      },
-      '[data-component="ButtonCounter"]': {
-        backgroundColor: 'btn.outline.counterBg',
-        color: 'btn.outline.text'
-      }
-    }
-  };
-  return style[variant];
-};
-
-const getSizeStyles = (size = 'medium', variant = 'default', iconOnly) => {
-  let paddingY, paddingX, fontSize;
-
-  switch (size) {
-    case 'small':
-      paddingY = 3;
-      paddingX = 12;
-      fontSize = 0;
-      break;
-
-    case 'large':
-      paddingY = 9;
-      paddingX = 20;
-      fontSize = 2;
-      break;
-
-    case 'medium':
-    default:
-      paddingY = 5;
-      paddingX = 16;
-      fontSize = 1;
-  }
-
-  if (iconOnly) {
-    paddingX = paddingY + 2;
-  }
-
-  if (variant === 'invisible') {
-    paddingY = paddingY + 1;
-  }
-
-  return {
-    paddingY: `${paddingY}px`,
-    paddingX: `${paddingX}px`,
-    fontSize,
-    '[data-component="ButtonCounter"]': {
-      fontSize
-    }
-  };
-};
-
-const ButtonBase = _styledComponents.default.button.withConfig({
-  displayName: "button__ButtonBase",
-  componentId: "sc-15k5iqk-0"
-})(_sx.default);
-
 const Button = /*#__PURE__*/(0, _react.forwardRef)(({
   children,
-  sx: sxProp = {},
   ...props
 }, forwardedRef) => {
-  const {
-    icon: Icon,
-    leadingIcon: LeadingIcon,
-    trailingIcon: TrailingIcon,
-    variant = 'default',
-    size = 'medium'
-  } = props;
-  const iconOnly = !!Icon;
-  const {
-    theme
-  } = (0, _ThemeProvider.useTheme)();
-  const styles = {
-    borderRadius: '2',
-    border: '1px solid',
-    borderColor: theme === null || theme === void 0 ? void 0 : theme.colors.btn.border,
-    display: 'grid',
-    gridTemplateAreas: '"leadingIcon text trailingIcon"',
-    fontWeight: 'bold',
-    lineHeight: TEXT_ROW_HEIGHT,
-    whiteSpace: 'nowrap',
-    verticalAlign: 'middle',
-    cursor: 'pointer',
-    appearance: 'none',
-    userSelect: 'none',
-    textDecoration: 'none',
-    textAlign: 'center',
-    '& > :not(:last-child)': {
-      mr: '2'
-    },
-    '&:focus': {
-      outline: 'none'
-    },
-    '&:disabled': {
-      cursor: 'default'
-    },
-    '&:disabled svg': {
-      opacity: '0.6'
-    },
-    '[data-component="leadingIcon"]': {
-      gridArea: 'leadingIcon'
-    },
-    '[data-component="text"]': {
-      gridArea: 'text'
-    },
-    '[data-component="trailingIcon"]': {
-      gridArea: 'trailingIcon'
-    }
-  };
-  const iconWrapStyles = {
-    display: 'inline-block'
-  };
-
-  const sxStyles = _sx.merge.all([styles, getSizeStyles(size, variant, iconOnly), getVariantStyles(variant, theme), sxProp]);
-
-  return /*#__PURE__*/_react.default.createElement(ButtonBase, _extends({
-    sx: sxStyles,
+  return /*#__PURE__*/_react.default.createElement(_buttonBase.default, _extends({
     ref: forwardedRef
-  }, props), LeadingIcon && /*#__PURE__*/_react.default.createElement(_Box.default, {
-    as: "span",
-    "data-component": "leadingIcon",
-    sx: iconWrapStyles,
-    "aria-hidden": !iconOnly
-  }, /*#__PURE__*/_react.default.createElement(LeadingIcon, null)), /*#__PURE__*/_react.default.createElement("span", {
-    "data-component": "text",
-    hidden: Icon ? true : false
-  }, children), Icon && /*#__PURE__*/_react.default.createElement(_Box.default, {
-    "data-component": "icon-only",
-    as: "span",
-    sx: {
-      display: 'inline-block'
-    },
-    "aria-hidden": !iconOnly
-  }, /*#__PURE__*/_react.default.createElement(Icon, null)), TrailingIcon && /*#__PURE__*/_react.default.createElement(_Box.default, {
-    as: "span",
-    "data-component": "trailingIcon",
-    sx: { ...iconWrapStyles,
-      ml: 2
-    },
-    "aria-hidden": !iconOnly
-  }, /*#__PURE__*/_react.default.createElement(TrailingIcon, null)));
+  }, props, {
+    as: "button"
+  }), children);
 });
 exports.Button = Button;
-Button.displayName = 'Button';
-Object.assign(Button, {});
+Button.displayName = 'Button';

package/lib/NewButton/icon-button.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { IconButtonProps } from './types';
+declare const IconButton: React.ForwardRefExoticComponent<Pick<IconButtonProps, string | number | symbol> & React.RefAttributes<HTMLButtonElement>>;
+export default IconButton;

package/lib/NewButton/icon-button.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _sx = require("../sx");
+
+var _ThemeProvider = require("../ThemeProvider");
+
+var _Box = _interopRequireDefault(require("../Box"));
+
+var _types = require("./types");
+
+var _styles = require("./styles");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+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); }
+
+const IconButton = /*#__PURE__*/(0, _react.forwardRef)((props, forwardedRef) => {
+  const {
+    variant = 'default',
+    size = 'medium',
+    sx: sxProp = {},
+    icon: Icon,
+    iconLabel
+  } = props;
+  const {
+    theme
+  } = (0, _ThemeProvider.useTheme)();
+  const styles = { ...(0, _styles.getBaseStyles)(theme)
+  };
+
+  const sxStyles = _sx.merge.all([styles, (0, _styles.getSizeStyles)(size, variant, true), (0, _styles.getVariantStyles)(variant, theme), sxProp]);
+
+  return /*#__PURE__*/_react.default.createElement(_types.StyledButton, _extends({
+    sx: sxStyles,
+    ref: forwardedRef
+  }, props), /*#__PURE__*/_react.default.createElement("span", {
+    hidden: true
+  }, iconLabel), /*#__PURE__*/_react.default.createElement(_Box.default, {
+    as: "span",
+    sx: {
+      display: 'inline-block'
+    }
+  }, /*#__PURE__*/_react.default.createElement(Icon, null)));
+});
+var _default = IconButton;
+exports.default = _default;

package/lib/NewButton/index.d.ts

@@ -1,14 +1,9 @@
 /// <reference types="react" />
-import { ButtonProps } from './types';
-export type { ButtonProps as NewButtonProps };
-export declare const NewButton: import("react").ForwardRefExoticComponent<{
-    variant?: import("./types").VariantType | undefined;
-    size?: import("./types").Size | undefined;
-    icon?: import("react").FunctionComponent<import("@primer/octicons-react/dist/icons").IconProps> | undefined;
-    leadingIcon?: import("react").FunctionComponent<import("@primer/octicons-react/dist/icons").IconProps> | undefined;
-    trailingIcon?: import("react").FunctionComponent<import("@primer/octicons-react/dist/icons").IconProps> | undefined;
-    disabled?: boolean | undefined;
-    children: import("react").ReactNode;
-} & import("../sx").SxProp & import("react").HTMLAttributes<HTMLButtonElement> & import("react").RefAttributes<HTMLButtonElement>> & {
+import IconButton from './icon-button';
+import ButtonLink from './button-link';
+import { ButtonProps, IconButtonProps } from './types';
+export type { ButtonProps as NewButtonProps, IconButtonProps };
+export declare const NewButton: import("react").ForwardRefExoticComponent<Pick<ButtonProps, string | number | symbol> & import("react").RefAttributes<HTMLButtonElement>> & {
     Counter: ({ children, sx: sxProp, ...props }: import("./button-counter").CounterProps) => JSX.Element;
 };
+export { IconButton, ButtonLink };

package/lib/NewButton/index.js

@@ -3,12 +3,30 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "IconButton", {
+  enumerable: true,
+  get: function () {
+    return _iconButton.default;
+  }
+});
+Object.defineProperty(exports, "ButtonLink", {
+  enumerable: true,
+  get: function () {
+    return _buttonLink.default;
+  }
+});
 exports.NewButton = void 0;
 
 var _button = require("./button");
 
 var _buttonCounter = require("./button-counter");
 
+var _iconButton = _interopRequireDefault(require("./icon-button"));
+
+var _buttonLink = _interopRequireDefault(require("./button-link"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 const NewButton = Object.assign(_button.Button, {
   Counter: _buttonCounter.Counter
 });