@flodesk/grain 10.10.4 → 10.10.6

package/es/components/box2.js

@@ -9,7 +9,7 @@ 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";
 import "core-js/modules/es.object.assign.js";
-var _excluded = ["color", "colorHover", "backgroundColor", "backgroundColorHover", "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", "shadowHover", "overflow", "overflowX", "overflowY", "aspectRatio", "zIndex", "tag", "opacity", "opacityHover", "order", "alignSelf", "flex", "transition", "transitionHover", "cursor", "children", "className", "style", "borderColor", "borderColorHover", "borderWidth", "borderLeftWidth", "borderRightWidth", "borderTopWidth", "borderBottomWidth", "borderXWidth", "borderYWidth"];
+var _excluded = ["color", "colorHover", "backgroundColor", "backgroundColorHover", "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", "shadowHover", "overflow", "overflowX", "overflowY", "aspectRatio", "zIndex", "tag", "opacity", "opacityHover", "order", "alignSelf", "flex", "transition", "transitionHover", "cursor", "children", "className", "style", "borderColor", "borderColorHover", "borderWidth", "borderWidthLeft", "borderWidthRight", "borderWidthTop", "borderWidthBottom", "borderWidthX", "borderWidthY"];
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
 
@@ -88,12 +88,12 @@ export var Box2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
       borderColor = _ref.borderColor,
       borderColorHover = _ref.borderColorHover,
       borderWidth = _ref.borderWidth,
-      borderLeftWidth = _ref.borderLeftWidth,
-      borderRightWidth = _ref.borderRightWidth,
-      borderTopWidth = _ref.borderTopWidth,
-      borderBottomWidth = _ref.borderBottomWidth,
-      borderXWidth = _ref.borderXWidth,
-      borderYWidth = _ref.borderYWidth,
+      borderWidthLeft = _ref.borderWidthLeft,
+      borderWidthRight = _ref.borderWidthRight,
+      borderWidthTop = _ref.borderWidthTop,
+      borderWidthBottom = _ref.borderWidthBottom,
+      borderWidthX = _ref.borderWidthX,
+      borderWidthY = _ref.borderWidthY,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
   var styles = _objectSpread({}, generateStyleAttributes({
@@ -164,7 +164,7 @@ export var Box2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
     shadow: shadow,
     shadowHover: shadowHover,
     radius: radius
-  }, _defineProperty(_generateClassNameAtt, "position", position), _defineProperty(_generateClassNameAtt, "overflow", overflow), _defineProperty(_generateClassNameAtt, "transition", transition), _defineProperty(_generateClassNameAtt, "transitionHover", transitionHover), _defineProperty(_generateClassNameAtt, "cursor", cursor), _defineProperty(_generateClassNameAtt, "alignSelf", alignSelf), _defineProperty(_generateClassNameAtt, "borderColor", borderColor), _defineProperty(_generateClassNameAtt, "borderColorHover", borderColorHover), _defineProperty(_generateClassNameAtt, "borderWidth", borderWidth), _defineProperty(_generateClassNameAtt, "borderLeftWidth", borderLeftWidth), _defineProperty(_generateClassNameAtt, "borderRightWidth", borderRightWidth), _defineProperty(_generateClassNameAtt, "borderTopWidth", borderTopWidth), _defineProperty(_generateClassNameAtt, "borderBottomWidth", borderBottomWidth), _defineProperty(_generateClassNameAtt, "borderXWidth", borderXWidth), _defineProperty(_generateClassNameAtt, "borderYWidth", borderYWidth), _generateClassNameAtt)), propClassName].join(' ').replace(/\s+/g, ' ').trim();
+  }, _defineProperty(_generateClassNameAtt, "position", position), _defineProperty(_generateClassNameAtt, "overflow", overflow), _defineProperty(_generateClassNameAtt, "transition", transition), _defineProperty(_generateClassNameAtt, "transitionHover", transitionHover), _defineProperty(_generateClassNameAtt, "cursor", cursor), _defineProperty(_generateClassNameAtt, "alignSelf", alignSelf), _defineProperty(_generateClassNameAtt, "borderColor", borderColor), _defineProperty(_generateClassNameAtt, "borderColorHover", borderColorHover), _defineProperty(_generateClassNameAtt, "borderWidth", borderWidth), _defineProperty(_generateClassNameAtt, "borderWidthLeft", borderWidthLeft), _defineProperty(_generateClassNameAtt, "borderWidthRight", borderWidthRight), _defineProperty(_generateClassNameAtt, "borderWidthTop", borderWidthTop), _defineProperty(_generateClassNameAtt, "borderWidthBottom", borderWidthBottom), _defineProperty(_generateClassNameAtt, "borderWidthX", borderWidthX), _defineProperty(_generateClassNameAtt, "borderWidthY", borderWidthY), _generateClassNameAtt)), propClassName].join(' ').replace(/\s+/g, ' ').trim();
   var Tag = tag;
   return ___EmotionJSX(Tag, _extends({
     ref: ref,
@@ -181,12 +181,12 @@ Box2.propTypes = {
   borderColor: types.color,
   borderColorHover: types.color,
   borderWidth: types.borderWidth,
-  borderLeftWidth: types.borderWidth,
-  borderRightWidth: types.borderWidth,
-  borderTopWidth: types.borderWidth,
-  borderBottomWidth: types.borderWidth,
-  borderXWidth: types.borderWidth,
-  borderYWidth: types.borderWidth,
+  borderWidthLeft: types.borderWidth,
+  borderWidthRight: types.borderWidth,
+  borderWidthTop: types.borderWidth,
+  borderWidthBottom: types.borderWidth,
+  borderWidthX: types.borderWidth,
+  borderWidthY: types.borderWidth,
   width: types.responsiveDimension,
   minWidth: types.responsiveDimension,
   maxWidth: types.responsiveDimension,

package/es/styles/utilities.js

@@ -17,6 +17,9 @@ import "core-js/modules/es.string.includes.js";
 import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.object.entries.js";
 import "core-js/modules/es.array.map.js";
+import "core-js/modules/es.object.values.js";
+import "core-js/modules/es.regexp.exec.js";
+import "core-js/modules/es.string.replace.js";
 import "core-js/modules/es.symbol.js";
 import "core-js/modules/es.symbol.description.js";
 import "core-js/modules/es.symbol.iterator.js";
@@ -25,7 +28,7 @@ import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import "core-js/modules/es.array.slice.js";
 import "core-js/modules/es.array.from.js";
-import "core-js/modules/es.regexp.exec.js";
+import { borderWidths } from '../types';
 import { styleConfig } from '../utilities';
 import { propNameToShort } from '../utilities/style-config';
 
@@ -37,14 +40,10 @@ var generateUtilityClassDeclarations = function generateUtilityClassDeclarations
         var property = prop.property;
         var cssValue = set.valueTransformer ? set.valueTransformer(variable) : variable;
         var hasHover = prop.propName.includes('Hover');
-
-        if (!hasHover) {
-          css += "\n            .".concat(propNameToShort(prop.propName), "-").concat(variable, " {\n              ").concat(property, ": ").concat(cssValue, "\n            }");
-        }
-
-        if (hasHover) {
-          css += "\n            .".concat(propNameToShort(prop.propName), "-").concat(variable, ":hover {\n              ").concat(property, ": ").concat(cssValue, "\n            }");
-        }
+        var selector = ".".concat(propNameToShort(prop.propName), "-").concat(variable);
+        var declaration = "{".concat(property, ": ").concat(cssValue, "}");
+        if (!hasHover) css += "".concat(selector, " ").concat(declaration);
+        if (hasHover) css += "".concat(selector, ":hover ").concat(declaration);
       });
     });
   });
@@ -64,14 +63,9 @@ var generateStyleClassDeclarations = function generateStyleClassDeclarations(pro
       var propName = prop.propName;
       var cssVar = "--".concat(propNameToShort(propName));
       var hasHover = prop.propName.includes('Hover');
-
-      if (!hasHover) {
-        css += "[style*=\"".concat(cssVar, ":\"] {").concat(property, ": var(").concat(cssVar, ")}");
-      }
-
-      if (hasHover) {
-        css += "[style*=\"".concat(cssVar, "\"]:hover {").concat(property, ": var(").concat(cssVar, ")}");
-      }
+      var declaration = "{".concat(property, ": var(").concat(cssVar, ")}");
+      if (!hasHover) css += "[style*=\"".concat(cssVar, ":\"] ").concat(declaration);
+      if (hasHover) css += "[style*=\"".concat(cssVar, ":\"]:hover ").concat(declaration);
 
       if (set.isResponsive) {
         css += "\n          [style*=\"".concat(cssVar, "-def\"] {").concat(property, ": var(").concat(cssVar, "-def)}\n        ");
@@ -108,28 +102,21 @@ var spaceProps = styleConfig.spaceProps,
 var classAndStyleDeclarationProps = [spaceProps, colorProps, shadowProps, radiusProps, transitionProps, sizeProps, borderColorProps];
 var classDeclarationProps = [].concat(classAndStyleDeclarationProps, [positionProps, overflowProps, cursorProps, sizeProps, alignSelfProps, borderWidthProps]);
 var styleDeclarationProps = [].concat(classAndStyleDeclarationProps, [dimensionProps, aspectRatioProps, orderProps, flexProps, opacityProps]);
-var borderSides = {
-  t: 'top',
-  r: 'right',
-  b: 'bottom',
-  l: 'left',
-  x: 'inline',
-  y: 'block'
-};
 
 var generateBorderStyle = function generateBorderStyle() {
   var css = '';
-  Object.entries(borderSides).map(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-        shortSide = _ref4[0],
-        side = _ref4[1];
-
-    css += "\n        [class*=\"bd".concat(shortSide, "w-\"] { border-").concat(side, "-style: solid }\n      ");
+  Object.values(borderWidthProps.props).map(function (prop) {
+    var property = prop.property.replace('width', 'style');
+    if (prop.propName === 'borderWidth') return;
+    css += "\n        [class*=\"".concat(prop.short, "\"] { ").concat(property, ": solid }\n      ");
   }).join('');
-  css += "\n    [class*=\"bdw-\"] { border-style: solid }\n  ";
+  var allSideSelector = borderWidthProps.props[0].short;
+  css += "\n    ".concat(borderWidths.map(function (w) {
+    return ".".concat(allSideSelector, "-").concat(w);
+  }), " { border-style: solid }\n  ");
   return css;
 };
 
-var defaultBorderColor = "\n  [class*=\"bdw-\"]:not([class*=\"bdc-\"]),\n  [class*=\"bdw-\"][class*=\"bdc-h\"]:not(:hover) {\n    border-color: var(--grn-color-border);\n  }\n";
-var utilities = "\n  ".concat(generateUtilityClassDeclarations(classDeclarationProps), ";\n  ").concat(generateStyleClassDeclarations(styleDeclarationProps), ";\n  ").concat(generateBorderStyle(), "\n  ").concat(defaultBorderColor, "\n");
+var defaultBorderColor = "\n  [class*=\"bd\"] {\n    border-color: var(--grn-color-border);\n  }\n";
+var utilities = "\n  ".concat(defaultBorderColor, "\n  ").concat(generateUtilityClassDeclarations(classDeclarationProps), ";\n  ").concat(generateStyleClassDeclarations(styleDeclarationProps), ";\n  ").concat(generateBorderStyle(), "\n");
 export default utilities;

package/es/utilities/style-config.js

@@ -331,29 +331,29 @@ export var styleConfig = {
       property: 'border-width',
       short: 'bdw'
     }, {
-      propName: 'borderTopWidth',
+      propName: 'borderWidthTop',
       property: 'border-top-width',
-      short: 'bdtw'
+      short: 'bdw-t'
     }, {
-      propName: 'borderRightWidth',
+      propName: 'borderWidthRight',
       property: 'border-right-width',
-      short: 'bdrw'
+      short: 'bdw-r'
     }, {
-      propName: 'borderBottomWidth',
+      propName: 'borderWidthBottom',
       property: 'border-bottom-width',
-      short: 'bdbw'
+      short: 'bdw-b'
     }, {
-      propName: 'borderLeftWidth',
+      propName: 'borderWidthLeft',
       property: 'border-left-width',
-      short: 'bdlw'
+      short: 'bdw-l'
     }, {
-      propName: 'borderXWidth',
+      propName: 'borderWidthX',
       property: 'border-inline-width',
-      short: 'bdxw'
+      short: 'bdw-x'
     }, {
-      propName: 'borderYWidth',
+      propName: 'borderWidthY',
       property: 'border-block-width',
-      short: 'bdyw'
+      short: 'bdw-y'
     }],
     valueTransformer: function valueTransformer(borderWidth) {
       return "".concat(borderWidth, "px");

package/package.json

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