@dxc-technology/halstack-react 0.0.0-cd617f3 → 0.0.0-ce0214d

package/box/Box.js

@@ -9,8 +9,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
@@ -19,15 +17,13 @@ var _react = _interopRequireDefault(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _variables = require("../common/variables.js");
 
 var _utils = require("../common/utils.js");
 
-var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _BackgroundColorContext = require("../BackgroundColorContext.js");
+var _BackgroundColorContext = require("../BackgroundColorContext");
 
 var _templateObject;
 
@@ -36,12 +32,13 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var DxcBox = function DxcBox(_ref) {
-  var shadowDepth = _ref.shadowDepth,
-      margin = _ref.margin,
-      padding = _ref.padding,
+  var _ref$shadowDepth = _ref.shadowDepth,
+      shadowDepth = _ref$shadowDepth === void 0 ? 2 : _ref$shadowDepth,
       _ref$display = _ref.display,
       display = _ref$display === void 0 ? "inline-flex" : _ref$display,
       children = _ref.children,
+      margin = _ref.margin,
+      padding = _ref.padding,
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? "fitContent" : _ref$size;
   var colorsTheme = (0, _useTheme["default"])();
@@ -74,9 +71,8 @@ var calculateWidth = function calculateWidth(margin, size, padding) {
   return sizes[size];
 };
 
-var StyledDxcBox = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  letter-spacing: ", ";\n  overflow: hidden;\n  width: ", ";\n  background-color: ", ";\n  box-shadow: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  padding: ", ";\n  padding-top: ", ";\n  padding-right: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n"])), function (_ref2) {
-  var display = _ref2.display;
-  return display;
+var StyledDxcBox = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  letter-spacing: ", ";\n  overflow: hidden;\n  width: ", ";\n  background-color: ", ";\n  box-shadow: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  padding: ", ";\n  padding-top: ", ";\n  padding-right: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n"])), function (props) {
+  return props.display;
 }, function (props) {
   return props.theme.borderRadius;
 }, function (props) {
@@ -93,60 +89,28 @@ var StyledDxcBox = _styledComponents["default"].div(_templateObject || (_templat
   return props.theme.backgroundColor;
 }, function (props) {
   return props.shadowDepth === 1 ? "".concat(props.theme.oneShadowDepthShadowOffsetX, " ").concat(props.theme.oneShadowDepthShadowOffsetY, " ").concat(props.theme.oneShadowDepthShadowBlur, "  ").concat(props.theme.oneShadowDepthShadowSpread, " ").concat(props.theme.oneShadowDepthShadowColor) : props.shadowDepth === 2 ? "".concat(props.theme.twoShadowDepthShadowOffsetX, " ").concat(props.theme.twoShadowDepthShadowOffsetY, " ").concat(props.theme.twoShadowDepthShadowBlur, "  ").concat(props.theme.twoShadowDepthShadowSpread, " ").concat(props.theme.twoShadowDepthShadowColor) : "".concat(props.theme.noneShadowDepthShadowOffsetX, " ").concat(props.theme.noneShadowDepthShadowOffsetY, " ").concat(props.theme.noneShadowDepthShadowBlur, "  ").concat(props.theme.noneShadowDepthShadowSpread, " ").concat(props.theme.noneShadowDepthShadowColor);
-}, function (_ref3) {
-  var margin = _ref3.margin;
-  return margin && (0, _typeof2["default"])(margin) !== "object" ? _variables.spaces[margin] : "0px";
-}, function (_ref4) {
-  var margin = _ref4.margin;
-  return margin && margin.top ? _variables.spaces[margin.top] : "";
-}, function (_ref5) {
-  var margin = _ref5.margin;
-  return margin && margin.right ? _variables.spaces[margin.right] : "";
-}, function (_ref6) {
-  var margin = _ref6.margin;
-  return margin && margin.bottom ? _variables.spaces[margin.bottom] : "";
-}, function (_ref7) {
-  var margin = _ref7.margin;
-  return margin && margin.left ? _variables.spaces[margin.left] : "";
-}, function (_ref8) {
-  var padding = _ref8.padding;
+}, function (props) {
+  return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
+}, function (props) {
+  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.top ? _variables.spaces[props.margin.top] : "";
+}, function (props) {
+  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.right ? _variables.spaces[props.margin.right] : "";
+}, function (props) {
+  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.bottom ? _variables.spaces[props.margin.bottom] : "";
+}, function (props) {
+  return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
+}, function (_ref2) {
+  var padding = _ref2.padding;
   return padding && (0, _typeof2["default"])(padding) !== "object" ? _variables.spaces[padding] : "0px";
-}, function (_ref9) {
-  var padding = _ref9.padding;
-  return padding && padding.top ? _variables.spaces[padding.top] : "";
-}, function (_ref10) {
-  var padding = _ref10.padding;
-  return padding && padding.right ? _variables.spaces[padding.right] : "";
-}, function (_ref11) {
-  var padding = _ref11.padding;
-  return padding && padding.bottom ? _variables.spaces[padding.bottom] : "";
-}, function (_ref12) {
-  var padding = _ref12.padding;
-  return padding && padding.left ? _variables.spaces[padding.left] : "";
+}, function (props) {
+  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.top ? _variables.spaces[props.padding.top] : "";
+}, function (props) {
+  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.right ? _variables.spaces[props.padding.right] : "";
+}, function (props) {
+  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.bottom ? _variables.spaces[props.padding.bottom] : "";
+}, function (props) {
+  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.left ? _variables.spaces[props.padding.left] : "";
 });
 
-DxcBox.propTypes = {
-  size: _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(sizes))),
-  display: _propTypes["default"].string,
-  shadowDepth: _propTypes["default"].oneOf([0, 1, 2]),
-  margin: _propTypes["default"].oneOfType([_propTypes["default"].shape({
-    top: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
-  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
-  padding: _propTypes["default"].oneOfType([_propTypes["default"].shape({
-    top: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
-  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))])
-};
-DxcBox.defaultProps = {
-  shadowDepth: 2,
-  display: "inline-flex",
-  margin: null,
-  padding: null
-};
 var _default = DxcBox;
 exports["default"] = _default;

package/box/Box.stories.tsx

@@ -0,0 +1,132 @@
+import React from "react";
+import Title from "../../.storybook/components/Title";
+import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import DxcBox from "./Box";
+
+export default {
+  title: "Box ",
+  component: DxcBox,
+};
+
+export const Chromatic = () => (
+  <>
+    <Title title="Display flex" theme="light" level={2} />
+    <ExampleContainer>
+      <DxcBox display="flex" padding="medium">
+        Box
+      </DxcBox>
+    </ExampleContainer>
+    <Title title="ShadowDepth" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="ShadowDepth 0" theme="light" level={4} />
+      <DxcBox shadowDepth={0} margin="medium" padding="medium">
+        Box
+      </DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="ShadowDepth 1" theme="light" level={4} />
+      <DxcBox shadowDepth={1} margin="medium" padding="medium">
+        Box
+      </DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="ShadowDepth 2" theme="light" level={4} />
+      <DxcBox shadowDepth={2} margin="medium" padding="medium">
+        Box
+      </DxcBox>
+    </ExampleContainer>
+    <Title title="Paddings" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Xxsmall padding" theme="light" level={4} />
+      <DxcBox padding="xxsmall">Box</DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Xsmall padding" theme="light" level={4} />
+      <DxcBox padding="xsmall">Box</DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Small padding" theme="light" level={4} />
+      <DxcBox padding="small">Box</DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Medium padding" theme="light" level={4} />
+      <DxcBox padding="medium">Box</DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Large padding" theme="light" level={4} />
+      <DxcBox padding="large">Box</DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Xlarge padding" theme="light" level={4} />
+      <DxcBox padding="xlarge">Box</DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Xxlarge padding" theme="light" level={4} />
+      <DxcBox padding="xxlarge">Box</DxcBox>
+    </ExampleContainer>
+    <Title title="Margins" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Xxsmall margin" theme="light" level={4} />
+      <DxcBox margin="xxsmall" padding="medium">
+        Box
+      </DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Xsmall margin" theme="light" level={4} />
+      <DxcBox margin="xsmall" padding="medium">
+        Box
+      </DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Small margin" theme="light" level={4} />
+      <DxcBox margin="small" padding="medium">
+        Box
+      </DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Medium margin" theme="light" level={4} />
+      <DxcBox margin="medium" padding="medium">
+        Box
+      </DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Large margin" theme="light" level={4} />
+      <DxcBox margin="large" padding="medium">
+        Box
+      </DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Xlarge margin" theme="light" level={4} />
+      <DxcBox margin="xlarge" padding="medium">
+        Box
+      </DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Xxlarge margin" theme="light" level={4} />
+      <DxcBox margin="xxlarge" padding="medium">
+        Box
+      </DxcBox>
+    </ExampleContainer>
+    <Title title="Sizes" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Small size" theme="light" level={4} />
+      <DxcBox size="small">Box</DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Medium size" theme="light" level={4} />
+      <DxcBox size="medium">Box</DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Large size" theme="light" level={4} />
+      <DxcBox size="large">Box</DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="FillParent size" theme="light" level={4} />
+      <DxcBox size="fillParent">Box</DxcBox>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="FitContent" theme="light" level={4} />
+      <DxcBox size="fitContent">Box</DxcBox>
+    </ExampleContainer>
+  </>
+);

package/box/Box.test.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _Card = _interopRequireDefault(require("../card/Card"));
+
+describe("Box component tests", function () {
+  test("Box renders with correct text", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Card["default"], null, "test-box")),
+        getByText = _render.getByText;
+
+    expect(getByText("test-box")).toBeTruthy();
+  });
+});

package/box/types.d.ts

@@ -0,0 +1,43 @@
+/// <reference types="react" />
+declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+declare type Margin = {
+    top?: Space;
+    bottom?: Space;
+    left?: Space;
+    right?: Space;
+};
+declare type Padding = {
+    top?: Space;
+    bottom?: Space;
+    left?: Space;
+    right?: Space;
+};
+declare type Props = {
+    /**
+     * The size of the shadow to be displayed around the box.
+     */
+    shadowDepth?: 0 | 1 | 2;
+    /**
+     * Changes the display CSS property of the box div.
+     */
+    display?: string;
+    /**
+     * Custom content that will be placed in the box component.
+     */
+    children: React.ReactNode;
+    /**
+     * Size of the margin to be applied to the component ('xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge').
+     * You can pass an object with 'top', 'bottom', 'left' and 'right' properties in order to specify different margin sizes.
+     */
+    margin?: Space | Margin;
+    /**
+     * Size of the padding to be applied to the custom area ('xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge').
+     * You can pass an object with 'top', 'bottom', 'left' and 'right' properties in order to specify different padding sizes.
+     */
+    padding?: Space | Padding;
+    /**
+     * Size of the component.
+     */
+    size?: "small" | "medium" | "large" | "fillParent" | "fitContent";
+};
+export default Props;

package/box/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/button/Button.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import ButtonPropsType from "./types";
-declare const DxcButton: ({ label, mode, disabled, iconPosition, type, iconSrc, icon, onClick, margin, size, tabIndex, }: ButtonPropsType) => JSX.Element;
+declare const DxcButton: ({ label, mode, disabled, iconPosition, type, icon, onClick, margin, size, tabIndex, }: ButtonPropsType) => JSX.Element;
 export default DxcButton;

package/button/Button.js

@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
@@ -23,9 +23,9 @@ var _variables = require("../common/variables.js");
 
 var _utils = require("../common/utils.js");
 
-var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext.js"));
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
@@ -44,18 +44,23 @@ var DxcButton = function DxcButton(_ref) {
       iconPosition = _ref$iconPosition === void 0 ? "before" : _ref$iconPosition,
       _ref$type = _ref.type,
       type = _ref$type === void 0 ? "button" : _ref$type,
-      _ref$iconSrc = _ref.iconSrc,
-      iconSrc = _ref$iconSrc === void 0 ? "" : _ref$iconSrc,
       icon = _ref.icon,
       _ref$onClick = _ref.onClick,
-      _onClick = _ref$onClick === void 0 ? "" : _ref$onClick,
+      _onClick = _ref$onClick === void 0 ? function () {} : _ref$onClick,
       margin = _ref.margin,
-      size = _ref.size,
+      _ref$size = _ref.size,
+      size = _ref$size === void 0 ? "fitContent" : _ref$size,
       _ref$tabIndex = _ref.tabIndex,
       tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
   var colorsTheme = (0, _useTheme["default"])();
   var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
+
+  var labelComponent = /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    icon: icon,
+    iconPosition: iconPosition
+  }, label);
+
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.button
   }, /*#__PURE__*/_react["default"].createElement(DxCButton, {
@@ -68,27 +73,20 @@ var DxcButton = function DxcButton(_ref) {
     backgroundType: backgroundType,
     icon: icon
   }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-    disabled: disabled,
     type: type,
+    disabled: disabled,
     disableRipple: true,
-    "aria-disabled": disabled ? true : false,
+    "aria-disabled": disabled,
     tabIndex: disabled ? -1 : tabIndex,
     onClick: function onClick() {
-      if (_onClick) {
-        _onClick();
-      }
+      _onClick();
     }
-  }, label && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
-    icon: icon,
-    iconPosition: iconPosition
-  }, label), icon ? /*#__PURE__*/_react["default"].createElement(IconContainer, {
+  }, label && iconPosition === "after" && labelComponent, icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
     label: label,
     iconPosition: iconPosition
-  }, (0, _typeof2["default"])(icon) === "object" ? icon : /*#__PURE__*/_react["default"].createElement(icon)) : iconSrc && /*#__PURE__*/_react["default"].createElement(ButtonIcon, {
-    label: label,
-    iconPosition: iconPosition,
-    src: iconSrc
-  }))));
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(ButtonIcon, {
+    src: icon
+  }) : icon), label && iconPosition === "before" && labelComponent)));
 };
 
 var sizes = {
@@ -123,13 +121,9 @@ var IconContainer = _styledComponents["default"].div(_templateObject2 || (_templ
   return !props.label ? "0px" : props.iconPosition === "before" && props.label !== "" && "8px" || "8px";
 });
 
-var ButtonIcon = _styledComponents["default"].img(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 24px;\n  max-width: 24px;\n  margin-left: ", ";\n  margin-right: ", ";\n"])), function (props) {
-  return props.iconPosition === "after" && props.label !== "" && "10px" || "0px";
-}, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && "10px" || "0px";
-});
+var ButtonIcon = _styledComponents["default"].img(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])([""])));
 
-var DxCButton = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  display: inline-block;\n  width: ", ";\n  cursor: ", ";\n\n  .MuiButtonBase-root {\n    padding-left: ", ";\n    padding-right: ", ";\n    padding-top: ", ";\n    padding-bottom: ", ";\n\n    .MuiButton-label {\n      display: flex;\n      flex-direction: ", ";\n      align-items: center;\n    }\n\n    box-shadow: 0 0 0 2px transparent;\n    font-family: ", ";\n    font-size: ", ";\n    font-weight: ", ";\n    letter-spacing: ", ";\n    min-width: ", ";\n    width: 100%;\n    height: 40px;\n    transition: none !important;\n\n    &:focus {\n      border-color: transparent;\n      box-shadow: 0 0 0 2px\n        ", ";\n    }\n\n    ", "\n  }\n"])), function (props) {
+var DxCButton = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  display: inline-block;\n  width: ", ";\n  cursor: ", ";\n\n  .MuiButtonBase-root {\n    padding-left: ", ";\n    padding-right: ", ";\n    padding-top: ", ";\n    padding-bottom: ", ";\n\n    .MuiButton-label {\n      display: flex;\n      align-items: center;\n    }\n\n    box-shadow: 0 0 0 2px transparent;\n    font-family: ", ";\n    font-size: ", ";\n    font-weight: ", ";\n    letter-spacing: ", ";\n    min-width: ", ";\n    width: 100%;\n    height: 40px;\n    transition: none !important;\n\n    &:focus {\n      border-color: transparent;\n      box-shadow: 0 0 0 2px\n        ", ";\n    }\n\n    ", "\n  }\n"])), function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.top ? _variables.spaces[props.margin.top] : "";
@@ -151,8 +145,6 @@ var DxCButton = _styledComponents["default"].div(_templateObject4 || (_templateO
   return props.theme.paddingTop;
 }, function (props) {
   return props.theme.paddingBottom;
-}, function (props) {
-  return props.iconPosition === "after" && "row" || "row-reverse";
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
@@ -170,9 +162,9 @@ var DxCButton = _styledComponents["default"].div(_templateObject4 || (_templateO
       backgroundType = props.backgroundType;
 
   if (mode === "primary") {
-    return "\n        border-radius: ".concat(props.theme.primaryBorderRadius, ";\n        border-width:  ").concat(props.theme.primaryBorderThickness, ";\n        border-style:  ").concat(props.theme.primaryBorderStyle, ";\n        font-family:   ").concat(props.theme.primaryFontFamily, ";\n        font-size:     ").concat(props.theme.primaryFontSize, ";\n        font-weight:   ").concat(props.theme.primaryFontWeight, ";\n        background-color: ").concat(backgroundType === "dark" ? props.theme.primaryBackgroundColorOnDark : props.theme.primaryBackgroundColor, ";\n        color: ").concat(backgroundType && backgroundType === "dark" ? props.theme.primaryFontColorOnDark : props.theme.primaryFontColor, " !important;\n\n        &:hover {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryHoverBackgroundColorOnDark : props.theme.primaryHoverBackgroundColor, ";\n        }\n        &:active {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryActiveBackgroundColorOnDark : props.theme.primaryActiveBackgroundColor, " !important;\n          border-color: transparent;\n          box-shadow: 0 0 0 2px ").concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n        }\n        &:disabled { \n          cursor: not-allowed;\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryDisabledBackgroundColorOnDark : props.theme.primaryDisabledBackgroundColor, ";\n          color: ").concat(backgroundType === "dark" ? props.theme.primaryDisabledFontColorOnDark : props.theme.primaryDisabledFontColor, "!important; \n        }\n        .MuiButton-label {\n          z-index: 5;\n        }\n      ");
+    return "\n        border-radius: ".concat(props.theme.primaryBorderRadius, ";\n        border-width:  ").concat(props.theme.primaryBorderThickness, ";\n        border-style:  ").concat(props.theme.primaryBorderStyle, ";\n        font-family:   ").concat(props.theme.primaryFontFamily, ";\n        font-size:     ").concat(props.theme.primaryFontSize, ";\n        font-weight:   ").concat(props.theme.primaryFontWeight, ";\n        background-color: ").concat(backgroundType === "dark" ? props.theme.primaryBackgroundColorOnDark : props.theme.primaryBackgroundColor, ";\n        color: ").concat(backgroundType && backgroundType === "dark" ? props.theme.primaryFontColorOnDark : props.theme.primaryFontColor, " !important;\n\n        &:hover {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryHoverBackgroundColorOnDark : props.theme.primaryHoverBackgroundColor, ";\n        }\n        &:active {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryActiveBackgroundColorOnDark : props.theme.primaryActiveBackgroundColor, " !important;\n          border-color: transparent;\n          box-shadow: 0 0 0 2px ").concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n        }\n        &:disabled { \n          cursor: not-allowed;\n          background-color: ").concat(backgroundType === "dark" ? props.theme.primaryDisabledBackgroundColorOnDark : props.theme.primaryDisabledBackgroundColor, ";\n          color: ").concat(backgroundType === "dark" ? props.theme.primaryDisabledFontColorOnDark : props.theme.primaryDisabledFontColor, " !important; \n        }\n      ");
   } else if (mode === "secondary") {
-    return "\n        border-radius: ".concat(props.theme.secondaryBorderRadius, ";\n        border-width:  ").concat(props.theme.secondaryBorderThickness, ";\n        border-style:  ").concat(props.theme.secondaryBorderStyle, ";\n        font-family:   ").concat(props.theme.secondaryFontFamily, ";\n        font-size:     ").concat(props.theme.secondaryFontSize, ";\n        font-weight:   ").concat(props.theme.secondaryFontWeight, ";\n        background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryBackgroundColorOnDark : props.theme.secondaryBackgroundColor, ";\n        color: ").concat(backgroundType === "dark" ? props.theme.secondaryFontColorOnDark : props.theme.secondaryFontColor, " !important;\n        border-color: ").concat(backgroundType === "dark" ? props.theme.secondaryBorderColorOnDark : props.theme.secondaryBorderColor, ";\n\n        &:hover {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverBackgroundColorOnDark : props.theme.secondaryHoverBackgroundColor, ";\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor, " !important;\n        }\n        &:active {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryActiveBackgroundColorOnDark : props.theme.secondaryActiveBackgroundColor, " !important;\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor, " !important;\n          border-color: transparent;\n          box-shadow: 0 0 0 2px ").concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n        }\n        &:disabled {\n          cursor: not-allowed;\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledBackgroundColorOnDark : props.theme.secondaryDisabledBackgroundColor, " !important;\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledFontColorOnDark : props.theme.secondaryDisabledFontColor, " !important;\n          border-color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledBorderColorOnDark : props.theme.secondaryDisabledBorderColor, ";\n          }\n          .MuiButton-label {\n            z-index: 5;\n          }\n        ");
+    return "\n        border-radius: ".concat(props.theme.secondaryBorderRadius, ";\n        border-width:  ").concat(props.theme.secondaryBorderThickness, ";\n        border-style:  ").concat(props.theme.secondaryBorderStyle, ";\n        font-family:   ").concat(props.theme.secondaryFontFamily, ";\n        font-size:     ").concat(props.theme.secondaryFontSize, ";\n        font-weight:   ").concat(props.theme.secondaryFontWeight, ";\n        background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryBackgroundColorOnDark : props.theme.secondaryBackgroundColor, ";\n        color: ").concat(backgroundType === "dark" ? props.theme.secondaryFontColorOnDark : props.theme.secondaryFontColor, " !important;\n        border-color: ").concat(backgroundType === "dark" ? props.theme.secondaryBorderColorOnDark : props.theme.secondaryBorderColor, ";\n\n        &:hover {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverBackgroundColorOnDark : props.theme.secondaryHoverBackgroundColor, ";\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor, " !important;\n        }\n        &:active {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryActiveBackgroundColorOnDark : props.theme.secondaryActiveBackgroundColor, " !important;\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor, " !important;\n          border-color: transparent;\n          box-shadow: 0 0 0 2px ").concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n        }\n        &:disabled {\n          cursor: not-allowed;\n          background-color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledBackgroundColorOnDark : props.theme.secondaryDisabledBackgroundColor, " !important;\n          color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledFontColorOnDark : props.theme.secondaryDisabledFontColor, " !important;\n          border-color: ").concat(backgroundType === "dark" ? props.theme.secondaryDisabledBorderColorOnDark : props.theme.secondaryDisabledBorderColor, ";\n          }\n        ");
   } else if (mode === "text") {
     return "\n        border-radius: ".concat(props.theme.textBorderRadius, ";\n        border-width:  ").concat(props.theme.textBorderThickness, ";\n        border-style:  ").concat(props.theme.textBorderStyle, ";\n        font-family:   ").concat(props.theme.textFontFamily, ";\n        font-size:     ").concat(props.theme.textFontSize, ";\n        font-weight:   ").concat(props.theme.textFontWeight, ";\n        background-color: ").concat(backgroundType === "dark" ? props.theme.textBackgroundColorOnDark : props.theme.textBackgroundColor, ";\n        color: ").concat(backgroundType === "dark" ? props.theme.textFontColorOnDark : props.theme.textFontColor, " !important;\n\n        &:hover {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.textHoverBackgroundColorOnDark : props.theme.textHoverBackgroundColor, ";\n        }\n        &:active {\n          background-color: ").concat(backgroundType === "dark" ? props.theme.textActiveBackgroundColorOnDark : props.theme.textActiveBackgroundColor, " !important;\n          border-color: transparent;\n          box-shadow: 0 0 0 2px ").concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor, ";\n        }\n        &:disabled {\n          cursor:not-allowed;\n          color: ").concat(backgroundType === "dark" ? props.theme.textDisabledFontColorOnDark : props.theme.textDisabledFontColor, " !important;\n          background-color: ").concat(backgroundType === "dark" ? props.theme.textDisabledBackgroundColorOnDark : props.theme.textDisabledBackgroundColor, ";\n        }\n      ");
   }