@sproutsocial/racine 11.2.5-sproutTheme-beta.2 → 11.2.5-sproutTheme-beta.5

package/lib/Input/index.js

@@ -8,6 +8,69 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func
 
 import * as React from "react";
 import Container, { Accessory } from "./styles";
+import Button from "../Button";
+import Icon from "../Icon";
+import styled from "styled-components";
+var InputContext = /*#__PURE__*/React.createContext({});
+var StyledButton = styled(Button).withConfig({
+  displayName: "Input__StyledButton",
+  componentId: "sc-1ck1dnm-0"
+})(["&:hover,&:active{color:", ";}"], function (props) {
+  return props.theme.utils.interact(props.theme.colors.icon.base);
+});
+
+var ClearButton = function ClearButton() {
+  var _React$useContext = React.useContext(InputContext),
+      onClear = _React$useContext.onClear,
+      handleClear = _React$useContext.handleClear,
+      clearButtonLabel = _React$useContext.clearButtonLabel,
+      hasValue = _React$useContext.hasValue,
+      inputSize = _React$useContext.size; // Hide the button when there is no text to clear.
+
+
+  if (!hasValue) {
+    return null;
+  } // Log a warning and hide the button when no onClear callback is provided.
+  // If we called handleClear with no onClear prop, all the button would do is focus the Input.
+
+
+  if (!onClear) {
+    console.warn("Warning: No onClear prop provided to Input when using Input.ClearButton. Omitting Input.ClearButton.");
+    return null;
+  } // 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 clearButtonLabel to Input.");
+  } // Reduce Button padding for size small Inputs so that the Button 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 = inputSize === "small" ? 100 : undefined;
+  var px = inputSize === "small" ? 200 : undefined;
+  var buttonSize = inputSize === "small" ? "default" : inputSize;
+  return /*#__PURE__*/React.createElement(StyledButton, {
+    onClick: handleClear,
+    size: buttonSize,
+    py: py,
+    px: px,
+    title: clearButtonLabel || "Clear",
+    ariaLabel: clearButtonLabel || "Clear",
+    color: "icon.base"
+  }, /*#__PURE__*/React.createElement(Icon, {
+    name: "circlex"
+  }));
+}; // 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) {
   _inheritsLoose(Input, _React$Component);
@@ -22,39 +85,38 @@ var Input = /*#__PURE__*/function (_React$Component) {
     _this = _React$Component.call.apply(_React$Component, [this].concat(args)) || this;
 
     _this.handleBlur = function (e) {
-      if (_this.props.onBlur) {
-        _this.props.onBlur(e);
+      return _this.props.onBlur == null ? void 0 : _this.props.onBlur(e);
+    };
+
+    _this.handleClear = function (e) {
+      // Only attempt to focus the input if the ref is an object. It won't work for refs that are functions.
+      if (typeof _this.props.innerRef === "object") {
+        var _this$props$innerRef$;
+
+        (_this$props$innerRef$ = _this.props.innerRef.current) == null ? void 0 : _this$props$innerRef$.focus();
       }
+
+      _this.props.onClear == null ? void 0 : _this.props.onClear(e);
     };
 
     _this.handleChange = function (e) {
-      if (_this.props.onChange) {
-        _this.props.onChange(e, e.currentTarget.value);
-      }
+      return _this.props.onChange == null ? void 0 : _this.props.onChange(e, e.currentTarget.value);
     };
 
     _this.handleFocus = function (e) {
-      if (_this.props.onFocus) {
-        _this.props.onFocus(e);
-      }
+      return _this.props.onFocus == null ? void 0 : _this.props.onFocus(e);
     };
 
     _this.handleKeyDown = function (e) {
-      if (_this.props.onKeyDown) {
-        _this.props.onKeyDown(e, e.currentTarget.value);
-      }
+      return _this.props.onKeyDown == null ? void 0 : _this.props.onKeyDown(e, e.currentTarget.value);
     };
 
     _this.handleKeyUp = function (e) {
-      if (_this.props.onKeyUp) {
-        _this.props.onKeyUp(e, e.currentTarget.value);
-      }
+      return _this.props.onKeyUp == null ? void 0 : _this.props.onKeyUp(e, e.currentTarget.value);
     };
 
     _this.handlePaste = function (e) {
-      if (_this.props.onPaste) {
-        _this.props.onPaste(e, e.currentTarget.value);
-      }
+      return _this.props.onPaste == null ? void 0 : _this.props.onPaste(e, e.currentTarget.value);
     };
 
     return _this;
@@ -81,9 +143,11 @@ var Input = /*#__PURE__*/function (_React$Component) {
         maxLength = _this$props.maxLength,
         ariaLabel = _this$props.ariaLabel,
         ariaDescribedby = _this$props.ariaDescribedby,
+        clearButtonLabel = _this$props.clearButtonLabel,
         innerRef = _this$props.innerRef,
         onBlur = _this$props.onBlur,
         onChange = _this$props.onChange,
+        onClear = _this$props.onClear,
         onFocus = _this$props.onFocus,
         onKeyDown = _this$props.onKeyDown,
         onKeyUp = _this$props.onKeyUp,
@@ -93,25 +157,44 @@ 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,
-        rest = _objectWithoutPropertiesLoose(_this$props, ["autoComplete", "autoFocus", "disabled", "readOnly", "isInvalid", "hasWarning", "id", "name", "placeholder", "type", "required", "value", "elemBefore", "elemAfter", "maxLength", "ariaLabel", "ariaDescribedby", "innerRef", "onBlur", "onChange", "onFocus", "onKeyDown", "onKeyUp", "onPaste", "inputProps", "qa", "appearance"]);
+        size = _this$props.size,
+        rest = _objectWithoutPropertiesLoose(_this$props, ["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"]); // Convert autoComplete from a boolean prop to a string value.
+
 
     var autoCompleteValue = undefined;
 
     if (autoComplete !== undefined) {
       autoCompleteValue = autoComplete ? "on" : "off";
-    }
+    } // Add default elemBefore and elemAfter elements if type is search.
 
+
+    var elementBefore = type === "search" && !elemBefore ? /*#__PURE__*/React.createElement(Icon, {
+      name: "search",
+      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: !!elemBefore,
-      hasAfterElement: !!elemAfter,
+      hasBeforeElement: !!elementBefore,
+      hasAfterElement: !!elementAfter,
       disabled: disabled,
       invalid: !!isInvalid,
       warning: hasWarning,
-      appearance: appearance // $FlowIssue - upgrade v0.112.0
-
-    }, rest), elemBefore && /*#__PURE__*/React.createElement(Accessory, {
+      appearance: appearance,
+      size: size // $FlowIssue - upgrade v0.112.0
+
+    }, rest), /*#__PURE__*/React.createElement(InputContext.Provider, {
+      value: {
+        handleClear: this.handleClear,
+        hasValue: !!value,
+        clearButtonLabel: clearButtonLabel,
+        onClear: onClear,
+        size: size
+      }
+    }, elementBefore && /*#__PURE__*/React.createElement(Accessory, {
       before: true
-    }, elemBefore), /*#__PURE__*/React.createElement("input", _extends({
+    }, elementBefore), /*#__PURE__*/React.createElement("input", _extends({
       "aria-invalid": !!isInvalid,
       "aria-label": ariaLabel,
       "aria-describedby": ariaDescribedby,
@@ -136,9 +219,10 @@ var Input = /*#__PURE__*/function (_React$Component) {
       "data-qa-input": name || "",
       "data-qa-input-isdisabled": disabled === true,
       "data-qa-input-isrequired": required === true
-    }, qa, inputProps)), elemAfter && /*#__PURE__*/React.createElement(Accessory, {
-      after: true
-    }, elemAfter));
+    }, qa, inputProps)), elementAfter && /*#__PURE__*/React.createElement(Accessory, {
+      after: true,
+      isClearButton: isClearButton(elementAfter)
+    }, elementAfter)));
   };
 
   return Input;
@@ -149,6 +233,9 @@ Input.defaultProps = {
   disabled: false,
   type: "text",
   size: "default",
-  appearance: "primary"
+  appearance: "primary",
+  innerRef: /*#__PURE__*/React.createRef()
 };
-export { Input as default };
+Input.ClearButton = ClearButton;
+Input.ClearButton.displayName = "Input.ClearButton";
+export default Input;

package/lib/Input/styles.js

@@ -73,7 +73,7 @@ export var Accessory = styled.div.withConfig({
 }, function (props) {
   return props.before && css(["left:", ";"], props.theme.space[350]);
 }, function (props) {
-  return props.after && css(["right:", ";"], props.theme.space[350]);
+  return props.after && css(["right:", ";"], props.isClearButton ? 0 : props.theme.space[350]);
 });
 Container.displayName = "InputContainer";
 Accessory.displayName = "InputAccessory";

package/lib/TokenInput/index.js

@@ -282,7 +282,7 @@ var TokenInput = /*#__PURE__*/function (_React$Component) {
       "aria-invalid": !!isInvalid,
       "aria-label": ariaLabel,
       autoFocus: autoFocus,
-      autocomplete: autocomplete,
+      autoComplete: autocomplete,
       disabled: disabled,
       id: id,
       name: name,

package/lib/themes/dark/theme.js

@@ -159,7 +159,10 @@ var colors = _extends({}, lightTheme.colors, {
     subtext: COLORS.COLOR_NEUTRAL_300,
     body: COLORS.COLOR_NEUTRAL_100,
     inverse: COLORS.COLOR_NEUTRAL_900,
-    error: COLORS.COLOR_RED_400
+    error: COLORS.COLOR_RED_400,
+    background: {
+      highlight: COLORS.COLOR_YELLOW_900
+    }
   },
   icon: {
     base: COLORS.COLOR_NEUTRAL_100,

package/lib/themes/extendedThemes/sproutTheme/dark/getDarkThemeColors.js

@@ -30,7 +30,16 @@ export function getDarkThemeColors(themeColors) {
         }
       }
     },
-    icon: {
+    container: _extends({}, themeColors.container, {
+      background: _extends({}, themeColors.container.background, {
+        // FIX: These need to be changed to have dark mode colors
+        // For now we've copied the light mode values here as well.
+        positive_sentiment: themeColors.blue[500],
+        negative_sentiment: themeColors.red[500],
+        neutral_sentiment: themeColors.neutral[300]
+      })
+    }),
+    icon: _extends({}, themeColors.icon, {
       // FIX: These need to be changed to have dark mode colors
       // For now we've copied the light mode values here as well.
       sentiment: {
@@ -38,6 +47,6 @@ export function getDarkThemeColors(themeColors) {
         negative_sentiment: themeColors.red[500],
         neutral_sentiment: themeColors.neutral[300]
       }
-    }
+    })
   });
 }

package/lib/themes/extendedThemes/sproutTheme/dark/theme.js

@@ -4,15 +4,13 @@ import clone from "just-clone";
 import baseDarkTheme from "../../../dark/theme";
 import { getDarkThemeColors } from "./getDarkThemeColors";
 import { getNonColorThemeValues } from "../NonColorThemeValues";
+// clone base theme. (we don't want to mutate the base theme)
+var themeClone = clone(baseDarkTheme); // get non color theme values
 
-var darkTheme = function darkTheme(baseDarkTheme) {
-  // clone base theme. (we don't want to mutate the base theme)
-  var themeClone = clone(baseDarkTheme); // get non color theme values
+var nonColorThemeValues = getNonColorThemeValues(themeClone); // get sprout specific dark theme colors
 
-  var nonColorThemeValues = getNonColorThemeValues(themeClone); // get sprout specific dark theme colors
+var darkThemeColors = getDarkThemeColors(themeClone.colors);
 
-  var darkThemeColors = getDarkThemeColors(themeClone.colors);
-  return _extends({}, themeClone, nonColorThemeValues, darkThemeColors);
-};
+var darkTheme = _extends({}, themeClone, nonColorThemeValues, darkThemeColors);
 
 export default darkTheme;

package/lib/themes/extendedThemes/sproutTheme/light/getLightThemeColors.js

@@ -30,12 +30,19 @@ export function getLightThemeColors(themeColors) {
         }
       }
     },
-    icon: {
+    container: _extends({}, themeColors.container, {
+      background: _extends({}, themeColors.container.background, {
+        positive_sentiment: themeColors.blue[500],
+        negative_sentiment: themeColors.red[500],
+        neutral_sentiment: themeColors.neutral[300]
+      })
+    }),
+    icon: _extends({}, themeColors.icon, {
       sentiment: {
         positive_sentiment: themeColors.blue[500],
         negative_sentiment: themeColors.red[500],
         neutral_sentiment: themeColors.neutral[300]
       }
-    }
+    })
   });
 }

package/lib/themes/extendedThemes/sproutTheme/light/theme.js

@@ -4,15 +4,13 @@ import clone from "just-clone";
 import baseLightTheme from "../../../light/theme";
 import { getLightThemeColors } from "./getLightThemeColors";
 import { getNonColorThemeValues } from "../NonColorThemeValues";
+// clone base theme. (we don't want to mutate the base theme)
+var themeClone = clone(baseLightTheme); // get non color theme values
 
-var lightTheme = function lightTheme(baseLightTheme) {
-  // clone base theme. (we don't want to mutate the base theme)
-  var themeClone = clone(baseLightTheme); // get non color theme values
+var nonColorThemeValues = getNonColorThemeValues(themeClone); // get sprout specific light theme colors
 
-  var nonColorThemeValues = getNonColorThemeValues(themeClone); // get sprout specific light theme colors
+var lightThemeColors = getLightThemeColors(themeClone.colors);
 
-  var lightThemeColors = getLightThemeColors(themeClone.colors);
-  return _extends({}, themeClone, nonColorThemeValues, lightThemeColors);
-};
+var lightTheme = _extends({}, themeClone, nonColorThemeValues, lightThemeColors);
 
 export default lightTheme;

package/lib/themes/light/theme.js

@@ -157,7 +157,10 @@ var colors = _extends({
     subtext: COLORS.COLOR_NEUTRAL_700,
     body: COLORS.COLOR_NEUTRAL_800,
     inverse: COLORS.COLOR_NEUTRAL_0,
-    error: COLORS.COLOR_RED_800
+    error: COLORS.COLOR_RED_800,
+    background: {
+      highlight: COLORS.COLOR_YELLOW_200
+    }
   },
   icon: {
     base: COLORS.COLOR_NEUTRAL_800,

package/package.json

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