@dxc-technology/halstack-react 0.0.0-f54247d → 0.0.0-f6d6be5

package/box/Box.js

@@ -17,9 +17,9 @@ var _react = _interopRequireDefault(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
-var _utils = require("../common/utils.js");
+var _utils = require("../common/utils");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
@@ -38,17 +38,15 @@ var DxcBox = function DxcBox(_ref) {
       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"])();
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.box
-  }, /*#__PURE__*/_react["default"].createElement(StyledDxcBox, {
+  }, /*#__PURE__*/_react["default"].createElement(Box, {
     shadowDepth: shadowDepth,
     display: display,
     margin: margin,
-    padding: padding,
     size: size
   }, /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
     color: colorsTheme.box.backgroundColor
@@ -63,15 +61,11 @@ var sizes = {
   fitContent: "fit-content"
 };
 
-var calculateWidth = function calculateWidth(margin, size, padding) {
-  if (size === "fillParent") {
-    return "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), " -\n    ").concat((0, _utils.getMargin)(padding, "left"), " - ").concat((0, _utils.getMargin)(padding, "right"), ")");
-  }
-
-  return sizes[size];
+var calculateWidth = function calculateWidth(margin, size) {
+  return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : 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 (props) {
+var Box = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\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"])), function (props) {
   return props.display;
 }, function (props) {
   return props.theme.borderRadius;
@@ -82,9 +76,7 @@ var StyledDxcBox = _styledComponents["default"].div(_templateObject || (_templat
 }, function (props) {
   return props.theme.borderColor;
 }, function (props) {
-  return props.theme.letterSpacing;
-}, function (props) {
-  return calculateWidth(props.margin, props.size, props.padding);
+  return calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.theme.backgroundColor;
 }, function (props) {
@@ -99,17 +91,6 @@ var StyledDxcBox = _styledComponents["default"].div(_templateObject || (_templat
   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 (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] : "";
 });
 
 var _default = DxcBox;

package/box/Box.stories.tsx

@@ -2,109 +2,88 @@ import React from "react";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import DxcBox from "./Box";
+import DxcInset from "../inset/Inset";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Box ",
   component: DxcBox,
 };
 
+const opinionatedTheme = {
+  box: {
+    baseColor: "#ffffff",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <Title title="Display flex" theme="light" level={2} />
     <ExampleContainer>
-      <DxcBox display="flex" padding="medium">
-        Box
+      <DxcBox display="flex">
+        <DxcInset space="2rem">Box</DxcInset>
       </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 shadowDepth={0} margin="medium">
+        <DxcInset space="2rem">Box</DxcInset>
       </DxcBox>
     </ExampleContainer>
     <ExampleContainer>
       <Title title="ShadowDepth 1" theme="light" level={4} />
-      <DxcBox shadowDepth={1} margin="medium" padding="medium">
-        Box
+      <DxcBox shadowDepth={1} margin="medium">
+        <DxcInset space="2rem">Box</DxcInset>
       </DxcBox>
     </ExampleContainer>
     <ExampleContainer>
       <Title title="ShadowDepth 2" theme="light" level={4} />
-      <DxcBox shadowDepth={2} margin="medium" padding="medium">
-        Box
+      <DxcBox shadowDepth={2} margin="medium">
+        <DxcInset space="2rem">Box</DxcInset>
       </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 margin="xxsmall">
+        <DxcInset space="2rem">Box</DxcInset>
       </DxcBox>
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Xsmall margin" theme="light" level={4} />
-      <DxcBox margin="xsmall" padding="medium">
-        Box
+      <DxcBox margin="xsmall">
+        <DxcInset space="2rem">Box</DxcInset>
       </DxcBox>
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Small margin" theme="light" level={4} />
-      <DxcBox margin="small" padding="medium">
-        Box
+      <DxcBox margin="small">
+        <DxcInset space="2rem">Box</DxcInset>
       </DxcBox>
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium margin" theme="light" level={4} />
-      <DxcBox margin="medium" padding="medium">
-        Box
+      <DxcBox margin="medium">
+        <DxcInset space="2rem">Box</DxcInset>
       </DxcBox>
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Large margin" theme="light" level={4} />
-      <DxcBox margin="large" padding="medium">
-        Box
+      <DxcBox margin="large">
+        <DxcInset space="2rem">Box</DxcInset>
       </DxcBox>
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Xlarge margin" theme="light" level={4} />
-      <DxcBox margin="xlarge" padding="medium">
-        Box
+      <DxcBox margin="xlarge">
+        <DxcInset space="2rem">Box</DxcInset>
       </DxcBox>
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Xxlarge margin" theme="light" level={4} />
-      <DxcBox margin="xxlarge" padding="medium">
-        Box
+      <DxcBox margin="xxlarge">
+        <DxcInset space="2rem">Box</DxcInset>
       </DxcBox>
     </ExampleContainer>
     <Title title="Sizes" theme="light" level={2} />
@@ -128,5 +107,13 @@ export const Chromatic = () => (
       <Title title="FitContent" theme="light" level={4} />
       <DxcBox size="fitContent">Box</DxcBox>
     </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcBox display="flex">
+          <DxcInset space="2rem">Box</DxcInset>
+        </DxcBox>
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );

package/box/Box.test.js

@@ -6,7 +6,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _Card = _interopRequireDefault(require("../card/Card"));
+var _Card = _interopRequireDefault(require("../card/Card.tsx"));
 
 describe("Box component tests", function () {
   test("Box renders with correct text", function () {

package/box/types.d.ts

@@ -6,12 +6,6 @@ declare type Margin = {
     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.
@@ -30,12 +24,6 @@ declare type Props = {
      * You can pass an object with 'top', 'bottom', 'left' and 'right' properties in order to specify different margin sizes.
      */
     margin?: Space | Margin;
-    /**
-     * @deprecated This prop will be removed shortly, consider using the Inset component for this purpose.
-     * 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.
      */

package/bulleted-list/BulletedList.js

@@ -57,7 +57,9 @@ var DxcBulletedList = function DxcBulletedList(_ref2) {
       backgroundType: backgroundType
     })) : type === "icon" ? /*#__PURE__*/_react["default"].createElement(Bullet, null, /*#__PURE__*/_react["default"].createElement(Icon, {
       backgroundType: backgroundType
-    }, icon)) : /*#__PURE__*/_react["default"].createElement(Bullet, null, /*#__PURE__*/_react["default"].createElement(Disc, {
+    }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
+      src: icon
+    }) : icon)) : /*#__PURE__*/_react["default"].createElement(Bullet, null, /*#__PURE__*/_react["default"].createElement(Disc, {
       backgroundType: backgroundType
     })), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
       color: backgroundType && backgroundType === "dark" ? colorsTheme.bulletedList.fontColorOnDark : colorsTheme.bulletedList.fontColor
@@ -73,7 +75,7 @@ var Bullet = _styledComponents["default"].div(_templateObject2 || (_templateObje
 
 var GeneralContent = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: grid;\n  grid-template-columns: auto 1fr;\n  align-items: center;\n"])));
 
-var Icon = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 1.5rem;\n  width: auto;\n  margin-right: ", ";\n  align-content: center;\n  color: ", ";\n  & > svg {\n    height: ", ";\n    width: ", ";\n  }\n"])), function (props) {
+var Icon = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 1.5rem;\n  width: auto;\n  margin-right: ", ";\n  align-content: center;\n  color: ", ";\n  svg,\n  img {\n    height: ", ";\n    width: ", ";\n  }\n"])), function (props) {
   return props.theme.bulletMarginRight;
 }, function (props) {
   return props.backgroundType && props.backgroundType === "dark" ? props.theme.fontColorOnDark : props.theme.fontColor;

package/bulleted-list/BulletedList.stories.tsx

@@ -20,12 +20,18 @@ const icon = (
 export const Chromatic = () => (
   <>
     <ExampleContainer>
-      <Title title="Icon list" level={4} />
+      <Title title="Icon list (SVG)" level={4} />
       <DxcBulletedList type="icon" icon={icon}>
         <DxcBulletedList.Item>Code</DxcBulletedList.Item>
         <DxcBulletedList.Item>Usage</DxcBulletedList.Item>
         <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
       </DxcBulletedList>
+      <Title title="Icon list (path)" level={4} />
+      <DxcBulletedList type="icon" icon="https://upload.wikimedia.org/wikipedia/commons/e/e0/Check_green_icon.svg">
+        <DxcBulletedList.Item>Code</DxcBulletedList.Item>
+        <DxcBulletedList.Item>Usage</DxcBulletedList.Item>
+        <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
+      </DxcBulletedList>
       <Title title="Number list" level={4} />
       <DxcBulletedList type="number">
         <DxcBulletedList.Item>Code</DxcBulletedList.Item>

package/bulleted-list/types.d.ts

@@ -1,11 +1,38 @@
 /// <reference types="react" />
-declare type SVG = React.ReactNode & (React.SVGProps<SVGSVGElement> | React.FunctionComponent<React.SVGProps<SVGSVGElement>>);
-declare type Props = {
+declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
+declare type IconProps = {
+    /**
+     * Defines the style of the bullet point in the list.
+     */
+    type: "icon";
+    /**
+     * Icon to display as bullet.
+     */
+    icon: string | SVG;
+    /**
+     * Text to be shown in the list.
+     */
     children: React.ReactNode;
-    type?: "disc" | "circle" | "square" | "number" | "icon";
-    icon?: string | SVG;
 };
+declare type OtherProps = {
+    /**
+     * Defines the style of the bullet point in the list.
+     */
+    type?: "disc" | "circle" | "square" | "number";
+    /**
+     * Icon to display as bullet.
+     */
+    icon?: never;
+    /**
+     * Text to be shown in the list.
+     */
+    children: React.ReactNode;
+};
+declare type Props = IconProps | OtherProps;
 export default Props;
 export declare type BulletedListItemPropsType = {
+    /**
+     * Text to be shown in the list.
+     */
     children?: React.ReactNode;
 };

package/button/Button.d.ts

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

package/button/Button.js

@@ -17,36 +17,20 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
-var _utils = require("../common/utils.js");
+var _utils = require("../common/utils");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2, _templateObject3;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 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 sizes = {
-  small: "42px",
-  medium: "120px",
-  large: "240px",
-  fillParent: "100%",
-  fitContent: "fit-content"
-};
-
-var calculateWidth = function calculateWidth(margin, size) {
-  if (size === "fillParent") {
-    return "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")");
-  }
-
-  return sizes[size];
-};
-
 var DxcButton = function DxcButton(_ref) {
   var _ref$label = _ref.label,
       label = _ref$label === void 0 ? "" : _ref$label,
@@ -56,6 +40,7 @@ var DxcButton = function DxcButton(_ref) {
       disabled = _ref$disabled === void 0 ? false : _ref$disabled,
       _ref$iconPosition = _ref.iconPosition,
       iconPosition = _ref$iconPosition === void 0 ? "before" : _ref$iconPosition,
+      title = _ref.title,
       _ref$type = _ref.type,
       type = _ref$type === void 0 ? "button" : _ref$type,
       icon = _ref.icon,
@@ -69,35 +54,53 @@ var DxcButton = function DxcButton(_ref) {
 
   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(Button, {
-    type: type,
-    mode: mode !== "primary" && mode !== "secondary" && mode !== "text" ? "primary" : mode,
+    "aria-label": title,
     disabled: disabled,
-    "aria-disabled": disabled,
+    onClick: function onClick() {
+      _onClick();
+    },
     tabIndex: disabled ? -1 : tabIndex,
+    title: title,
+    type: type,
+    $mode: mode !== "primary" && mode !== "secondary" && mode !== "text" ? "primary" : mode,
+    hasLabel: label ? true : false,
+    hasIcon: icon ? true : false,
+    iconPosition: iconPosition,
     backgroundType: backgroundType,
     size: size,
-    margin: margin,
-    onClick: function onClick() {
-      _onClick();
-    }
-  }, label && iconPosition === "after" && labelComponent, icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
-    label: label,
-    iconPosition: iconPosition
-  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(ButtonIcon, {
+    margin: margin
+  }, label && /*#__PURE__*/_react["default"].createElement(LabelContainer, null, label), icon && /*#__PURE__*/_react["default"].createElement(IconContainer, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: icon
-  }) : icon), label && iconPosition === "before" && labelComponent));
+  }) : icon)));
 };
 
-var Button = _styledComponents["default"].button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  display: inline-flex;\n  width: ", ";\n  height: 40px;\n  padding-left: ", ";\n  padding-right: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  align-items: center;\n  justify-content: center;\n  box-shadow: 0 0 0 2px transparent;\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  cursor: pointer;\n  &:focus {\n    outline: none;\n    box-shadow: 0 0 0 2px\n      ", ";\n  }\n  ", "\n"])), function (props) {
+var sizes = {
+  small: "42px",
+  medium: "120px",
+  large: "240px",
+  fillParent: "100%",
+  fitContent: "fit-content"
+};
+
+var calculateWidth = function calculateWidth(margin, size) {
+  return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
+};
+
+var getButtonStyles = function getButtonStyles(props) {
+  var $mode = props.$mode,
+      backgroundType = props.backgroundType,
+      disabled = props.disabled;
+  return "\n    border-radius: ".concat($mode === "primary" ? props.theme.primaryBorderRadius : $mode === "secondary" ? props.theme.secondaryBorderRadius : props.theme.textBorderRadius, ";\n    border-width: ").concat($mode === "primary" ? props.theme.primaryBorderThickness : $mode === "secondary" ? props.theme.secondaryBorderThickness : props.theme.textBorderThickness, ";\n    border-style: ").concat($mode === "primary" ? props.theme.primaryBorderStyle : $mode === "secondary" ? props.theme.secondaryBorderStyle : props.theme.textBorderStyle, ";\n    font-family: ").concat($mode === "primary" ? props.theme.primaryFontFamily : $mode === "secondary" ? props.theme.secondaryFontFamily : props.theme.textFontFamily, ";\n    font-size: ").concat($mode === "primary" ? props.theme.primaryFontSize : $mode === "secondary" ? props.theme.secondaryFontSize : props.theme.textFontSize, ";\n    font-weight: ").concat($mode === "primary" ? props.theme.primaryFontWeight : $mode === "secondary" ? props.theme.secondaryFontWeight : props.theme.textFontWeight, ";\n    background-color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryBackgroundColorOnDark : props.theme.primaryBackgroundColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryBackgroundColorOnDark : props.theme.secondaryBackgroundColor : backgroundType === "dark" ? props.theme.textBackgroundColorOnDark : props.theme.textBackgroundColor, ";\n    color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryFontColorOnDark : props.theme.primaryFontColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryFontColorOnDark : props.theme.secondaryFontColor : backgroundType === "dark" ? props.theme.textFontColorOnDark : props.theme.textFontColor, ";\n    border-color: ").concat($mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryBorderColorOnDark : props.theme.secondaryBorderColor : "", ";\n    &:hover {\n      background-color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryHoverBackgroundColorOnDark : props.theme.primaryHoverBackgroundColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryHoverBackgroundColorOnDark : props.theme.secondaryHoverBackgroundColor : backgroundType === "dark" ? props.theme.textHoverBackgroundColorOnDark : props.theme.textHoverBackgroundColor, ";\n      color: ").concat($mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor : "", ";\n    }\n    &:focus {\n      border-color: ").concat($mode === "secondary" ? "transparent" : "", ";\n    }\n    &:active {\n      background-color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryActiveBackgroundColorOnDark : props.theme.primaryActiveBackgroundColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryActiveBackgroundColorOnDark : props.theme.secondaryActiveBackgroundColor : backgroundType === "dark" ? props.theme.textActiveBackgroundColorOnDark : props.theme.textActiveBackgroundColor, ";\n      color: ").concat($mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor : "", ";\n      border-color: ").concat($mode === "secondary" ? "transparent" : "", ";\n      outline: none;\n      box-shadow: ").concat(!disabled ? "0 0 0 2px ".concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor) : "", ";\n    }\n    &:disabled {\n      cursor: not-allowed;\n      background-color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryDisabledBackgroundColorOnDark : props.theme.primaryDisabledBackgroundColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryDisabledBackgroundColorOnDark : props.theme.secondaryDisabledBackgroundColor : backgroundType === "dark" ? props.theme.textDisabledBackgroundColorOnDark : props.theme.textDisabledBackgroundColor, ";\n      color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryDisabledFontColorOnDark : props.theme.primaryDisabledFontColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryDisabledFontColorOnDark : props.theme.secondaryDisabledFontColor : backgroundType === "dark" ? props.theme.textDisabledFontColorOnDark : props.theme.textDisabledFontColor, ";\n      border-color: ").concat($mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryDisabledBorderColorOnDark : props.theme.secondaryDisabledBorderColor : "", ";\n    }\n  ");
+};
+
+var Button = _styledComponents["default"].button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-direction: ", ";\n  gap: 0.5rem;\n  align-items: center;\n  justify-content: center;\n  width: ", ";\n  height: 40px;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  box-shadow: 0 0 0 2px transparent;\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  cursor: pointer;\n\n  &:focus {\n    outline: none;\n    box-shadow: 0 0 0 2px\n      ", ";\n  }\n\n  ", "\n"])), function (props) {
+  return props.iconPosition === "after" ? "row" : "row-reverse";
+}, function (props) {
+  return calculateWidth(props.margin, props.size);
+}, 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] : "";
@@ -107,16 +110,14 @@ var Button = _styledComponents["default"].button(_templateObject || (_templateOb
   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 (props) {
-  return calculateWidth(props.margin, props.size);
-}, function (props) {
-  return props.theme.paddingLeft;
-}, function (props) {
-  return props.theme.paddingRight;
 }, function (props) {
   return props.theme.paddingTop;
 }, function (props) {
   return props.theme.paddingBottom;
+}, function (props) {
+  return props.hasIcon && !props.hasLabel ? props.theme.paddingLeft : "calc(".concat(props.theme.paddingLeft, " + 8px)");
+}, function (props) {
+  return props.hasIcon && !props.hasLabel ? props.theme.paddingRight : "calc(".concat(props.theme.paddingRight, " + 8px)");
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
@@ -128,29 +129,16 @@ var Button = _styledComponents["default"].button(_templateObject || (_templateOb
 }, function (props) {
   return props.backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor;
 }, function (props) {
-  var mode = props.mode,
-      backgroundType = props.backgroundType,
-      disabled = props.disabled;
-  return "\n        border-radius: ".concat(props.mode === "primary" ? props.theme.primaryBorderRadius : props.mode === "secondary" ? props.theme.secondaryBorderRadius : props.theme.textBorderRadius, ";\n        border-width: ").concat(props.mode === "primary" ? props.theme.primaryBorderThickness : props.mode === "secondary" ? props.theme.secondaryBorderThickness : props.theme.textBorderThickness, ";\n        border-style: ").concat(mode === "primary" ? props.theme.primaryBorderStyle : mode === "secondary" ? props.theme.secondaryBorderStyle : props.theme.textBorderStyle, ";\n        font-family: ").concat(mode === "primary" ? props.theme.primaryFontFamily : mode === "secondary" ? props.theme.secondaryFontFamily : props.theme.textFontFamily, ";\n        font-size: ").concat(mode === "primary" ? props.theme.primaryFontSize : mode === "secondary" ? props.theme.secondaryFontSize : props.theme.textFontSize, ";\n        font-weight: ").concat(mode === "primary" ? props.theme.primaryFontWeight : mode === "secondary" ? props.theme.secondaryFontWeight : props.theme.textFontWeight, ";\n        background-color: ").concat(mode === "primary" ? backgroundType === "dark" ? props.theme.primaryBackgroundColorOnDark : props.theme.primaryBackgroundColor : mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryBackgroundColorOnDark : props.theme.secondaryBackgroundColor : backgroundType === "dark" ? props.theme.textBackgroundColorOnDark : props.theme.textBackgroundColor, ";\n        color: ").concat(mode === "primary" ? backgroundType === "dark" ? props.theme.primaryFontColorOnDark : props.theme.primaryFontColor : mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryFontColorOnDark : props.theme.secondaryFontColor : backgroundType === "dark" ? props.theme.textFontColorOnDark : props.theme.textFontColor, ";\n        border-color: ").concat(mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryBorderColorOnDark : props.theme.secondaryBorderColor : "", ";\n        &:hover {\n          background-color: ").concat(mode === "primary" ? backgroundType === "dark" ? props.theme.primaryHoverBackgroundColorOnDark : props.theme.primaryHoverBackgroundColor : mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryHoverBackgroundColorOnDark : props.theme.secondaryHoverBackgroundColor : backgroundType === "dark" ? props.theme.textHoverBackgroundColorOnDark : props.theme.textHoverBackgroundColor, ";\n          color: ").concat(mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor : "", ";\n        }\n        &:focus {\n          border-color: ").concat(mode === "secondary" ? "transparent" : "", ";\n        }\n        &:active {\n          background-color: ").concat(mode === "primary" ? backgroundType === "dark" ? props.theme.primaryActiveBackgroundColorOnDark : props.theme.primaryActiveBackgroundColor : mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryActiveBackgroundColorOnDark : props.theme.secondaryActiveBackgroundColor : backgroundType === "dark" ? props.theme.textActiveBackgroundColorOnDark : props.theme.textActiveBackgroundColor, ";\n          color: ").concat(mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor : "", ";\n          border-color: ").concat(mode === "secondary" ? "transparent" : "", ";\n          outline: none;\n          box-shadow: ").concat(!disabled ? "0 0 0 2px ".concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor) : "", ";\n        }\n        &:disabled {\n          cursor: not-allowed;\n          background-color: ").concat(mode === "primary" ? backgroundType === "dark" ? props.theme.primaryDisabledBackgroundColorOnDark : props.theme.primaryDisabledBackgroundColor : mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryDisabledBackgroundColorOnDark : props.theme.secondaryDisabledBackgroundColor : backgroundType === "dark" ? props.theme.textDisabledBackgroundColorOnDark : props.theme.textDisabledBackgroundColor, ";\n          color: ").concat(mode === "primary" ? backgroundType === "dark" ? props.theme.primaryDisabledFontColorOnDark : props.theme.primaryDisabledFontColor : mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryDisabledFontColorOnDark : props.theme.secondaryDisabledFontColor : backgroundType === "dark" ? props.theme.textDisabledFontColorOnDark : props.theme.textDisabledFontColor, ";\n          border-color: ").concat(mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryDisabledBorderColorOnDark : props.theme.secondaryDisabledBorderColor : "", ";\n        }\n      ");
+  return getButtonStyles(props);
 });
 
-var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  line-height: ", ";\n  font-size: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n  text-transform: none;\n  white-space: nowrap;\n  margin-right: ", ";\n  margin-left: ", ";\n"])), function (props) {
+var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  line-height: ", ";\n  font-size: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n  text-transform: none;\n  white-space: nowrap;\n"])), function (props) {
   return props.theme.labelFontLineHeight;
 }, function (props) {
   return props.theme.fontSize;
-}, function (props) {
-  return !props.icon || props.iconPosition === "before" ? "8px" : "0px";
-}, function (props) {
-  return !props.icon || props.iconPosition === "after" ? "8px" : "0px";
-});
-
-var IconContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 24px;\n  max-width: 24px;\n  margin-left: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n  display: flex;\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
-  return !props.label ? "0px" : props.iconPosition === "after" && props.label !== "" && "8px" || "8px";
-}, function (props) {
-  return !props.label ? "0px" : props.iconPosition === "before" && props.label !== "" && "8px" || "8px";
 });
 
-var ButtonIcon = _styledComponents["default"].img(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])));
+var IconContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  img,\n  svg {\n    height: 24px;\n    width: 24px;\n  }\n"])));
 
 var _default = DxcButton;
 exports["default"] = _default;