@primer/components 31.2.1-rc.f73a0f8c → 32.0.1-rc.44e3df9b

package/lib/FilterList.js

@@ -18,7 +18,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const FilterListBase = _styledComponents.default.ul.withConfig({
   displayName: "FilterList__FilterListBase",
   componentId: "sc-1l4pxmz-0"
-})(["list-style-type:none;", ";", ";"], _constants.COMMON, _sx.default);
+})(["list-style-type:none;margin:0;padding:0;", ";"], _sx.default);
 
 const FilterList = ({
   children,
@@ -36,7 +36,7 @@ FilterList.displayName = "FilterList";
 const FilterListItemBase = _styledComponents.default.a.withConfig({
   displayName: "FilterList__FilterListItemBase",
   componentId: "sc-1l4pxmz-1"
-})(["position:relative;display:block;padding:", ";margin:", ";overflow:hidden;font-size:", ";color:", ";background-color:", "!important;text-decoration:none;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;border-radius:", ";&:hover{text-decoration:none;background-color:", ";}&:active{color:", ";background-color:", ";}.count{float:right;font-weight:", ";}", ";", ";"], props => props.small ? `${(0, _constants.get)('space.1')(props)} 10px` : `${(0, _constants.get)('space.2')(props)} 11px`, props => props.small ? '0 0 2px' : '0 0 5px 0', (0, _constants.get)('fontSizes.1'), props => props.selected ? (0, _constants.get)('colors.fg.onEmphasis') : (0, _constants.get)('colors.fg.muted'), props => props.selected ? (0, _constants.get)('colors.accent.emphasis') : '', (0, _constants.get)('radii.1'), (0, _constants.get)('colors.canvas.subtle'), (0, _constants.get)('colors.fg.onEmphasis'), (0, _constants.get)('colors.accent.emphasis'), (0, _constants.get)('fontWeights.bold'), _constants.COMMON, _sx.default);
+})(["position:relative;display:block;padding:", ";margin:", ";overflow:hidden;font-size:", ";color:", ";background-color:", "!important;text-decoration:none;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;border-radius:", ";&:hover{text-decoration:none;background-color:", ";}&:active{color:", ";background-color:", ";}.count{float:right;font-weight:", ";}", ";"], props => props.small ? `${(0, _constants.get)('space.1')(props)} 10px` : `${(0, _constants.get)('space.2')(props)} 11px`, props => props.small ? '0 0 2px' : '0 0 5px 0', (0, _constants.get)('fontSizes.1'), props => props.selected ? (0, _constants.get)('colors.fg.onEmphasis') : (0, _constants.get)('colors.fg.muted'), props => props.selected ? (0, _constants.get)('colors.accent.emphasis') : '', (0, _constants.get)('radii.1'), (0, _constants.get)('colors.canvas.subtle'), (0, _constants.get)('colors.fg.onEmphasis'), (0, _constants.get)('colors.accent.emphasis'), (0, _constants.get)('fontWeights.bold'), _sx.default);
 
 function FilterListItem({
   children,
@@ -50,10 +50,6 @@ function FilterListItem({
 }
 
 FilterListItem.displayName = "FilterListItem";
-FilterList.defaultProps = {
-  m: 0,
-  p: 0
-};
 FilterListItem.displayName = 'FilterList.Item';
 
 var _default = Object.assign(FilterList, {

package/lib/FilteredActionList/index.js

@@ -1,5 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FilteredActionList = void 0;
-var FilteredActionList_1 = require("./FilteredActionList");
-Object.defineProperty(exports, "FilteredActionList", { enumerable: true, get: function () { return FilteredActionList_1.FilteredActionList; } });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "FilteredActionList", {
+  enumerable: true,
+  get: function () {
+    return _FilteredActionList.FilteredActionList;
+  }
+});
+
+var _FilteredActionList = require("./FilteredActionList");

package/lib/FilteredSearch.d.ts

@@ -1,6 +1,5 @@
-import { SystemCommonProps } from './constants';
 import { SxProp } from './sx';
 import { ComponentProps } from './utils/types';
-declare const FilteredSearch: import("styled-components").StyledComponent<"div", any, SystemCommonProps & SxProp, never>;
+declare const FilteredSearch: import("styled-components").StyledComponent<"div", any, SxProp, never>;
 export declare type FilteredSearchProps = ComponentProps<typeof FilteredSearch>;
 export default FilteredSearch;

package/lib/FilteredSearch.js

@@ -16,7 +16,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const FilteredSearch = _styledComponents.default.div.withConfig({
   displayName: "FilteredSearch",
   componentId: "sc-15qfedq-0"
-})(["", ";display:flex;align-items:stretch;summary{border-radius:0;border-top-left-radius:", ";border-bottom-left-radius:", ";border-right:0;}.TextInput-wrapper{border-radius:0;border-top-right-radius:", ";border-bottom-right-radius:", ";z-index:1;}", ""], _constants.COMMON, (0, _constants.get)('radii.2'), (0, _constants.get)('radii.2'), (0, _constants.get)('radii.2'), (0, _constants.get)('radii.2'), _sx.default);
+})(["display:flex;align-items:stretch;summary{border-radius:0;border-top-left-radius:", ";border-bottom-left-radius:", ";border-right:0;}.TextInput-wrapper{border-radius:0;border-top-right-radius:", ";border-bottom-right-radius:", ";z-index:1;}", ""], (0, _constants.get)('radii.2'), (0, _constants.get)('radii.2'), (0, _constants.get)('radii.2'), (0, _constants.get)('radii.2'), _sx.default);
 
 var _default = FilteredSearch;
 exports.default = _default;

package/lib/Flash.d.ts

@@ -1,9 +1,8 @@
-import { SystemCommonProps } from './constants';
 import { SxProp } from './sx';
 import { ComponentProps } from './utils/types';
 declare const Flash: import("styled-components").StyledComponent<"div", any, {
     variant?: "success" | "danger" | "default" | "warning" | undefined;
     full?: boolean | undefined;
-} & SystemCommonProps & SxProp, never>;
+} & SxProp, never>;
 export declare type FlashProps = ComponentProps<typeof Flash>;
 export default Flash;

package/lib/Flash.js

@@ -55,7 +55,7 @@ const variants = (0, _styledSystem.variant)({
 const Flash = _styledComponents.default.div.withConfig({
   displayName: "Flash",
   componentId: "sc-4y90bn-0"
-})(["position:relative;color:", ";padding:", ";border-style:solid;border-width:", ";border-radius:", ";margin-top:", ";p:last-child{margin-bottom:0;}svg{margin-right:", ";}", ";", ";", ";"], (0, _constants.get)('colors.fg.default'), (0, _constants.get)('space.3'), props => props.full ? '1px 0px' : '1px', props => props.full ? '0' : (0, _constants.get)('radii.2'), props => props.full ? '-1px' : '0', (0, _constants.get)('space.2'), _constants.COMMON, variants, _sx.default);
+})(["position:relative;color:", ";padding:", ";border-style:solid;border-width:", ";border-radius:", ";margin-top:", ";p:last-child{margin-bottom:0;}svg{margin-right:", ";}", ";", ";"], (0, _constants.get)('colors.fg.default'), (0, _constants.get)('space.3'), props => props.full ? '1px 0px' : '1px', props => props.full ? '0' : (0, _constants.get)('radii.2'), props => props.full ? '-1px' : '0', (0, _constants.get)('space.2'), variants, _sx.default);
 
 Flash.defaultProps = {
   variant: 'default'

package/lib/FormGroup.d.ts

@@ -1,12 +1,11 @@
 /// <reference types="hoist-non-react-statics" />
-import { SystemCommonProps, SystemTypographyProps } from './constants';
 import { SxProp } from './sx';
 import { ComponentProps } from './utils/types';
-declare const FormGroup: import("styled-components").StyledComponent<"div", any, SystemCommonProps & SxProp, never>;
-declare const FormGroupLabel: import("styled-components").StyledComponent<"label", any, SystemTypographyProps & SystemCommonProps & SxProp, never>;
+declare const FormGroup: import("styled-components").StyledComponent<"div", any, SxProp, never>;
+declare const FormGroupLabel: import("styled-components").StyledComponent<"label", any, SxProp, never>;
 export declare type FormGroupProps = ComponentProps<typeof FormGroup>;
 export declare type FormGroupLabelProps = ComponentProps<typeof FormGroupLabel>;
-declare const _default: string & import("styled-components").StyledComponentBase<"div", any, SystemCommonProps & SxProp, never> & import("hoist-non-react-statics").NonReactStatics<never, {}> & {
-    Label: import("styled-components").StyledComponent<"label", any, SystemTypographyProps & SystemCommonProps & SxProp, never>;
+declare const _default: string & import("styled-components").StyledComponentBase<"div", any, SxProp, never> & import("hoist-non-react-statics").NonReactStatics<never, {}> & {
+    Label: import("styled-components").StyledComponent<"label", any, SxProp, never>;
 };
 export default _default;

package/lib/FormGroup.js

@@ -16,12 +16,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const FormGroup = _styledComponents.default.div.withConfig({
   displayName: "FormGroup",
   componentId: "sc-14z6yax-0"
-})(["margin:", " 0;font-weight:", ";", ";", ";"], (0, _constants.get)('space.3'), (0, _constants.get)('fontWeights.normal'), _constants.COMMON, _sx.default);
+})(["margin:", " 0;font-weight:", ";", ";"], (0, _constants.get)('space.3'), (0, _constants.get)('fontWeights.normal'), _sx.default);
 
 const FormGroupLabel = _styledComponents.default.label.withConfig({
   displayName: "FormGroup__FormGroupLabel",
   componentId: "sc-14z6yax-1"
-})(["display:block;margin:0 0 ", ";font-size:", ";font-weight:", ";", ";", ";", ";"], (0, _constants.get)('space.2'), (0, _constants.get)('fontSizes.1'), (0, _constants.get)('fontWeights.bold'), _constants.TYPOGRAPHY, _constants.COMMON, _sx.default);
+})(["display:block;margin:0 0 ", ";font-size:", ";font-weight:", ";", ";"], (0, _constants.get)('space.2'), (0, _constants.get)('fontSizes.1'), (0, _constants.get)('fontWeights.bold'), _sx.default);
 
 FormGroupLabel.displayName = 'FormGroup.Label';
 

package/lib/Header.d.ts

@@ -1,24 +1,23 @@
 /// <reference types="hoist-non-react-statics" />
 import * as History from 'history';
-import { SystemBorderProps, SystemCommonProps, SystemTypographyProps } from './constants';
 import { SxProp } from './sx';
 import { ComponentProps } from './utils/types';
-declare const Header: import("styled-components").StyledComponent<"div", any, SystemBorderProps & SystemCommonProps & SxProp, never>;
+declare const Header: import("styled-components").StyledComponent<"div", any, SxProp, never>;
 declare const HeaderItem: import("styled-components").StyledComponent<"div", any, {
     full?: boolean | undefined;
-} & SystemCommonProps & SxProp, never>;
+} & SxProp, never>;
 declare const HeaderLink: import("styled-components").StyledComponent<"a", any, {
     to?: History.LocationDescriptor<unknown> | undefined;
-} & SystemCommonProps & SxProp & SystemTypographyProps & SystemBorderProps, never>;
+} & SxProp, never>;
 export declare type HeaderProps = ComponentProps<typeof Header>;
 export declare type HeaderLinkProps = ComponentProps<typeof HeaderLink>;
 export declare type HeaderItemProps = ComponentProps<typeof HeaderItem>;
-declare const _default: string & import("styled-components").StyledComponentBase<"div", any, SystemBorderProps & SystemCommonProps & SxProp, never> & import("hoist-non-react-statics").NonReactStatics<never, {}> & {
+declare const _default: string & import("styled-components").StyledComponentBase<"div", any, SxProp, never> & import("hoist-non-react-statics").NonReactStatics<never, {}> & {
     Link: import("styled-components").StyledComponent<"a", any, {
         to?: History.LocationDescriptor<unknown> | undefined;
-    } & SystemCommonProps & SxProp & SystemTypographyProps & SystemBorderProps, never>;
+    } & SxProp, never>;
     Item: import("styled-components").StyledComponent<"div", any, {
         full?: boolean | undefined;
-    } & SystemCommonProps & SxProp, never>;
+    } & SxProp, never>;
 };
 export default _default;

package/lib/Header.js

@@ -21,14 +21,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 const Header = _styledComponents.default.div.withConfig({
   displayName: "Header",
   componentId: "sc-217i47-0"
-})(["z-index:32;display:flex;padding:", ";font-size:", ";line-height:", ";color:", ";background-color:", ";align-items:center;flex-wrap:nowrap;", " ", " ", ";"], (0, _constants.get)('space.3'), (0, _constants.get)('fontSizes.1'), (0, _constants.get)('lineHeights.default'), (0, _constants.get)('colors.header.text'), (0, _constants.get)('colors.header.bg'), _constants.COMMON, _constants.BORDER, _sx.default);
+})(["z-index:32;display:flex;padding:", ";font-size:", ";line-height:", ";color:", ";background-color:", ";align-items:center;flex-wrap:nowrap;", ";"], (0, _constants.get)('space.3'), (0, _constants.get)('fontSizes.1'), (0, _constants.get)('lineHeights.default'), (0, _constants.get)('colors.header.text'), (0, _constants.get)('colors.header.bg'), _sx.default);
 
 const HeaderItem = _styledComponents.default.div.withConfig({
   displayName: "Header__HeaderItem",
   componentId: "sc-217i47-1"
-})(["display:flex;margin-right:", ";align-self:stretch;align-items:center;flex-wrap:nowrap;", ";", ";", ";", ";"], (0, _constants.get)('space.3'), ({
+})(["display:flex;margin-right:", ";align-self:stretch;align-items:center;flex-wrap:nowrap;", ";", ";"], (0, _constants.get)('space.3'), ({
   full
-}) => full && (0, _styledComponents.css)(["flex:auto;"]), _constants.COMMON, _constants.BORDER, _sx.default);
+}) => full && (0, _styledComponents.css)(["flex:auto;"]), _sx.default);
 
 HeaderItem.displayName = 'Header.Item';
 
@@ -49,7 +49,7 @@ const HeaderLink = _styledComponents.default.a.attrs(({
 }).withConfig({
   displayName: "Header__HeaderLink",
   componentId: "sc-217i47-2"
-})(["font-weight:", ";color:", ";white-space:nowrap;cursor:pointer;text-decoration:none;display:flex;align-items:center;&:hover,&:focus{color:", ";}", ";", ";", ";", ";"], (0, _constants.get)('fontWeights.bold'), (0, _constants.get)('colors.header.logo'), (0, _constants.get)('colors.header.text'), _constants.COMMON, _constants.BORDER, _constants.TYPOGRAPHY, _sx.default);
+})(["font-weight:", ";color:", ";white-space:nowrap;cursor:pointer;text-decoration:none;display:flex;align-items:center;&:hover,&:focus{color:", ";}", ";"], (0, _constants.get)('fontWeights.bold'), (0, _constants.get)('colors.header.logo'), (0, _constants.get)('colors.header.text'), _sx.default);
 
 HeaderLink.displayName = 'Header.Link';
 

package/lib/Label.d.ts

@@ -1,11 +1,10 @@
 import { BorderColorProps } from 'styled-system';
-import { SystemCommonProps } from './constants';
 import { SxProp } from './sx';
 import { ComponentProps } from './utils/types';
 declare const Label: import("styled-components").StyledComponent<"span", any, {
     variant?: "small" | "medium" | "large" | "xl" | undefined;
     dropshadow?: boolean | undefined;
     outline?: boolean | undefined;
-} & BorderColorProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, string | number | symbol> & SystemCommonProps & SxProp, never>;
+} & BorderColorProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, string | number | symbol> & SxProp, never>;
 export declare type LabelProps = ComponentProps<typeof Label>;
 export default Label;

package/lib/Label.js

@@ -19,7 +19,7 @@ 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 outlineStyles = (0, _styledComponents.css)(["margin-top:-1px;margin-bottom:-1px;color:", ";border:", " solid ", ";box-shadow:none;", ";", ";background-color:transparent;"], (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('borderWidths.1'), (0, _constants.get)('colors.border.default'), _styledSystem.borderColor, _constants.COMMON);
+const outlineStyles = (0, _styledComponents.css)(["margin-top:-1px;margin-bottom:-1px;color:", ";border:", " solid ", ";box-shadow:none;", ";background-color:transparent;"], (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('borderWidths.1'), (0, _constants.get)('colors.border.default'), _styledSystem.borderColor);
 const sizeVariant = (0, _styledSystem.variant)({
   variants: {
     small: {
@@ -49,10 +49,9 @@ const sizeVariant = (0, _styledSystem.variant)({
 const Label = _styledComponents.default.span.withConfig({
   displayName: "Label",
   componentId: "sc-1t3ykp0-0"
-})(["display:inline-block;font-weight:", ";color:", ";border-radius:", ";&:hover{text-decoration:none;}", " ", " ", " ", "  ", ""], (0, _constants.get)('fontWeights.semibold'), (0, _constants.get)('colors.fg.onEmphasis'), (0, _constants.get)('radii.3'), sizeVariant, _constants.COMMON, props => props.dropshadow ? 'box-shadow: inset 0 -1px 0 rgba(27, 31, 35, 0.12)' : '', props => props.outline ? outlineStyles : '', _sx.default);
+})(["display:inline-block;font-weight:", ";color:", ";border-radius:", ";background-color:", ";&:hover{text-decoration:none;}", " ", " ", "  ", ""], (0, _constants.get)('fontWeights.semibold'), (0, _constants.get)('colors.fg.onEmphasis'), (0, _constants.get)('radii.3'), (0, _constants.get)('colors.neutral.emphasis'), sizeVariant, props => props.dropshadow ? 'box-shadow: inset 0 -1px 0 rgba(27, 31, 35, 0.12)' : '', props => props.outline ? outlineStyles : '', _sx.default);
 
 Label.defaultProps = {
-  bg: 'neutral.emphasis',
   variant: 'medium'
 };
 var _default = Label;

package/lib/LabelGroup.d.ts

@@ -1,6 +1,5 @@
-import { SystemCommonProps } from './constants';
 import { SxProp } from './sx';
 import { ComponentProps } from './utils/types';
-declare const LabelGroup: import("styled-components").StyledComponent<"span", any, SystemCommonProps & SxProp, never>;
+declare const LabelGroup: import("styled-components").StyledComponent<"span", any, SxProp, never>;
 export declare type LabelGroupProps = ComponentProps<typeof LabelGroup>;
 export default LabelGroup;

package/lib/LabelGroup.js

@@ -16,7 +16,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const LabelGroup = _styledComponents.default.span.withConfig({
   displayName: "LabelGroup",
   componentId: "k6k3qa-0"
-})(["", " & *{margin-right:", ";}& *:last-child{margin-right:0;}", ";"], _constants.COMMON, (0, _constants.get)('space.1'), _sx.default);
+})(["& *{margin-right:", ";}& *:last-child{margin-right:0;}", ";"], (0, _constants.get)('space.1'), _sx.default);
 
 var _default = LabelGroup;
 exports.default = _default;

package/lib/Link.d.ts

@@ -1,10 +1,9 @@
-import { SystemCommonProps, SystemTypographyProps } from './constants';
 import { SxProp } from './sx';
 import { ComponentProps } from './utils/types';
 declare const Link: import("styled-components").StyledComponent<"a", any, {
     hoverColor?: string | undefined;
     muted?: boolean | undefined;
     underline?: boolean | undefined;
-} & SystemCommonProps & SxProp & SystemTypographyProps, never>;
+} & SxProp, never>;
 export declare type LinkProps = ComponentProps<typeof Link>;
 export default Link;

package/lib/Link.js

@@ -25,7 +25,7 @@ const hoverColor = (0, _styledSystem.system)({
 const Link = _styledComponents.default.a.withConfig({
   displayName: "Link",
   componentId: "sc-1brdqhf-0"
-})(["color:", ";text-decoration:", ";&:hover{text-decoration:", ";", ";}&:is(button){display:inline-block;padding:0;font-size:inherit;white-space:nowrap;cursor:pointer;user-select:none;background-color:transparent;border:0;appearance:none;}", ";", ";", ";"], props => props.muted ? (0, _constants.get)('colors.fg.muted')(props) : (0, _constants.get)('colors.accent.fg')(props), props => props.underline ? 'underline' : 'none', props => props.muted ? 'none' : 'underline', props => props.hoverColor ? hoverColor : props.muted ? `color: ${(0, _constants.get)('colors.accent.fg')(props)}` : '', _constants.TYPOGRAPHY, _constants.COMMON, _sx.default);
+})(["color:", ";text-decoration:", ";&:hover{text-decoration:", ";", ";}&:is(button){display:inline-block;padding:0;font-size:inherit;white-space:nowrap;cursor:pointer;user-select:none;background-color:transparent;border:0;appearance:none;}", ";"], props => props.muted ? (0, _constants.get)('colors.fg.muted')(props) : (0, _constants.get)('colors.accent.fg')(props), props => props.underline ? 'underline' : 'none', props => props.muted ? 'none' : 'underline', props => props.hoverColor ? hoverColor : props.muted ? `color: ${(0, _constants.get)('colors.accent.fg')(props)}` : '', _sx.default);
 
 var _default = Link;
 exports.default = _default;

package/lib/NewButton/button.js

@@ -23,6 +23,8 @@ 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: {
@@ -146,7 +148,7 @@ const getVariantStyles = (variant = 'default', theme) => {
         borderColor: 'btn.outline.focusBorder',
         boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.outline.focusShadow}`
       },
-      '&:active': {
+      '&:active:not([disabled])': {
         color: 'btn.outline.selectedText',
         backgroundColor: 'btn.outline.selectedBg',
         boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.outline.selectedShadow}`,
@@ -217,6 +219,7 @@ const ButtonBase = _styledComponents.default.button.withConfig({
 
 const Button = /*#__PURE__*/(0, _react.forwardRef)(({
   children,
+  sx: sxProp = {},
   ...props
 }, forwardedRef) => {
   const {
@@ -224,12 +227,9 @@ const Button = /*#__PURE__*/(0, _react.forwardRef)(({
     leadingIcon: LeadingIcon,
     trailingIcon: TrailingIcon,
     variant = 'default',
-    size = 'medium',
-    sx: sxProp = {}
+    size = 'medium'
   } = props;
   const iconOnly = !!Icon;
-  const TEXT_ROW_HEIGHT = '20px'; // custom value off the scale
-
   const {
     theme
   } = (0, _ThemeProvider.useTheme)();
@@ -270,46 +270,38 @@ const Button = /*#__PURE__*/(0, _react.forwardRef)(({
       gridArea: 'trailingIcon'
     }
   };
-  const variableStyles = { ...getSizeStyles(size, variant, iconOnly),
-    ...getVariantStyles(variant, theme)
-  };
-  const componentStyles = { ...styles,
-    ...variableStyles
-  };
   const iconWrapStyles = {
     display: 'inline-block'
   };
-  return (
-    /*#__PURE__*/
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore Why wont it accept the sx prop?
-    _react.default.createElement(ButtonBase, _extends({
-      sx: (0, _sx.merge)(componentStyles, sxProp),
-      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 : undefined
-    }, 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)))
-  );
+
+  const sxStyles = _sx.merge.all([styles, getSizeStyles(size, variant, iconOnly), getVariantStyles(variant, theme), sxProp]);
+
+  return /*#__PURE__*/_react.default.createElement(ButtonBase, _extends({
+    sx: sxStyles,
+    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)));
 });
 exports.Button = Button;
 Button.displayName = 'Button';

package/lib/NewButton/index.js

@@ -1,8 +1,15 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.NewButton = void 0;
-const button_1 = require("./button");
-const button_counter_1 = require("./button-counter");
-exports.NewButton = Object.assign(button_1.Button, {
-    Counter: button_counter_1.Counter
+
+var _button = require("./button");
+
+var _buttonCounter = require("./button-counter");
+
+const NewButton = Object.assign(_button.Button, {
+  Counter: _buttonCounter.Counter
 });
+exports.NewButton = NewButton;

package/lib/NewButton/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";

package/lib/Overlay.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
-import { SystemPositionProps, SystemCommonProps } from './constants';
-import { ComponentProps } from './utils/types';
+import { AriaRole, Merge } from './utils/types';
 import { TouchOrMouseEvent } from './hooks';
 import { SxProp } from './sx';
 import { AnchorSide } from './behaviors/anchoredPosition';
@@ -10,7 +9,7 @@ declare type StyledOverlayProps = {
     maxHeight?: keyof Omit<typeof heightMap, 'auto' | 'initial'>;
     visibility?: 'visible' | 'hidden';
     anchorSide?: AnchorSide;
-};
+} & SxProp;
 declare const heightMap: {
     xsmall: string;
     small: string;
@@ -28,20 +27,22 @@ declare const widthMap: {
     xxlarge: string;
     auto: string;
 };
-declare const StyledOverlay: import("styled-components").StyledComponent<"div", any, StyledOverlayProps & SystemCommonProps & SxProp, never>;
-export declare type OverlayProps = {
+declare type BaseOverlayProps = {
     ignoreClickRefs?: React.RefObject<HTMLElement>[];
     initialFocusRef?: React.RefObject<HTMLElement>;
     returnFocusRef: React.RefObject<HTMLElement>;
     onClickOutside: (e: TouchOrMouseEvent) => void;
     onEscape: (e: KeyboardEvent) => void;
     visibility?: 'visible' | 'hidden';
-    [additionalKey: string]: unknown;
-    top: number;
-    left: number;
+    'data-test-id'?: unknown;
+    top?: number;
+    left?: number;
     portalContainerName?: string;
     preventFocusOnOpen?: boolean;
-} & Omit<ComponentProps<typeof StyledOverlay>, 'visibility' | keyof SystemPositionProps>;
+    role?: AriaRole;
+    children?: React.ReactNode;
+};
+export declare type OverlayProps = Merge<StyledOverlayProps, BaseOverlayProps>;
 /**
  * An `Overlay` is a flexible floating surface, used to display transient content such as menus,
  * selection options, dialogs, and more. Overlays use shadows to express elevation. The `Overlay`
@@ -59,5 +60,5 @@ export declare type OverlayProps = {
  * @param left Optional. Horizontal position of the overlay, relative to its closest positioned ancestor (often its `Portal`).
  * @param portalContainerName Optional. The name of the portal container to render the Overlay into.
  */
-declare const Overlay: React.ForwardRefExoticComponent<Pick<OverlayProps, string | number> & React.RefAttributes<HTMLDivElement>>;
+declare const Overlay: React.ForwardRefExoticComponent<Omit<StyledOverlayProps, keyof BaseOverlayProps> & BaseOverlayProps & React.RefAttributes<HTMLDivElement>>;
 export default Overlay;

package/lib/Overlay.js

@@ -9,10 +9,10 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _constants = require("./constants");
-
 var _useIsomorphicLayoutEffect = _interopRequireDefault(require("./utils/useIsomorphicLayoutEffect"));
 
+var _constants = require("./constants");
+
 var _hooks = require("./hooks");
 
 var _Portal = _interopRequireDefault(require("./Portal"));
@@ -83,7 +83,7 @@ function getSlideAnimationStartingVector(anchorSide) {
 const StyledOverlay = _styledComponents.default.div.withConfig({
   displayName: "Overlay__StyledOverlay",
   componentId: "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;}", ";", ";"], (0, _constants.get)('colors.canvas.overlay'), (0, _constants.get)('shadows.overlay.shadow'), props => heightMap[props.height || 'auto'], props => props.maxHeight && heightMap[props.maxHeight], props => widthMap[props.width || 'auto'], animationDuration, (0, _constants.get)('animation.easeOutCubic'), _constants.COMMON, _sx.default);
+})(["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;}", ";"], (0, _constants.get)('colors.canvas.overlay'), (0, _constants.get)('shadows.overlay.shadow'), props => heightMap[props.height || 'auto'], props => props.maxHeight && heightMap[props.maxHeight], props => widthMap[props.width || 'auto'], animationDuration, (0, _constants.get)('animation.easeOutCubic'), _sx.default);
 
 /**
  * An `Overlay` is a flexible floating surface, used to display transient content such as menus,
@@ -171,7 +171,6 @@ const Overlay = /*#__PURE__*/_react.default.forwardRef(({
     style: {
       top: `${top || 0}px`,
       left: `${left || 0}px`,
-      ...rest.style,
       '--styled-overlay-visibility': visibility
     }
   })));

package/lib/Pagehead.d.ts

@@ -1,6 +1,5 @@
-import { SystemCommonProps } from './constants';
 import { SxProp } from './sx';
 import { ComponentProps } from './utils/types';
-declare const Pagehead: import("styled-components").StyledComponent<"div", any, SystemCommonProps & SxProp, never>;
+declare const Pagehead: import("styled-components").StyledComponent<"div", any, SxProp, never>;
 export declare type PageheadProps = ComponentProps<typeof Pagehead>;
 export default Pagehead;

package/lib/Pagehead.js

@@ -16,7 +16,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const Pagehead = _styledComponents.default.div.withConfig({
   displayName: "Pagehead",
   componentId: "sc-1ntn78e-0"
-})(["position:relative;padding-top:", ";padding-bottom:", ";margin-bottom:", ";border-bottom:1px solid ", ";", ";", ";"], (0, _constants.get)('space.4'), (0, _constants.get)('space.4'), (0, _constants.get)('space.4'), (0, _constants.get)('colors.border.default'), _constants.COMMON, _sx.default);
+})(["position:relative;padding-top:", ";padding-bottom:", ";margin-bottom:", ";border-bottom:1px solid ", ";", ";"], (0, _constants.get)('space.4'), (0, _constants.get)('space.4'), (0, _constants.get)('space.4'), (0, _constants.get)('colors.border.default'), _sx.default);
 
 var _default = Pagehead;
 exports.default = _default;

package/lib/Pagination/Pagination.js

@@ -24,7 +24,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 const Page = _styledComponents.default.a.withConfig({
   displayName: "Pagination__Page",
   componentId: "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 );}}", ";"], (0, _constants.get)('colors.fg.default'), (0, _constants.get)('space.1'), (0, _constants.get)('borderWidths.1'), (0, _constants.get)('radii.2'), (0, _constants.get)('colors.border.default'), (0, _constants.get)('colors.border.muted'), (0, _constants.get)('colors.accent.fg'), (0, _constants.get)('colors.fg.onEmphasis'), (0, _constants.get)('colors.accent.emphasis'), (0, _constants.get)('colors.primer.fg.disabled'), (0, _constants.get)('space.1'), (0, _constants.get)('space.1'), _constants.COMMON);
+})(["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 );}}"], (0, _constants.get)('colors.fg.default'), (0, _constants.get)('space.1'), (0, _constants.get)('borderWidths.1'), (0, _constants.get)('radii.2'), (0, _constants.get)('colors.border.default'), (0, _constants.get)('colors.border.muted'), (0, _constants.get)('colors.accent.fg'), (0, _constants.get)('colors.fg.onEmphasis'), (0, _constants.get)('colors.accent.emphasis'), (0, _constants.get)('colors.primer.fg.disabled'), (0, _constants.get)('space.1'), (0, _constants.get)('space.1'));
 
 function usePaginationPages({
   theme,

package/lib/Pagination/index.js

@@ -1,7 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Pagination_1 = __importDefault(require("./Pagination"));
-exports.default = Pagination_1.default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _Pagination = _interopRequireDefault(require("./Pagination"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = _Pagination.default;
+exports.default = _default;

package/lib/Popover.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="hoist-non-react-statics" />
-import { SystemCommonProps, SystemLayoutProps, SystemPositionProps } from './constants';
 import { SxProp } from './sx';
 import { ComponentProps } from './utils/types';
 declare type CaretPosition = 'top' | 'bottom' | 'left' | 'right' | 'bottom-left' | 'bottom-right' | 'top-left' | 'top-right' | 'left-bottom' | 'left-top' | 'right-bottom' | 'right-top';
@@ -7,15 +6,15 @@ declare const Popover: import("styled-components").StyledComponent<"div", any, {
     caret?: CaretPosition | undefined;
     relative?: boolean | undefined;
     open?: boolean | undefined;
-} & SystemCommonProps & SystemLayoutProps & SystemPositionProps & SxProp, never>;
-declare const PopoverContent: import("styled-components").StyledComponent<"div", any, import("styled-system").SpaceProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, string | number | symbol> & import("styled-system").ColorProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, string | number | symbol> & import("styled-system").TypographyProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & import("styled-system").LayoutProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & import("styled-system").FlexboxProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & import("styled-system").GridProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & import("styled-system").BackgroundProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, import("csstype").Property.Background<import("styled-system").TLengthStyledSystem>> & import("styled-system").BorderProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, import("csstype").Property.Border<import("styled-system").TLengthStyledSystem>> & import("styled-system").PositionProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & import("styled-system").ShadowProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & SxProp, never>;
+} & SxProp, never>;
+declare const PopoverContent: import("styled-components").StyledComponent<"div", any, SxProp, never>;
 export declare type PopoverProps = ComponentProps<typeof Popover>;
 export declare type PopoverContentProps = ComponentProps<typeof PopoverContent>;
 declare const _default: string & import("styled-components").StyledComponentBase<"div", any, {
     caret?: CaretPosition | undefined;
     relative?: boolean | undefined;
     open?: boolean | undefined;
-} & SystemCommonProps & SystemLayoutProps & SystemPositionProps & SxProp, never> & import("hoist-non-react-statics").NonReactStatics<never, {}> & {
-    Content: import("styled-components").StyledComponent<"div", any, import("styled-system").SpaceProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, string | number | symbol> & import("styled-system").ColorProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, string | number | symbol> & import("styled-system").TypographyProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & import("styled-system").LayoutProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & import("styled-system").FlexboxProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & import("styled-system").GridProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & import("styled-system").BackgroundProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, import("csstype").Property.Background<import("styled-system").TLengthStyledSystem>> & import("styled-system").BorderProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, import("csstype").Property.Border<import("styled-system").TLengthStyledSystem>> & import("styled-system").PositionProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & import("styled-system").ShadowProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> & SxProp, never>;
+} & SxProp, never> & import("hoist-non-react-statics").NonReactStatics<never, {}> & {
+    Content: import("styled-components").StyledComponent<"div", any, SxProp, never>;
 };
 export default _default;