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

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

@@ -1,4 +1,4 @@
-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 _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); }
 
@@ -17,14 +17,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, {
-    onClick: handleClear
+    onClick: handleClear,
+    size: buttonSize,
+    py: py,
+    px: px
   }, /*#__PURE__*/React.createElement(Icon, {
     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) {
@@ -44,11 +74,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) {
@@ -77,8 +106,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,
@@ -111,6 +138,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.
 
 
@@ -123,21 +151,26 @@ var Input = /*#__PURE__*/function (_React$Component) {
 
     var elementBefore = type === "search" && !elemBefore ? /*#__PURE__*/React.createElement(Icon, {
       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(Container, _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(Accessory, {
       before: true
@@ -167,10 +200,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.0",
+  "version": "11.3.0-beta.3",
   "license": "MIT",
   "files": [
     "__flow__",