@flodesk/grain 2.8.1 → 2.11.0

package/es/components/arrange.js

@@ -0,0 +1,290 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Arrange = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
+var _utilities = require("../utilities");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _styled = _interopRequireDefault(require("@emotion/styled"));
+
+var _types = require("../types");
+
+var _box = require("./box");
+
+var _excluded = ["children", "gap", "columns", "autoFlow", "justifyItems", "alignItems", "justifyContent", "alignContent", "placeItems", "placeContent"];
+
+var _templateObject;
+
+var __jsx = _react.default.createElement;
+var Wrapper = (0, _styled.default)(_box.Box)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: grid;\n  grid-auto-flow: ", ";\n  justify-content: start;\n  align-items: center;\n  gap: ", ";\n  grid-template-columns: ", ";\n  justify-items: ", ";\n  align-items: ", ";\n  justify-content: ", ";\n  align-content: ", ";\n  place-items: ", ";\n  place-content: ", ";\n"])), function (p) {
+  return p.autoFlow;
+}, function (p) {
+  return (0, _utilities.getSpace)(p.gap);
+}, function (p) {
+  return (0, _utilities.getGridColumns)(p.columns);
+}, function (p) {
+  return p.justifyItems;
+}, function (p) {
+  return p.alignItems;
+}, function (p) {
+  return p.justifyContent;
+}, function (p) {
+  return p.alignContent;
+}, function (p) {
+  return p.placeItems;
+}, function (p) {
+  return p.placeContent;
+});
+
+var Arrange = function Arrange(_ref) {
+  var children = _ref.children,
+      gap = _ref.gap,
+      columns = _ref.columns,
+      _ref$autoFlow = _ref.autoFlow,
+      autoFlow = _ref$autoFlow === void 0 ? 'column' : _ref$autoFlow,
+      justifyItems = _ref.justifyItems,
+      alignItems = _ref.alignItems,
+      justifyContent = _ref.justifyContent,
+      alignContent = _ref.alignContent,
+      placeItems = _ref.placeItems,
+      placeContent = _ref.placeContent,
+      props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  return __jsx(Wrapper, (0, _extends2.default)({
+    gap: gap,
+    columns: columns,
+    autoFlow: autoFlow
+  }, props), children);
+};
+
+exports.Arrange = Arrange;
+Arrange.__docgenInfo = {
+  "description": "",
+  "methods": [],
+  "displayName": "Arrange",
+  "props": {
+    "autoFlow": {
+      "defaultValue": {
+        "value": "'column'",
+        "computed": false
+      },
+      "type": {
+        "name": "enum",
+        "value": [{
+          "value": "\"column\"",
+          "computed": false
+        }, {
+          "value": "\"row\"",
+          "computed": false
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
+    "gap": {
+      "type": {
+        "name": "union",
+        "value": [{
+          "name": "enum",
+          "value": [{
+            "value": "\"xs\"",
+            "computed": false
+          }, {
+            "value": "\"s\"",
+            "computed": false
+          }, {
+            "value": "\"m\"",
+            "computed": false
+          }, {
+            "value": "\"l\"",
+            "computed": false
+          }, {
+            "value": "\"xl\"",
+            "computed": false
+          }, {
+            "value": "\"xxl\"",
+            "computed": false
+          }]
+        }, {
+          "name": "number"
+        }, {
+          "name": "string"
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
+    "columns": {
+      "type": {
+        "name": "union",
+        "value": [{
+          "name": "array"
+        }, {
+          "name": "string"
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
+    "justifyItems": {
+      "type": {
+        "name": "enum",
+        "value": [{
+          "value": "\"start\"",
+          "computed": false
+        }, {
+          "value": "\"end\"",
+          "computed": false
+        }, {
+          "value": "\"center\"",
+          "computed": false
+        }, {
+          "value": "\"stretch\"",
+          "computed": false
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
+    "alignItems": {
+      "type": {
+        "name": "enum",
+        "value": [{
+          "value": "\"start\"",
+          "computed": false
+        }, {
+          "value": "\"end\"",
+          "computed": false
+        }, {
+          "value": "\"center\"",
+          "computed": false
+        }, {
+          "value": "\"stretch\"",
+          "computed": false
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
+    "justifyContent": {
+      "type": {
+        "name": "enum",
+        "value": [{
+          "value": "\"start\"",
+          "computed": false
+        }, {
+          "value": "\"end\"",
+          "computed": false
+        }, {
+          "value": "\"center\"",
+          "computed": false
+        }, {
+          "value": "\"stretch\"",
+          "computed": false
+        }, {
+          "value": "\"space-around\"",
+          "computed": false
+        }, {
+          "value": "\"space-between\"",
+          "computed": false
+        }, {
+          "value": "\"space-evenly\"",
+          "computed": false
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
+    "alignContent": {
+      "type": {
+        "name": "enum",
+        "value": [{
+          "value": "\"start\"",
+          "computed": false
+        }, {
+          "value": "\"end\"",
+          "computed": false
+        }, {
+          "value": "\"center\"",
+          "computed": false
+        }, {
+          "value": "\"stretch\"",
+          "computed": false
+        }, {
+          "value": "\"space-around\"",
+          "computed": false
+        }, {
+          "value": "\"space-between\"",
+          "computed": false
+        }, {
+          "value": "\"space-evenly\"",
+          "computed": false
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
+    "placeItems": {
+      "type": {
+        "name": "enum",
+        "value": [{
+          "value": "\"start\"",
+          "computed": false
+        }, {
+          "value": "\"end\"",
+          "computed": false
+        }, {
+          "value": "\"center\"",
+          "computed": false
+        }, {
+          "value": "\"stretch\"",
+          "computed": false
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
+    "placeContent": {
+      "type": {
+        "name": "enum",
+        "value": [{
+          "value": "\"start\"",
+          "computed": false
+        }, {
+          "value": "\"end\"",
+          "computed": false
+        }, {
+          "value": "\"center\"",
+          "computed": false
+        }, {
+          "value": "\"stretch\"",
+          "computed": false
+        }, {
+          "value": "\"space-around\"",
+          "computed": false
+        }, {
+          "value": "\"space-between\"",
+          "computed": false
+        }, {
+          "value": "\"space-evenly\"",
+          "computed": false
+        }]
+      },
+      "required": false,
+      "description": ""
+    }
+  }
+};

package/es/components/{box/index.js → box.js}

@@ -15,68 +15,68 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-require("core-js/modules/es.array.concat.js");
-
-var _utilities = require("../../utilities");
+var _utilities = require("../utilities");
 
 var _react = _interopRequireDefault(require("react"));
 
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 
-var _types = require("../../types");
+var _types = require("../types");
 
-var _excluded = ["children", "color", "backgroundColor", "borderSide", "borderWidth", "borderColor", "width", "height", "radius", "padding", "paddingTop", "paddingBottom", "paddingLeft", "paddingRight", "paddingX", "paddingY", "margin", "marginTop", "marginBottom", "marginLeft", "marginRight", "marginX", "marginY", "position", "top", "bottom", "left", "right", "shadow", "overflow", "aspectRatio"];
+var _excluded = ["children", "color", "backgroundColor", "borderSide", "borderWidth", "borderColor", "width", "minWidth", "maxWidth", "height", "minHeight", "maxHeight", "radius", "padding", "paddingTop", "paddingBottom", "paddingLeft", "paddingRight", "paddingX", "paddingY", "margin", "marginTop", "marginBottom", "marginLeft", "marginRight", "marginX", "marginY", "position", "top", "bottom", "left", "right", "shadow", "overflow", "aspectRatio"];
 
 var _templateObject;
 
 var __jsx = _react.default.createElement;
 
-var getSpaceCss = function getSpaceCss(propertyName, propertyValue) {
-  if (propertyValue || propertyValue === 0) {
-    return "".concat(propertyName, ": ").concat((0, _utilities.getSpace)(propertyValue));
-  }
-};
-
-var Wrapper = _styled.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n  \n  ", ";\n  ", ";\n  ", ";\n  ", ";\n  ", ";\n  \n  ", ";\n  ", ";\n  ", ";\n  ", ";\n  ", ";\n  \n  ", ";\n  ", ";\n  ", ";\n  ", ";\n  \n  position: ", ";\n  color: ", ";\n  background-color: ", ";\n  width: ", ";\n  height: ", ";\n  border-radius: ", ";\n  box-shadow: ", ";\n  overflow: ", ";\n  aspect-ratio: ", ";\n"])), function (p) {
+var Wrapper = _styled.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n  \n  padding:", ";\n  padding-top:", ";\n  padding-bottom:", ";\n  padding-left:", ";\n  padding-right:", ";\n  \n  margin:", ";\n  margin-top:", ";\n  margin-bottom:", ";\n  margin-left:", ";\n  margin-right:", ";\n  \n  top:", ";\n  bottom:", ";\n  left:", ";\n  right:", ";\n  \n  width: ", ";\n  min-width: ", ";\n  max-width: ", ";\n  height: ", ";\n  min-height: ", ";\n  max-height: ", ";\n\n  color: ", ";\n  background-color: ", ";\n  \n  position: ", ";\n  border-radius: ", ";\n  box-shadow: ", ";\n  overflow: ", ";\n  aspect-ratio: ", ";\n"])), function (p) {
   return (0, _utilities.getBorder)(p.borderSide, p.borderWidth, p.borderColor);
 }, function (p) {
-  return getSpaceCss('padding', p.padding);
+  return (0, _utilities.getSpace)(p.padding);
 }, function (p) {
-  return getSpaceCss('padding-top', p.paddingTop);
+  return (0, _utilities.getSpace)(p.paddingTop);
 }, function (p) {
-  return getSpaceCss('padding-bottom', p.paddingBottom);
+  return (0, _utilities.getSpace)(p.paddingBottom);
 }, function (p) {
-  return getSpaceCss('padding-left', p.paddingLeft);
+  return (0, _utilities.getSpace)(p.paddingLeft);
 }, function (p) {
-  return getSpaceCss('padding-right', p.paddingRight);
+  return (0, _utilities.getSpace)(p.paddingRight);
 }, function (p) {
-  return getSpaceCss('margin', p.margin);
+  return (0, _utilities.getSpace)(p.margin);
 }, function (p) {
-  return getSpaceCss('margin-top', p.marginTop);
+  return (0, _utilities.getSpace)(p.marginTop);
 }, function (p) {
-  return getSpaceCss('margin-bottom', p.marginBottom);
+  return (0, _utilities.getSpace)(p.marginBottom);
 }, function (p) {
-  return getSpaceCss('margin-left', p.marginLeft);
+  return (0, _utilities.getSpace)(p.marginLeft);
 }, function (p) {
-  return getSpaceCss('margin-right', p.marginRight);
+  return (0, _utilities.getSpace)(p.marginRight);
 }, function (p) {
-  return getSpaceCss('top', p.top);
+  return (0, _utilities.getSpace)(p.top);
 }, function (p) {
-  return getSpaceCss('bottom', p.bottom);
+  return (0, _utilities.getSpace)(p.bottom);
 }, function (p) {
-  return getSpaceCss('left', p.left);
+  return (0, _utilities.getSpace)(p.left);
 }, function (p) {
-  return getSpaceCss('right', p.right);
+  return (0, _utilities.getSpace)(p.right);
 }, function (p) {
-  return p.position;
+  return (0, _utilities.getDimension)(p.width);
+}, function (p) {
+  return (0, _utilities.getDimension)(p.minWidth);
+}, function (p) {
+  return (0, _utilities.getDimension)(p.maxWidth);
+}, function (p) {
+  return (0, _utilities.getDimension)(p.height);
+}, function (p) {
+  return (0, _utilities.getDimension)(p.minHeight);
+}, function (p) {
+  return (0, _utilities.getDimension)(p.maxHeight);
 }, function (p) {
   return (0, _utilities.getColor)(p.color);
 }, function (p) {
   return (0, _utilities.getColor)(p.backgroundColor);
 }, function (p) {
-  return (0, _utilities.getSpace)(p.width);
-}, function (p) {
-  return (0, _utilities.getSpace)(p.height);
+  return p.position;
 }, function (p) {
   return (0, _utilities.getRadius)(p.radius);
 }, function (p) {
@@ -95,7 +95,11 @@ var Box = function Box(_ref) {
       borderWidth = _ref.borderWidth,
       borderColor = _ref.borderColor,
       width = _ref.width,
+      minWidth = _ref.minWidth,
+      maxWidth = _ref.maxWidth,
       height = _ref.height,
+      minHeight = _ref.minHeight,
+      maxHeight = _ref.maxHeight,
       radius = _ref.radius,
       padding = _ref.padding,
       paddingTop = _ref.paddingTop,
@@ -127,7 +131,11 @@ var Box = function Box(_ref) {
     borderWidth: borderWidth,
     borderColor: borderColor,
     width: width,
+    minWidth: minWidth,
+    maxWidth: maxWidth,
     height: height,
+    minHeight: minHeight,
+    maxHeight: maxHeight,
     radius: radius,
     padding: padding,
     paddingTop: paddingY || paddingTop,
@@ -164,6 +172,9 @@ Box.__docgenInfo = {
           "value": [{
             "value": "\"greys\"",
             "computed": false
+          }, {
+            "value": "\"fades\"",
+            "computed": false
           }, {
             "value": "\"baseColors\"",
             "computed": false
@@ -186,6 +197,9 @@ Box.__docgenInfo = {
           "value": [{
             "value": "\"greys\"",
             "computed": false
+          }, {
+            "value": "\"fades\"",
+            "computed": false
           }, {
             "value": "\"baseColors\"",
             "computed": false
@@ -249,6 +263,9 @@ Box.__docgenInfo = {
           "value": [{
             "value": "\"greys\"",
             "computed": false
+          }, {
+            "value": "\"fades\"",
+            "computed": false
           }, {
             "value": "\"baseColors\"",
             "computed": false
@@ -275,6 +292,30 @@ Box.__docgenInfo = {
       "required": false,
       "description": ""
     },
+    "minWidth": {
+      "type": {
+        "name": "union",
+        "value": [{
+          "name": "number"
+        }, {
+          "name": "string"
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
+    "maxWidth": {
+      "type": {
+        "name": "union",
+        "value": [{
+          "name": "number"
+        }, {
+          "name": "string"
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
     "height": {
       "type": {
         "name": "union",
@@ -287,12 +328,39 @@ Box.__docgenInfo = {
       "required": false,
       "description": ""
     },
+    "minHeight": {
+      "type": {
+        "name": "union",
+        "value": [{
+          "name": "number"
+        }, {
+          "name": "string"
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
+    "maxHeight": {
+      "type": {
+        "name": "union",
+        "value": [{
+          "name": "number"
+        }, {
+          "name": "string"
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
     "radius": {
       "type": {
         "name": "union",
         "value": [{
           "name": "enum",
           "value": [{
+            "value": "\"xs\"",
+            "computed": false
+          }, {
             "value": "\"s\"",
             "computed": false
           }, {

package/es/components/{button/index.js → button.js}

@@ -17,7 +17,7 @@ require("core-js/modules/es.array.concat.js");
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-var _utilities = require("../../utilities");
+var _utilities = require("../utilities");
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -27,21 +27,22 @@ var _react2 = require("@emotion/react");
 
 var _excluded = ["children", "tag", "variant", "isDisabled"];
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 var __jsx = _react.default.createElement;
+var variables = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  --grn-buttonTextBoxPaddingX-m: 20px;\n  --grn-color-buttonBorder: var(--grn-color-fade4);\n  --grn-color-buttonBorder-hover: var(--grn-color-fade6);\n  --grn-color-buttonBorder-active: var(--grn-color-grey8);\n"])));
 var variants = {
-  neutral: (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n    color: inherit;\n    background-color: transparent;\n    border-color: ", ";\n\n    &:hover {\n      border-color: ", ";\n    }\n    &:active {\n      border-color: ", ";\n    }\n  "])), (0, _utilities.getColor)('buttonBorder'), (0, _utilities.getColor)('buttonBorderHover'), (0, _utilities.getColor)('buttonBorderActive')),
-  primary: (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n    color: white;\n    background-color: ", ";\n    border-color: transparent;\n\n    &:hover {\n      background-color: ", ";\n    }\n    &:active {\n      color: ", ";\n      background-color: black;\n    }\n  "])), (0, _utilities.getColor)('body'), (0, _utilities.getColor)('grey7'), (0, _utilities.getColor)('grey2'))
+  neutral: (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n    color: inherit;\n    background-color: transparent;\n    border-color: var(--grn-color-buttonBorder);\n\n    &:hover {\n      border-color: var(--grn-color-buttonBorder-hover);\n    }\n    &:active {\n      border-color: var(--grn-color-buttonBorder-active);\n    }\n  "]))),
+  primary: (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n    color: white;\n    background-color: ", ";\n    border-color: transparent;\n\n    &:hover {\n      background-color: ", ";\n    }\n    &:active {\n      color: ", ";\n      background-color: black;\n    }\n  "])), (0, _utilities.getColor)('accent'), (0, _utilities.getColor)('grey7'), (0, _utilities.getColor)('grey2'))
 };
 
-var Wrapper = _styled.default.button(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  appearance: none;\n  border: none;\n  font-family: inherit;\n  font-size: inherit;\n  cursor: pointer;\n  border-width: 1px;\n  border-style: solid;\n  font-weight: ", ";\n  border-radius: ", ";\n  transition: ", ";\n  height: var(--grn-textBoxHeight-m);\n  padding: 0 var(--grn-buttonTextBoxPaddingX-m);\n  \n  ", ";\n  \n  ", ";\n  \n  &:hover {\n    transition: ", ";\n  }\n  \n  &:active {\n    transition: 0s;\n  }\n"])), (0, _utilities.getWeight)('medium'), (0, _utilities.getRadius)('s'), (0, _utilities.getTransition)('slow'), function (p) {
+var Wrapper = _styled.default.button(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n  appearance: none;\n  border: none;\n  font-family: inherit;\n  font-size: inherit;\n  cursor: pointer;\n  border-width: 1px;\n  border-style: solid;\n  font-weight: ", ";\n  border-radius: ", ";\n  transition: ", ";\n  height: var(--grn-textBoxHeight-m);\n  padding: 0 var(--grn-buttonTextBoxPaddingX-m);\n  background-color: transparent;\n\n  ", ";\n\n  ", ";\n\n  &:hover {\n    transition: ", ";\n  }\n\n  &:active {\n    transition: 0s;\n  }\n"])), variables, (0, _utilities.getWeight)('medium'), (0, _utilities.getRadius)('s'), (0, _utilities.getTransition)('slow'), function (p) {
   return !p.isDisabled && variants[p.variant];
 }, function (p) {
   return p.isDisabled && "\n    color: ".concat((0, _utilities.getColor)('disabledContent'), ";\n    background-color: ").concat((0, _utilities.getColor)('disabledBackground'), ";\n    border-color: transparent;\n    cursor: default;\n  ");
 }, (0, _utilities.getTransition)('fast'));
 
-var ButtonText = _styled.default.span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  --opticalCompensation: -0.3px;\n\n  position: relative;\n  top: var(--opticalCompensation);\n"])));
+var ButtonText = _styled.default.span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  --opticalCompensation: -0.3px;\n\n  position: relative;\n  top: var(--opticalCompensation);\n"])));
 
 var Button = function Button(_ref) {
   var children = _ref.children,

package/es/components/index.js

@@ -23,10 +23,16 @@ Object.defineProperty(exports, "Button", {
     return _button.Button;
   }
 });
-Object.defineProperty(exports, "Input", {
+Object.defineProperty(exports, "TextInput", {
   enumerable: true,
   get: function get() {
-    return _input.Input;
+    return _textInput.TextInput;
+  }
+});
+Object.defineProperty(exports, "Arrange", {
+  enumerable: true,
+  get: function get() {
+    return _arrange.Arrange;
   }
 });
 
@@ -36,4 +42,6 @@ var _box = require("./box");
 
 var _button = require("./button");
 
-var _input = require("./input");
+var _textInput = require("./text-input");
+
+var _arrange = require("./arrange");

package/es/components/text-input.js

@@ -0,0 +1,124 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TextInput = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
+var _utilities = require("../utilities");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _styled = _interopRequireDefault(require("@emotion/styled"));
+
+var _types = require("../types");
+
+var _react2 = require("@emotion/react");
+
+var _excluded = ["value", "placeholder", "size", "label", "id"];
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+
+var __jsx = _react.default.createElement;
+var variables = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  --grn-fieldTextBoxPaddingX-s: 8px;\n  --grn-fieldTextBoxPaddingX-m: 12px;\n  --grn-color-fieldBorder: var(--grn-color-fade3);\n  --grn-color-fieldBorder-hover: var(--grn-color-fade6);\n"])));
+var inputSizes = {
+  s: (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n    height: var(--grn-textBoxHeight-s);\n    padding: 0 var(--grn-fieldTextBoxPaddingX-s);\n    border-radius: ", ";\n  "])), (0, _utilities.getRadius)('xs')),
+  m: (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n    height: var(--grn-textBoxHeight-m);\n    padding: 0 var(--grn-fieldTextBoxPaddingX-m);\n    border-radius: ", ";\n  "])), (0, _utilities.getRadius)('s'))
+};
+var labelSizes = {
+  s: '2px',
+  m: 'xs'
+};
+
+var Wrapper = _styled.default.div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n  font-size: ", ";\n"])), variables, function (p) {
+  return (0, _utilities.getTextSize)(p.size);
+});
+
+var Label = _styled.default.label(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  display: block;\n  margin-bottom: ", ";\n"])), function (p) {
+  return (0, _utilities.getSpace)(labelSizes[p.size]);
+});
+
+var InputField = _styled.default.input(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  appearance: none;\n  border: none;\n  font-family: inherit;\n  background-color: transparent;\n  color: inherit;\n  font-size: inherit;\n  transition: ", ";\n  border: 1px solid var(--grn-color-fieldBorder);\n  width: 100%;\n  ", ";\n  outline: none;\n\n  &::placeholder {\n    color: ", ";\n  }\n\n  &:hover {\n    transition: ", ";\n    border-color: var(--grn-color-fieldBorder-hover);\n  }\n  \n  &:focus {\n    transition: 0s;\n    border-color: var(--grn-color-selection);\n  }\n"])), (0, _utilities.getTransition)('slow'), function (p) {
+  return inputSizes[p.size];
+}, (0, _utilities.getColor)('grey5'), (0, _utilities.getTransition)('fast'));
+
+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,
+      props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  return __jsx(Wrapper, {
+    size: size,
+    type: "text"
+  }, label && __jsx(Label, {
+    htmlFor: id,
+    size: size
+  }, label), __jsx(InputField, (0, _extends2.default)({
+    value: value,
+    placeholder: placeholder,
+    size: size,
+    label: label,
+    id: id
+  }, props)));
+};
+
+exports.TextInput = TextInput;
+TextInput.__docgenInfo = {
+  "description": "",
+  "methods": [],
+  "displayName": "TextInput",
+  "props": {
+    "size": {
+      "defaultValue": {
+        "value": "'m'",
+        "computed": false
+      },
+      "type": {
+        "name": "enum",
+        "value": [{
+          "value": "\"s\"",
+          "computed": false
+        }, {
+          "value": "\"m\"",
+          "computed": false
+        }]
+      },
+      "required": false,
+      "description": ""
+    },
+    "id": {
+      "type": {
+        "name": "string"
+      },
+      "required": true,
+      "description": ""
+    },
+    "value": {
+      "type": {
+        "name": "string"
+      },
+      "required": false,
+      "description": ""
+    },
+    "label": {
+      "type": {
+        "name": "node"
+      },
+      "required": false,
+      "description": ""
+    }
+  }
+};

package/es/components/{text/index.js → text.js}

@@ -15,13 +15,13 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-var _utilities = require("../../utilities");
+var _utilities = require("../utilities");
 
 var _react = _interopRequireDefault(require("react"));
 
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 
-var _types = require("../../types");
+var _types = require("../types");
 
 var _excluded = ["children", "size", "weight", "color", "tag", "hasEllipsis", "ellipsisLines", "align"];
 
@@ -137,6 +137,9 @@ Text.__docgenInfo = {
           "value": [{
             "value": "\"greys\"",
             "computed": false
+          }, {
+            "value": "\"fades\"",
+            "computed": false
           }, {
             "value": "\"baseColors\"",
             "computed": false

package/es/styles/components-variables.css

@@ -1,15 +1,4 @@
 :root {
   --grn-textBoxHeight-s: 28px;
   --grn-textBoxHeight-m: 40px;
-
-  --grn-fieldTextBoxPaddingX-s: 8px;
-  --grn-fieldTextBoxPaddingX-m: 12px;
-
-  --grn-buttonTextBoxPaddingX-m: 20px;
-}
-
-:root {
-  --grn-color-buttonBorder: hsl(var(--grn-color-grey8-HSL) / 30%);
-  --grn-color-buttonBorderHover: hsl(var(--grn-color-grey8-HSL) / 50%);
-  --grn-color-buttonBorderActive: hsl(var(--grn-color-grey8-HSL) / 80%);
 }

package/es/styles/variables.css

@@ -26,6 +26,7 @@
 }
 
 :root {
+  --grn-radius-xs: 3.5px;
   --grn-radius-s: 5px;
   --grn-radius-m: 10px;
   --grn-radius-l: 15px;
@@ -37,16 +38,27 @@
 }
 
 :root {
-  --grn-color-grey8-HSL: 0 0% 7%;
+  --grn-color-grey8-HS: 0 0%;
+  --grn-color-grey8-HSL: var(--grn-color-grey8-HS) 7%;
 
   --grn-color-grey8: hsl(var(--grn-color-grey8-HSL));
-  --grn-color-grey7: hsl(0 0% 20%);
-  --grn-color-grey6: hsl(0 0% 32%);
-  --grn-color-grey5: hsl(0 0% 50%);
-  --grn-color-grey4: hsl(0 0% 66%);
-  --grn-color-grey3: hsl(0 0% 83%);
-  --grn-color-grey2: hsl(0 0% 93%);
-  --grn-color-grey1: hsl(0 0% 98%);
+  --grn-color-grey7: hsl(var(--grn-color-grey8-HS) 20%);
+  --grn-color-grey6: hsl(var(--grn-color-grey8-HS) 32%);
+  --grn-color-grey5: hsl(var(--grn-color-grey8-HS) 50%);
+  --grn-color-grey4: hsl(var(--grn-color-grey8-HS) 66%);
+  --grn-color-grey3: hsl(var(--grn-color-grey8-HS) 83%);
+  --grn-color-grey2: hsl(var(--grn-color-grey8-HS) 93%);
+  --grn-color-grey1: hsl(var(--grn-color-grey8-HS) 98%);
+}
+
+:root {
+  --grn-color-fade7: hsl(var(--grn-color-grey8-HS) 0% / 49%);
+  --grn-color-fade6: hsl(var(--grn-color-grey8-HS) 0% / 42%);
+  --grn-color-fade5: hsl(var(--grn-color-grey8-HS) 0% / 35%);
+  --grn-color-fade4: hsl(var(--grn-color-grey8-HS) 0% / 28%);
+  --grn-color-fade3: hsl(var(--grn-color-grey8-HS) 0% / 21%);
+  --grn-color-fade2: hsl(var(--grn-color-grey8-HS) 0% / 14%);
+  --grn-color-fade1: hsl(var(--grn-color-grey8-HS) 0% / 7%);
 }
 
 :root {
@@ -56,16 +68,16 @@
 
 :root {
   --grn-color-body: var(--grn-color-grey8);
-  --grn-color-bodyDimmed: hsl(var(--grn-color-grey8-HSL) / 50%);
+  --grn-color-bodyDimmed: var(--grn-color-fade7);
   --grn-color-accent: var(--grn-color-grey8);
-  --grn-color-backgroundSecondary: hsl(0 0% 100%);
+  --grn-color-backgroundSecondary: white;
   --grn-color-background: var(--grn-color-grey1);
-  --grn-color-overlay: hsl(var(--grn-color-grey8-HSL) / 7%);
-  --grn-color-border: hsl(var(--grn-color-grey8-HSL) / 15%);
+  --grn-color-overlay: var(--grn-color-fade1);
+  --grn-color-border: var(--grn-color-fade2);
   --grn-color-selection: var(--grn-color-blue);
   --grn-color-danger: var(--grn-color-red);
   --grn-color-disabledContent: var(--grn-color-grey5);
-  --grn-color-disabledBackground: hsl(var(--grn-color-grey8-HSL) / 12%);
+  --grn-color-disabledBackground: var(--grn-color-fade1);
 }
 
 :root {

package/es/{types/index.js → types.js}

@@ -13,7 +13,7 @@ require("core-js/modules/es.object.keys.js");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _variables = require("../variables");
+var _variables = require("./variables");
 
 var types = {
   color: _propTypes.default.oneOfType([_propTypes.default.oneOf(Object.keys(_variables.vars.colors)), _propTypes.default.string]),
@@ -26,6 +26,11 @@ var types = {
   textSize: _propTypes.default.oneOfType([_propTypes.default.oneOf(Object.keys(_variables.vars.textSizes)), _propTypes.default.number, _propTypes.default.string]),
   weight: _propTypes.default.oneOf(Object.keys(_variables.vars.weights)),
   textAlign: _propTypes.default.oneOf(["left", "center", "right"]),
-  overflow: _propTypes.default.oneOf(["visible", "hidden", "scroll", "auto"])
+  overflow: _propTypes.default.oneOf(["visible", "hidden", "scroll", "auto"]),
+  fieldSize: _propTypes.default.oneOf(["s", "m"]),
+  columns: _propTypes.default.oneOfType([_propTypes.default.array, _propTypes.default.string]),
+  autoFlow: _propTypes.default.oneOf(["column", "row"]),
+  gridItemsAlignments: _propTypes.default.oneOf(["start", "end", "center", "stretch"]),
+  gridContentPositions: _propTypes.default.oneOf(["start", "end", "center", "stretch", "space-around", "space-between", "space-evenly"])
 };
 exports.types = types;

package/es/{utilities/index.js → utilities.js}

@@ -23,13 +23,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getBorder = exports.getSpace = exports.getTransition = exports.getRadius = exports.getWeight = exports.getTextSize = exports.getShadow = exports.getColor = exports.getCssVar = exports.getCssVarCore = exports.isBrowser = void 0;
+exports.getBorder = exports.getGridColumns = exports.getDimension = exports.getSpace = exports.getTransition = exports.getRadius = exports.getWeight = exports.getTextSize = exports.getShadow = exports.getColor = exports.getCssVar = exports.getCssVarCore = exports.isBrowser = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 require("core-js/modules/es.array.concat.js");
 
-var _variables = require("../variables");
+require("core-js/modules/es.array.map.js");
+
+var _variables = require("./variables");
 
 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; }
 
@@ -54,8 +56,20 @@ var u = function u(amount) {
   return "calc(var(--grn-unit) * ".concat(amount, ")");
 };
 
+var isNumber = function isNumber(value) {
+  return typeof value === "number";
+};
+
+var isString = function isString(value) {
+  return typeof value === "string";
+};
+
+var isArray = function isArray(value) {
+  return Array.isArray(value);
+};
+
 var getColor = function getColor(color) {
-  if (color in _objectSpread(_objectSpread(_objectSpread({}, _variables.vars.colors.baseColors), _variables.vars.colors.greys), _variables.vars.colors.semanticColors)) {
+  if (color in _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, _variables.vars.colors.baseColors), _variables.vars.colors.greys), _variables.vars.colors.semanticColors), _variables.vars.colors.fades)) {
     return getCssVar("color", color);
   }
 
@@ -113,20 +127,53 @@ var getTransition = function getTransition(transition) {
 exports.getTransition = getTransition;
 
 var getSpace = function getSpace(space) {
-  if (isNaN(space)) {
-    if (space in _variables.vars.spaces) {
-      return getCssVar("space", space);
-    }
+  if (space === 0) return space;
 
-    return space;
+  if (isNumber(space)) {
+    return u(space);
   }
 
-  if (space === 0) return space;
-  return u(space);
+  if (space in _variables.vars.spaces) {
+    return getCssVar("space", space);
+  }
+
+  if (isString(space)) {
+    return space;
+  }
 };
 
 exports.getSpace = getSpace;
 
+var getDimension = function getDimension(dimension) {
+  if (dimension === 0) return dimension;
+
+  if (isNumber(dimension)) {
+    return u(dimension);
+  }
+
+  if (isString(dimension)) {
+    return dimension;
+  }
+};
+
+exports.getDimension = getDimension;
+
+var getGridColumns = function getGridColumns(columns) {
+  if (columns) {
+    if (isArray(columns)) {
+      return columns.map(function (column) {
+        return getDimension(column);
+      }).join(" ");
+    }
+
+    if (isString(columns)) {
+      return columns;
+    }
+  }
+};
+
+exports.getGridColumns = getGridColumns;
+
 var getBorder = function getBorder(borderSide) {
   var borderWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "1px";
   var borderColor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "border";

package/es/{variables/index.js → variables.js}

@@ -30,6 +30,7 @@ var vars = {
     semiBold: "semiBold"
   },
   radiuses: {
+    xs: "xs",
     s: "s",
     m: "m",
     l: "l"
@@ -54,6 +55,15 @@ var vars = {
       grey2: "grey2",
       grey1: "grey1"
     },
+    fades: {
+      fade7: "fade7",
+      fade6: "fade6",
+      fade5: "fade5",
+      fade4: "fade4",
+      fade3: "fade3",
+      fade2: "fade2",
+      fade1: "fade1"
+    },
     baseColors: {
       blue: "blue",
       red: "red"
@@ -66,9 +76,6 @@ var vars = {
       background: "background",
       overlay: "overlay",
       border: "border",
-      buttonBorder: "buttonBorder",
-      buttonBorderHover: "buttonBorderHover",
-      buttonBorderActive: "buttonBorderActive",
       selection: "selection",
       danger: "danger",
       disabledContent: "disabledContent",

package/package.json

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

package/es/components/input/index.js

@@ -1,75 +0,0 @@
-"use strict";
-
-require("core-js/modules/es.object.define-property.js");
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Input = void 0;
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
-var _utilities = require("../../utilities");
-
-var _react = _interopRequireDefault(require("react"));
-
-var _styled = _interopRequireDefault(require("@emotion/styled"));
-
-var _types = require("../../types");
-
-var _excluded = ["value", "placeholder", "size"];
-
-var _templateObject;
-
-var __jsx = _react.default.createElement;
-
-var Wrapper = _styled.default.input(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  appearance: none;\n  border: none;\n  font-family: inherit;\n  background-color: transparent;\n  color: inherit;\n  font-size: ", ";\n  border-radius: ", ";\n  border: 1px solid ", ";\n  height: ", ";\n  padding: 0 ", ";\n  width: 100%;\n"])), function (p) {
-  return (0, _utilities.getTextSize)(p.size);
-}, (0, _utilities.getRadius)('m'), (0, _utilities.getColor)('grey3'), function (p) {
-  return "var(--grn-textBoxHeight-".concat(p.size, ")");
-}, function (p) {
-  return "var(--grn-fieldTextBoxPaddingX-".concat(p.size, ")");
-});
-
-var Input = function Input(_ref) {
-  var value = _ref.value,
-      _ref$placeholder = _ref.placeholder,
-      placeholder = _ref$placeholder === void 0 ? 'Placeholder' : _ref$placeholder,
-      _ref$size = _ref.size,
-      size = _ref$size === void 0 ? 'm' : _ref$size,
-      props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return __jsx(Wrapper, (0, _extends2.default)({
-    value: value,
-    placeholder: placeholder,
-    size: size
-  }, props));
-};
-
-exports.Input = Input;
-Input.__docgenInfo = {
-  "description": "",
-  "methods": [],
-  "displayName": "Input",
-  "props": {
-    "placeholder": {
-      "defaultValue": {
-        "value": "'Placeholder'",
-        "computed": false
-      },
-      "required": false
-    },
-    "size": {
-      "defaultValue": {
-        "value": "'m'",
-        "computed": false
-      },
-      "required": false
-    }
-  }
-};