@dxc-technology/halstack-react 0.0.0-c18d61a → 0.0.0-c1a6e05

package/switch/Switch.stories.tsx

@@ -4,12 +4,20 @@ import { BackgroundColorProvider } from "../BackgroundColorContext";
 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: "Switch",
   component: DxcSwitch,
 };
 
+const opinionatedTheme = {
+  switch: {
+    checkedBaseColor: "#5f249f",
+    fontColor: "#000000",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <ExampleContainer>
@@ -134,5 +142,30 @@ export const Chromatic = () => (
       <Title title="FitContent size" theme="light" level={4} />
       <DxcSwitch label="FitContent" size="fitContent" />
     </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Checked" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSwitch label="Switch" defaultChecked />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Default" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSwitch label="Switch" />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSwitch label="Switch" disabled />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled checked" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSwitch label="Switch" disabled defaultChecked />
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );

package/switch/Switch.test.js

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

package/switch/types.d.ts

@@ -1,11 +1,11 @@
-export declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-export declare type Margin = {
+declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+declare type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
     right?: Space;
 };
-export declare type SwitchPropsType = {
+declare type Props = {
     /**
      * Initial state of the switch, only when it is uncontrolled.
      */
@@ -59,3 +59,8 @@ export declare type SwitchPropsType = {
      */
     tabIndex?: number;
 };
+/**
+ * Reference to the component.
+ */
+export declare type RefType = HTMLDivElement;
+export default Props;

package/table/Table.js

@@ -17,9 +17,9 @@ var _react = _interopRequireDefault(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
-var _utils = require("../common/utils.js");
+var _utils = require("../common/utils");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 

package/table/Table.stories.jsx

@@ -2,12 +2,21 @@ import React from "react";
 import DxcTable from "./Table";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Table",
   component: DxcTable,
 };
 
+const opinionatedTheme = {
+  table: {
+    baseColor: "#5f249f",
+    headerFontColor: "#ffffff",
+    cellFontColor: "#000000",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <ExampleContainer>
@@ -271,7 +280,77 @@ export const Chromatic = () => (
           <td>Cell 9</td>
         </tr>
       </DxcTable>
-      <hr />
+    </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcTable>
+          <tr>
+            <th>
+              header<br></br>subheader
+            </th>
+            <th>
+              header<br></br>subheader
+            </th>
+            <th>
+              header<br></br>subheader
+            </th>
+          </tr>
+          <tr>
+            <td>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
+              dolore magna aliqua.
+            </td>
+            <td>
+              Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+              consequat.
+            </td>
+            <td>
+              Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+            </td>
+          </tr>
+          <tr>
+            <td>cell data</td>
+            <td>cell data</td>
+            <td>cell data</td>
+          </tr>
+          <tr>
+            <td>cell data</td>
+            <td>cell data</td>
+            <td>cell data</td>
+          </tr>
+          <tr>
+            <td>cell data</td>
+            <td>cell data</td>
+            <td>cell data</td>
+          </tr>
+          <tr>
+            <td>cell data</td>
+            <td>cell data</td>
+            <td>cell data</td>
+          </tr>
+          <tr>
+            <td>cell data</td>
+            <td>cell data</td>
+            <td>cell data</td>
+          </tr>
+          <tr>
+            <td>cell data</td>
+            <td>cell data</td>
+            <td>cell data</td>
+          </tr>
+          <tr>
+            <td>cell data</td>
+            <td>cell data</td>
+            <td>cell data</td>
+          </tr>
+          <tr>
+            <td>cell data</td>
+            <td>cell data</td>
+            <td>cell data</td>
+          </tr>
+        </DxcTable>
+      </HalstackProvider>
     </ExampleContainer>
   </>
 );

package/table/Table.test.js

@@ -6,11 +6,11 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _Table = _interopRequireDefault(require("./Table"));
+var _Table = _interopRequireDefault(require("./Table.tsx"));
 
 describe("Table component tests", function () {
   test("Table renders with correct content", function () {
-    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Table["default"], null, /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("th", null, "header-1"), /*#__PURE__*/_react["default"].createElement("th", null, "header-2"), /*#__PURE__*/_react["default"].createElement("th", null, "header-3")), /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, "cell-1"), /*#__PURE__*/_react["default"].createElement("td", null, "cell-2"), /*#__PURE__*/_react["default"].createElement("td", null, "cell-3")), /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, "cell-4"), /*#__PURE__*/_react["default"].createElement("td", null, "cell-5"), /*#__PURE__*/_react["default"].createElement("td", null, "cell-6")))),
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Table["default"], null, /*#__PURE__*/_react["default"].createElement("thead", null, /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("th", null, "header-1"), /*#__PURE__*/_react["default"].createElement("th", null, "header-2"), /*#__PURE__*/_react["default"].createElement("th", null, "header-3"))), /*#__PURE__*/_react["default"].createElement("tbody", null, /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, "cell-1"), /*#__PURE__*/_react["default"].createElement("td", null, "cell-2"), /*#__PURE__*/_react["default"].createElement("td", null, "cell-3")), /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, "cell-4"), /*#__PURE__*/_react["default"].createElement("td", null, "cell-5"), /*#__PURE__*/_react["default"].createElement("td", null, "cell-6"))))),
         getByText = _render.getByText;
 
     expect(getByText("header-1")).toBeTruthy();

package/tabs/Tab.js

@@ -17,11 +17,11 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _Badge = _interopRequireDefault(require("../badge/Badge"));
 
-var _Typography = _interopRequireDefault(require("../typography/Typography"));
+var _BaseTypography = _interopRequireDefault(require("../utils/BaseTypography"));
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 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); }
 
@@ -42,7 +42,6 @@ var Tab = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     type: "button",
     tabIndex: tabIndex,
     disabled: tab.isDisabled,
-    "aria-disabled": tab.isDisabled,
     "aria-selected": active,
     hasLabelAndIcon: hasLabelAndIcon,
     iconPosition: iconPosition,
@@ -57,15 +56,15 @@ var Tab = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       _onMouseLeave();
     }
   }, /*#__PURE__*/_react["default"].createElement(MainLabelContainer, {
-    hasBadge: tab.notificationNumber,
+    notificationNumber: tab.notificationNumber,
     hasLabelAndIcon: hasLabelAndIcon,
     iconPosition: iconPosition
   }, tab.icon && /*#__PURE__*/_react["default"].createElement(TabIconContainer, {
     hasLabelAndIcon: hasLabelAndIcon,
     iconPosition: iconPosition
-  }, typeof tab.icon === "string" ? /*#__PURE__*/_react["default"].createElement(TabIcon, {
+  }, typeof tab.icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: tab.icon
-  }) : tab.icon), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+  }) : tab.icon), /*#__PURE__*/_react["default"].createElement(_BaseTypography["default"], {
     color: tab.isDisabled ? colorsTheme.tabs.disabledFontColor : active ? colorsTheme.tabs.selectedFontColor : colorsTheme.tabs.unselectedFontColor,
     fontFamily: colorsTheme.tabs.fontFamily,
     fontSize: colorsTheme.tabs.fontSize,
@@ -74,15 +73,15 @@ var Tab = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     textAlign: "center",
     letterSpacing: "0.025em",
     lineHeight: "1.715em"
-  }, tab.label)), tab.notificationNumber && tab.notificationNumber && /*#__PURE__*/_react["default"].createElement(BadgeContainer, {
+  }, tab.label)), tab.notificationNumber && /*#__PURE__*/_react["default"].createElement(BadgeContainer, {
     hasLabelAndIcon: hasLabelAndIcon,
     iconPosition: iconPosition
   }, /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
-    notificationText: tab.notificationNumber > 99 ? "+99" : tab.notificationNumber
+    notificationText: typeof tab.notificationNumber === "number" && tab.notificationNumber > 99 ? "+99" : tab.notificationNumber
   })));
 });
 
-var TabContainer = _styledComponents["default"].button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  text-transform: ", ";\n  overflow: hidden;\n  flex-shrink: 0;\n  border: 0;\n  cursor: pointer;\n  display: inline-flex;\n  align-items: center;\n  user-select: none;\n  vertical-align: middle;\n  justify-content: center;\n  min-width: 90px;\n  max-width: 360px;\n  padding: ", ";\n  height: ", ";\n  min-height: ", ";\n  background-color: ", ";\n  svg {\n    color: ", ";\n  }\n\n  &:hover {\n    background-color: ", ";\n  }\n\n  &:active {\n    background-color: ", ";\n  }\n\n  &:focus {\n    outline: ", " solid 1px;\n    outline-offset: -1px;\n  }\n\n  &[aria-selected=\"true\"] {\n    background-color: ", ";\n    svg {\n      color: ", ";\n    }\n    opacity: 1;\n  }\n\n  &[aria-disabled=\"true\"] {\n    background-color: ", " !important;\n    cursor: not-allowed !important;\n    pointer-events: all;\n    font-style: ", ";\n    svg {\n      color: ", ";\n    }\n    outline: none !important;\n    > div {\n      opacity: 0.5;\n    }\n  }\n"])), function (props) {
+var TabContainer = _styledComponents["default"].button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  text-transform: ", ";\n  overflow: hidden;\n  flex-shrink: 0;\n  border: 0;\n  cursor: pointer;\n  display: inline-flex;\n  align-items: center;\n  user-select: none;\n  vertical-align: middle;\n  justify-content: center;\n  min-width: 90px;\n  max-width: 360px;\n  padding: ", ";\n  height: ", ";\n  min-height: ", ";\n  background-color: ", ";\n\n  &:hover {\n    background-color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n  &:focus {\n    outline: ", " solid 1px;\n    outline-offset: -1px;\n  }\n  svg {\n    color: ", ";\n  }\n\n  &[aria-selected=\"true\"] {\n    background-color: ", ";\n    svg {\n      color: ", ";\n    }\n    opacity: 1;\n  }\n\n  &:disabled {\n    background-color: ", " !important;\n    cursor: not-allowed !important;\n    pointer-events: all;\n    font-style: ", ";\n    outline: none !important;\n\n    svg {\n      color: ", ";\n    }\n    > div {\n      opacity: 0.5;\n    }\n  }\n"])), function (props) {
   return props.theme.fontTextTransform;
 }, function (props) {
   return (!props.hasLabelAndIcon || props.hasLabelAndIcon && props.iconPosition !== "top") && "12px 16px" || "8px 16px";
@@ -92,14 +91,14 @@ var TabContainer = _styledComponents["default"].button(_templateObject || (_temp
   return (!props.hasLabelAndIcon || props.hasLabelAndIcon && props.iconPosition !== "top") && "47px" || "71px";
 }, function (props) {
   return props.theme.unselectedBackgroundColor;
-}, function (props) {
-  return props.theme.unselectedIconColor;
 }, function (props) {
   return "".concat(props.theme.hoverBackgroundColor, " !important");
 }, function (props) {
   return "".concat(props.theme.pressedBackgroundColor, " !important");
 }, function (props) {
   return props.theme.focusOutline;
+}, function (props) {
+  return props.theme.unselectedIconColor;
 }, function (props) {
   return props.theme.selectedBackgroundColor;
 }, function (props) {
@@ -119,17 +118,15 @@ var BadgeContainer = _styledComponents["default"].div(_templateObject2 || (_temp
 var MainLabelContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: ", ";\n  align-items: center;\n  margin-left: ", ";\n"])), function (props) {
   return props.hasLabelAndIcon && props.iconPosition === "top" && "column" || "row";
 }, function (props) {
-  return props.hasBadge ? typeof props.hasBadge === "number" ? "calc(".concat(props.theme.badgeWidthWithNotificationNumber, " + 12px)") : "calc(".concat(props.theme.badgeWidth, " + 12px)") : "unset";
+  return props.notificationNumber ? typeof props.notificationNumber === "number" ? "calc(".concat(props.theme.badgeWidthWithNotificationNumber, " + 12px)") : "calc(".concat(props.theme.badgeWidth, " + 12px)") : "unset";
 });
 
-var TabIconContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 22px;\n  max-width: 22px;\n  margin-bottom: ", ";\n  margin-right: ", ";\n  overflow: hidden;\n  display: flex;\n  align-items: center;\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
+var TabIconContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  margin-bottom: ", ";\n  margin-right: ", ";\n\n  img,\n  svg {\n    height: 22px;\n    width: 22px;\n  }\n"])), function (props) {
   return props.hasLabelAndIcon && props.iconPosition === "top" && "8px" || "";
 }, function (props) {
   return props.hasLabelAndIcon && props.iconPosition === "left" && "12px" || "";
 });
 
-var TabIcon = _styledComponents["default"].img(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 100%;\n  display: inline-flex;\n  align-items: center;\n  flex-direction: column;\n  justify-content: center;\n"])));
-
 var _default = /*#__PURE__*/_react["default"].memo(Tab);
 
 exports["default"] = _default;

package/tabs/Tabs.js

@@ -19,7 +19,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
@@ -193,7 +193,7 @@ var DxcTabs = function DxcTabs(_ref) {
     var _refTabList$current3;
 
     var scrollWidth = (refTabList === null || refTabList === void 0 ? void 0 : (_refTabList$current3 = refTabList.current) === null || _refTabList$current3 === void 0 ? void 0 : _refTabList$current3.offsetWidth) * 0.75;
-    var moveX;
+    var moveX = 0;
 
     if (countClick <= scrollWidth) {
       moveX = 0;
@@ -213,7 +213,7 @@ var DxcTabs = function DxcTabs(_ref) {
     var _refTabList$current4, _refTabList$current5;
 
     var scrollWidth = (refTabList === null || refTabList === void 0 ? void 0 : (_refTabList$current4 = refTabList.current) === null || _refTabList$current4 === void 0 ? void 0 : _refTabList$current4.offsetWidth) * 0.75;
-    var moveX;
+    var moveX = 0;
 
     if (countClick + scrollWidth + (refTabList === null || refTabList === void 0 ? void 0 : (_refTabList$current5 = refTabList.current) === null || _refTabList$current5 === void 0 ? void 0 : _refTabList$current5.offsetWidth) >= totalTabsWidth) {
       var _refTabList$current6;
@@ -343,9 +343,8 @@ var DxcTabs = function DxcTabs(_ref) {
     iconPosition: iconPosition
   }, /*#__PURE__*/_react["default"].createElement(ScrollIndicator, {
     onClick: scrollLeft,
-    scrollLeftEnabled: scrollLeftEnabled,
     enabled: enabledIndicator,
-    "aria-disabled": !scrollLeftEnabled,
+    disabled: !scrollLeftEnabled,
     "aria-label": translatedLabels.tabs.scrollLeft,
     tabIndex: scrollLeftEnabled ? tabIndex : -1,
     minHeightTabs: minHeightTabs
@@ -386,16 +385,15 @@ var DxcTabs = function DxcTabs(_ref) {
     "aria-disabled": isActiveIndicatorDisabled
   }))), /*#__PURE__*/_react["default"].createElement(ScrollIndicator, {
     onClick: scrollRight,
-    scrollRightEnabled: scrollRightEnabled,
     enabled: enabledIndicator,
-    "aria-disabled": !scrollRightEnabled,
+    disabled: !scrollRightEnabled,
     "aria-label": translatedLabels.tabs.scrollRight,
     tabIndex: scrollRightEnabled ? tabIndex : -1,
     minHeightTabs: minHeightTabs
   }, arrowIcons.right))));
 };
 
-var Underline = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  left: 0;\n  bottom: 0;\n  width: 100%;\n  position: absolute;\n  height: ", ";\n  background-color: ", ";\n  z-index: 1;\n"])), function (props) {
+var Underline = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  position: absolute;\n  left: 0;\n  bottom: 0;\n  width: 100%;\n  height: ", ";\n  background-color: ", ";\n"])), function (props) {
   return props.theme.dividerThickness;
 }, function (props) {
   return props.theme.dividerColor;
@@ -421,16 +419,12 @@ var Tabs = _styledComponents["default"].div(_templateObject3 || (_templateObject
   return props.theme.unselectedBackgroundColor;
 });
 
-var ScrollIndicator = _styledComponents["default"].button(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: ", ";\n  background-color: #ffffff;\n  font-size: 1.25rem;\n  min-width: ", ";\n  height: ", "px;\n  padding: 0;\n  justify-content: center;\n  cursor: pointer;\n  border-bottom: solid ", " ", ";\n  box-sizing: border-box;\n  border: none;\n  &:hover {\n    background-color: ", ";\n  }\n  &:focus {\n    outline: ", " solid 1px;\n    outline-offset: -1px;\n  }\n  &:active {\n    background-color: ", ";\n  }\n  svg {\n    height: 20px;\n    width: 20px;\n    align-self: center;\n    fill: ", ";\n    visibility: visible;\n  }\n  &[aria-disabled=\"true\"] {\n    pointer-events: none;\n    cursor: default;\n    svg {\n      visibility: hidden;\n    }\n    &:focus {\n      outline: none;\n    }\n    &:hover,\n    &:active {\n      background-color: transparent !important;\n    }\n  }\n"])), function (props) {
+var ScrollIndicator = _styledComponents["default"].button(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: ", ";\n  justify-content: center;\n  min-width: ", ";\n  height: ", "px;\n  padding: 0;\n  border: none;\n  background-color: #ffffff;\n  font-size: 1.25rem;\n  cursor: pointer;\n\n  &:hover {\n    background-color: ", ";\n  }\n  &:focus {\n    outline: ", " solid 1px;\n    outline-offset: -1px;\n  }\n  &:active {\n    background-color: ", ";\n  }\n  &:disabled {\n    cursor: default;\n    svg {\n      visibility: hidden;\n    }\n    &:focus {\n      outline: none;\n    }\n    &:hover,\n    &:active {\n      background-color: transparent !important;\n    }\n  }\n\n  svg {\n    align-self: center;\n    height: 20px;\n    width: 20px;\n    fill: ", ";\n  }\n"])), function (props) {
   return props.enabled ? "flex" : "none";
 }, function (props) {
   return props.theme.scrollButtonsWidth;
 }, function (props) {
   return props.minHeightTabs - 1;
-}, function (props) {
-  return props.theme.dividerThickness;
-}, function (props) {
-  return props.theme.dividerColor;
 }, function (props) {
   return "".concat(props.theme.hoverBackgroundColor, " !important");
 }, function (props) {
@@ -441,19 +435,19 @@ var ScrollIndicator = _styledComponents["default"].button(_templateObject4 || (_
   return props.theme.unselectedFontColor;
 });
 
-var ActiveIndicator = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  left: ", ";\n  width: ", ";\n  z-index: 2;\n  background-color: ", ";\n  bottom: 0;\n  height: ", ";\n  position: absolute;\n  &[aria-disabled=\"true\"] {\n    background-color: ", ";\n    display: none;\n  }\n"])), function (props) {
+var ActiveIndicator = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  position: absolute;\n  bottom: 0;\n  left: ", ";\n  width: ", ";\n  height: ", ";\n  background-color: ", ";\n  &[aria-disabled=\"true\"] {\n    background-color: ", ";\n    display: none;\n  }\n"])), function (props) {
   return "".concat(props.tabLeft, "px");
 }, function (props) {
   return "".concat(props.tabWidth, "px");
-}, function (props) {
-  return props.theme.selectedUnderlineColor;
 }, function (props) {
   return props.theme.selectedUnderlineThickness;
+}, function (props) {
+  return props.theme.selectedUnderlineColor;
 }, function (props) {
   return props.theme.disabledFontColor;
 });
 
-var TabsContent = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  z-index: 1;\n  flex: 1 1 auto;\n  display: inline-block;\n  position: relative;\n  white-space: nowrap;\n  overflow-x: scroll;\n  ::-webkit-scrollbar {\n    display: none;\n  }\n"])));
+var TabsContent = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  flex: 1 1 auto;\n  display: inline-block;\n  position: relative;\n  white-space: nowrap;\n  overflow-x: scroll;\n  ::-webkit-scrollbar {\n    display: none;\n  }\n"])));
 
 var TabList = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  min-height: ", "px;\n"])), function (props) {
   return props.minHeightTabs;

package/tabs/Tabs.stories.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import DxcTabs from "./Tabs";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Tabs",
@@ -9,9 +10,8 @@ export default {
 };
 
 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 xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" height="20" width="20" fill="currentColor">
+    <path d="m10 17-1.042-.938q-2.083-1.854-3.437-3.177-1.354-1.323-2.136-2.354Q2.604 9.5 2.302 8.646 2 7.792 2 6.896q0-1.854 1.271-3.125T6.396 2.5q1.021 0 1.979.438.958.437 1.625 1.229.667-.792 1.625-1.229.958-.438 1.979-.438 1.854 0 3.125 1.271T18 6.896q0 .896-.292 1.729-.291.833-1.073 1.854-.781 1.021-2.145 2.365-1.365 1.344-3.49 3.26Zm0-2.021q1.938-1.729 3.188-2.948 1.25-1.219 1.989-2.125.74-.906 1.031-1.614.292-.709.292-1.396 0-1.229-.833-2.063Q14.833 4 13.604 4q-.729 0-1.364.302-.636.302-1.094.844L10.417 6h-.834l-.729-.854q-.458-.542-1.114-.844Q7.083 4 6.396 4q-1.229 0-2.063.833-.833.834-.833 2.063 0 .687.271 1.364.271.678.989 1.573.719.896 1.98 2.125Q8 13.188 10 14.979Zm0-5.5Z" />
   </svg>
 );
 
@@ -74,10 +74,20 @@ const tabsNotification = tabs.map((tab, index) => ({
   notificationNumber: (index === 0 && true) || (index === 1 && 5) || (index === 2 && 200),
 }));
 
-const tabsIcon = tabs.map((tab) => ({ ...tab, icon: iconSVG }));
+const tabsIcon = tabs.map((tab, index) =>
+  index <= tabs.length / 2
+    ? { ...tab, icon: "https://cdn-icons-png.flaticon.com/512/5039/5039041.png" }
+    : { ...tab, icon: iconSVG }
+);
 
 const tabsNotificationIcon = tabsNotification.map((tab) => ({ ...tab, icon: iconSVG }));
 
+const opinionatedTheme = {
+  tabs: {
+    baseColor: "#5f249f",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <ExampleContainer>
@@ -152,7 +162,37 @@ export const Chromatic = () => (
     <ExampleContainer>
       <Title title="Xxlarge margin" theme="light" level={4} />
       <DxcTabs tabs={tabs} margin="xxlarge" />
-      <hr />
+    </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="With icon and notification" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcTabs tabs={tabsNotificationIcon} />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcTabs activeTabIndex={0} tabs={disabledTabs} />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcTabs tabs={tabs} />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcTabs tabs={tabs} />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Actived" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcTabs tabs={tabs} />
+      </HalstackProvider>
     </ExampleContainer>
   </>
 );

package/tabs/Tabs.test.js

@@ -6,7 +6,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _Tabs = _interopRequireDefault(require("./Tabs"));
+var _Tabs = _interopRequireDefault(require("./Tabs.tsx"));
 
 var sampleTabs = [{
   label: "Tab-1"
@@ -17,13 +17,13 @@ var sampleTabs = [{
 }];
 var sampleTabsWithBadge = [{
   label: "Tab-1",
-  notificationNumber: "10"
+  notificationNumber: 10
 }, {
   label: "Tab-2",
-  notificationNumber: "20"
+  notificationNumber: 20
 }, {
   label: "Tab-3",
-  notificationNumber: "101"
+  notificationNumber: 101
 }];
 var sampleTabsMiddleDisabled = [{
   label: "Tab-1"
@@ -149,7 +149,6 @@ describe("Tabs component tests", function () {
       onTabClick: onTabClick,
       activeTabIndex: 0
     })),
-        getByText = _render7.getByText,
         getAllByRole = _render7.getAllByRole;
 
     var tabs = getAllByRole("tab");

package/tabs/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-export declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-export declare type Margin = {
+declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+declare type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;

package/tag/Tag.js

@@ -19,11 +19,11 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _utils = require("../common/utils.js");
+var _utils = require("../common/utils");
 
 var _Box = _interopRequireDefault(require("../box/Box"));
 
@@ -64,9 +64,7 @@ var DxcTag = function DxcTag(_ref) {
   var tagContent = /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     size: size,
     shadowDepth: isHovered && (onClick || linkHref) && 2 || 1
-  }, /*#__PURE__*/_react["default"].createElement(TagContent, {
-    labelPosition: labelPosition
-  }, labelPosition === "before" && size !== "small" && label && /*#__PURE__*/_react["default"].createElement(TagLabel, null, label), icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
+  }, /*#__PURE__*/_react["default"].createElement(TagContent, null, labelPosition === "before" && size !== "small" && label && /*#__PURE__*/_react["default"].createElement(TagLabel, null, label), icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
     iconBgColor: iconBgColor
   }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(TagIcon, {
     src: icon
@@ -114,16 +112,16 @@ var StyledDxcTag = _styledComponents["default"].div(_templateObject || (_templat
   return margin && (0, _typeof2["default"])(margin) !== "object" ? _variables.spaces[margin] : "0px";
 }, function (_ref4) {
   var margin = _ref4.margin;
-  return margin && margin.top ? _variables.spaces[margin.top] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.top ? _variables.spaces[margin.top] : "";
 }, function (_ref5) {
   var margin = _ref5.margin;
-  return margin && margin.right ? _variables.spaces[margin.right] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.right ? _variables.spaces[margin.right] : "";
 }, function (_ref6) {
   var margin = _ref6.margin;
-  return margin && margin.bottom ? _variables.spaces[margin.bottom] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.bottom ? _variables.spaces[margin.bottom] : "";
 }, function (_ref7) {
   var margin = _ref7.margin;
-  return margin && margin.left ? _variables.spaces[margin.left] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.left ? _variables.spaces[margin.left] : "";
 }, function (props) {
   return calculateWidth(props.margin, props.size);
 }, function (props) {

package/tag/Tag.stories.tsx

@@ -3,6 +3,7 @@ import { userEvent, within } from "@storybook/testing-library";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import DxcTag from "./Tag";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Tag",
@@ -23,6 +24,13 @@ const largeIcon = (
   </svg>
 );
 
+const opinionatedTheme = {
+  tag: {
+    fontColor: "#000000",
+    iconColor: "#ffffff",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <ExampleContainer>
@@ -124,7 +132,12 @@ export const Chromatic = () => (
       <Title title="FitContent size" theme="light" level={4} />
       <DxcTag label="FitContent" size="fitContent" icon={icon} />
     </ExampleContainer>
-    <hr />
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcTag label="Tag" icon={icon} />
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );
 

package/tag/Tag.test.js

@@ -6,7 +6,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _Tag = _interopRequireDefault(require("./Tag"));
+var _Tag = _interopRequireDefault(require("./Tag.tsx"));
 
 describe("Tag component tests", function () {
   test("Tag renders with correct label", function () {