@dxc-technology/halstack-react 0.0.0-efa7c74 → 0.0.0-f00a97a

package/bulleted-list/BulletedList.stories.tsx

@@ -0,0 +1,200 @@
+import React from "react";
+import styled from "styled-components";
+import Title from "../../.storybook/components/Title";
+import { BackgroundColorProvider } from "../BackgroundColorContext";
+import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import DxcBulletedList from "./BulletedList";
+
+export default {
+  title: "BulletedList",
+  component: DxcBulletedList,
+};
+
+const icon = (
+  <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+    <path d="M0 0h24v24H0V0z" fill="none" />
+    <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z" />
+  </svg>
+);
+
+export const Chromatic = () => (
+  <>
+    <ExampleContainer>
+      <Title title="Icon list" 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="Number list" level={4} />
+      <DxcBulletedList type="number">
+        <DxcBulletedList.Item>Code</DxcBulletedList.Item>
+        <DxcBulletedList.Item>Usage</DxcBulletedList.Item>
+        <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
+      </DxcBulletedList>
+      <Title title="Square" level={4} />
+      <DxcBulletedList type="square">
+        <DxcBulletedList.Item>Code</DxcBulletedList.Item>
+        <DxcBulletedList.Item>Usage</DxcBulletedList.Item>
+        <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
+      </DxcBulletedList>
+      <Title title="Circle" level={4} />
+      <DxcBulletedList type="circle">
+        <DxcBulletedList.Item>Code</DxcBulletedList.Item>
+        <DxcBulletedList.Item>Usage</DxcBulletedList.Item>
+        <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
+      </DxcBulletedList>
+      <Title title="Disc" level={4} />
+      <DxcBulletedList>
+        <DxcBulletedList.Item>Code</DxcBulletedList.Item>
+        <DxcBulletedList.Item>Usage</DxcBulletedList.Item>
+        <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
+      </DxcBulletedList>
+      <Title title="Multiple lines" level={4} />
+      <Container>
+        <Title title="Number" level={4} />
+        <DxcBulletedList type="number">
+          <DxcBulletedList.Item>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua.
+          </DxcBulletedList.Item>
+          <DxcBulletedList.Item>Text 2.</DxcBulletedList.Item>
+        </DxcBulletedList>
+      </Container>
+      <Container>
+        <Title title="Square" level={4} />
+        <DxcBulletedList type="square">
+          <DxcBulletedList.Item>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua.
+          </DxcBulletedList.Item>
+          <DxcBulletedList.Item>Text 2.</DxcBulletedList.Item>
+        </DxcBulletedList>
+      </Container>
+      <Container>
+        <Title title="Circle" level={4} />
+        <DxcBulletedList type="circle">
+          <DxcBulletedList.Item>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua.
+          </DxcBulletedList.Item>
+          <DxcBulletedList.Item>Text 2.</DxcBulletedList.Item>
+        </DxcBulletedList>
+      </Container>
+      <Title title="Disc" level={4} />
+      <Container>
+        <DxcBulletedList>
+          <DxcBulletedList.Item>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua.
+          </DxcBulletedList.Item>
+          <DxcBulletedList.Item>Text 2.</DxcBulletedList.Item>
+        </DxcBulletedList>
+      </Container>
+      <Container>
+        <Title title="Icon" level={4} />
+        <DxcBulletedList type="icon" icon={icon}>
+          <DxcBulletedList.Item>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua.
+          </DxcBulletedList.Item>
+          <DxcBulletedList.Item>Text 2.</DxcBulletedList.Item>
+        </DxcBulletedList>
+      </Container>
+    </ExampleContainer>
+    <BackgroundColorProvider color="#333333">
+      <DarkContainerForBulletedList>
+        <Title title="Icon list" theme="dark" 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="Number list" theme="dark" level={4} />
+        <DxcBulletedList type="number">
+          <DxcBulletedList.Item>Code</DxcBulletedList.Item>
+          <DxcBulletedList.Item>Usage</DxcBulletedList.Item>
+          <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
+        </DxcBulletedList>
+        <Title title="Square" theme="dark" level={4} />
+        <DxcBulletedList type="square">
+          <DxcBulletedList.Item>Code</DxcBulletedList.Item>
+          <DxcBulletedList.Item>Usage</DxcBulletedList.Item>
+          <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
+        </DxcBulletedList>
+        <Title title="Circle" theme="dark" level={4} />
+        <DxcBulletedList type="circle">
+          <DxcBulletedList.Item>Code</DxcBulletedList.Item>
+          <DxcBulletedList.Item>Usage</DxcBulletedList.Item>
+          <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
+        </DxcBulletedList>
+        <Title title="Disc" theme="dark" level={4} />
+        <DxcBulletedList>
+          <DxcBulletedList.Item>Code</DxcBulletedList.Item>
+          <DxcBulletedList.Item>Usage</DxcBulletedList.Item>
+          <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
+        </DxcBulletedList>
+        <Title title="Multiple lines" theme="dark" level={4} />
+        <Container>
+          <Title title="Number" theme="dark" level={4} />
+          <DxcBulletedList type="number">
+            <DxcBulletedList.Item>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+              dolore magna aliqua.
+            </DxcBulletedList.Item>
+            <DxcBulletedList.Item>Text 2.</DxcBulletedList.Item>
+          </DxcBulletedList>
+        </Container>
+        <Container>
+          <Title title="Square" theme="dark" level={4} />
+          <DxcBulletedList type="square">
+            <DxcBulletedList.Item>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+              dolore magna aliqua.
+            </DxcBulletedList.Item>
+            <DxcBulletedList.Item>Text 2.</DxcBulletedList.Item>
+          </DxcBulletedList>
+        </Container>
+        <Container>
+          <Title title="Circle" theme="dark" level={4} />
+          <DxcBulletedList type="circle">
+            <DxcBulletedList.Item>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+              dolore magna aliqua.
+            </DxcBulletedList.Item>
+            <DxcBulletedList.Item>Text 2.</DxcBulletedList.Item>
+          </DxcBulletedList>
+        </Container>
+        <Title title="Disc" theme="dark" level={4} />
+        <Container>
+          <DxcBulletedList>
+            <DxcBulletedList.Item>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+              dolore magna aliqua.
+            </DxcBulletedList.Item>
+            <DxcBulletedList.Item>Text 2.</DxcBulletedList.Item>
+          </DxcBulletedList>
+        </Container>
+        <Container>
+          <Title title="Icon" theme="dark" level={4} />
+          <DxcBulletedList type="icon" icon={icon}>
+            <DxcBulletedList.Item>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+              dolore magna aliqua.
+            </DxcBulletedList.Item>
+            <DxcBulletedList.Item>Text 2.</DxcBulletedList.Item>
+          </DxcBulletedList>
+        </Container>
+      </DarkContainerForBulletedList>
+    </BackgroundColorProvider>
+  </>
+);
+
+const Container = styled.div`
+  width: 400px;
+`;
+
+const DarkContainerForBulletedList = styled.div`
+  background-color: #333333;
+  padding: 5px;
+`;

package/bulleted-list/types.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="react" />
+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";
+    icon?: string | SVG;
+};
+export default Props;
+export declare type BulletedListItemPropsType = {
+    children?: React.ReactNode;
+};

package/bulleted-list/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, icon, iconSrc, 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,13 +9,11 @@ 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 _react = _interopRequireWildcard(require("react"));
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
@@ -23,9 +21,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;
 
@@ -33,6 +31,22 @@ 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 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,
@@ -45,88 +59,45 @@ var DxcButton = function DxcButton(_ref) {
       _ref$type = _ref.type,
       type = _ref$type === void 0 ? "button" : _ref$type,
       icon = _ref.icon,
-      _ref$iconSrc = _ref.iconSrc,
-      iconSrc = _ref$iconSrc === void 0 ? "" : _ref$iconSrc,
-      _onClick = _ref.onClick,
+      _ref$onClick = _ref.onClick,
+      _onClick = _ref$onClick === void 0 ? function () {} : _ref$onClick,
       margin = _ref.margin,
       _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, {
+  }, /*#__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 && /*#__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 = {
-  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];
-};
-
-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"])(["\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 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 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] : "";
@@ -138,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) {
@@ -148,8 +117,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) {
@@ -158,22 +125,32 @@ 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        .MuiButton-label {\n          z-index: 5;\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        ");
-  } 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  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 _default = DxcButton;
 exports["default"] = _default;

package/button/Button.stories.tsx

@@ -1,5 +1,6 @@
 import React from "react";
 import DxcButton from "./Button";
+import DxcFlex from "./../flex/Flex";
 import { BackgroundColorProvider } from "../BackgroundColorContext";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
@@ -10,14 +11,12 @@ export default {
   component: DxcButton,
 };
 
-const iconSVG = () => {
-  return (
-    <svg viewBox="0 0 24 24" fill="currentColor">
-      <path d="M0 0h24v24H0z" fill="none" />
-      <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
-    </svg>
-  );
-};
+const iconSVG = (
+  <svg viewBox="0 0 24 24" fill="currentColor">
+    <path d="M0 0h24v24H0z" fill="none" />
+    <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
+  </svg>
+);
 export const Chromatic = () => (
   <>
     <Title title="Primary" theme="light" level={2} />
@@ -272,5 +271,13 @@ export const Chromatic = () => (
       <Title title="Xxlarge margin" theme="light" level={4} />
       <DxcButton label="Xxlarge margin" margin="xxlarge" />
     </ExampleContainer>
+    <Title title="Inside a flex" theme="light" level={2} />
+    <ExampleContainer>
+      <DxcFlex direction="column" gap="0.75rem">
+        <DxcButton label="Button" />
+        <DxcButton label="Button" />
+        <DxcButton label="Button" />
+      </DxcFlex>
+    </ExampleContainer>
   </>
 );

package/button/Button.test.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _Button = _interopRequireDefault(require("./Button"));
+
+describe("Button component tests", function () {
+  test("Button renders with correct text", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      label: "Button"
+    })),
+        getByText = _render.getByText;
+
+    expect(getByText("Button")).toBeTruthy();
+  });
+  test("Calls correct function on click", function () {
+    var onClick = jest.fn();
+
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      label: "Button",
+      onClick: onClick
+    })),
+        getByText = _render2.getByText;
+
+    var button = getByText("Button");
+
+    _react2.fireEvent.click(button);
+
+    expect(onClick).toHaveBeenCalled();
+  });
+});

package/button/types.d.ts

@@ -1,19 +1,19 @@
 /// <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;
     right?: Space;
 };
-declare type SVG = React.SVGProps<SVGSVGElement> | React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
+export declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
 declare type Props = {
     /**
-     * Text to be placed next to the button.
+     * Text to be placed in the button.
      */
     label?: string;
     /**
-     * Uses one of the available button modes.
+     * The available button modes.
      */
     mode?: "primary" | "secondary" | "text";
     /**
@@ -25,17 +25,13 @@ declare type Props = {
      */
     iconPosition?: "before" | "after";
     /**
-     * This prop corresponds to the 'type' prop of the button in html.
+     * 'type' html prop of the button.
      */
     type?: "button" | "reset" | "submit";
     /**
-     * Element used as the icon that will be placed next to the button label.
+     * Element or path used as the icon that will be placed next to the label.
      */
-    icon?: SVG;
-    /**
-     * @deprecated URL of the icon that will be placed next to the button label.
-     */
-    iconSrc?: string;
+    icon?: string | SVG;
     /**
      * This function will be called when the user clicks the button.
      */