@primer/components 31.2.1-rc.f73a0f8c → 32.0.1-rc.c4c2c50a

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/FilterList.jsx

@@ -9,7 +9,8 @@ const constants_1 = require("./constants");
 const sx_1 = __importDefault(require("./sx"));
 const FilterListBase = styled_components_1.default.ul `
   list-style-type: none;
-  ${constants_1.COMMON};
+  margin: 0;
+  padding: 0;
   ${sx_1.default};
 `;
 const FilterList = ({ children, ...rest }) => {
@@ -44,7 +45,6 @@ const FilterListItemBase = styled_components_1.default.a `
     float: right;
     font-weight: ${constants_1.get('fontWeights.bold')};
   }
-  ${constants_1.COMMON};
   ${sx_1.default};
 `;
 function FilterListItem({ children, count, ...rest }) {
@@ -55,9 +55,5 @@ function FilterListItem({ children, count, ...rest }) {
       {children}
     </FilterListItemBase>);
 }
-FilterList.defaultProps = {
-    m: 0,
-    p: 0
-};
 FilterListItem.displayName = 'FilterList.Item';
 exports.default = Object.assign(FilterList, { Item: FilterListItem });

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/FilteredSearch.jsx

@@ -7,7 +7,6 @@ const styled_components_1 = __importDefault(require("styled-components"));
 const constants_1 = require("./constants");
 const sx_1 = __importDefault(require("./sx"));
 const FilteredSearch = styled_components_1.default.div `
-  ${constants_1.COMMON};
   display: flex;
   align-items: stretch;
 

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/Flash.jsx

@@ -60,7 +60,6 @@ const Flash = styled_components_1.default.div `
     margin-right: ${constants_1.get('space.2')};
   }
 
-  ${constants_1.COMMON};
   ${variants};
   ${sx_1.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/FormGroup.jsx

@@ -9,7 +9,6 @@ const sx_1 = __importDefault(require("./sx"));
 const FormGroup = styled_components_1.default.div `
   margin: ${constants_1.get('space.3')} 0;
   font-weight: ${constants_1.get('fontWeights.normal')};
-  ${constants_1.COMMON};
   ${sx_1.default};
 `;
 const FormGroupLabel = styled_components_1.default.label `
@@ -17,8 +16,6 @@ const FormGroupLabel = styled_components_1.default.label `
   margin: 0 0 ${constants_1.get('space.2')};
   font-size: ${constants_1.get('fontSizes.1')};
   font-weight: ${constants_1.get('fontWeights.bold')};
-  ${constants_1.TYPOGRAPHY};
-  ${constants_1.COMMON};
   ${sx_1.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/Header.jsx

@@ -36,8 +36,6 @@ const Header = styled_components_1.default.div `
   align-items: center;
   flex-wrap: nowrap;
 
-  ${constants_1.COMMON}
-  ${constants_1.BORDER}
   ${sx_1.default};
 `;
 const HeaderItem = styled_components_1.default.div `
@@ -52,8 +50,6 @@ const HeaderItem = styled_components_1.default.div `
       flex: auto;
     `};
 
-  ${constants_1.COMMON};
-  ${constants_1.BORDER};
   ${sx_1.default};
 `;
 HeaderItem.displayName = 'Header.Item';
@@ -81,9 +77,6 @@ const HeaderLink = styled_components_1.default.a.attrs(({ to }) => {
     color: ${constants_1.get('colors.header.text')};
   }
 
-  ${constants_1.COMMON};
-  ${constants_1.BORDER};
-  ${constants_1.TYPOGRAPHY};
   ${sx_1.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/Label.jsx

@@ -33,7 +33,6 @@ const outlineStyles = styled_components_1.css `
   border: ${constants_1.get('borderWidths.1')} solid ${constants_1.get('colors.border.default')};
   box-shadow: none;
   ${styled_system_1.borderColor};
-  ${constants_1.COMMON};
   background-color: transparent;
 `;
 const sizeVariant = styled_system_1.variant({
@@ -66,19 +65,18 @@ const Label = styled_components_1.default.span `
   font-weight: ${constants_1.get('fontWeights.semibold')};
   color: ${constants_1.get('colors.fg.onEmphasis')};
   border-radius: ${constants_1.get('radii.3')};
+  background-color: ${constants_1.get('colors.neutral.emphasis')};
 
   &:hover {
     text-decoration: none;
   }
 
   ${sizeVariant}
-  ${constants_1.COMMON}
   ${props => (props.dropshadow ? 'box-shadow: inset 0 -1px 0 rgba(27, 31, 35, 0.12)' : '')}
   ${props => (props.outline ? outlineStyles : '')} // must be last to override other values
   ${sx_1.default}
 `;
 Label.defaultProps = {
-    bg: 'neutral.emphasis',
     variant: 'medium'
 };
 exports.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/LabelGroup.jsx

@@ -7,7 +7,6 @@ const styled_components_1 = __importDefault(require("styled-components"));
 const constants_1 = require("./constants");
 const sx_1 = __importDefault(require("./sx"));
 const LabelGroup = styled_components_1.default.span `
-  ${constants_1.COMMON}
   & * {
     margin-right: ${constants_1.get('space.1')};
   }

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/Link.jsx

@@ -31,8 +31,6 @@ const Link = styled_components_1.default.a `
     border: 0;
     appearance: none;
   }
-  ${constants_1.TYPOGRAPHY};
-  ${constants_1.COMMON};
   ${sx_1.default};
 `;
 exports.default = Link;

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/button.jsx

@@ -28,6 +28,7 @@ const Box_1 = __importDefault(require("../Box"));
 const styled_components_1 = __importDefault(require("styled-components"));
 const sx_1 = __importStar(require("../sx"));
 const ThemeProvider_1 = require("../ThemeProvider");
+const TEXT_ROW_HEIGHT = '20px'; // custom value off the scale
 const getVariantStyles = (variant = 'default', theme) => {
     const style = {
         default: {
@@ -151,7 +152,7 @@ const getVariantStyles = (variant = 'default', theme) => {
                 borderColor: 'btn.outline.focusBorder',
                 boxShadow: `${theme?.shadows.btn.outline.focusShadow}`
             },
-            '&:active': {
+            '&:active:not([disabled])': {
                 color: 'btn.outline.selectedText',
                 backgroundColor: 'btn.outline.selectedBg',
                 boxShadow: `${theme?.shadows.btn.outline.selectedShadow}`,
@@ -208,10 +209,9 @@ const getSizeStyles = (size = 'medium', variant = 'default', iconOnly) => {
     };
 };
 const ButtonBase = styled_components_1.default.button(sx_1.default);
-const Button = react_1.forwardRef(({ children, ...props }, forwardedRef) => {
-    const { icon: Icon, leadingIcon: LeadingIcon, trailingIcon: TrailingIcon, variant = 'default', size = 'medium', sx: sxProp = {} } = props;
+const Button = react_1.forwardRef(({ children, sx: sxProp = {}, ...props }, forwardedRef) => {
+    const { icon: Icon, leadingIcon: LeadingIcon, trailingIcon: TrailingIcon, variant = 'default', size = 'medium' } = props;
     const iconOnly = !!Icon;
-    const TEXT_ROW_HEIGHT = '20px'; // custom value off the scale
     const { theme } = ThemeProvider_1.useTheme();
     const styles = {
         borderRadius: '2',
@@ -250,28 +250,29 @@ const Button = react_1.forwardRef(({ children, ...props }, forwardedRef) => {
             gridArea: 'trailingIcon'
         }
     };
-    const variableStyles = { ...getSizeStyles(size, variant, iconOnly), ...getVariantStyles(variant, theme) };
-    const componentStyles = { ...styles, ...variableStyles };
     const iconWrapStyles = {
         display: 'inline-block'
     };
-    return (
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore Why wont it accept the sx prop?
-    <ButtonBase sx={sx_1.merge(componentStyles, sxProp)} ref={forwardedRef} {...props}>
-      {LeadingIcon && (<Box_1.default as="span" data-component="leadingIcon" sx={iconWrapStyles} aria-hidden={!iconOnly}>
-          <LeadingIcon />
-        </Box_1.default>)}
-      <span data-component="text" hidden={Icon ? true : undefined}>
-        {children}
-      </span>
-      {Icon && (<Box_1.default data-component="icon-only" as="span" sx={{ display: 'inline-block' }} aria-hidden={!iconOnly}>
-          <Icon />
-        </Box_1.default>)}
-      {TrailingIcon && (<Box_1.default as="span" data-component="trailingIcon" sx={{ ...iconWrapStyles, ml: 2 }} aria-hidden={!iconOnly}>
-          <TrailingIcon />
-        </Box_1.default>)}
-    </ButtonBase>);
+    const sxStyles = sx_1.merge.all([
+        styles,
+        getSizeStyles(size, variant, iconOnly),
+        getVariantStyles(variant, theme),
+        sxProp
+    ]);
+    return (<ButtonBase sx={sxStyles} ref={forwardedRef} {...props}>
+        {LeadingIcon && (<Box_1.default as="span" data-component="leadingIcon" sx={iconWrapStyles} aria-hidden={!iconOnly}>
+            <LeadingIcon />
+          </Box_1.default>)}
+        <span data-component="text" hidden={Icon ? true : false}>
+          {children}
+        </span>
+        {Icon && (<Box_1.default data-component="icon-only" as="span" sx={{ display: 'inline-block' }} aria-hidden={!iconOnly}>
+            <Icon />
+          </Box_1.default>)}
+        {TrailingIcon && (<Box_1.default as="span" data-component="trailingIcon" sx={{ ...iconWrapStyles, ml: 2 }} aria-hidden={!iconOnly}>
+            <TrailingIcon />
+          </Box_1.default>)}
+      </ButtonBase>);
 });
 exports.Button = Button;
 Button.displayName = 'Button';