@dxc-technology/halstack-react 0.0.0-2bca710 → 0.0.0-2bd2d63

package/bulleted-list/BulletedList.stories.tsx

@@ -1,12 +1,11 @@
 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",
+  title: "Bulleted List",
   component: DxcBulletedList,
 };
 
@@ -27,7 +26,7 @@ export const Chromatic = () => (
         <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
       </DxcBulletedList>
       <Title title="Icon list (path)" level={4} />
-      <DxcBulletedList type="icon" icon="https://upload.wikimedia.org/wikipedia/commons/e/e0/Check_green_icon.svg">
+      <DxcBulletedList type="icon" icon="filled_check_circle">
         <DxcBulletedList.Item>Code</DxcBulletedList.Item>
         <DxcBulletedList.Item>Usage</DxcBulletedList.Item>
         <DxcBulletedList.Item>Specifications</DxcBulletedList.Item>
@@ -108,99 +107,9 @@ export const Chromatic = () => (
         </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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
-declare type IconProps = {
+type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
+type IconProps = {
     /**
      * Defines the style of the bullet point in the list.
      */
@@ -14,7 +14,7 @@ declare type IconProps = {
      */
     children: React.ReactNode;
 };
-declare type OtherProps = {
+type OtherProps = {
     /**
      * Defines the style of the bullet point in the list.
      */
@@ -28,9 +28,9 @@ declare type OtherProps = {
      */
     children: React.ReactNode;
 };
-declare type Props = IconProps | OtherProps;
+type Props = IconProps | OtherProps;
 export default Props;
-export declare type BulletedListItemPropsType = {
+export type BulletedListItemPropsType = {
     /**
      * Text to be shown in the list.
      */

package/button/Button.accessibility.test.d.ts

@@ -0,0 +1 @@
+export {};

package/button/Button.accessibility.test.js

@@ -0,0 +1,127 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _axeHelper = require("../../test/accessibility/axe-helper.js");
+var _Button = _interopRequireDefault(require("./Button"));
+var iconSVG = /*#__PURE__*/_react["default"].createElement("svg", {
+  width: "24px",
+  height: "24px",
+  viewBox: "0 0 24 24",
+  fill: "currentColor"
+}, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M0 0h24v24H0z",
+  fill: "none"
+}), /*#__PURE__*/_react["default"].createElement("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"
+}));
+describe("Button component accessibility tests", function () {
+  it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, container, results;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+            label: "Primary",
+            icon: iconSVG,
+            iconPosition: "after",
+            margin: "small",
+            mode: "primary",
+            title: "Button Title",
+            size: "fitContent",
+            type: "button"
+          })), container = _render.container;
+          _context.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it("Should not have basic accessibility issues for disabled mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render2, container, results;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+            label: "Primary",
+            icon: iconSVG,
+            iconPosition: "after",
+            margin: "small",
+            mode: "primary",
+            title: "Button Title",
+            size: "fitContent",
+            type: "button",
+            disabled: true
+          })), container = _render2.container;
+          _context2.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  it("Should not have basic accessibility issues for secondary mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var _render3, container, results;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+            label: "Primary",
+            icon: iconSVG,
+            iconPosition: "after",
+            margin: "small",
+            mode: "secondary",
+            title: "Button Title",
+            size: "fitContent",
+            type: "button"
+          })), container = _render3.container;
+          _context3.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context3.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
+  it("Should not have basic accessibility issues for text mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    var _render4, container, results;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+            label: "Primary",
+            icon: iconSVG,
+            iconPosition: "after",
+            margin: "small",
+            mode: "text",
+            title: "Button Title",
+            size: "fitContent",
+            type: "button"
+          })), container = _render4.container;
+          _context4.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context4.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  })));
+});

package/button/Button.js

@@ -1,59 +1,43 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
-var _react = _interopRequireWildcard(require("react"));
-
+var _react = _interopRequireDefault(require("react"));
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
 var _variables = require("../common/variables");
-
 var _utils = require("../common/utils");
-
 var _useTheme = _interopRequireDefault(require("../useTheme"));
-
-var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
-
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
 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; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var DxcButton = function DxcButton(_ref) {
   var _ref$label = _ref.label,
-      label = _ref$label === void 0 ? "" : _ref$label,
-      _ref$mode = _ref.mode,
-      mode = _ref$mode === void 0 ? "primary" : _ref$mode,
-      _ref$disabled = _ref.disabled,
-      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-      _ref$iconPosition = _ref.iconPosition,
-      iconPosition = _ref$iconPosition === void 0 ? "before" : _ref$iconPosition,
-      title = _ref.title,
-      _ref$type = _ref.type,
-      type = _ref$type === void 0 ? "button" : _ref$type,
-      icon = _ref.icon,
-      _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;
-
+    label = _ref$label === void 0 ? "" : _ref$label,
+    _ref$mode = _ref.mode,
+    mode = _ref$mode === void 0 ? "primary" : _ref$mode,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    _ref$iconPosition = _ref.iconPosition,
+    iconPosition = _ref$iconPosition === void 0 ? "before" : _ref$iconPosition,
+    title = _ref.title,
+    _ref$type = _ref.type,
+    type = _ref$type === void 0 ? "button" : _ref$type,
+    icon = _ref.icon,
+    _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(Button, {
@@ -69,14 +53,12 @@ var DxcButton = function DxcButton(_ref) {
     hasLabel: label ? true : false,
     hasIcon: icon ? true : false,
     iconPosition: iconPosition,
-    backgroundType: backgroundType,
     size: size,
     margin: margin
-  }, label && /*#__PURE__*/_react["default"].createElement(LabelContainer, null, label), icon && /*#__PURE__*/_react["default"].createElement(IconContainer, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
-    src: icon
+  }, label && /*#__PURE__*/_react["default"].createElement(LabelContainer, null, label), icon && /*#__PURE__*/_react["default"].createElement(IconContainer, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: icon
   }) : icon)));
 };
-
 var sizes = {
   small: "42px",
   medium: "120px",
@@ -84,19 +66,16 @@ var sizes = {
   fillParent: "100%",
   fitContent: "fit-content"
 };
-
 var calculateWidth = function calculateWidth(margin, size) {
   return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
 };
-
-var getButtonStyles = function getButtonStyles(props) {
-  var $mode = props.$mode,
-      backgroundType = props.backgroundType,
-      disabled = props.disabled;
-  return "\n    border-radius: ".concat($mode === "primary" ? props.theme.primaryBorderRadius : $mode === "secondary" ? props.theme.secondaryBorderRadius : props.theme.textBorderRadius, ";\n    border-width: ").concat($mode === "primary" ? props.theme.primaryBorderThickness : $mode === "secondary" ? props.theme.secondaryBorderThickness : props.theme.textBorderThickness, ";\n    border-style: ").concat($mode === "primary" ? props.theme.primaryBorderStyle : $mode === "secondary" ? props.theme.secondaryBorderStyle : props.theme.textBorderStyle, ";\n    font-family: ").concat($mode === "primary" ? props.theme.primaryFontFamily : $mode === "secondary" ? props.theme.secondaryFontFamily : props.theme.textFontFamily, ";\n    font-size: ").concat($mode === "primary" ? props.theme.primaryFontSize : $mode === "secondary" ? props.theme.secondaryFontSize : props.theme.textFontSize, ";\n    font-weight: ").concat($mode === "primary" ? props.theme.primaryFontWeight : $mode === "secondary" ? props.theme.secondaryFontWeight : props.theme.textFontWeight, ";\n    background-color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryBackgroundColorOnDark : props.theme.primaryBackgroundColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryBackgroundColorOnDark : props.theme.secondaryBackgroundColor : backgroundType === "dark" ? props.theme.textBackgroundColorOnDark : props.theme.textBackgroundColor, ";\n    color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryFontColorOnDark : props.theme.primaryFontColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryFontColorOnDark : props.theme.secondaryFontColor : backgroundType === "dark" ? props.theme.textFontColorOnDark : props.theme.textFontColor, ";\n    border-color: ").concat($mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryBorderColorOnDark : props.theme.secondaryBorderColor : "", ";\n    &:hover {\n      background-color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryHoverBackgroundColorOnDark : props.theme.primaryHoverBackgroundColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryHoverBackgroundColorOnDark : props.theme.secondaryHoverBackgroundColor : backgroundType === "dark" ? props.theme.textHoverBackgroundColorOnDark : props.theme.textHoverBackgroundColor, ";\n      color: ").concat($mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor : "", ";\n    }\n    &:focus {\n      border-color: ").concat($mode === "secondary" ? "transparent" : "", ";\n    }\n    &:active {\n      background-color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryActiveBackgroundColorOnDark : props.theme.primaryActiveBackgroundColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryActiveBackgroundColorOnDark : props.theme.secondaryActiveBackgroundColor : backgroundType === "dark" ? props.theme.textActiveBackgroundColorOnDark : props.theme.textActiveBackgroundColor, ";\n      color: ").concat($mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryHoverFontColorOnDark : props.theme.secondaryHoverFontColor : "", ";\n      border-color: ").concat($mode === "secondary" ? "transparent" : "", ";\n      outline: none;\n      box-shadow: ").concat(!disabled ? "0 0 0 2px ".concat(backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor) : "", ";\n    }\n    &:disabled {\n      cursor: not-allowed;\n      background-color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryDisabledBackgroundColorOnDark : props.theme.primaryDisabledBackgroundColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryDisabledBackgroundColorOnDark : props.theme.secondaryDisabledBackgroundColor : backgroundType === "dark" ? props.theme.textDisabledBackgroundColorOnDark : props.theme.textDisabledBackgroundColor, ";\n      color: ").concat($mode === "primary" ? backgroundType === "dark" ? props.theme.primaryDisabledFontColorOnDark : props.theme.primaryDisabledFontColor : $mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryDisabledFontColorOnDark : props.theme.secondaryDisabledFontColor : backgroundType === "dark" ? props.theme.textDisabledFontColorOnDark : props.theme.textDisabledFontColor, ";\n      border-color: ").concat($mode === "secondary" ? backgroundType === "dark" ? props.theme.secondaryDisabledBorderColorOnDark : props.theme.secondaryDisabledBorderColor : "", ";\n    }\n  ");
+var getButtonStyles = function getButtonStyles($mode, theme) {
+  return "\n  border-color: ".concat($mode === "secondary" ? theme.secondaryBorderColor : "", ";\n  border-radius: ").concat($mode === "primary" ? theme.primaryBorderRadius : $mode === "secondary" ? theme.secondaryBorderRadius : theme.textBorderRadius, ";\n  border-width: ").concat($mode === "primary" ? theme.primaryBorderThickness : $mode === "secondary" ? theme.secondaryBorderThickness : theme.textBorderThickness, ";\n  border-style: ").concat($mode === "primary" ? theme.primaryBorderStyle : $mode === "secondary" ? theme.secondaryBorderStyle : theme.textBorderStyle, ";\n  font-family: ").concat($mode === "primary" ? theme.primaryFontFamily : $mode === "secondary" ? theme.secondaryFontFamily : theme.textFontFamily, ";\n  font-size: ").concat($mode === "primary" ? theme.primaryFontSize : $mode === "secondary" ? theme.secondaryFontSize : theme.textFontSize, ";\n  font-weight: ").concat($mode === "primary" ? theme.primaryFontWeight : $mode === "secondary" ? theme.secondaryFontWeight : theme.textFontWeight, ";\n  background-color: ").concat($mode === "primary" ? theme.primaryBackgroundColor : $mode === "secondary" ? theme.secondaryBackgroundColor : theme.textBackgroundColor, ";\n  color: ").concat($mode === "primary" ? theme.primaryFontColor : $mode === "secondary" ? theme.secondaryFontColor : theme.textFontColor, ";\n  ");
 };
-
-var Button = _styledComponents["default"].button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-direction: ", ";\n  gap: 0.5rem;\n  align-items: center;\n  justify-content: center;\n  width: ", ";\n  height: 40px;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  box-shadow: 0 0 0 2px transparent;\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  cursor: pointer;\n\n  &:focus {\n    outline: none;\n    box-shadow: 0 0 0 2px\n      ", ";\n  }\n\n  ", "\n"])), function (props) {
+var getButtonStates = function getButtonStates(disabled, $mode, theme) {
+  return "\n  &:hover {\n    background-color: ".concat($mode === "primary" ? theme.primaryHoverBackgroundColor : $mode === "secondary" ? theme.secondaryHoverBackgroundColor : theme.textHoverBackgroundColor, ";\n    color: ").concat($mode === "secondary" ? theme.secondaryHoverFontColor : "", ";\n  }\n  &:focus {\n    border-color: ").concat($mode === "secondary" ? "transparent" : "", ";\n  }\n  &:active {\n    background-color: ").concat($mode === "primary" ? theme.primaryActiveBackgroundColor : $mode === "secondary" ? theme.secondaryActiveBackgroundColor : theme.textActiveBackgroundColor, ";\n    color: ").concat($mode === "secondary" ? theme.secondaryHoverFontColor : "", ";\n    border-color: ").concat($mode === "secondary" ? "transparent" : "", ";\n    outline: none;\n    box-shadow: ").concat(!disabled ? "0 0 0 2px ".concat(theme.focusBorderColor) : "", ";\n  }\n  &:disabled {\n    cursor: not-allowed;\n    background-color: ").concat($mode === "primary" ? theme.primaryDisabledBackgroundColor : $mode === "secondary" ? theme.secondaryDisabledBackgroundColor : theme.textDisabledBackgroundColor, ";\n    color: ").concat($mode === "primary" ? theme.primaryDisabledFontColor : $mode === "secondary" ? theme.secondaryDisabledFontColor : theme.textDisabledFontColor, ";\n    border-color: ").concat($mode === "secondary" ? theme.secondaryDisabledBorderColor : "", ";\n  }\n");
+};
+var Button = _styledComponents["default"].button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-direction: ", ";\n  gap: 0.5rem;\n  align-items: center;\n  justify-content: center;\n  width: ", ";\n  height: 40px;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  box-shadow: 0 0 0 2px transparent;\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  cursor: pointer;\n\n  &:focus {\n    outline: none;\n    box-shadow: 0 0 0 2px ", ";\n  }\n\n  ", "\n  ", "\n"])), function (props) {
   return props.iconPosition === "after" ? "row" : "row-reverse";
 }, function (props) {
   return calculateWidth(props.margin, props.size);
@@ -127,18 +106,16 @@ var Button = _styledComponents["default"].button(_templateObject || (_templateOb
 }, function (props) {
   return props.theme.labelLetterSpacing;
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.focusBorderColorOnDark : props.theme.focusBorderColor;
+  return props.theme.focusBorderColor;
+}, function (props) {
+  return getButtonStyles(props.$mode, props.theme);
 }, function (props) {
-  return getButtonStyles(props);
+  return getButtonStates(props.disabled, props.$mode, props.theme);
 });
-
 var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  line-height: ", ";\n  font-size: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n  text-transform: none;\n  white-space: nowrap;\n"])), function (props) {
   return props.theme.labelFontLineHeight;
 }, function (props) {
   return props.theme.fontSize;
 });
-
-var IconContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  img,\n  svg {\n    height: 24px;\n    width: 24px;\n  }\n"])));
-
-var _default = DxcButton;
-exports["default"] = _default;
+var IconContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  font-size: 24px;\n\n  svg {\n    height: 24px;\n    width: 24px;\n  }\n"])));
+var _default = exports["default"] = DxcButton;