@dxc-technology/halstack-react 0.0.0-c908d78 → 0.0.0-c9b5c13

package/tabs-nav/NavTabs.stories.tsx

@@ -0,0 +1,170 @@
+import React from "react";
+import DxcNavTabs from "./NavTabs";
+import Title from "../../.storybook/components/Title";
+import ExampleContainer from "../../.storybook/components/ExampleContainer";
+
+export default {
+  title: "NavTabs",
+  component: DxcNavTabs,
+};
+
+const iconSVG = (
+  <svg viewBox="0 0 24 24" fill="currentColor">
+    <path d="M0 0h24v24H0z" fill="none" />
+    <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
+  </svg>
+);
+
+export const Chromatic = () => (
+  <>
+    <ExampleContainer>
+      <Title title="Only label" theme="light" level={4} />
+      <DxcNavTabs>
+        <DxcNavTabs.Tab href="#" active>
+          Tab 1
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" disabled>
+          Tab 2
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#">Tab 3</DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#">Tab 4</DxcNavTabs.Tab>
+      </DxcNavTabs>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered tabs" theme="light" level={4} />
+      <DxcNavTabs>
+        <DxcNavTabs.Tab href="#" active>
+          Tab 1
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" disabled>
+          Tab 2
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#">Tab 3</DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#">Tab 4</DxcNavTabs.Tab>
+      </DxcNavTabs>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused tabs" theme="light" level={4} />
+      <DxcNavTabs>
+        <DxcNavTabs.Tab href="#" active>
+          Tab 1
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" disabled>
+          Tab 2
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#">Tab 3</DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#">Tab 4</DxcNavTabs.Tab>
+      </DxcNavTabs>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Actived tabs" theme="light" level={4} />
+      <DxcNavTabs>
+        <DxcNavTabs.Tab href="#" active>
+          Tab 1
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" disabled>
+          Tab 2
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#">Tab 3</DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#">Tab 4</DxcNavTabs.Tab>
+      </DxcNavTabs>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="With notification number" theme="light" level={4} />
+      <DxcNavTabs>
+        <DxcNavTabs.Tab href="#" active notificationNumber>
+          Tab 1
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" disabled notificationNumber={5}>
+          Tab 2
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" notificationNumber={120}>
+          Tab 3
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#">Tab 4</DxcNavTabs.Tab>
+      </DxcNavTabs>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="With icon position top" theme="light" level={4} />
+      <DxcNavTabs>
+        <DxcNavTabs.Tab href="#" active icon={iconSVG}>
+          Tab 1
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" disabled icon={iconSVG}>
+          Tab 2
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG}>
+          Tab 3
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG}>
+          Tab 4
+        </DxcNavTabs.Tab>
+      </DxcNavTabs>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="With icon position left" theme="light" level={4} />
+      <DxcNavTabs iconPosition="left">
+        <DxcNavTabs.Tab href="#" active icon={iconSVG}>
+          Tab 1
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" disabled icon={iconSVG}>
+          Tab 2
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG}>
+          Tab 3
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG}>
+          Tab 4
+        </DxcNavTabs.Tab>
+      </DxcNavTabs>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="With icon and notification number" theme="light" level={4} />
+      <DxcNavTabs>
+        <DxcNavTabs.Tab href="#" active icon={iconSVG} notificationNumber>
+          Tab 1
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" disabled icon={iconSVG} notificationNumber={5}>
+          Tab 2
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG} notificationNumber={120}>
+          Tab 3
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG}>
+          Tab 4
+        </DxcNavTabs.Tab>
+      </DxcNavTabs>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="With icon on the left and notification number" theme="light" level={4} />
+      <DxcNavTabs iconPosition="left">
+        <DxcNavTabs.Tab href="#" active icon={iconSVG} notificationNumber>
+          Tab 1
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" disabled icon={iconSVG} notificationNumber={5}>
+          Tab 2
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG} notificationNumber={120}>
+          Tab 3
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG}>
+          Tab 4
+        </DxcNavTabs.Tab>
+      </DxcNavTabs>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="With long label" theme="light" level={4} />
+      <DxcNavTabs>
+        <DxcNavTabs.Tab href="#" active>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG} disabled notificationNumber={3}>
+          Tab 2
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG}>
+          Tab 3
+        </DxcNavTabs.Tab>
+      </DxcNavTabs>
+    </ExampleContainer>
+  </>
+);

package/tabs-nav/NavTabs.test.js

@@ -0,0 +1,82 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _NavTabs = _interopRequireDefault(require("./NavTabs"));
+
+describe("Tabs component tests", function () {
+  test("Tabs render with correct labels and attributes", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_NavTabs["default"], null, /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test1",
+      active: true
+    }, "Tab 1"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test2",
+      disabled: true
+    }, "Tab 2"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test3"
+    }, "Tab 3"))),
+        getByText = _render.getByText,
+        getAllByRole = _render.getAllByRole,
+        getByRole = _render.getByRole;
+
+    expect(getByRole("tablist")).toBeTruthy();
+    expect(getByRole("tablist").getAttribute("aria-label")).toBe("Navigation tabs");
+    expect(getByText("Tab 1")).toBeTruthy();
+    expect(getByText("Tab 2")).toBeTruthy();
+    expect(getByText("Tab 3")).toBeTruthy();
+    var tabs = getAllByRole("tab");
+    tabs.forEach(function (tab, index) {
+      expect(tab.getAttribute("aria-selected")).toBe((index === 0).toString());
+    });
+    var anchors = getAllByRole("link");
+    expect(anchors.length).toBe(2);
+    expect(anchors[0].getAttribute("href")).toBe("/test1");
+    expect(anchors[1].getAttribute("href")).toBe("/test3");
+    expect(anchors[0].getAttribute("tabindex")).toBe("0");
+    expect(anchors[1].getAttribute("tabindex")).toBe("-1");
+  });
+  test("Tabs render with correct labels, badges and icons", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_NavTabs["default"], null, /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test1",
+      active: true,
+      notificationNumber: 10
+    }, "Tab 1"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test2",
+      disabled: true,
+      notificationNumber: 20
+    }, "Tab 2"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test3",
+      notificationNumber: 1000,
+      icon: "/testIcon.png"
+    }, "Tab 3"))),
+        getByText = _render2.getByText,
+        getByRole = _render2.getByRole;
+
+    expect(getByText("10")).toBeTruthy();
+    expect(getByText("20")).toBeTruthy();
+    expect(getByText("+99")).toBeTruthy();
+    expect(getByRole("img")).toBeTruthy();
+  });
+  test("Tabs render with correct tab index", function () {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_NavTabs["default"], {
+      tabIndex: 3
+    }, /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test1"
+    }, "Tab 1"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test2",
+      disabled: true
+    }, "Tab 2"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test3",
+      active: true
+    }, "Tab 3"))),
+        getAllByRole = _render3.getAllByRole;
+
+    var tabs = getAllByRole("link");
+    expect(tabs[0].getAttribute("tabindex")).toBe("-1");
+    expect(tabs[1].getAttribute("tabindex")).toBe("3");
+  });
+});

package/tabs-nav/Tab.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+import { TabProps } from "./types";
+declare const DxcTab: React.ForwardRefExoticComponent<TabProps & React.RefAttributes<HTMLAnchorElement>>;
+export default DxcTab;

package/tabs-nav/Tab.js

@@ -0,0 +1,132 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+
+var _Badge = _interopRequireDefault(require("../badge/Badge"));
+
+var _NavTabs = require("./NavTabs");
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+
+var _excluded = ["href", "active", "icon", "disabled", "notificationNumber", "children"];
+
+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 || _typeof(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 DxcTab = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, _ref2) {
+  var href = _ref.href,
+      _ref$active = _ref.active,
+      active = _ref$active === void 0 ? false : _ref$active,
+      icon = _ref.icon,
+      _ref$disabled = _ref.disabled,
+      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+      _ref$notificationNumb = _ref.notificationNumber,
+      notificationNumber = _ref$notificationNumb === void 0 ? false : _ref$notificationNumb,
+      children = _ref.children,
+      otherProps = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
+  var tabRef = /*#__PURE__*/(0, _react.createRef)();
+
+  var _useContext = (0, _react.useContext)(_NavTabs.NavTabsContext),
+      iconPosition = _useContext.iconPosition,
+      tabIndex = _useContext.tabIndex,
+      hasIcons = _useContext.hasIcons,
+      focusedLabel = _useContext.focusedLabel;
+
+  (0, _react.useLayoutEffect)(function () {
+    var _tabRef$current;
+
+    focusedLabel === children.toString() && (tabRef === null || tabRef === void 0 ? void 0 : (_tabRef$current = tabRef.current) === null || _tabRef$current === void 0 ? void 0 : _tabRef$current.focus());
+  }, [focusedLabel]);
+
+  var handleOnKeyDown = function handleOnKeyDown(event) {
+    var _tabRef$current2;
+
+    switch (event.keyCode) {
+      case 13: // enter
+
+      case 32:
+        // space
+        tabRef === null || tabRef === void 0 ? void 0 : (_tabRef$current2 = tabRef.current) === null || _tabRef$current2 === void 0 ? void 0 : _tabRef$current2.click();
+        event.preventDefault();
+        break;
+    }
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(TabContainer, {
+    active: active,
+    role: "tab",
+    "aria-selected": active
+  }, /*#__PURE__*/_react["default"].createElement(Tab, (0, _extends2["default"])({
+    href: !disabled && href ? href : undefined,
+    disabled: disabled,
+    iconPosition: iconPosition,
+    hasIcon: hasIcons,
+    ref: function ref(anchorRef) {
+      tabRef.current = anchorRef;
+
+      if (_ref2) {
+        if (typeof _ref2 === "function") _ref2(anchorRef);else {
+          _ref2.current = anchorRef;
+        }
+      }
+    },
+    onKeyDown: handleOnKeyDown,
+    tabIndex: active ? tabIndex : -1
+  }, otherProps), icon && /*#__PURE__*/_react["default"].createElement(TabIconContainer, {
+    iconPosition: iconPosition
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(TabIcon, {
+    src: icon
+  }) : icon), /*#__PURE__*/_react["default"].createElement(LabelContainer, null, children, notificationNumber && /*#__PURE__*/_react["default"].createElement(BadgeContainer, null, /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+    notificationText: notificationNumber > 99 ? "+99" : notificationNumber,
+    disabled: disabled
+  })))));
+});
+
+var TabContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  border-bottom: 2px solid ", ";\n"])), function (props) {
+  return props.active ? "#6f2c91" : "#0000001a";
+});
+
+var Tab = _styledComponents["default"].a(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: ", ";\n  justify-content: center;\n  align-items: center;\n\n  font-family: \"Open Sans\";\n  font-style: normal;\n  font-weight: 400;\n  font-size: 1rem;\n  color: ", ";\n  text-decoration-color: transparent;\n  cursor: ", ";\n\n  height: ", ";\n  min-width: 164px;\n  margin: 0.5rem;\n  padding: 0.375rem;\n\n  border-radius: 4px;\n\n  ", "\n"])), function (props) {
+  return props.hasIcon && props.iconPosition === "top" ? "column" : "row";
+}, function (props) {
+  return props.disabled ? "#0000004D" : "#333333";
+}, function (props) {
+  return props.disabled ? "not-allowed" : "pointer";
+}, function (props) {
+  return props.hasIcon && props.iconPosition === "top" ? "66px" : "32px";
+}, function (props) {
+  return !props.disabled && ":hover {\n    background: #0000000D;\n  }\n\n  :focus {\n    outline: 2px solid #33aaff};\n  }\n\n  :active {\n    background: #0000001A;\n    outline: 2px solid #33aaff};\n  }";
+});
+
+var TabIcon = _styledComponents["default"].img(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])([""])));
+
+var TabIconContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 24px;\n  max-width: 24px;\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) {
+  return props.iconPosition === "top" && "0.375rem";
+}, function (props) {
+  return props.iconPosition === "left" && "0.625rem";
+});
+
+var LabelContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n"])));
+
+var BadgeContainer = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: 0.5rem;\n"])));
+
+var _default = DxcTab;
+exports["default"] = _default;

package/tabs-nav/types.d.ts

@@ -0,0 +1,53 @@
+/// <reference types="react" />
+declare type SVG = React.SVGProps<SVGSVGElement>;
+export declare type TabProps = {
+    /**
+     * Whether the tab is active or not.
+     */
+    active?: boolean;
+    /**
+     * Whether the tab is disabled or not.
+     */
+    disabled?: boolean;
+    /**
+     * Page to be opened when the user clicks on the tab.
+     */
+    href?: string;
+    /**
+     * Element or path used as the icon that will be displayed in the tab.
+     */
+    icon?: string | SVG;
+    /**
+     * If the value is 'true', an empty badge will appear.
+     * If it is 'false', no badge will appear.
+     * If a number is put it will be shown as the label of the notification
+     * in the tab, taking into account that if that number is greater than 99,
+     * it will appear as '+99' in the badge.
+     */
+    notificationNumber?: boolean | number;
+    /**
+     * Content of the tab.
+     */
+    children: string;
+};
+export declare type NavTabsProps = {
+    /**
+     * Whether the icon should appear above or to the left of the label.
+     */
+    iconPosition?: "top" | "left";
+    /**
+     * Value of the tabindex for each tab.
+     */
+    tabIndex?: number;
+    /**
+     * Content of the tabs nav.
+     */
+    children: React.ReactNode;
+};
+export declare type NavTabsContextProps = {
+    iconPosition: "top" | "left";
+    tabIndex: number;
+    hasIcons: boolean;
+    focusedLabel: string;
+};
+export {};

package/tabs-nav/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/tag/Tag.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import TagPropsType from "./types";
-declare const DxcTag: ({ icon, iconSrc, label, linkHref, onClick, iconBgColor, labelPosition, newWindow, margin, size, tabIndex, }: TagPropsType) => JSX.Element;
+declare const DxcTag: ({ icon, label, linkHref, onClick, iconBgColor, labelPosition, newWindow, margin, size, tabIndex, }: TagPropsType) => JSX.Element;
 export default DxcTag;

package/tag/Tag.js

@@ -9,10 +9,10 @@ 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 _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -21,13 +21,13 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _variables = require("../common/variables.js");
 
-var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _utils = require("../common/utils.js");
 
 var _Box = _interopRequireDefault(require("../box/Box"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
 
 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); }
 
@@ -35,7 +35,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var DxcTag = function DxcTag(_ref) {
   var icon = _ref.icon,
-      iconSrc = _ref.iconSrc,
       _ref$label = _ref.label,
       label = _ref$label === void 0 ? "" : _ref$label,
       linkHref = _ref.linkHref,
@@ -67,11 +66,11 @@ var DxcTag = function DxcTag(_ref) {
     shadowDepth: isHovered && (onClick || linkHref) && 2 || 1
   }, /*#__PURE__*/_react["default"].createElement(TagContent, {
     labelPosition: labelPosition
-  }, /*#__PURE__*/_react["default"].createElement(IconContainer, {
+  }, labelPosition === "before" && size !== "small" && label && /*#__PURE__*/_react["default"].createElement(TagLabel, null, label), icon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
     iconBgColor: iconBgColor
-  }, icon ? /*#__PURE__*/_react["default"].createElement(TagIconContainer, null, (0, _typeof2["default"])(icon) === "object" ? icon : /*#__PURE__*/_react["default"].createElement(icon)) : /*#__PURE__*/_react["default"].createElement(TagIcon, {
-    src: iconSrc
-  })), size !== "small" && /*#__PURE__*/_react["default"].createElement(TagLabel, null, label)));
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(TagIcon, {
+    src: icon
+  }) : icon), labelPosition === "after" && size !== "small" && label && /*#__PURE__*/_react["default"].createElement(TagLabel, null, label)));
 
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.tag
@@ -131,10 +130,7 @@ var StyledDxcTag = _styledComponents["default"].div(_templateObject || (_templat
   return props.theme.height;
 });
 
-var TagContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  flex-direction: ", ";\n  width: 100%;\n  height: ", ";\n"])), function (_ref8) {
-  var labelPosition = _ref8.labelPosition;
-  return labelPosition === "before" && "row-reverse" || "row";
-}, function (props) {
+var TagContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  width: 100%;\n  height: ", ";\n"])), function (props) {
   return props.theme.height;
 });
 
@@ -146,20 +142,8 @@ var StyledButton = _styledComponents["default"].button(_templateObject4 || (_tem
   return props.theme.focusColor;
 });
 
-var TagIcon = _styledComponents["default"].img(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  overflow: hidden;\n  width: ", ";\n  height: ", ";\n"])), function (props) {
-  return props.theme.iconWidth;
-}, function (props) {
-  return props.theme.iconHeight;
-});
-
-var TagIconContainer = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  overflow: hidden;\n\n  img,\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
-  return props.theme.iconWidth;
-}, function (props) {
-  return props.theme.iconHeight;
-});
-
-var IconContainer = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  background: ", ";\n  width: ", ";\n  height: 100%;\n  justify-content: center;\n  align-items: center;\n  color: ", ";\n  min-width: ", ";\n"])), function (_ref9) {
-  var iconBgColor = _ref9.iconBgColor;
+var IconContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  background: ", ";\n  width: ", ";\n  height: 100%;\n  justify-content: center;\n  align-items: center;\n  color: ", ";\n  min-width: ", ";\n  overflow: hidden;\n  img,\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (_ref8) {
+  var iconBgColor = _ref8.iconBgColor;
   return iconBgColor;
 }, function (props) {
   return props.theme.iconSectionWidth;
@@ -167,9 +151,15 @@ var IconContainer = _styledComponents["default"].div(_templateObject7 || (_templ
   return props.theme.iconColor;
 }, function (props) {
   return props.theme.iconSectionWidth;
+}, function (props) {
+  return props.theme.iconWidth;
+}, function (props) {
+  return props.theme.iconHeight;
 });
 
-var TagLabel = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  flex-grow: 1;\n  text-align: center;\n  text-overflow: ellipsis;\n  overflow: hidden;\n  white-space: nowrap;\n"])), function (props) {
+var TagIcon = _styledComponents["default"].img(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])([""])));
+
+var TagLabel = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  flex-grow: 1;\n  text-align: center;\n  text-overflow: ellipsis;\n  overflow: hidden;\n  white-space: nowrap;\n"])), function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.theme.fontSize;