@sproutsocial/racine 11.3.0-beta.1 → 11.3.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Change Log
 
+## 11.2.4
+
+### Patch Changes
+
+- 206bd32: copy updates to the TypeProps comments that power Seeds prop tables
+
+## 11.2.3
+
+### Patch Changes
+
+- 514d738: Patch badge component flow issue
+
+## 11.2.2
+
+### Patch Changes
+
+- 9cc377e: Created extended theme directory
+
+## 11.2.1
+
+### Patch Changes
+
+- 6968733: adds deprecation messaging to typeProps to be displayed on seeds page
+
+## 11.2.0
+
+### Minor Changes
+
+- a71a431: backwards compatible style and api changes to the badge component
+
 ## 11.1.2
 
 ### Patch Changes

package/__flow__/Badge/constants.js

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

package/__flow__/Badge/index.js

@@ -1,43 +1,70 @@
 // @flow
 import * as React from "react";
+import Icon from "../Icon";
 import Container from "./styles";
+import Box from "../Box";
 
 type TypeProps = {
-  text: React.Node,
-  type:
-    | "primary"
-    | "secondary"
-    | "passive"
-    | "common"
-    | "approval"
-    | "default"
-    | "suggestion",
-  size: "default" | "small",
+  children?: React.Node,
+  /** DEPRECATED: Use children instead of text */
+  text?: React.Node,
+  /** Size default is deprecated in favor of small and large */
+  size?: "small" | "large" | "default",
+  badgeColor?:
+    | "green"
+    | "blue"
+    | "purple"
+    | "yellow"
+    | "orange"
+    | "red"
+    | "neutral",
+  iconName?: string,
+  /** DEPRECATED: Possibly only used for testing. Refrain from using at all if possible. (optional) */
   tip?: React.Node,
+  /** DEPRECATED: The legacy method of choosing a theme. Use badgeColor instead. (optional) */
+  type?: string,
 };
 
-export default class Badge extends React.Component<TypeProps> {
-  static defaultProps = {
-    type: "primary",
-    size: "default",
-  };
-
-  render() {
-    const { size, type, tip, text, ...rest } = this.props;
-
-    return (
-      <Container
-        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}
-      </Container>
+const Badge = ({
+  children,
+  text,
+  iconName,
+  type,
+  tip,
+  size = "small",
+  badgeColor = "blue",
+  ...rest
+}: TypeProps) => {
+  if (children && text) {
+    throw new Error(
+      "can't use both `children` and `text` props. Text is deprecated, consider using children."
     );
   }
-}
+
+  return (
+    <Container
+      {...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}
+    >
+      <Box display="flex" alignItems="center" JustifyContent="center">
+        {iconName ? (
+          <Icon
+            mr={200}
+            name={iconName}
+            size={size === "small" ? "mini" : "default"}
+          />
+        ) : null}
+        {children || text}
+      </Box>
+    </Container>
+  );
+};
+
+export default Badge;

package/__flow__/Badge/index.stories.js

@@ -1,53 +1,46 @@
 import React from "react";
-import { text } from "@storybook/addon-knobs";
 import Badge from "./index";
+import Box from "../Box";
+import Numeral from "../Numeral";
+import Text from "../Text";
+import Stack from "../Stack";
 
 export default {
   title: "Badge",
 };
 
 export const permutations = () => (
-  <>
-    <Badge
-      text={text("text", "Test")}
-      type="default"
-      size={text("size", "small")}
-    />
-    <Badge text={text("text", "Test")} size={text("size", "small")} />
-    <Badge
-      text={text("text", "Test")}
-      type="secondary"
-      size={text("size", "small")}
-    />
-    <Badge
-      text={text("text", "Test")}
-      type="passive"
-      size={text("size", "small")}
-    />
-    <Badge
-      text={text("text", "Test")}
-      type="common"
-      size={text("size", "small")}
-    />
-    <Badge
-      text={text("text", "Test")}
-      type="approval"
-      size={text("size", "small")}
-    />
-    <Badge
-      text={text("text", "Test")}
-      type="suggestion"
-      size={text("size", "small")}
-    />
-
-    <Badge text={text("text", "Test")} type="default" />
-    <Badge text={text("text", "Test")} />
-    <Badge text={text("text", "Test")} type="secondary" />
-    <Badge text={text("text", "Test")} type="passive" />
-    <Badge text={text("text", "Test")} type="common" />
-    <Badge text={text("text", "Test")} type="approval" />
-    <Badge text={text("text", "Test")} type="suggestion" />
-  </>
+  <Stack space={450}>
+    <Box display="flex" alignItems="center">
+      <Badge badgeColor="green">Badge</Badge>
+      <Badge>Badge</Badge>
+      <Badge badgeColor="purple">Badge</Badge>
+      <Badge badgeColor="yellow">Badge</Badge>
+      <Badge badgeColor="orange">Badge</Badge>
+      <Badge badgeColor="red">Badge</Badge>
+      <Badge badgeColor="neutral" iconName="atom">
+        Badge
+      </Badge>
+      <Badge
+        size="small"
+        type="default"
+        bg="chartreuse"
+        color="crimson"
+        p={500}
+      >
+        Radical overrides!
+      </Badge>
+    </Box>
+    <Box display="flex" alignItems="center">
+      <Badge size="large" type="secondary" iconName="sparkles">
+        Supports legacy types
+      </Badge>
+      <Badge size="large">
+        <Numeral fontWeight="bold" number={1569241} />
+        <Text ml={200}>and children!</Text>
+      </Badge>
+    </Box>
+  </Stack>
 );
 
 permutations.story = {

package/__flow__/Badge/index.test.js

@@ -3,48 +3,50 @@ import Badge from "./";
 import { render } from "../utils/react-testing-library";
 import "jest-styled-components";
 
-describe("Racine Badge", () => {
-  it("should render with default props", () => {
-    const { getByText, getByDataQaLabel } = render(<Badge text="Test" />);
+describe("Badge...", () => {
+  it("...should render with default props", () => {
+    const { getByText } = render(<Badge>Test</Badge>);
     expect(getByText("Test")).toBeTruthy();
-    expect(getByDataQaLabel({ "badge-type": "primary" })).toBeTruthy();
+    expect(getByText("Test").closest("span")).toHaveStyleRule(
+      "padding",
+      "0px 4px"
+    );
+    expect(getByText("Test").closest("span")).toHaveStyleRule(
+      "background",
+      "#dcf2ff"
+    );
   });
 
-  it("should render with correct size styling", () => {
-    const { getByText } = render(<Badge text="Test" size="small" />);
-    expect(getByText("Test")).toHaveStyleRule("padding", "4px 8px");
+  it("...should render with correct size styling", () => {
+    const { getByText } = render(<Badge size="large">Test</Badge>);
+    expect(getByText("Test").closest("span")).toHaveStyleRule("padding", "8px");
   });
 
-  it("should render with secondary type", () => {
-    const { getByText, getByDataQaLabel } = render(
-      <Badge text="Test" type="secondary" />
-    );
+  it("...should render with legacy type", () => {
+    const { getByText } = render(<Badge type="secondary">Test</Badge>);
     expect(getByText("Test")).toBeTruthy();
-    expect(getByDataQaLabel({ "badge-type": "secondary" })).toBeTruthy();
-  });
-
-  it("should render with passive type", () => {
-    const { getByText, getByDataQaLabel } = render(
-      <Badge text="Test" type="passive" />
+    expect(getByText("Test").closest("span")).toHaveStyleRule(
+      "color",
+      "#364141"
+    );
+    expect(getByText("Test").closest("span")).toHaveStyleRule(
+      "background",
+      "#fdefcd"
     );
-    expect(getByText("Test")).toBeTruthy();
-    expect(getByDataQaLabel({ "badge-type": "passive" })).toBeTruthy();
   });
 
-  it("should render with common type", () => {
-    const { getByText, getByDataQaLabel } = render(
-      <Badge text="Test" type="common" />
-    );
+  it("...should render with a badge color", () => {
+    const { getByText } = render(<Badge badgeColor="purple">Test</Badge>);
     expect(getByText("Test")).toBeTruthy();
-    expect(getByDataQaLabel({ "badge-type": "common" })).toBeTruthy();
+    expect(getByText("Test").closest("span")).toHaveStyleRule(
+      "background",
+      "#eaeaf9"
+    );
   });
 
-  it("should render with approval type", () => {
-    const { getByText, getByDataQaLabel } = render(
-      <Badge text="Test" type="approval" />
-    );
-    expect(getByText("Test")).toBeTruthy();
-    expect(getByDataQaLabel({ "badge-type": "approval" })).toBeTruthy();
+  it("...should render with an icon", () => {
+    const { container } = render(<Badge iconName="sparkles">Test</Badge>);
+    expect(container.querySelector("svg")).toBeTruthy();
   });
   it("should render with suggestion type", () => {
     const { getByText, getByDataQaLabel } = render(
@@ -54,9 +56,9 @@ describe("Racine Badge", () => {
     expect(getByDataQaLabel({ "badge-type": "suggestion" })).toBeTruthy();
   });
 
-  it("should render with tooltip class", () => {
+  it("...should render with tooltip class", () => {
     const { getByText, getByDataQaLabel } = render(
-      <Badge text="Test" tip="test tip" />
+      <Badge tip="test tip">Test</Badge>
     );
     expect(getByText("Test")).toBeTruthy();
     expect(getByDataQaLabel({ "badge-tip": "test tip" })).toBeTruthy();

package/__flow__/Badge/styles.js

@@ -1,51 +1,31 @@
 //@flow
-import styled, { css, type StyledComponent } from "styled-components";
+import styled, { type StyledComponent } from "styled-components";
 import { COMMON } from "../utils/system-props";
-import { themeGet } from "@styled-system/theme-get";
-
 import type { TypeTheme } from "../types/theme.flow";
-
-const 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",
-};
-
-const 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",
-};
+import { themeGet } from "@styled-system/theme-get";
+import { legacyBadgeColors } from "./constants";
 
 // eslint-disable-next-line prettier/prettier
-const Container: StyledComponent<{type: "primary" | "secondary" | "passive" | "common" | "approval" | "default" | "suggestion", small: boolean, ...}, TypeTheme, *> = styled.span`
+const Container: StyledComponent<{type: ?string, badgeColor: string, size: string, ...}, TypeTheme, *> = styled.span`
+  font-family: ${(p) => p.theme.fontFamily};
+  ${(p) =>
+    p.size === "small" ? p.theme.typography[100] : p.theme.typography[200]};
+  border-radius: 9999px;
+  line-height: 16px;
   display: inline-block;
-  text-align: center;
-  border-radius: 50px;
-  font-family: ${(props) => props.theme.fontFamily};
-
-  padding: ${(props) =>
-    props.small
-      ? `${props.theme.space[200]} ${props.theme.space[300]}`
-      : `${props.theme.space[300]} ${props.theme.space[350]}`};
-
-  ${(props) =>
-    props.small ? props.theme.typography[100] : props.theme.typography[200]}
-
-  ${(props) => css`
-    color: ${themeGet(colors[props.type])(props)};
-    background: ${themeGet(backgroundColors[props.type])(props)};
-  `}
-
-  ${COMMON}
+  color: ${(p) =>
+    p.type
+      ? themeGet(legacyBadgeColors[p.type].color)
+      : p.theme.colors.text.body};
+  background: ${(p) =>
+    p.type
+      ? themeGet(legacyBadgeColors[p.type].background)
+      : p.theme.colors.container.background.decorative[p.badgeColor]};
+  padding: ${(p) =>
+    p.size === "small"
+      ? `${p.theme.space[0]} ${p.theme.space[200]}`
+      : `${p.theme.space[300]}`};
+  ${COMMON};
 `;
 
 export default Container;

package/__flow__/Input/index.js

@@ -72,12 +72,19 @@ type TypeProps = {
 type TypeInputContext = $Shape<{
   handleClear: (e: SyntheticEvent<HTMLButtonElement>) => void,
   clearButtonLabel: string,
+  hasValue: boolean,
 }>;
 
 const InputContext = React.createContext<TypeInputContext>({});
 
 const ClearButton = () => {
-  const { handleClear, clearButtonLabel } = React.useContext(InputContext);
+  const { handleClear, clearButtonLabel, hasValue } =
+    React.useContext(InputContext);
+
+  // Hide the button when there is no text to clear.
+  if (!hasValue) {
+    return null;
+  }
   return (
     <Button onClick={handleClear}>
       {/*Unlocalized fallback should not be used. Always include a localized
@@ -87,6 +94,15 @@ const ClearButton = () => {
   );
 };
 
+// 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.
+const isClearButton = (elem: any) => {
+  if (elem?.type) {
+    return elem.type.displayName === "Input.ClearButton";
+  }
+  return false;
+};
+
 class Input extends React.Component<TypeProps> {
   static defaultProps = {
     autoFocus: false,
@@ -185,6 +201,7 @@ class Input extends React.Component<TypeProps> {
           value={{
             handleClear: this.handleClear,
             clearButtonLabel,
+            hasValue: !!value,
           }}
         >
           {elementBefore && <Accessory before>{elementBefore}</Accessory>}
@@ -219,14 +236,7 @@ class Input extends React.Component<TypeProps> {
           />
 
           {elementAfter && (
-            <Accessory
-              after
-              // 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?.type?.prototype === Input.ClearButton.prototype
-              }
-            >
+            <Accessory after isClearButton={isClearButton(elementAfter)}>
               {elementAfter}
             </Accessory>
           )}

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

@@ -32,7 +32,13 @@ 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; // Hide the button when there is no text to clear.
+
+
+  if (!hasValue) {
+    return null;
+  }
 
   return /*#__PURE__*/React.createElement(_Button.default, {
     onClick: handleClear
@@ -40,6 +46,16 @@ var ClearButton = function ClearButton() {
     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) {
@@ -88,8 +104,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,
@@ -149,7 +163,8 @@ var Input = /*#__PURE__*/function (_React$Component) {
     }, rest), /*#__PURE__*/React.createElement(InputContext.Provider, {
       value: {
         handleClear: this.handleClear,
-        clearButtonLabel: clearButtonLabel
+        clearButtonLabel: clearButtonLabel,
+        hasValue: !!value
       }
     }, elementBefore && /*#__PURE__*/React.createElement(_styles.Accessory, {
       before: true
@@ -179,10 +194,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;

package/lib/Badge/styles.js

@@ -1,35 +1,20 @@
-import styled, { css } from "styled-components";
+import styled from "styled-components";
 import { COMMON } from "../utils/system-props";
 import { themeGet } from "@styled-system/theme-get";
-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
+import { legacyBadgeColors } from "./constants"; // eslint-disable-next-line prettier/prettier
 
 var Container = styled.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 css(["color:", ";background:", ";"], themeGet(colors[props.type])(props), 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 ? themeGet(legacyBadgeColors[p.type].color) : p.theme.colors.text.body;
+}, function (p) {
+  return p.type ? themeGet(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];
 }, COMMON);
 export default Container;

package/lib/Input/index.js

@@ -17,7 +17,13 @@ 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; // Hide the button when there is no text to clear.
+
+
+  if (!hasValue) {
+    return null;
+  }
 
   return /*#__PURE__*/React.createElement(Button, {
     onClick: handleClear
@@ -25,6 +31,16 @@ var ClearButton = function ClearButton() {
     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) {
@@ -73,8 +89,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,
@@ -134,7 +148,8 @@ var Input = /*#__PURE__*/function (_React$Component) {
     }, rest), /*#__PURE__*/React.createElement(InputContext.Provider, {
       value: {
         handleClear: this.handleClear,
-        clearButtonLabel: clearButtonLabel
+        clearButtonLabel: clearButtonLabel,
+        hasValue: !!value
       }
     }, elementBefore && /*#__PURE__*/React.createElement(Accessory, {
       before: true
@@ -164,10 +179,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(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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sproutsocial/racine",
-  "version": "11.3.0-beta.1",
+  "version": "11.3.0-beta.2",
   "license": "MIT",
   "files": [
     "__flow__",