@dxc-technology/halstack-react 0.0.0-dfcca07 → 0.0.0-dfd09f9

package/tabs/Tabs.js

@@ -9,13 +9,13 @@ 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 = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _Tabs = _interopRequireDefault(require("@material-ui/core/Tabs"));
 
@@ -27,7 +27,7 @@ var _variables = require("../common/variables.js");
 
 var _Badge = _interopRequireDefault(require("../badge/Badge"));
 
-var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
 
@@ -36,7 +36,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var DxcTabs = function DxcTabs(_ref) {
-  var activeTabIndex = _ref.activeTabIndex,
+  var defaultActiveTabIndex = _ref.defaultActiveTabIndex,
+      activeTabIndex = _ref.activeTabIndex,
       tabs = _ref.tabs,
       onTabClick = _ref.onTabClick,
       onTabHover = _ref.onTabHover,
@@ -46,10 +47,10 @@ var DxcTabs = function DxcTabs(_ref) {
       _ref$tabIndex = _ref.tabIndex,
       tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
-  var _React$useState = _react["default"].useState(0),
-      _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
-      innerActiveTabIndex = _React$useState2[0],
-      setInnerActiveTabIndex = _React$useState2[1];
+  var _useState = (0, _react.useState)(defaultActiveTabIndex !== null && defaultActiveTabIndex !== void 0 ? defaultActiveTabIndex : 0),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+      innerActiveTabIndex = _useState2[0],
+      setInnerActiveTabIndex = _useState2[1];
 
   var colorsTheme = (0, _useTheme["default"])();
   var hasLabelAndIcon = tabs && tabs.filter(function (tab) {
@@ -57,10 +58,7 @@ var DxcTabs = function DxcTabs(_ref) {
   }).length > 0;
 
   var handleChange = function handleChange(event, newValue) {
-    if (activeTabIndex == null) {
-      setInnerActiveTabIndex(newValue);
-    }
-
+    activeTabIndex !== null && activeTabIndex !== void 0 ? activeTabIndex : setInnerActiveTabIndex(newValue);
     onTabClick === null || onTabClick === void 0 ? void 0 : onTabClick(newValue);
   };
 
@@ -70,12 +68,12 @@ var DxcTabs = function DxcTabs(_ref) {
     }, /*#__PURE__*/_react["default"].createElement(TabLabelContainer, {
       hasLabelAndIcon: hasLabelAndIcon,
       iconPosition: iconPosition
-    }, tab.icon ? /*#__PURE__*/_react["default"].createElement(TabIconContainer, {
+    }, tab.icon && /*#__PURE__*/_react["default"].createElement(TabIconContainer, {
       hasLabelAndIcon: hasLabelAndIcon,
       iconPosition: iconPosition
-    }, (0, _typeof2["default"])(tab.icon) === "object" ? tab.icon : /*#__PURE__*/_react["default"].createElement(tab.icon)) : tab.iconSrc && /*#__PURE__*/_react["default"].createElement(TabIcon, {
-      src: tab.iconSrc
-    }), /*#__PURE__*/_react["default"].createElement(LabelTextContainer, null, tab.label))), tab.notificationNumber && tab.notificationNumber !== false && /*#__PURE__*/_react["default"].createElement(BadgeContainer, {
+    }, typeof tab.icon === "string" ? /*#__PURE__*/_react["default"].createElement(TabIcon, {
+      src: tab.icon
+    }) : tab.icon), /*#__PURE__*/_react["default"].createElement(LabelTextContainer, null, tab.label))), tab.notificationNumber && tab.notificationNumber !== false && /*#__PURE__*/_react["default"].createElement(BadgeContainer, {
       hasLabelAndIcon: hasLabelAndIcon,
       iconPosition: iconPosition
     }, /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
@@ -90,7 +88,7 @@ var DxcTabs = function DxcTabs(_ref) {
     hasLabelAndIcon: hasLabelAndIcon,
     iconPosition: iconPosition
   }, /*#__PURE__*/_react["default"].createElement(Underline, null), /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
-    value: activeTabIndex != null ? activeTabIndex : innerActiveTabIndex,
+    value: activeTabIndex !== null && activeTabIndex !== void 0 ? activeTabIndex : innerActiveTabIndex,
     onChange: handleChange,
     variant: "scrollable",
     scrollButtons: "auto"
@@ -201,7 +199,7 @@ var DxCTabs = _styledComponents["default"].div(_templateObject7 || (_templateObj
   return props.theme.scrollButtonsWidth;
 });
 
-var TabIcon = _styledComponents["default"].img(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: 22px;\n  max-width: 22px;\n"])));
+var TabIcon = _styledComponents["default"].img(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])([""])));
 
 var TabIconContainer = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (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) {
   return props.hasLabelAndIcon && props.iconPosition === "top" && "8px" || "";

package/tabs/Tabs.stories.tsx

@@ -1,5 +1,4 @@
 import React from "react";
-import { userEvent, within } from "@storybook/testing-library";
 import DxcTabs from "./Tabs";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
@@ -9,14 +8,12 @@ export default {
   component: DxcTabs,
 };
 
-const iconSVG = () => {
-  return (
-    <svg viewBox="0 0 24 24" fill="currentColor">
-      <path d="M0 0h24v24H0z" fill="none" />
-      <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
-    </svg>
-  );
-};
+const iconSVG = (
+  <svg viewBox="0 0 24 24" fill="currentColor">
+    <path d="M0 0h24v24H0z" fill="none" />
+    <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
+  </svg>
+);
 
 const tabs: any = [
   {
@@ -84,10 +81,9 @@ export const Chromatic = () => (
     <ExampleContainer>
       <Title title="Scrollable" theme="light" level={4} />
       <div style={{ width: "400px" }}>
-        <DxcTabs tabs={tabsNotificationIcon} iconPosition="left" activeTabIndex={1} />
+        <DxcTabs tabs={tabsNotificationIcon} iconPosition="left" defaultActiveTabIndex={1} />
       </div>
     </ExampleContainer>
-
     <Title title="Margins" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Xxsmall margin" theme="light" level={4} />
@@ -116,6 +112,7 @@ export const Chromatic = () => (
     <ExampleContainer>
       <Title title="Xxlarge margin" theme="light" level={4} />
       <DxcTabs tabs={tabs} margin="xxlarge" />
+      <hr />
     </ExampleContainer>
   </>
 );

package/tabs/Tabs.test.js

@@ -0,0 +1,140 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _Tabs = _interopRequireDefault(require("./Tabs"));
+
+var sampleTabs = [{
+  label: "Tab-1"
+}, {
+  label: "Tab-2"
+}, {
+  label: "Tab-3"
+}];
+var sampleTabsWithBadge = [{
+  label: "Tab-1",
+  notificationNumber: "10"
+}, {
+  label: "Tab-2",
+  notificationNumber: "20"
+}, {
+  label: "Tab-3",
+  notificationNumber: "101"
+}];
+describe("Tabs component tests", function () {
+  test("Tabs render with correct labels", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
+      tabs: sampleTabs
+    })),
+        getByText = _render.getByText,
+        getAllByRole = _render.getAllByRole;
+
+    var tabs = getAllByRole("tab");
+    expect(getByText("Tab-1")).toBeTruthy();
+    expect(getByText("Tab-2")).toBeTruthy();
+    expect(getByText("Tab-3")).toBeTruthy();
+    expect(tabs[0].getAttribute("aria-selected")).toBe("true");
+    expect(tabs[1].getAttribute("aria-selected")).toBe("false");
+    expect(tabs[2].getAttribute("aria-selected")).toBe("false");
+  });
+  test("Tabs render with correct labels and badges", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
+      tabs: sampleTabsWithBadge
+    })),
+        getByText = _render2.getByText;
+
+    expect(getByText("10")).toBeTruthy();
+    expect(getByText("20")).toBeTruthy();
+    expect(getByText("+99")).toBeTruthy();
+  });
+  test("Tabs render with an initially active tab", function () {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
+      defaultActiveTabIndex: 2,
+      tabs: sampleTabsWithBadge
+    })),
+        getAllByRole = _render3.getAllByRole;
+
+    var tabs = getAllByRole("tab");
+    expect(tabs[0].getAttribute("aria-selected")).toBe("false");
+    expect(tabs[1].getAttribute("aria-selected")).toBe("false");
+    expect(tabs[2].getAttribute("aria-selected")).toBe("true");
+  });
+  test("Tabs render with correct icons", function () {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
+      tabs: [{
+        label: "Tab-1",
+        icon: "/testIcon1.png"
+      }, {
+        label: "Tab-2",
+        icon: "/testIcon2.png"
+      }, {
+        label: "Tab-3",
+        icon: "/testIcon3.png"
+      }]
+    })),
+        getAllByRole = _render4.getAllByRole;
+
+    expect(getAllByRole("img")[0].getAttribute("src")).toBe("/testIcon1.png");
+    expect(getAllByRole("img")[1].getAttribute("src")).toBe("/testIcon2.png");
+    expect(getAllByRole("img")[2].getAttribute("src")).toBe("/testIcon3.png");
+  });
+  test("Tabs render with disabled tab", function () {
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
+      tabs: [{
+        label: "Tab-1",
+        isDisabled: true
+      }, {
+        label: "Tab-2"
+      }]
+    })),
+        getAllByRole = _render5.getAllByRole;
+
+    expect(getAllByRole("tab")[0].hasAttribute("disabled")).toBeTruthy();
+    expect(getAllByRole("tab")[1].hasAttribute("disabled")).toBeFalsy();
+  });
+  test("Uncontrolled tabs", function () {
+    var onTabClick = jest.fn();
+
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
+      tabs: sampleTabs,
+      onTabClick: onTabClick
+    })),
+        getByText = _render6.getByText;
+
+    var tab1 = getByText("Tab-1");
+    var tab2 = getByText("Tab-2");
+
+    _react2.fireEvent.click(tab2);
+
+    expect(onTabClick).toHaveBeenCalledWith(1);
+
+    _react2.fireEvent.click(tab1);
+
+    expect(onTabClick).toHaveBeenCalledWith(0);
+  });
+  test("Controlled tabs", function () {
+    var onTabClick = jest.fn();
+
+    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
+      tabs: sampleTabs,
+      onTabClick: onTabClick,
+      activeTabIndex: 0
+    })),
+        getByText = _render7.getByText;
+
+    var tab2 = getByText("Tab-2");
+    var tab3 = getByText("Tab-3");
+
+    _react2.fireEvent.click(tab2);
+
+    expect(onTabClick).toHaveBeenCalledWith(1);
+
+    _react2.fireEvent.click(tab3);
+
+    expect(onTabClick).toHaveBeenCalledWith(2);
+  });
+});

package/tabs/types.d.ts

@@ -6,20 +6,8 @@ declare type Margin = {
     left?: Space;
     right?: Space;
 };
-declare type SVG = React.SVGProps<SVGSVGElement> | React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
-declare type Tab = {
-    /**
-     * Tab label.
-     */
-    label?: string;
-    /**
-     * Element used as the icon that will be displayed in the tab.
-     */
-    icon?: SVG;
-    /**
-     * @deprecated URL of the icon to be displayed in the tab.
-     */
-    iconSrc?: string;
+declare type SVG = React.SVGProps<SVGSVGElement>;
+declare type TabCommonProps = {
     /**
      * Whether the tab is disabled or not.
      */
@@ -33,15 +21,39 @@ declare type Tab = {
      */
     notificationNumber?: boolean | number;
 };
+declare type TabLabelProps = TabCommonProps & {
+    /**
+     * Tab label.
+     */
+    label: string;
+    /**
+     * Element or path used as the icon that will be displayed in the tab.
+     */
+    icon?: string | SVG;
+};
+declare type TabIconProps = TabCommonProps & {
+    /**
+     * Tab label.
+     */
+    label?: string;
+    /**
+     * Element or path used as the icon that will be displayed in the tab.
+     */
+    icon: string | SVG;
+};
 declare type Props = {
     /**
      * An array of objects representing the tabs.
      */
-    tabs: Tab[];
+    tabs: (TabLabelProps | TabIconProps)[];
     /**
      * Whether the icon should appear above or to the left of the label.
      */
     iconPosition?: "top" | "left";
+    /**
+     * Initially active tab, only when it is uncontrolled.
+     */
+    defaultActiveTabIndex?: number;
     /**
      * The index of the active tab. If undefined, the component will be
      * uncontrolled and the active tab will be managed internally by the component.

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, {
+  }, 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), size !== "small" && label && /*#__PURE__*/_react["default"].createElement(TagLabel, null, label)));
 
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.tag
@@ -146,19 +145,7 @@ 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 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 (_ref9) {
   var iconBgColor = _ref9.iconBgColor;
   return iconBgColor;
 }, function (props) {
@@ -167,9 +154,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;

package/tag/Tag.stories.tsx

@@ -9,29 +9,22 @@ export default {
   component: DxcTag,
 };
 
-const icon = () => {
-  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 largeIcon = () => {
-  return (
-    <svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="currentColor">
-      <path d="M0 0h24v24H0V0z" fill="none" />
-      <path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm.5-13H11v6l5.25 3.15.75-1.23-4.5-2.67z" />
-    </svg>
-  );
-};
+const icon = (
+  <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 largeIcon = (
+  <svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="currentColor">
+    <path d="M0 0h24v24H0V0z" fill="none" />
+    <path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm.5-13H11v6l5.25 3.15.75-1.23-4.5-2.67z" />
+  </svg>
+);
 
 export const Chromatic = () => (
   <>
-    <ExampleContainer>
-      <Title title="Without label" theme="light" level={4} />
-      <DxcTag />
-    </ExampleContainer>
     <ExampleContainer>
       <Title title="With icon" theme="light" level={4} />
       <DxcTag icon={icon} />
@@ -46,7 +39,10 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With label and icon" theme="light" level={4} />
-      <DxcTag label="Tag" icon={icon} />
+      <DxcTag
+        label="Tag"
+        icon="https://iconape.com/wp-content/files/yd/367773/svg/logo-linkedin-logo-icon-png-svg.png"
+      />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With right icon" theme="light" level={4} />
@@ -102,37 +98,38 @@ export const Chromatic = () => (
     <Title title="Sizes" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Small size" theme="light" level={4} />
-      <DxcTag label="Small" size="small" />
+      <DxcTag label="Small" size="small" icon={icon} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium size" theme="light" level={4} />
-      <DxcTag label="Medium size medium s" size="medium" />
+      <DxcTag label="Medium size medium s" size="medium" icon={icon} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium size with ellipsis" theme="light" level={4} />
-      <DxcTag label="Medium size medium si medium" size="medium" />
+      <DxcTag label="Medium size medium si medium" size="medium" icon={icon} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Large size" theme="light" level={4} />
-      <DxcTag label="Large size large size large size large size large size" size="large" />
+      <DxcTag label="Large size large size large size large size large size" size="large" icon={icon} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Large size with ellipsis" theme="light" level={4} />
-      <DxcTag label="Large size large size large size large size large size large size" size="large" />
+      <DxcTag label="Large size large size large size large size large size large size" size="large" icon={icon} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="FillParent size" theme="light" level={4} />
-      <DxcTag label="FillParent" size="fillParent" />
+      <DxcTag label="FillParent" size="fillParent" icon={icon} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="FitContent size" theme="light" level={4} />
-      <DxcTag label="FitContent" size="fitContent" />
+      <DxcTag label="FitContent" size="fitContent" icon={icon} />
     </ExampleContainer>
+    <hr />
   </>
 );
 
 const LinkTag = () => (
-  <ExampleContainer>
+  <ExampleContainer expanded>
     <Title title="Hover link tag" theme="light" level={4} />
     <DxcTag label="Tag" icon={icon} linkHref="https://www.dxc.com" />
   </ExampleContainer>

package/tag/Tag.test.js

@@ -0,0 +1,60 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _Tag = _interopRequireDefault(require("./Tag"));
+
+describe("Tag component tests", function () {
+  test("Tag renders with correct label", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
+      label: "tag-test"
+    })),
+        getByText = _render.getByText;
+
+    expect(getByText("tag-test")).toBeTruthy();
+  });
+  test("Tag renders with correct label before", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
+      label: "tag-test",
+      labelPosition: "before"
+    })),
+        getByText = _render2.getByText;
+
+    expect(getByText("tag-test")).toBeTruthy();
+  });
+  test("Tag renders with correct icon", function () {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
+      label: "tag-test",
+      icon: "/test-icon.jpg"
+    })),
+        getByRole = _render3.getByRole;
+
+    expect(getByRole("img").getAttribute("src")).toBe("/test-icon.jpg");
+  });
+  test("Tag renders with link href", function () {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
+      label: "tag-test",
+      linkHref: "/test/page"
+    })),
+        getByRole = _render4.getByRole;
+
+    expect(getByRole("link").getAttribute("href")).toBe("/test/page");
+  });
+  test("Call correct function on click", function () {
+    var onClick = jest.fn();
+
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tag["default"], {
+      label: "tag-test",
+      onClick: onClick
+    })),
+        getByText = _render5.getByText;
+
+    _react2.fireEvent.click(getByText("tag-test"));
+
+    expect(onClick).toHaveBeenCalled();
+  });
+});

package/tag/types.d.ts

@@ -6,20 +6,8 @@ declare type Margin = {
     left?: Space;
     right?: Space;
 };
-declare type SVG = React.SVGProps<SVGSVGElement> | React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
-declare type Props = {
-    /**
-     * Element used as the icon that will be placed next to the label.
-     */
-    icon?: SVG;
-    /**
-     * @deprecated URL of the icon.
-     */
-    iconSrc?: string;
-    /**
-     * Text to be placed next inside the tag.
-     */
-    label?: string;
+declare type SVG = React.SVGProps<SVGSVGElement>;
+declare type TagCommonProps = {
     /**
      * If defined, the tag will be displayed as an anchor, using this prop as "href".
      * Component will show some visual feedback on hover.
@@ -57,4 +45,25 @@ declare type Props = {
      */
     tabIndex?: number;
 };
+declare type TagLabelProps = TagCommonProps & {
+    /**
+     * Element or path used as the icon that will be placed next to the label.
+     */
+    icon?: string | SVG;
+    /**
+     * Text to be placed next inside the tag.
+     */
+    label: string;
+};
+declare type TagIconProps = TagCommonProps & {
+    /**
+     * Element or path used as the icon that will be placed next to the label.
+     */
+    icon: string | SVG;
+    /**
+     * Text to be placed next inside the tag.
+     */
+    label?: string;
+};
+declare type Props = TagLabelProps | TagIconProps;
 export default Props;