@dxc-technology/halstack-react 0.0.0-f4755a1 → 0.0.0-f53d80b

package/button/Button.js

@@ -9,30 +9,44 @@ 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"));
 
-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,
@@ -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"]);
   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, {
+  }, label && iconPosition === "after" && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
     icon: icon,
     iconPosition: iconPosition
-  }, label), icon ? /*#__PURE__*/_react["default"].createElement(IconContainer, {
+  }, label), 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
-  }))));
-};
-
-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];
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
+    src: icon
+  }) : 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"])(["\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,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        .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  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;

package/button/Button.stories.tsx

@@ -1,23 +1,62 @@
 import React from "react";
-import DxcButton from "./Button";
 import { BackgroundColorProvider } from "../BackgroundColorContext";
+import DxcButton from "./Button";
+import DxcFlex from "./../flex/Flex";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import DarkContainer from "../../.storybook/components/DarkSection";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Button",
   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 width="24px" height="24px" 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 facebookIcon = (
+  <svg
+    version="1.1"
+    id="Capa_1"
+    x="0px"
+    y="0px"
+    width="438.536px"
+    height="438.536px"
+    viewBox="0 0 438.536 438.536"
+    fill="currentColor"
+  >
+    <g>
+      <path
+        d="M414.41,24.123C398.333,8.042,378.963,0,356.315,0H82.228C59.58,0,40.21,8.042,24.126,24.123
+  C8.045,40.207,0.003,59.576,0.003,82.225v274.084c0,22.647,8.042,42.018,24.123,58.102c16.084,16.084,35.454,24.126,58.102,24.126
+  h274.084c22.648,0,42.018-8.042,58.095-24.126c16.084-16.084,24.126-35.454,24.126-58.102V82.225
+  C438.532,59.576,430.49,40.204,414.41,24.123z M373.155,225.548h-49.963V406.84h-74.802V225.548H210.99V163.02h37.401v-37.402
+  c0-26.838,6.283-47.107,18.843-60.813c12.559-13.706,33.304-20.555,62.242-20.555h49.963v62.526h-31.401
+  c-10.663,0-17.467,1.853-20.417,5.568c-2.949,3.711-4.428,10.23-4.428,19.558v31.119h56.534L373.155,225.548z"
+      />
+    </g>
+  </svg>
+);
+
+const smallIcon = (
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" height="20" width="20" fill="currentColor">
+    <path d="m7.646 18.333-.313-2.625q-.208-.125-.458-.27-.25-.146-.458-.271l-2.438 1.021-2.354-4.063 2.083-1.583V9.458L1.625 7.875l2.354-4.063 2.438 1.021q.208-.125.458-.27.25-.146.458-.271l.313-2.625h4.708l.313 2.625q.208.125.458.271.25.145.458.27l2.438-1.021 2.354 4.063-2.063 1.583v1.084l2.063 1.583-2.354 4.063-2.438-1.021q-.208.125-.458.271-.25.145-.458.27l-.313 2.625ZM10 12.979q1.229 0 2.104-.875T12.979 10q0-1.229-.875-2.104T10 7.021q-1.229 0-2.104.875T7.021 10q0 1.229.875 2.104t2.104.875Zm0-1.75q-.5 0-.865-.364-.364-.365-.364-.865t.364-.865q.365-.364.865-.364t.865.364q.364.365.364.865t-.364.865q-.365.364-.865.364ZM10.021 10Zm-.854 6.583h1.666l.25-2.166q.605-.167 1.167-.5.562-.334 1.021-.792l2.021.854.833-1.375-1.771-1.354q.104-.292.146-.604.042-.313.042-.646 0-.292-.042-.594t-.125-.635l1.771-1.375-.834-1.375-2.02.875q-.48-.479-1.032-.802-.552-.323-1.156-.49l-.271-2.187H9.167l-.271 2.187q-.604.167-1.156.49-.552.323-1.011.781l-2.021-.854-.833 1.375 1.75 1.354q-.083.333-.125.646-.042.312-.042.604t.042.594q.042.302.125.635l-1.75 1.375.833 1.375 2.021-.854q.459.458 1.011.781.552.323 1.156.49Z" />
+  </svg>
+);
+
+const opinionatedTheme = {
+  button: {
+    baseColor: "#5f249f",
+    primaryFontColor: "#ffffff",
+    secondaryHoverFontColor: "#ffffff",
+  },
 };
+
 export const Chromatic = () => (
   <>
     <Title title="Primary" theme="light" level={2} />
@@ -39,7 +78,7 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled" theme="light" level={4} />
-      <DxcButton label="Primary disabled" disabled />
+      <DxcButton label="Primary disabled" disabled icon={iconSVG} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With left icon" theme="light" level={4} />
@@ -53,6 +92,18 @@ export const Chromatic = () => (
       <Title title="Only icon" theme="light" level={4} />
       <DxcButton icon={iconSVG} />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Big icon (SVG)" theme="light" level={4} />
+      <DxcButton icon={facebookIcon} />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Big icon (image)" theme="light" level={4} />
+      <DxcButton icon="https://www.freepnglogos.com/uploads/facebook-logo-design-1.png" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Small icon" theme="light" level={4} />
+      <DxcButton icon={smallIcon} />
+    </ExampleContainer>
     <Title title="Secondary" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Enabled" theme="light" level={4} />
@@ -72,12 +123,19 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled" theme="light" level={4} />
-      <DxcButton mode="secondary" disabled label="Secondary disabled" />
+      <DxcButton mode="secondary" disabled label="Secondary disabled" icon={iconSVG} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With icon" theme="light" level={4} />
       <DxcButton mode="secondary" label="Secondary" icon={iconSVG} />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Only icon (image)" theme="light" level={4} />
+      <DxcButton
+        mode="secondary"
+        icon="https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons/images/icon-and-image-large-icon-settings_2x.png"
+      />
+    </ExampleContainer>
     <Title title="Text" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Enabled" theme="light" level={4} />
@@ -97,12 +155,19 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled" theme="light" level={4} />
-      <DxcButton mode="text" label="Text disabled" disabled />
+      <DxcButton mode="text" label="Text disabled" disabled icon={iconSVG} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With icon" theme="light" level={4} />
       <DxcButton label="Text" mode="text" icon={iconSVG} />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Only icon (image)" theme="light" level={4} />
+      <DxcButton
+        mode="text"
+        icon="https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons/images/icon-and-image-large-icon-settings_2x.png"
+      />
+    </ExampleContainer>
     <BackgroundColorProvider color="#333333">
       <DarkContainer>
         <Title title="Primary" theme="dark" level={2} />
@@ -124,7 +189,7 @@ export const Chromatic = () => (
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Disabled" theme="dark" level={4} />
-          <DxcButton label="Primary disabled" disabled />
+          <DxcButton label="Primary disabled" disabled icon={iconSVG} />
         </ExampleContainer>
         <ExampleContainer>
           <Title title="With icon" theme="dark" level={4} />
@@ -149,7 +214,7 @@ export const Chromatic = () => (
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Disabled" theme="dark" level={4} />
-          <DxcButton mode="secondary" disabled label="Secondary disabled" />
+          <DxcButton mode="secondary" disabled label="Secondary disabled" icon={iconSVG} />
         </ExampleContainer>
         <ExampleContainer>
           <Title title="With icon" theme="dark" level={4} />
@@ -174,7 +239,7 @@ export const Chromatic = () => (
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Disabled" theme="dark" level={4} />
-          <DxcButton mode="text" label="Text disabled" disabled />
+          <DxcButton mode="text" label="Text disabled" disabled icon={iconSVG} />
         </ExampleContainer>
         <ExampleContainer>
           <Title title="With icon" theme="dark" level={4} />
@@ -272,5 +337,89 @@ 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>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <Title title="Primary" theme="light" level={3} />
+    <ExampleContainer>
+      <Title title="Enabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton label="Primary" icon={iconSVG} />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcButton label="Primary hovered" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcButton label="Primary focused" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Actived" theme="light" level={4} />
+      <DxcButton label="Primary actived" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton label="Primary" icon={iconSVG} disabled />
+      </HalstackProvider>
+    </ExampleContainer>
+    <Title title="Secondary" theme="light" level={3} />
+    <ExampleContainer>
+      <Title title="Enabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton mode="secondary" label="Secondary" icon={iconSVG} />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcButton mode="secondary" label="Secondary hovered" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcButton mode="secondary" label="Secondary focused" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Actived" theme="light" level={4} />
+      <DxcButton mode="secondary" label="Secondary actived" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton mode="secondary" label="Secondary" icon={iconSVG} disabled />
+      </HalstackProvider>
+    </ExampleContainer>
+    <Title title="Text" theme="light" level={3} />
+    <ExampleContainer>
+      <Title title="Enabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton mode="text" label="Text" icon={iconSVG} />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcButton mode="text" label="Text hovered" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcButton mode="text" label="Text focused" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Actived" theme="light" level={4} />
+      <DxcButton mode="text" label="Text actived" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton mode="text" label="Text disabled" icon={iconSVG} disabled />
+      </HalstackProvider>
+    </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.tsx"));
+
+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

@@ -6,14 +6,14 @@ declare type Margin = {
     left?: Space;
     right?: Space;
 };
-declare type SVG = React.SVGProps<SVGSVGElement> | React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
+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.
      */