@primer/components 0.0.0-202111245715 → 0.0.0-2021113144816

package/lib-esm/Dropdown.d.ts

@@ -16,6 +16,7 @@ export declare type DropdownItemProps = ComponentProps<typeof DropdownItem>;
 declare const _default: {
     ({ children, className, ...rest }: {
         color?: string | undefined;
+        property?: string | undefined;
         translate?: "yes" | "no" | undefined;
         hidden?: boolean | undefined;
         children?: React.ReactNode;
@@ -47,7 +48,6 @@ declare const _default: {
         datatype?: string | undefined;
         inlist?: any;
         prefix?: string | undefined;
-        property?: string | undefined;
         resource?: string | undefined;
         typeof?: string | undefined;
         vocab?: string | undefined;
@@ -282,6 +282,7 @@ declare const _default: {
     }): JSX.Element;
     defaultProps: Partial<{
         color?: string | undefined;
+        property?: string | undefined;
         translate?: "yes" | "no" | undefined;
         hidden?: boolean | undefined;
         children?: React.ReactNode;
@@ -313,7 +314,6 @@ declare const _default: {
         datatype?: string | undefined;
         inlist?: any;
         prefix?: string | undefined;
-        property?: string | undefined;
         resource?: string | undefined;
         typeof?: string | undefined;
         vocab?: string | undefined;
@@ -555,6 +555,7 @@ declare const _default: {
     Button: {
         ({ children, ...rest }: {
             color?: string | undefined;
+            property?: string | undefined;
             translate?: "yes" | "no" | undefined;
             hidden?: boolean | undefined;
             children?: React.ReactNode;
@@ -590,7 +591,6 @@ declare const _default: {
             datatype?: string | undefined;
             inlist?: any;
             prefix?: string | undefined;
-            property?: string | undefined;
             resource?: string | undefined;
             typeof?: string | undefined;
             vocab?: string | undefined;
@@ -819,8 +819,8 @@ declare const _default: {
             onTransitionEnd?: React.TransitionEventHandler<HTMLButtonElement> | undefined;
             onTransitionEndCapture?: React.TransitionEventHandler<HTMLButtonElement> | undefined;
             css?: import("@emotion/core").InterpolationWithTheme<any>;
-            as?: string | React.ComponentClass<any, any> | React.FunctionComponent<any> | undefined;
             disabled?: boolean | undefined;
+            as?: string | React.ComponentClass<any, any> | React.FunctionComponent<any> | undefined;
             autoFocus?: boolean | undefined;
             formAction?: string | undefined;
             formEncType?: string | undefined;
@@ -832,6 +832,7 @@ declare const _default: {
         }): JSX.Element;
         defaultProps: Partial<{
             color?: string | undefined;
+            property?: string | undefined;
             translate?: "yes" | "no" | undefined;
             hidden?: boolean | undefined;
             children?: React.ReactNode;
@@ -867,7 +868,6 @@ declare const _default: {
             datatype?: string | undefined;
             inlist?: any;
             prefix?: string | undefined;
-            property?: string | undefined;
             resource?: string | undefined;
             typeof?: string | undefined;
             vocab?: string | undefined;
@@ -1096,8 +1096,8 @@ declare const _default: {
             onTransitionEnd?: React.TransitionEventHandler<HTMLButtonElement> | undefined;
             onTransitionEndCapture?: React.TransitionEventHandler<HTMLButtonElement> | undefined;
             css?: import("@emotion/core").InterpolationWithTheme<any>;
-            as?: string | React.ComponentClass<any, any> | React.FunctionComponent<any> | undefined;
             disabled?: boolean | undefined;
+            as?: string | React.ComponentClass<any, any> | React.FunctionComponent<any> | undefined;
             autoFocus?: boolean | undefined;
             formAction?: string | undefined;
             formEncType?: string | undefined;

package/lib-esm/DropdownMenu/DropdownButton.d.ts

@@ -3,6 +3,7 @@ import { ButtonProps } from '../Button/Button';
 export declare type DropdownButtonProps = ButtonProps;
 export declare const DropdownButton: React.ForwardRefExoticComponent<Pick<React.PropsWithChildren<{
     color?: string | undefined;
+    property?: string | undefined;
     translate?: "yes" | "no" | undefined;
     hidden?: boolean | undefined;
     children?: React.ReactNode;
@@ -38,7 +39,6 @@ export declare const DropdownButton: React.ForwardRefExoticComponent<Pick<React.
     datatype?: string | undefined;
     inlist?: any;
     prefix?: string | undefined;
-    property?: string | undefined;
     resource?: string | undefined;
     typeof?: string | undefined;
     vocab?: string | undefined;
@@ -267,8 +267,8 @@ export declare const DropdownButton: React.ForwardRefExoticComponent<Pick<React.
     onTransitionEnd?: React.TransitionEventHandler<HTMLButtonElement> | undefined;
     onTransitionEndCapture?: React.TransitionEventHandler<HTMLButtonElement> | undefined;
     css?: import("@emotion/core").InterpolationWithTheme<any>;
-    as?: string | React.ComponentClass<any, any> | React.FunctionComponent<any> | undefined;
     disabled?: boolean | undefined;
+    as?: string | React.ComponentClass<any, any> | React.FunctionComponent<any> | undefined;
     autoFocus?: boolean | undefined;
     formAction?: string | undefined;
     formEncType?: string | undefined;
@@ -277,4 +277,7 @@ export declare const DropdownButton: React.ForwardRefExoticComponent<Pick<React.
     formTarget?: string | undefined;
 } & {
     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<HTMLElement>>;
+}>, "theme" | "sx" | "key" | keyof React.ButtonHTMLAttributes<HTMLButtonElement> | keyof {
+    as?: string | React.ComponentClass<any, any> | React.FunctionComponent<any> | undefined;
+    variant?: "small" | "medium" | "large" | undefined;
+}> & React.RefAttributes<HTMLElement>>;

package/lib-esm/FilterList.d.ts

@@ -16,6 +16,7 @@ declare namespace FilterListItem {
 }
 declare const _default: (({ children, ...rest }: React.PropsWithChildren<{
     color?: string | undefined;
+    property?: string | undefined;
     translate?: "yes" | "no" | undefined;
     hidden?: boolean | undefined;
     children?: React.ReactNode;
@@ -46,7 +47,6 @@ declare const _default: (({ children, ...rest }: React.PropsWithChildren<{
     datatype?: string | undefined;
     inlist?: any;
     prefix?: string | undefined;
-    property?: string | undefined;
     resource?: string | undefined;
     typeof?: string | undefined;
     vocab?: string | undefined;

package/lib-esm/FilteredActionList/FilteredActionList.js

@@ -15,7 +15,7 @@ import useScrollFlash from '../hooks/useScrollFlash';
 import { scrollIntoViewingArea } from '../behaviors/scrollIntoViewingArea';
 const StyledHeader = styled.div.withConfig({
   displayName: "FilteredActionList__StyledHeader",
-  componentId: "yg3jkv-0"
+  componentId: "sc-yg3jkv-0"
 })(["box-shadow:0 1px 0 ", ";z-index:1;"], get('colors.border.default'));
 export function FilteredActionList({
   loading = false,

package/lib-esm/Flex.js

@@ -6,7 +6,7 @@ import Box from './Box';
  */
 const Flex = styled(Box).withConfig({
   displayName: "Flex",
-  componentId: "arghxi-0"
+  componentId: "sc-arghxi-0"
 })([""]);
 Flex.defaultProps = {
   display: 'flex'

package/lib-esm/LabelGroup.js

@@ -3,6 +3,6 @@ import { get } from './constants';
 import sx from './sx';
 const LabelGroup = styled.span.withConfig({
   displayName: "LabelGroup",
-  componentId: "k6k3qa-0"
+  componentId: "sc-k6k3qa-0"
 })(["& *{margin-right:", ";}& *:last-child{margin-right:0;}", ";"], get('space.1'), sx);
 export default LabelGroup;

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

@@ -1,4 +1,13 @@
 import React from 'react';
-import { ButtonProps } from './types';
-declare const Button: React.ForwardRefExoticComponent<Pick<ButtonProps, string | number | symbol> & React.RefAttributes<HTMLButtonElement>>;
+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>>;
 export { Button };

package/lib-esm/NewButton/button.js

@@ -1,16 +1,287 @@
 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); }
 
 import React, { forwardRef } from 'react';
-import ButtonBase from './button-base';
+import Box from '../Box';
+import styled from 'styled-components';
+import sx, { merge } from '../sx';
+import { useTheme } from '../ThemeProvider';
+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 = styled.button.withConfig({
+  displayName: "button__ButtonBase",
+  componentId: "sc-15k5iqk-0"
+})(sx);
 const Button = /*#__PURE__*/forwardRef(({
   children,
+  sx: sxProp = {},
   ...props
 }, forwardedRef) => {
+  const {
+    icon: Icon,
+    leadingIcon: LeadingIcon,
+    trailingIcon: TrailingIcon,
+    variant = 'default',
+    size = 'medium'
+  } = props;
+  const iconOnly = !!Icon;
+  const {
+    theme
+  } = 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 = merge.all([styles, getSizeStyles(size, variant, iconOnly), getVariantStyles(variant, theme), sxProp]);
   return /*#__PURE__*/React.createElement(ButtonBase, _extends({
+    sx: sxStyles,
     ref: forwardedRef
-  }, props, {
-    as: "button"
-  }), children);
+  }, props), LeadingIcon && /*#__PURE__*/React.createElement(Box, {
+    as: "span",
+    "data-component": "leadingIcon",
+    sx: iconWrapStyles,
+    "aria-hidden": !iconOnly
+  }, /*#__PURE__*/React.createElement(LeadingIcon, null)), /*#__PURE__*/React.createElement("span", {
+    "data-component": "text",
+    hidden: Icon ? true : false
+  }, children), Icon && /*#__PURE__*/React.createElement(Box, {
+    "data-component": "icon-only",
+    as: "span",
+    sx: {
+      display: 'inline-block'
+    },
+    "aria-hidden": !iconOnly
+  }, /*#__PURE__*/React.createElement(Icon, null)), TrailingIcon && /*#__PURE__*/React.createElement(Box, {
+    as: "span",
+    "data-component": "trailingIcon",
+    sx: { ...iconWrapStyles,
+      ml: 2
+    },
+    "aria-hidden": !iconOnly
+  }, /*#__PURE__*/React.createElement(TrailingIcon, null)));
 });
 Button.displayName = 'Button';
+Object.assign(Button, {});
 export { Button };

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

@@ -1,9 +1,14 @@
 /// <reference types="react" />
-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>> & {
+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>> & {
     Counter: ({ children, sx: sxProp, ...props }: import("./button-counter").CounterProps) => JSX.Element;
 };
-export { IconButton, ButtonLink };

package/lib-esm/NewButton/index.js

@@ -1,8 +1,5 @@
 import { Button } from './button';
 import { Counter } from './button-counter';
-import IconButton from './icon-button';
-import ButtonLink from './button-link';
 export const NewButton = Object.assign(Button, {
   Counter
-});
-export { IconButton, ButtonLink };
+});

package/lib-esm/NewButton/types.d.ts

@@ -1,11 +1,9 @@
-import React, { HTMLAttributes, ComponentPropsWithRef } from 'react';
+import React, { HTMLAttributes } from 'react';
 import { IconProps } from '@primer/octicons-react';
 import { SxProp } from '../sx';
-export declare const StyledButton: import("styled-components").StyledComponent<"button", any, SxProp, never>;
 export declare type VariantType = 'default' | 'primary' | 'invisible' | 'danger' | 'outline';
 export declare type Size = 'small' | 'medium' | 'large';
-declare type StyledButtonProps = ComponentPropsWithRef<typeof StyledButton>;
-export declare type ButtonBaseProps = {
+export declare type ButtonProps = {
     /**
      * Determine's the styles on a button one of 'default' | 'primary' | 'invisible' | 'danger'
      */
@@ -15,11 +13,9 @@ export declare type ButtonBaseProps = {
      */
     size?: Size;
     /**
-     * Items that are disabled can not be clicked, selected, or navigated through.
+     * This is to be used if it is an icon-only button. Will make text visually hidden
      */
-    disabled?: boolean;
-} & SxProp & HTMLAttributes<HTMLButtonElement> & StyledButtonProps;
-export declare type ButtonProps = {
+    icon?: React.FunctionComponent<IconProps>;
     /**
      * The leading icon comes before button content
      */
@@ -28,25 +24,9 @@ export declare type ButtonProps = {
      * The trailing icon comes after button content
      */
     trailingIcon?: React.FunctionComponent<IconProps>;
-    children: React.ReactNode;
-} & ButtonBaseProps;
-export declare type IconButtonProps = {
     /**
-     * This is to be used if it is an icon-only button. Will make text visually hidden
+     * Items that are disabled can not be clicked, selected, or navigated through.
      */
-    icon: React.FunctionComponent<IconProps>;
-    iconLabel: string;
-} & ButtonBaseProps;
-export declare type LinkButtonProps = {
-    underline?: boolean;
-    download?: string;
-    href?: string;
-    hrefLang?: string;
-    media?: string;
-    ping?: string;
-    rel?: string;
-    target?: string;
-    type?: string;
-    referrerPolicy?: React.AnchorHTMLAttributes<HTMLAnchorElement>['referrerPolicy'];
-};
-export {};
+    disabled?: boolean;
+    children: React.ReactNode;
+} & SxProp & HTMLAttributes<HTMLButtonElement>;

package/lib-esm/NewButton/types.js

@@ -1,6 +1 @@
-import styled from 'styled-components';
-import sx from '../sx';
-export const StyledButton = styled.button.withConfig({
-  displayName: "types__StyledButton",
-  componentId: "sc-1sm8kx1-0"
-})(sx);
+export {};

package/lib-esm/Overlay.js

@@ -60,7 +60,7 @@ function getSlideAnimationStartingVector(anchorSide) {
 
 const StyledOverlay = styled.div.withConfig({
   displayName: "Overlay__StyledOverlay",
-  componentId: "jhwkzw-0"
+  componentId: "sc-jhwkzw-0"
 })(["background-color:", ";box-shadow:", ";position:absolute;min-width:192px;max-width:640px;height:", ";max-height:", ";width:", ";border-radius:12px;overflow:hidden;animation:overlay-appear ", "ms ", ";@keyframes overlay-appear{0%{opacity:0;}100%{opacity:1;}}visibility:var(--styled-overlay-visibility);:focus{outline:none;}", ";"], get('colors.canvas.overlay'), get('shadows.overlay.shadow'), props => heightMap[props.height || 'auto'], props => props.maxHeight && heightMap[props.maxHeight], props => widthMap[props.width || 'auto'], animationDuration, get('animation.easeOutCubic'), sx);
 
 /**

package/lib-esm/Pagination/Pagination.js

@@ -8,7 +8,7 @@ import sx from '../sx';
 import { buildComponentData, buildPaginationModel } from './model';
 const Page = styled.a.withConfig({
   displayName: "Pagination__Page",
-  componentId: "b80nss-0"
+  componentId: "sc-b80nss-0"
 })(["display:inline-block;min-width:32px;padding:5px 10px;font-style:normal;line-height:20px;color:", ";text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;user-select:none;text-decoration:none;margin-right:", ";&:last-child{margin-right:0;}border:", " solid transparent;border-radius:", ";transition:border-color 0.2s cubic-bezier(0.3,0,0.5,1);&:hover,&:focus{text-decoration:none;border-color:", ";outline:0;transition-duration:0.1s;}&:active{border-color:", ";}&[rel='prev'],&[rel='next']{color:", ";}&[aria-current],&[aria-current]:hover{color:", ";background-color:", ";border-color:transparent;}&[aria-disabled],&[aria-disabled]:hover{color:", ";cursor:default;border-color:transparent;}@supports (clip-path:polygon(50% 0,100% 50%,50% 100%)){&[rel='prev']::before,&[rel='next']::after{display:inline-block;width:16px;height:16px;vertical-align:text-bottom;content:'';background-color:currentColor;}&[rel='prev']::before{margin-right:", ";clip-path:polygon( 9.8px 12.8px,8.7px 12.8px,4.5px 8.5px,4.5px 7.5px,8.7px 3.2px,9.8px 4.3px,6.1px 8px,9.8px 11.7px,9.8px 12.8px );}&[rel='next']::after{margin-left:", ";clip-path:polygon( 6.2px 3.2px,7.3px 3.2px,11.5px 7.5px,11.5px 8.5px,7.3px 12.8px,6.2px 11.7px,9.9px 8px,6.2px 4.3px,6.2px 3.2px );}}"], get('colors.fg.default'), get('space.1'), get('borderWidths.1'), get('radii.2'), get('colors.border.default'), get('colors.border.muted'), get('colors.accent.fg'), get('colors.fg.onEmphasis'), get('colors.accent.emphasis'), get('colors.primer.fg.disabled'), get('space.1'), get('space.1'));
 
 function usePaginationPages({
@@ -43,7 +43,7 @@ function usePaginationPages({
 
 const PaginationContainer = styled.nav.withConfig({
   displayName: "Pagination__PaginationContainer",
-  componentId: "b80nss-1"
+  componentId: "sc-b80nss-1"
 })(["margin-top:20px;margin-bottom:15px;text-align:center;", ";"], sx);
 
 function Pagination({