@flodesk/grain 3.1.2 → 5.1.0

package/es/components/text-input.js

@@ -12,7 +12,7 @@ import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import "core-js/modules/es.array.from.js";
 import "core-js/modules/es.regexp.exec.js";
-var _excluded = ["value", "placeholder", "size", "label", "id", "icon"];
+var _excluded = ["value", "placeholder", "label", "id", "icon", "hasError", "errorMessage"];
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
@@ -36,58 +36,35 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-import { getColor, getRadius, getTextSize } from '../utilities';
+import { getColor, getRadius } from '../utilities';
 import PropTypes from 'prop-types';
 import React from 'react';
 import styled from '@emotion/styled';
-import { types } from '../types';
 import { css } from '@emotion/react';
-import { Box } from './box';
+import { Box, Text } from '.';
 import { Icon } from './icon';
 import { transitions } from '../foundational';
-var variables = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  --grn-color-fieldBorder: var(--grn-color-fade3);\n  --grn-color-fieldBorder-hover: var(--grn-color-fade6);\n"])));
-var sizesStyles = {
-  s: {
-    height: 'var(--grn-textBoxHeight-s)',
-    padding: '0 8px',
-    labelGap: '2px',
-    iconOffsetPx: 8,
-    iconTextGapPx: 4
-  },
-  m: {
-    height: 'var(--grn-textBoxHeight-m)',
-    padding: '0 12px',
-    labelGap: '4px',
-    iconOffsetPx: 12,
-    iconTextGapPx: 8
-  }
-};
-var Wrapper = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", ";\n  font-size: ", ";\n"])), variables, function (p) {
-  return getTextSize(p.size);
-});
-var Label = styled.label(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: block;\n  margin-bottom: ", ";\n"])), function (p) {
-  return sizesStyles[p.size].labelGap;
-});
-var InputField = styled.input(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  ", ";\n  appearance: none;\n  border: none;\n  font-family: inherit;\n  background-color: transparent;\n  color: inherit;\n  font-size: inherit;\n  transition-property: border-color;\n  border: 1px solid var(--grn-color-fieldBorder);\n  width: 100%;\n  border-radius: ", ";\n  height: ", ";\n  padding: ", ";\n  ", ";\n  outline: none;\n\n  &::placeholder {\n    color: ", ";\n  }\n\n  &:hover {\n    border-color: var(--grn-color-fieldBorder-hover);\n  }\n\n  &:focus {\n    transition: 0s;\n    border-color: var(--grn-color-grey6);\n  }\n"])), transitions, function () {
-  return getRadius('s');
+var variables = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  --grn-fieldBorderColor: var(--grn-color-fade3);\n  --grn-fieldBorderColor-hover: var(--grn-color-fade6);\n  --grn-fieldBorderColor-focus: var(--grn-color-grey6);\n  --grn-fieldXPadding: 12px;\n"])));
+var iconOffsetPx = 12;
+var iconTextGapPx = 8;
+var Wrapper = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", ";\n"])), variables);
+var Label = styled.label(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: block;\n  margin-bottom: 4px;\n"])));
+var InputField = styled.input(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  ", ";\n  appearance: none;\n  border: none;\n  font: inherit;\n  color: inherit;\n  background-color: transparent;\n  transition-property: border-color;\n  width: 100%;\n  border-radius: ", ";\n  height: var(--grn-textBoxHeight-m);\n  padding: 0 var(--grn-fieldXPadding) 0 ", ";\n  outline: none;\n  border: 1px solid ", ";\n\n  &::placeholder {\n    color: ", ";\n  }\n\n  ", "\n"])), transitions, getRadius('s'), function (p) {
+  return p.paddingLeft;
 }, function (p) {
-  return sizesStyles[p.size].height;
-}, function (p) {
-  return sizesStyles[p.size].padding;
-}, function (p) {
-  return p.paddingLeft && "padding-left: ".concat(p.paddingLeft, "px");
-}, getColor('grey5'));
-var IconSection = styled.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  position: absolute;\n  margin: auto;\n  left: ", "px;\n  top: 0;\n  bottom: 0;\n  height: fit-content;\n  pointer-events: none;\n"])), function (p) {
-  return sizesStyles[p.size].iconOffsetPx;
+  return p.hasError ? 'var(--grn-color-danger)' : 'var(--grn-fieldBorderColor)';
+}, getColor('grey5'), function (p) {
+  return !p.hasError && "\n    &:hover {\n      border-color: var(--grn-fieldBorderColor-hover);\n    }\n\n    &:focus {\n      transition: 0s;\n      border-color: var(--grn-fieldBorderColor-focus);\n    }\n  ";
 });
+var IconSection = styled.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  position: absolute;\n  margin: auto;\n  left: ", "px;\n  top: 0;\n  bottom: 0;\n  height: fit-content;\n  pointer-events: none;\n"])), iconOffsetPx);
 export var TextInput = function TextInput(_ref) {
   var value = _ref.value,
       placeholder = _ref.placeholder,
-      _ref$size = _ref.size,
-      size = _ref$size === void 0 ? 'm' : _ref$size,
       label = _ref.label,
       id = _ref.id,
       icon = _ref.icon,
+      hasError = _ref.hasError,
+      errorMessage = _ref.errorMessage,
       props = _objectWithoutProperties(_ref, _excluded);
 
   var iconRef = React.useRef(null);
@@ -102,36 +79,36 @@ export var TextInput = function TextInput(_ref) {
       setIconWidth(iconRef.current.getBoundingClientRect().width);
     }
   }, []);
-  var paddingLeft = icon && sizesStyles[size].iconOffsetPx + iconWidth + sizesStyles[size].iconTextGapPx;
+  var paddingLeft = icon ? "".concat(iconOffsetPx + iconWidth + iconTextGapPx, "px") : "var(--grn-fieldXPadding)";
   return /*#__PURE__*/React.createElement(Wrapper, {
-    size: size,
     type: "text"
   }, label && /*#__PURE__*/React.createElement(Label, {
-    htmlFor: id,
-    size: size
+    htmlFor: id
   }, label), /*#__PURE__*/React.createElement(Box, {
     position: "relative"
-  }, icon && /*#__PURE__*/React.createElement(IconSection, {
-    size: size
-  }, /*#__PURE__*/React.createElement(Icon, {
+  }, icon && /*#__PURE__*/React.createElement(IconSection, null, /*#__PURE__*/React.createElement(Icon, {
     ref: iconRef,
-    icon: icon,
-    size: size
+    icon: icon
   })), /*#__PURE__*/React.createElement(InputField, Object.assign({
     value: value,
     placeholder: placeholder,
-    size: size,
     label: label,
     icon: icon,
     id: id,
-    paddingLeft: paddingLeft
-  }, props))));
+    paddingLeft: paddingLeft,
+    hasError: hasError
+  }, props))), errorMessage && /*#__PURE__*/React.createElement(Box, {
+    marginTop: 0.5
+  }, /*#__PURE__*/React.createElement(Text, {
+    color: "danger"
+  }, errorMessage)));
 };
 TextInput.propTypes = {
   id: PropTypes.string.isRequired,
   placeholder: PropTypes.string,
   value: PropTypes.string,
-  size: types.fieldSize,
   label: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
-  icon: PropTypes.node
+  icon: PropTypes.node,
+  hasError: PropTypes.bool,
+  errorMessage: PropTypes.string
 };

package/es/utilities/styles.js

@@ -1,29 +1,10 @@
 import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.array.map.js";
-import "core-js/modules/es.object.define-property.js";
-import "core-js/modules/es.object.keys.js";
-import "core-js/modules/es.symbol.js";
-import "core-js/modules/es.array.filter.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.object.get-own-property-descriptor.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-import "core-js/modules/es.object.get-own-property-descriptors.js";
-import "core-js/modules/es.object.define-properties.js";
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { getCssVar, isNumber, isString, u } from '.';
 import { vars, varInfo } from '../variables';
 import { getDimension } from './responsive';
-
-var allColors = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, vars.colors.bases), vars.colors.greys), vars.colors.semantics), vars.colors.fades);
-
 export var getColor = function getColor(color) {
-  if (color in allColors) {
+  if (color in vars.colors) {
     return getCssVar(varInfo.colors.name, color);
   }
 

package/es/variables.js

@@ -1,4 +1,58 @@
+import "core-js/modules/es.object.define-property.js";
+import "core-js/modules/es.object.keys.js";
+import "core-js/modules/es.symbol.js";
+import "core-js/modules/es.array.filter.js";
+import "core-js/modules/es.object.to-string.js";
+import "core-js/modules/es.object.get-own-property-descriptor.js";
+import "core-js/modules/web.dom-collections.for-each.js";
+import "core-js/modules/es.object.get-own-property-descriptors.js";
+import "core-js/modules/es.object.define-properties.js";
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 export var grnPrefix = '--grn-';
+export var colors = {
+  greys: {
+    grey8: 'grey8',
+    grey7: 'grey7',
+    grey6: 'grey6',
+    grey5: 'grey5',
+    grey4: 'grey4',
+    grey3: 'grey3',
+    grey2: 'grey2',
+    grey1: 'grey1'
+  },
+  fades: {
+    fade7: 'fade7',
+    fade6: 'fade6',
+    fade5: 'fade5',
+    fade4: 'fade4',
+    fade3: 'fade3',
+    fade2: 'fade2',
+    fade1: 'fade1'
+  },
+  bases: {
+    blue: 'blue',
+    red: 'red'
+  },
+  semantics: {
+    body: 'body',
+    bodyDimmed: 'bodyDimmed',
+    accent: 'accent',
+    backgroundSecondary: 'backgroundSecondary',
+    background: 'background',
+    overlay: 'overlay',
+    border: 'border',
+    selection: 'selection',
+    danger: 'danger',
+    disabledContent: 'disabledContent',
+    disabledBackground: 'disabledBackground'
+  }
+};
 export var vars = {
   texts: {
     s: 's',
@@ -42,44 +96,7 @@ export var vars = {
     fast: 'fast',
     xFast: 'xFast'
   },
-  colors: {
-    greys: {
-      grey8: 'grey8',
-      grey7: 'grey7',
-      grey6: 'grey6',
-      grey5: 'grey5',
-      grey4: 'grey4',
-      grey3: 'grey3',
-      grey2: 'grey2',
-      grey1: 'grey1'
-    },
-    fades: {
-      fade7: 'fade7',
-      fade6: 'fade6',
-      fade5: 'fade5',
-      fade4: 'fade4',
-      fade3: 'fade3',
-      fade2: 'fade2',
-      fade1: 'fade1'
-    },
-    bases: {
-      blue: 'blue',
-      red: 'red'
-    },
-    semantics: {
-      body: 'body',
-      bodyDimmed: 'bodyDimmed',
-      accent: 'accent',
-      backgroundSecondary: 'backgroundSecondary',
-      background: 'background',
-      overlay: 'overlay',
-      border: 'border',
-      selection: 'selection',
-      danger: 'danger',
-      disabledContent: 'disabledContent',
-      disabledBackground: 'disabledBackground'
-    }
-  }
+  colors: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, colors.greys), colors.fades), colors.bases), colors.semantics)
 };
 export var varInfo = {
   texts: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flodesk/grain",
-  "version": "3.1.2",
+  "version": "5.1.0",
   "description": "Flodesk design system",
   "module": "es/index.js",
   "author": "Flodesk",