@primer/components 0.0.0-202111885047 → 0.0.0-2021119104340

package/lib/BranchName.js

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

package/lib/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/NewButton/button.js

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

package/lib/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/NewButton/index.js

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

package/lib/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/NewButton/types.js

@@ -1,19 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.StyledButton = void 0;
-
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-
-var _sx = _interopRequireDefault(require("../sx"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const StyledButton = _styledComponents.default.button.withConfig({
-  displayName: "types__StyledButton",
-  componentId: "sc-1sm8kx1-0"
-})(_sx.default);
-
-exports.StyledButton = StyledButton;
+"use strict";

package/lib-esm/BranchName.js

@@ -4,5 +4,5 @@ import sx from './sx';
 const BranchName = styled.a.withConfig({
   displayName: "BranchName",
   componentId: "sc-167ouzm-0"
-})(["display:inline-block;padding:2px 6px;font-size:", ";font-family:", ";color:", ";background-color:", ";border-radius:", ";text-decoration:none;", ";"], get('fontSizes.0'), get('fonts.mono'), get('colors.accent.fg'), get('colors.accent.subtle'), get('radii.2'), sx);
+})(["display:inline-block;padding:2px 6px;font-size:", ";font-family:", ";color:", ";background-color:", ";border-radius:", ";", ";"], get('fontSizes.0'), get('fonts.mono'), get('colors.fg.muted'), get('colors.accent.subtle'), get('radii.2'), sx);
 export default BranchName;

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 };