@flodesk/grain 10.9.5 → 10.9.6

package/es/components/box2.js

@@ -30,22 +30,11 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { forwardRef } from 'react';
 import { types } from '../types';
 import PropTypes from 'prop-types';
-import { styleConfig, generateStyleAttributes, generateClassNameAttributes } from '../utilities';
+import { generateStyleAttributes, generateClassNameAttributes } from '../utilities';
 import { jsx as ___EmotionJSX } from "@emotion/react";
-var dimensionProps = styleConfig.dimensionProps,
-    colorProps = styleConfig.colorProps,
-    zIndexProps = styleConfig.zIndexProps,
-    aspectRatioProps = styleConfig.aspectRatioProps,
-    flexProps = styleConfig.flexProps,
-    spaceProps = styleConfig.spaceProps,
-    shadowProps = styleConfig.shadowProps,
-    radiusProps = styleConfig.radiusProps,
-    orderProps = styleConfig.orderProps,
-    positionProps = styleConfig.positionProps,
-    overflowProps = styleConfig.overflowProps,
-    transitionProps = styleConfig.transitionProps,
-    cursorProps = styleConfig.cursorProps;
 export var Box2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
+  var _generateClassNameAtt;
+
   var all = _ref.all,
       color = _ref.color,
       colorHover = _ref.colorHover,
@@ -101,21 +90,44 @@ export var Box2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
       style = _ref.style,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
-  var allProps = {
-    all: all,
-    color: color,
-    colorHover: colorHover,
-    backgroundColor: backgroundColor,
-    backgroundColorHover: backgroundColorHover,
-    borderColorHover: borderColorHover,
-    borderSide: borderSide,
+  var styles = _objectSpread({}, generateStyleAttributes({
     width: width,
     minWidth: minWidth,
     maxWidth: maxWidth,
     height: height,
     minHeight: minHeight,
     maxHeight: maxHeight,
+    color: color,
+    colorHover: colorHover,
+    backgroundColor: backgroundColor,
+    backgroundColorHover: backgroundColorHover,
+    padding: padding,
+    paddingTop: paddingTop,
+    paddingBottom: paddingBottom,
+    paddingLeft: paddingLeft,
+    paddingRight: paddingRight,
+    paddingX: paddingX,
+    paddingY: paddingY,
+    margin: margin,
+    marginTop: marginTop,
+    marginBottom: marginBottom,
+    marginLeft: marginLeft,
+    marginRight: marginRight,
+    marginX: marginX,
+    marginY: marginY,
+    shadow: shadow,
+    shadowHover: shadowHover,
     radius: radius,
+    order: order,
+    zIndex: zIndex,
+    transition: transition,
+    transitionHover: transitionHover,
+    aspectRatio: aspectRatio,
+    flex: flex
+  }));
+
+  var propClassName = className ? className : '';
+  var classNames = [generateClassNameAttributes((_generateClassNameAtt = {
     padding: padding,
     paddingTop: paddingTop,
     paddingBottom: paddingBottom,
@@ -135,28 +147,14 @@ export var Box2 = /*#__PURE__*/forwardRef(function (_ref, ref) {
     bottom: bottom,
     left: left,
     right: right,
+    color: color,
+    colorHover: colorHover,
+    backgroundColor: backgroundColor,
+    backgroundColorHover: backgroundColorHover,
     shadow: shadow,
     shadowHover: shadowHover,
-    overflow: overflow,
-    overflowX: overflowX,
-    overflowY: overflowY,
-    aspectRatio: aspectRatio,
-    zIndex: zIndex,
-    tag: tag,
-    opacity: opacity,
-    opacityHover: opacityHover,
-    order: order,
-    alignSelf: alignSelf,
-    flex: flex,
-    transition: transition,
-    transitionHover: transitionHover,
-    cursor: cursor
-  };
-
-  var styles = _objectSpread({}, generateStyleAttributes([dimensionProps, colorProps, spaceProps, shadowProps, radiusProps, orderProps, zIndexProps, transitionProps, aspectRatioProps, flexProps], allProps));
-
-  var propClassName = className ? className : '';
-  var classNames = [generateClassNameAttributes([spaceProps, colorProps, shadowProps, radiusProps, positionProps, overflowProps, transitionProps, cursorProps], allProps), propClassName].join(' ').replace(/\s+/g, ' ').trim();
+    radius: radius
+  }, _defineProperty(_generateClassNameAtt, "position", position), _defineProperty(_generateClassNameAtt, "overflow", overflow), _defineProperty(_generateClassNameAtt, "transition", transition), _defineProperty(_generateClassNameAtt, "transitionHover", transitionHover), _defineProperty(_generateClassNameAtt, "cursor", cursor), _generateClassNameAtt)), propClassName].join(' ').replace(/\s+/g, ' ').trim();
   var Tag = tag;
   return ___EmotionJSX(Tag, _extends({
     ref: ref,

package/es/utilities/attributes.js

@@ -1,14 +1,17 @@
+import "core-js/modules/es.object.values.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/web.dom-collections.for-each.js";
+import "core-js/modules/es.object.keys.js";
 import "core-js/modules/es.array.concat.js";
 import { isObject } from './helpers';
-import { propNameToShort } from './style-config';
-export var generateStyleAttributes = function generateStyleAttributes(propsSets, allProps) {
+import { propNameToShort, styleConfig } from './style-config';
+export var generateStyleAttributes = function generateStyleAttributes(props) {
   var styles = {};
-  propsSets.forEach(function (propsSet) {
+  var styleConfigValues = Object.values(styleConfig);
+  styleConfigValues.forEach(function (propsSet) {
     propsSet.props.forEach(function (_ref) {
       var propName = _ref.propName;
-      var value = allProps[propName];
+      var value = props[propName];
       var hasVariable = propsSet.variableChecker ? propsSet.variableChecker(value) : false;
       var hasTransformer = propsSet.valueTransformer ? true : false;
       if (hasVariable) return;
@@ -18,34 +21,35 @@ export var generateStyleAttributes = function generateStyleAttributes(propsSets,
 
       if (!isObject(value)) {
         styles["--".concat(propNameShort)] = cssValue;
-      }
-
-      if (isObject(value)) {
+      } else {
         var def = value.default,
             mobile = value.mobile,
             tablet = value.tablet;
-        var defaultValueCss = hasTransformer ? propsSet.valueTransformer(def) : def;
-        var mobileValueCss = hasTransformer ? propsSet.valueTransformer(mobile) : mobile;
-        var tabletValueCss = hasTransformer ? propsSet.valueTransformer(tablet) : tablet;
-        styles["--".concat(propNameShort, "-def")] = defaultValueCss;
-        styles["--".concat(propNameShort, "-mob")] = mobileValueCss;
-        styles["--".concat(propNameShort, "-tab")] = tabletValueCss;
+        styles["--".concat(propNameShort, "-def")] = hasTransformer ? propsSet.valueTransformer(def) : def;
+        styles["--".concat(propNameShort, "-mob")] = hasTransformer ? propsSet.valueTransformer(mobile) : mobile;
+        styles["--".concat(propNameShort, "-tab")] = hasTransformer ? propsSet.valueTransformer(tablet) : tablet;
       }
     });
   });
   return styles;
 };
-export var generateClassNameAttributes = function generateClassNameAttributes(propsSets, allProps) {
+export var generateClassNameAttributes = function generateClassNameAttributes(props) {
   var classNames = [];
-  propsSets.forEach(function (propsSet) {
-    propsSet.props.forEach(function (_ref2) {
-      var propName = _ref2.propName;
-      var value = allProps[propName];
-      var hasVariable = propsSet.variableChecker ? propsSet.variableChecker(value) : false;
-      if (!hasVariable) return;
-      if (!value) return;
-      var className = "".concat(propNameToShort(propName), "-").concat(value);
-      classNames.push(className);
+  var propKeys = Object.keys(props);
+  var styleConfigValues = Object.values(styleConfig);
+  propKeys.forEach(function (prop) {
+    styleConfigValues.forEach(function (styleConfigItem) {
+      styleConfigItem.props.forEach(function (propItem) {
+        if (propItem.propName === prop) {
+          var propName = propItem.propName;
+          var value = props[propName];
+          var hasVariable = styleConfigItem.variableChecker ? styleConfigItem.variableChecker(value) : false;
+          if (!hasVariable) return;
+          if (!value) return;
+          var className = "".concat(propNameToShort(propName), "-").concat(value);
+          classNames.push(className);
+        }
+      });
     });
   });
   return classNames.join(' ');

package/package.json

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