@sproutsocial/racine 11.3.0-beta.0 → 11.3.0-beta.3

package/__flow__/Input/index.test.js

@@ -72,16 +72,31 @@ describe("Input", () => {
   describe("Input.ClearButton", () => {
     describe("Input type=search", () => {
       it("should render a clear button for search Inputs", () => {
-        const { getByTitle } = render(
+        const { getByRole } = render(
           <Input
             id="name"
             name="name"
             value="mic"
             type="search"
+            onClear={jest.fn()}
+            clearButtonLabel="Clear search"
+          />
+        );
+        expect(getByRole("button")).toBeTruthy();
+      });
+
+      it("should not render a clear button for search Inputs if there is no text", () => {
+        const { queryByRole } = render(
+          <Input
+            id="name"
+            name="name"
+            value=""
+            type="search"
+            onClear={jest.fn()}
             clearButtonLabel="Clear search"
           />
         );
-        expect(getByTitle("Clear search")).toBeTruthy();
+        expect(queryByRole("button")).toBeFalsy();
       });
 
       it("should not override an elemAfter prop if passed", () => {
@@ -91,6 +106,7 @@ describe("Input", () => {
             name="name"
             value="mic"
             type="search"
+            onClear={jest.fn()}
             elemAfter={<Text>After</Text>}
           />
         );
@@ -99,42 +115,32 @@ describe("Input", () => {
       });
 
       it("should use the fallback title if clearButtonLabel is not provided", () => {
-        const { getByTitle } = render(
-          <Input id="name" name="name" value="mic" type="search" />
-        );
-        expect(getByTitle("Clear")).toBeTruthy();
-      });
-
-      it("should call onClear when clicked", () => {
-        const mockOnClear = jest.fn();
         const { getByTitle } = render(
           <Input
             id="name"
             name="name"
             value="mic"
             type="search"
-            onClear={mockOnClear}
-            clearButtonLabel="Clear search"
+            onClear={jest.fn()}
           />
         );
-        fireEvent.click(getByTitle("Clear search"));
-        expect(mockOnClear).toHaveBeenCalled();
+        expect(getByTitle("Clear")).toBeTruthy();
       });
 
-      it("should call onChange when clicked if there is no onClear prop", () => {
-        const mockOnChange = jest.fn();
-        const { getByTitle } = render(
+      it("should call onClear when clicked", () => {
+        const mockOnClear = jest.fn();
+        const { getByRole } = render(
           <Input
             id="name"
             name="name"
             value="mic"
             type="search"
-            onChange={mockOnChange}
+            onClear={mockOnClear}
             clearButtonLabel="Clear search"
           />
         );
-        fireEvent.click(getByTitle("Clear search"));
-        expect(mockOnChange).toHaveBeenLastCalledWith(expect.anything(), "");
+        fireEvent.click(getByRole("button"));
+        expect(mockOnClear).toHaveBeenCalled();
       });
 
       it("should allow keyboard access to and Space key triggering of the clear button", () => {
@@ -184,7 +190,7 @@ describe("Input", () => {
 
     describe("Manual Input.ClearButton usage", () => {
       it("should render a clear button when passed with elemAfter", () => {
-        const { getByTitle } = render(
+        const { getByRole } = render(
           <Input
             id="name"
             name="name"
@@ -194,24 +200,24 @@ describe("Input", () => {
             clearButtonLabel="Clear search"
           />
         );
-        expect(getByTitle("Clear search")).toBeTruthy();
+        expect(getByRole("button")).toBeTruthy();
       });
 
-      it("should use the fallback title if clearButtonLabel is not provided", () => {
-        const { getByTitle } = render(
+      it("should not render a clear button if there is no text", () => {
+        const { queryByRole } = render(
           <Input
             id="name"
             name="name"
-            value="mic"
+            value=""
             type="text"
             elemAfter={<Input.ClearButton />}
+            clearButtonLabel="Clear search"
           />
         );
-        expect(getByTitle("Clear")).toBeTruthy();
+        expect(queryByRole("button")).toBeFalsy();
       });
 
-      it("should call onClear when Input.ClearButton is clicked", () => {
-        const mockOnClear = jest.fn();
+      it("should use the fallback title if clearButtonLabel is not provided", () => {
         const { getByTitle } = render(
           <Input
             id="name"
@@ -219,29 +225,26 @@ describe("Input", () => {
             value="mic"
             type="text"
             elemAfter={<Input.ClearButton />}
-            onClear={mockOnClear}
-            clearButtonLabel="Clear search"
           />
         );
-        fireEvent.click(getByTitle("Clear search"));
-        expect(mockOnClear).toHaveBeenCalled();
+        expect(getByTitle("Clear")).toBeTruthy();
       });
 
-      it("should call onChange when clicked if there is no onClear prop", () => {
-        const mockOnChange = jest.fn();
-        const { getByTitle } = render(
+      it("should call onClear when Input.ClearButton is clicked", () => {
+        const mockOnClear = jest.fn();
+        const { getByRole } = render(
           <Input
             id="name"
             name="name"
             value="mic"
             type="text"
             elemAfter={<Input.ClearButton />}
-            onChange={mockOnChange}
+            onClear={mockOnClear}
             clearButtonLabel="Clear search"
           />
         );
-        fireEvent.click(getByTitle("Clear search"));
-        expect(mockOnChange).toHaveBeenLastCalledWith(expect.anything(), "");
+        fireEvent.click(getByRole("button"));
+        expect(mockOnClear).toHaveBeenCalled();
       });
 
       it("should allow keyboard access to and Space key triggering of the clear button", () => {

package/__flow__/Link/index.js

@@ -8,10 +8,11 @@ type TypeProps = {
   /** Optional prop to make the URL open in a new tab */
   external?: boolean,
   children: React.Node,
+  /** Setting this prop will cause the component to be rendered as a link */
   href?: string,
   /** Disables user action and applies a disabled style to the component */
   disabled?: boolean,
-  /** Setting this prop will cause the component to be rendered as a button instead of an anchor) */
+  /** Can be used in addition to an href but still renders as a link. Omitting href will render as button */
   onClick?: (e: SyntheticEvent<HTMLButtonElement>) => void,
   as?: $PropertyType<TypeStyledComponentsCommonProps, "as">,
   underline?: boolean,

package/__flow__/themes/extendedThemes/README.md

@@ -0,0 +1,6 @@
+## Extended Theme Directory
+
+This directory serves as a shared environment for all extended themes. Each unique theme should have its own folder and theme.js file.
+`src/themes/extendedThemes/customTheme/theme.js`
+
+Check out our documentation for [How to extend the theme](https://seeds.sproutsocial.com/components/theme#extending-the-theme) on Seeds.

package/commonjs/Badge/constants.js

@@ -0,0 +1,43 @@
+"use strict";
+
+exports.__esModule = true;
+exports.legacyBadgeColors = void 0;
+var defaultPurple = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.purple"
+};
+var suggestion = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.blue"
+};
+var passive = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.neutral"
+};
+var primary = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.blue"
+};
+var secondary = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.yellow"
+};
+var common = {
+  color: "colors.text.inverse",
+  background: "colors.aqua.600"
+};
+var approval = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.orange"
+}; //Deprecated former "types"
+
+var legacyBadgeColors = {
+  primary: primary,
+  secondary: secondary,
+  passive: passive,
+  common: common,
+  approval: approval,
+  default: defaultPurple,
+  suggestion: suggestion
+};
+exports.legacyBadgeColors = legacyBadgeColors;

package/commonjs/Badge/index.js

@@ -5,9 +5,13 @@ exports.default = void 0;
 
 var React = _interopRequireWildcard(require("react"));
 
+var _Icon = _interopRequireDefault(require("../Icon"));
+
 var _styles = _interopRequireDefault(require("./styles"));
 
-var _excluded = ["size", "type", "tip", "text"];
+var _Box = _interopRequireDefault(require("../Box"));
+
+var _excluded = ["children", "text", "iconName", "type", "tip", "size", "badgeColor"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -19,43 +23,41 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-var Badge = /*#__PURE__*/function (_React$Component) {
-  _inheritsLoose(Badge, _React$Component);
-
-  function Badge() {
-    return _React$Component.apply(this, arguments) || this;
+var Badge = function Badge(_ref) {
+  var children = _ref.children,
+      text = _ref.text,
+      iconName = _ref.iconName,
+      type = _ref.type,
+      tip = _ref.tip,
+      _ref$size = _ref.size,
+      size = _ref$size === void 0 ? "small" : _ref$size,
+      _ref$badgeColor = _ref.badgeColor,
+      badgeColor = _ref$badgeColor === void 0 ? "blue" : _ref$badgeColor,
+      rest = _objectWithoutPropertiesLoose(_ref, _excluded);
+
+  if (children && text) {
+    throw new Error("can't use both `children` and `text` props. Text is deprecated, consider using children.");
   }
 
-  var _proto = Badge.prototype;
-
-  _proto.render = function render() {
-    var _this$props = this.props,
-        size = _this$props.size,
-        type = _this$props.type,
-        tip = _this$props.tip,
-        text = _this$props.text,
-        rest = _objectWithoutPropertiesLoose(_this$props, _excluded);
-
-    return /*#__PURE__*/React.createElement(_styles.default, _extends({
-      type: type,
-      small: size === "small",
-      "data-tip": tip,
-      "data-qa-badge": text || "",
-      "data-qa-badge-type": type,
-      "data-qa-badge-tip": tip || "" // $FlowIssue - upgrade v0.112.0
-
-    }, rest), text);
-  };
-
-  return Badge;
-}(React.Component);
-
-exports.default = Badge;
-Badge.defaultProps = {
-  type: "primary",
-  size: "default"
-};
+  return /*#__PURE__*/React.createElement(_styles.default, _extends({}, rest, {
+    // size previously included default, which currently maps to small.  Once consumers have updated this can be simplified.
+    size: size === "default" ? "large" : size,
+    badgeColor: badgeColor,
+    "data-tip": tip,
+    "data-qa-badge": text || "",
+    "data-qa-badge-type": type,
+    "data-qa-badge-tip": tip || "",
+    type: type && type
+  }), /*#__PURE__*/React.createElement(_Box.default, {
+    display: "flex",
+    alignItems: "center",
+    JustifyContent: "center"
+  }, iconName ? /*#__PURE__*/React.createElement(_Icon.default, {
+    mr: 200,
+    name: iconName,
+    size: size === "small" ? "mini" : "default"
+  }) : null, children || text));
+};
+
+var _default = Badge;
+exports.default = _default;

package/commonjs/Badge/styles.js

@@ -3,46 +3,30 @@
 exports.__esModule = true;
 exports.default = void 0;
 
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
+var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _systemProps = require("../utils/system-props");
 
 var _themeGet = require("@styled-system/theme-get");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var colors = {
-  primary: "colors.neutral.0",
-  secondary: "colors.neutral.800",
-  passive: "colors.neutral.800",
-  common: "colors.neutral.0",
-  approval: "colors.neutral.800",
-  default: "colors.neutral.0",
-  suggestion: "colors.neutral.900"
-};
-var backgroundColors = {
-  primary: "colors.blue.700",
-  secondary: "colors.yellow.500",
-  passive: "colors.neutral.200",
-  common: "colors.aqua.600",
-  approval: "colors.orange.300",
-  default: "colors.purple.700",
-  suggestion: "colors.blue.300"
-}; // eslint-disable-next-line prettier/prettier
+var _constants = require("./constants");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// eslint-disable-next-line prettier/prettier
 var Container = _styledComponents.default.span.withConfig({
   displayName: "styles__Container",
   componentId: "sc-g1g76b-0"
-})(["display:inline-block;text-align:center;border-radius:50px;font-family:", ";padding:", ";", " ", " ", ""], function (props) {
-  return props.theme.fontFamily;
-}, function (props) {
-  return props.small ? props.theme.space[200] + " " + props.theme.space[300] : props.theme.space[300] + " " + props.theme.space[350];
-}, function (props) {
-  return props.small ? props.theme.typography[100] : props.theme.typography[200];
-}, function (props) {
-  return (0, _styledComponents.css)(["color:", ";background:", ";"], (0, _themeGet.themeGet)(colors[props.type])(props), (0, _themeGet.themeGet)(backgroundColors[props.type])(props));
+})(["font-family:", ";", ";border-radius:9999px;line-height:16px;display:inline-block;color:", ";background:", ";padding:", ";", ";"], function (p) {
+  return p.theme.fontFamily;
+}, function (p) {
+  return p.size === "small" ? p.theme.typography[100] : p.theme.typography[200];
+}, function (p) {
+  return p.type ? (0, _themeGet.themeGet)(_constants.legacyBadgeColors[p.type].color) : p.theme.colors.text.body;
+}, function (p) {
+  return p.type ? (0, _themeGet.themeGet)(_constants.legacyBadgeColors[p.type].background) : p.theme.colors.container.background.decorative[p.badgeColor];
+}, function (p) {
+  return p.size === "small" ? p.theme.space[0] + " " + p.theme.space[200] : "" + p.theme.space[300];
 }, _systemProps.COMMON);
 
 var _default = Container;

package/commonjs/Input/index.js

@@ -11,7 +11,7 @@ var _Button = _interopRequireDefault(require("../Button"));
 
 var _Icon = _interopRequireDefault(require("../Icon"));
 
-var _excluded = ["autoComplete", "autoFocus", "disabled", "readOnly", "isInvalid", "hasWarning", "id", "name", "placeholder", "type", "required", "value", "elemBefore", "elemAfter", "maxLength", "ariaLabel", "ariaDescribedby", "clearButtonLabel", "innerRef", "onBlur", "onChange", "onClear", "onFocus", "onKeyDown", "onKeyUp", "onPaste", "inputProps", "qa", "appearance"];
+var _excluded = ["autoComplete", "autoFocus", "disabled", "readOnly", "isInvalid", "hasWarning", "id", "name", "placeholder", "type", "required", "value", "elemBefore", "elemAfter", "maxLength", "ariaLabel", "ariaDescribedby", "clearButtonLabel", "innerRef", "onBlur", "onChange", "onClear", "onFocus", "onKeyDown", "onKeyUp", "onPaste", "inputProps", "qa", "appearance", "size"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -32,14 +32,44 @@ var InputContext = /*#__PURE__*/React.createContext({});
 var ClearButton = function ClearButton() {
   var _React$useContext = React.useContext(InputContext),
       handleClear = _React$useContext.handleClear,
-      clearButtonLabel = _React$useContext.clearButtonLabel;
+      clearButtonLabel = _React$useContext.clearButtonLabel,
+      hasValue = _React$useContext.hasValue,
+      size = _React$useContext.size; // Hide the button when there is no text to clear.
+
+
+  if (!hasValue) {
+    return null;
+  } // Cut down the padding for size small Inputs so that the focus ring won't go outside the bounds of the Input.
+  // This adjustment is handled automatically for default and large Inputs via Button's size. There is no "small" Button.
+
+
+  var py = size === "small" ? 100 : undefined;
+  var px = size === "small" ? 200 : undefined;
+  var buttonSize = size === "small" ? "default" : size; // Warn if clearButtonLabel is not included, so that the unlocalized fallback will not be mistaken for a proper label.
+
+  if (!clearButtonLabel) {
+    console.warn("Warning: clearButtonLabel prop is required when using Input.ClearButton. Please pass a localized label to Input.");
+  }
 
   return /*#__PURE__*/React.createElement(_Button.default, {
-    onClick: handleClear
+    onClick: handleClear,
+    size: buttonSize,
+    py: py,
+    px: px
   }, /*#__PURE__*/React.createElement(_Icon.default, {
     name: "circlex",
     title: clearButtonLabel || "Clear"
   }));
+}; // Used for positioning elementAfter. This logic will detect if the element is a ClearButton,
+// regardless of whether it was manually passed as elemAfter or automatically added to a search Input.
+
+
+var isClearButton = function isClearButton(elem) {
+  if (elem != null && elem.type) {
+    return elem.type.displayName === "Input.ClearButton";
+  }
+
+  return false;
 };
 
 var Input = /*#__PURE__*/function (_React$Component) {
@@ -59,11 +89,10 @@ var Input = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.handleClear = function (e) {
-      if (_this.props.onClear) {
-        _this.props.onClear(e);
-      } else if (_this.props.onChange) {
-        _this.props.onChange(e, "");
-      }
+      var _this$props$innerRef, _this$props$innerRef$;
+
+      _this.props.onClear == null ? void 0 : _this.props.onClear(e);
+      (_this$props$innerRef = _this.props.innerRef) == null ? void 0 : (_this$props$innerRef$ = _this$props$innerRef.current) == null ? void 0 : _this$props$innerRef$.focus();
     };
 
     _this.handleChange = function (e) {
@@ -92,8 +121,6 @@ var Input = /*#__PURE__*/function (_React$Component) {
   var _proto = Input.prototype;
 
   _proto.render = function render() {
-    var _elementAfter$type;
-
     var _this$props = this.props,
         autoComplete = _this$props.autoComplete,
         autoFocus = _this$props.autoFocus,
@@ -126,6 +153,7 @@ var Input = /*#__PURE__*/function (_React$Component) {
         _this$props$qa = _this$props.qa,
         qa = _this$props$qa === void 0 ? {} : _this$props$qa,
         appearance = _this$props.appearance,
+        size = _this$props.size,
         rest = _objectWithoutPropertiesLoose(_this$props, _excluded); // Convert autoComplete from a boolean prop to a string value.
 
 
@@ -138,21 +166,26 @@ var Input = /*#__PURE__*/function (_React$Component) {
 
     var elementBefore = type === "search" && !elemBefore ? /*#__PURE__*/React.createElement(_Icon.default, {
       name: "search",
-      ariaHidden: true
-    }) : elemBefore;
-    var elementAfter = type === "search" && !elemAfter ? /*#__PURE__*/React.createElement(ClearButton, null) : elemAfter;
+      ariaHidden: true,
+      color: "icon.base"
+    }) : elemBefore; // Do not add a ClearButton if no onClear callback is provided or if an elemAfter prop was passed.
+
+    var elementAfter = type === "search" && onClear && !elemAfter ? /*#__PURE__*/React.createElement(ClearButton, null) : elemAfter;
     return /*#__PURE__*/React.createElement(_styles.default, _extends({
       hasBeforeElement: !!elementBefore,
       hasAfterElement: !!elementAfter,
       disabled: disabled,
       invalid: !!isInvalid,
       warning: hasWarning,
-      appearance: appearance // $FlowIssue - upgrade v0.112.0
+      appearance: appearance,
+      size: size // $FlowIssue - upgrade v0.112.0
 
     }, rest), /*#__PURE__*/React.createElement(InputContext.Provider, {
       value: {
         handleClear: this.handleClear,
-        clearButtonLabel: clearButtonLabel
+        hasValue: !!value,
+        clearButtonLabel: clearButtonLabel,
+        size: size
       }
     }, elementBefore && /*#__PURE__*/React.createElement(_styles.Accessory, {
       before: true
@@ -182,10 +215,8 @@ var Input = /*#__PURE__*/function (_React$Component) {
       "data-qa-input-isdisabled": disabled === true,
       "data-qa-input-isrequired": required === true
     }, qa, inputProps)), elementAfter && /*#__PURE__*/React.createElement(_styles.Accessory, {
-      after: true // Used for positioning. This logic will detect if the element is a ClearButton,
-      // regardless of whether it was manually passed as elemAfter or automatically added to a search Input.
-      ,
-      isClearButton: (elementAfter == null ? void 0 : (_elementAfter$type = elementAfter.type) == null ? void 0 : _elementAfter$type.prototype) === Input.ClearButton.prototype
+      after: true,
+      isClearButton: isClearButton(elementAfter)
     }, elementAfter)));
   };
 

package/lib/Badge/constants.js

@@ -0,0 +1,38 @@
+var defaultPurple = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.purple"
+};
+var suggestion = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.blue"
+};
+var passive = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.neutral"
+};
+var primary = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.blue"
+};
+var secondary = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.yellow"
+};
+var common = {
+  color: "colors.text.inverse",
+  background: "colors.aqua.600"
+};
+var approval = {
+  color: "colors.text.body",
+  background: "colors.container.background.decorative.orange"
+}; //Deprecated former "types"
+
+export var legacyBadgeColors = {
+  primary: primary,
+  secondary: secondary,
+  passive: passive,
+  common: common,
+  approval: approval,
+  default: defaultPurple,
+  suggestion: suggestion
+};

package/lib/Badge/index.js

@@ -1,49 +1,48 @@
-var _excluded = ["size", "type", "tip", "text"];
+var _excluded = ["children", "text", "iconName", "type", "tip", "size", "badgeColor"];
 
 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); }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 import * as React from "react";
+import Icon from "../Icon";
 import Container from "./styles";
-
-var Badge = /*#__PURE__*/function (_React$Component) {
-  _inheritsLoose(Badge, _React$Component);
-
-  function Badge() {
-    return _React$Component.apply(this, arguments) || this;
+import Box from "../Box";
+
+var Badge = function Badge(_ref) {
+  var children = _ref.children,
+      text = _ref.text,
+      iconName = _ref.iconName,
+      type = _ref.type,
+      tip = _ref.tip,
+      _ref$size = _ref.size,
+      size = _ref$size === void 0 ? "small" : _ref$size,
+      _ref$badgeColor = _ref.badgeColor,
+      badgeColor = _ref$badgeColor === void 0 ? "blue" : _ref$badgeColor,
+      rest = _objectWithoutPropertiesLoose(_ref, _excluded);
+
+  if (children && text) {
+    throw new Error("can't use both `children` and `text` props. Text is deprecated, consider using children.");
   }
 
-  var _proto = Badge.prototype;
-
-  _proto.render = function render() {
-    var _this$props = this.props,
-        size = _this$props.size,
-        type = _this$props.type,
-        tip = _this$props.tip,
-        text = _this$props.text,
-        rest = _objectWithoutPropertiesLoose(_this$props, _excluded);
-
-    return /*#__PURE__*/React.createElement(Container, _extends({
-      type: type,
-      small: size === "small",
-      "data-tip": tip,
-      "data-qa-badge": text || "",
-      "data-qa-badge-type": type,
-      "data-qa-badge-tip": tip || "" // $FlowIssue - upgrade v0.112.0
-
-    }, rest), text);
-  };
-
-  return Badge;
-}(React.Component);
-
-Badge.defaultProps = {
-  type: "primary",
-  size: "default"
+  return /*#__PURE__*/React.createElement(Container, _extends({}, rest, {
+    // size previously included default, which currently maps to small.  Once consumers have updated this can be simplified.
+    size: size === "default" ? "large" : size,
+    badgeColor: badgeColor,
+    "data-tip": tip,
+    "data-qa-badge": text || "",
+    "data-qa-badge-type": type,
+    "data-qa-badge-tip": tip || "",
+    type: type && type
+  }), /*#__PURE__*/React.createElement(Box, {
+    display: "flex",
+    alignItems: "center",
+    JustifyContent: "center"
+  }, iconName ? /*#__PURE__*/React.createElement(Icon, {
+    mr: 200,
+    name: iconName,
+    size: size === "small" ? "mini" : "default"
+  }) : null, children || text));
 };
-export { Badge as default };
+
+export default Badge;