@dxc-technology/halstack-react 0.0.0-b2237e2 → 0.0.0-b230d97

package/accordion-group/AccordionGroup.test.js

@@ -9,37 +9,10 @@ var _react2 = require("@testing-library/react");
 var _AccordionGroup = _interopRequireDefault(require("./AccordionGroup"));
 
 describe("Accordion component tests", function () {
-  test("Uncontrolled accordion group renders with children", function () {
-    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], null, /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
-      label: "Accordion1",
-      padding: "medium"
-    }, /*#__PURE__*/_react["default"].createElement("div", null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo lobortis eget.")), /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
-      label: "Accordion2",
-      padding: "medium"
-    }, /*#__PURE__*/_react["default"].createElement("div", null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo lobortis eget.")))),
-        getByText = _render.getByText,
-        getAllByRole = _render.getAllByRole;
-
-    expect(getByText("Accordion1")).toBeTruthy();
-    expect(getByText("Accordion2")).toBeTruthy();
-    expect(getAllByRole("button")[0].getAttribute("aria-expanded")).toBe("false");
-    expect(getAllByRole("button")[1].getAttribute("aria-expanded")).toBe("false");
-  });
-  test("Uncontrolled accordion group renders with only one children", function () {
-    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], null, /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
-      label: "Accordion1",
-      padding: "medium"
-    }, /*#__PURE__*/_react["default"].createElement("div", null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo lobortis eget.")))),
-        getByText = _render2.getByText,
-        getAllByRole = _render2.getAllByRole;
-
-    expect(getByText("Accordion1")).toBeTruthy();
-    expect(getAllByRole("button")[0].getAttribute("aria-expanded")).toBe("false");
-  });
   test("Uncontrolled accordion group calls correct function on click", function () {
     var onActiveChange = jest.fn();
 
-    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
       margin: "large",
       onActiveChange: onActiveChange
     }, /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
@@ -50,8 +23,8 @@ describe("Accordion component tests", function () {
       label: "Accordion2",
       padding: "medium"
     }, /*#__PURE__*/_react["default"].createElement("div", null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo lobortis eget.")))),
-        getByText = _render3.getByText,
-        getAllByRole = _render3.getAllByRole;
+        getByText = _render.getByText,
+        getAllByRole = _render.getAllByRole;
 
     expect(getAllByRole("button")[0].getAttribute("aria-expanded")).toBe("false");
     expect(getAllByRole("button")[1].getAttribute("aria-expanded")).toBe("false");
@@ -62,28 +35,29 @@ describe("Accordion component tests", function () {
     expect(getAllByRole("button")[0].getAttribute("aria-expanded")).toBe("true");
     expect(getAllByRole("button")[1].getAttribute("aria-expanded")).toBe("false");
   });
-  test("Uncontrolled accordion group renders initially with an accordion expanded", function () {
-    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
+  test("Uncontrolled accordion group renders initially with an accordion expanded using defaultIndexActive", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
       defaultIndexActive: 1
     }, /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
       label: "Accordion1",
       padding: "medium"
-    }, /*#__PURE__*/_react["default"].createElement("div", null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo lobortis eget.")), /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
+    }, /*#__PURE__*/_react["default"].createElement("div", null, "First accordion")), /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"].Accordion, {
       label: "Accordion2",
       padding: "medium"
-    }, /*#__PURE__*/_react["default"].createElement("div", null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit leo lobortis eget.")))),
-        getByText = _render4.getByText,
-        getAllByRole = _render4.getAllByRole;
+    }, /*#__PURE__*/_react["default"].createElement("div", null, "Second accordion")))),
+        queryByText = _render2.queryByText,
+        getByText = _render2.getByText,
+        getAllByRole = _render2.getAllByRole;
 
-    expect(getByText("Accordion1")).toBeTruthy();
-    expect(getByText("Accordion2")).toBeTruthy();
     expect(getAllByRole("button")[0].getAttribute("aria-expanded")).toBe("false");
     expect(getAllByRole("button")[1].getAttribute("aria-expanded")).toBe("true");
+    expect(getByText("Second accordion")).toBeTruthy();
+    expect(queryByText("First accordion")).toBeFalsy();
   });
   test("Controlled accordion with indexActive change", function () {
     var onActiveChange = jest.fn();
 
-    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
       margin: "large",
       indexActive: 1,
       onActiveChange: onActiveChange
@@ -95,11 +69,12 @@ describe("Accordion component tests", function () {
       label: "Accordion2",
       padding: "medium"
     }, /*#__PURE__*/_react["default"].createElement("div", null, "Text2")))),
-        getByText = _render5.getByText,
-        getAllByRole = _render5.getAllByRole,
-        rerender = _render5.rerender;
+        queryByText = _render3.queryByText,
+        getByText = _render3.getByText,
+        getAllByRole = _render3.getAllByRole,
+        rerender = _render3.rerender;
 
-    expect(getByText("Text1")).toBeTruthy();
+    expect(queryByText("Text1")).toBeFalsy();
     expect(getByText("Text2")).toBeTruthy();
 
     _react2.fireEvent.click(getByText("Accordion1"));
@@ -128,7 +103,7 @@ describe("Accordion component tests", function () {
   test("Disabled uncontrolled accordion group", function () {
     var onActiveChange = jest.fn();
 
-    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_AccordionGroup["default"], {
       margin: "large",
       onActiveChange: onActiveChange,
       disabled: true
@@ -140,7 +115,7 @@ describe("Accordion component tests", function () {
       label: "Accordion2",
       padding: "medium"
     }, /*#__PURE__*/_react["default"].createElement("div", null, "Text2")))),
-        getByText = _render6.getByText;
+        getByText = _render4.getByText;
 
     _react2.fireEvent.click(getByText("Accordion1"));
 

package/accordion-group/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Margin = {
+export declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+export declare type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
@@ -12,7 +12,7 @@ declare type Padding = {
     left?: Space;
     right?: Space;
 };
-declare type SVG = React.SVGProps<SVGSVGElement>;
+declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
 export declare type AccordionPropsType = {
     /**
      * The panel label.
@@ -31,6 +31,7 @@ export declare type AccordionPropsType = {
      */
     disabled?: boolean;
     /**
+     * @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.
      */
@@ -69,4 +70,10 @@ declare type Props = {
      */
     children: React.ReactElement<AccordionPropsType>[] | React.ReactElement<AccordionPropsType>;
 };
+export declare type AccordionGroupAccordionContextProps = {
+    activeIndex: number;
+    handlerActiveChange: (index: number) => void;
+    disabled: boolean;
+    index: number;
+};
 export default Props;

package/alert/Alert.js

@@ -146,7 +146,7 @@ var sizes = {
   medium: "480px",
   large: "820px",
   fillParent: "100%",
-  fitContent: "auto"
+  fitContent: "fit-content"
 };
 
 var calculateWidth = function calculateWidth(margin, size) {

package/box/Box.js

@@ -60,7 +60,7 @@ var sizes = {
   medium: "240px",
   large: "480px",
   fillParent: "100%",
-  fitContent: "unset"
+  fitContent: "fit-content"
 };
 
 var calculateWidth = function calculateWidth(margin, size, padding) {

package/box/types.d.ts

@@ -31,6 +31,7 @@ declare type Props = {
      */
     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.
      */

package/bulleted-list/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type SVG = React.SVGProps<SVGSVGElement> | React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
+declare type SVG = React.ReactNode & (React.SVGProps<SVGSVGElement> | React.FunctionComponent<React.SVGProps<SVGSVGElement>>);
 declare type Props = {
     children: React.ReactNode;
     type?: "disc" | "circle" | "square" | "number" | "icon";

package/button/Button.js

@@ -15,8 +15,6 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
-
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _variables = require("../common/variables.js");
@@ -27,12 +25,28 @@ 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,
@@ -55,75 +69,35 @@ 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(DxCButton, {
+  }, /*#__PURE__*/_react["default"].createElement(Button, {
     type: type,
-    margin: margin,
     mode: mode !== "primary" && mode !== "secondary" && mode !== "text" ? "primary" : mode,
     disabled: disabled,
-    iconPosition: iconPosition,
-    size: size,
-    backgroundType: backgroundType,
-    icon: icon
-  }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-    type: type,
-    disabled: disabled,
-    disableRipple: true,
     "aria-disabled": disabled,
     tabIndex: disabled ? -1 : tabIndex,
+    backgroundType: backgroundType,
+    size: size,
+    margin: margin,
     onClick: function onClick() {
       _onClick();
     }
-  }, label && iconPosition === "after" && labelComponent, icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
+  }, label && iconPosition === "after" && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    icon: icon,
+    iconPosition: iconPosition
+  }, label), icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
     label: label,
     iconPosition: iconPosition
-  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(ButtonIcon, {
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: icon
-  }) : icon), label && iconPosition === "before" && labelComponent)));
-};
-
-var sizes = {
-  small: "42px",
-  medium: "120px",
-  large: "240px",
-  fillParent: "100%",
-  fitContent: "unset"
-};
-
-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];
+  }) : icon), label && iconPosition === "before" && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    icon: icon,
+    iconPosition: iconPosition
+  }, label)));
 };
 
-var LabelContainer = _styledComponents["default"].span(_templateObject || (_templateObject = (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) {
-  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(_templateObject2 || (_templateObject2 = (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(_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      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 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) {
   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] : "";
@@ -135,8 +109,6 @@ var DxCButton = _styledComponents["default"].div(_templateObject4 || (_templateO
   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.disabled && "not-allowed" || "pointer";
 }, function (props) {
   return props.theme.paddingLeft;
 }, function (props) {
@@ -153,21 +125,29 @@ var DxCButton = _styledComponents["default"].div(_templateObject4 || (_templateO
   return props.theme.fontWeight;
 }, function (props) {
   return props.theme.labelLetterSpacing;
-}, function (props) {
-  return props.size === "small" && "calc(100% - 22px)" || "unset";
 }, function (props) {
   return props.backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor;
 }, function (props) {
   var mode = props.mode,
-      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      ");
-  } 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        ");
-  } 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      ");
-  }
+      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      ");
+});
+
+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) {
+  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  display: flex;\n  margin-left: ", ";\n  margin-right: ", ";\n\n  img,\n  svg {\n    height: 24px;\n    width: 24px;\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 _default = DxcButton;