@dxc-technology/halstack-react 0.0.0-c25d3b6 → 0.0.0-c2834c3

package/switch/Switch.js

@@ -21,7 +21,7 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _core = require("@material-ui/core");
 
-var _RequiredComponent = _interopRequireDefault(require("../common/RequiredComponent"));
+var _uuid = require("uuid");
 
 var _variables = require("../common/variables.js");
 
@@ -29,6 +29,8 @@ var _utils = require("../common/utils.js");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
+var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
+
 var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
 
 var _templateObject, _templateObject2;
@@ -38,7 +40,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 DxcSwitch = function DxcSwitch(_ref) {
-  var checked = _ref.checked,
+  var defaultChecked = _ref.defaultChecked,
+      checked = _ref.checked,
       value = _ref.value,
       _ref$label = _ref.label,
       label = _ref$label === void 0 ? "" : _ref$label,
@@ -48,21 +51,28 @@ var DxcSwitch = function DxcSwitch(_ref) {
       name = _ref$name === void 0 ? "" : _ref$name,
       _ref$disabled = _ref.disabled,
       disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+      _ref$optional = _ref.optional,
+      optional = _ref$optional === void 0 ? false : _ref$optional,
       onChange = _ref.onChange,
-      _ref$required = _ref.required,
-      required = _ref$required === void 0 ? false : _ref$required,
       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 _useState = (0, _react.useState)(false),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      innerChecked = _useState2[0],
-      setInnerChecked = _useState2[1];
+  var _useState = (0, _react.useState)("switch-".concat((0, _uuid.v4)())),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
+      switchId = _useState2[0];
+
+  var labelId = "label-".concat(switchId);
+
+  var _useState3 = (0, _react.useState)(defaultChecked !== null && defaultChecked !== void 0 ? defaultChecked : false),
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+      innerChecked = _useState4[0],
+      setInnerChecked = _useState4[1];
 
   var colorsTheme = (0, _useTheme["default"])();
+  var translatedLabels = (0, _useTranslatedLabels["default"])();
   var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
 
   var handlerSwitchChange = function handlerSwitchChange(event) {
@@ -75,6 +85,14 @@ var DxcSwitch = function DxcSwitch(_ref) {
     } else onChange === null || onChange === void 0 ? void 0 : onChange(!checked);
   };
 
+  var labelComponent = /*#__PURE__*/_react["default"].createElement(LabelContainer, {
+    id: labelId,
+    labelPosition: labelPosition,
+    onClick: !disabled && handlerSwitchChange,
+    disabled: disabled,
+    backgroundType: backgroundType
+  }, labelPosition === "before" ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, label, " ", optional && /*#__PURE__*/_react["default"].createElement("span", null, translatedLabels.formFields.optionalLabel)) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, optional && /*#__PURE__*/_react["default"].createElement("span", null, translatedLabels.formFields.optionalLabel), " ", label));
+
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme["switch"]
   }, /*#__PURE__*/_react["default"].createElement(SwitchContainer, {
@@ -83,22 +101,20 @@ var DxcSwitch = function DxcSwitch(_ref) {
     labelPosition: labelPosition,
     size: size,
     backgroundType: backgroundType
-  }, /*#__PURE__*/_react["default"].createElement(_core.Switch, {
+  }, labelPosition === "before" && labelComponent, /*#__PURE__*/_react["default"].createElement(_core.Switch, {
     checked: checked !== null && checked !== void 0 ? checked : innerChecked,
     inputProps: {
       name: name,
+      "aria-labelledby": labelId,
+      role: "switch",
+      "aria-checked": checked !== null && checked !== void 0 ? checked : innerChecked,
       tabIndex: tabIndex
     },
     onChange: handlerSwitchChange,
     value: value,
     disabled: disabled,
     disableRipple: true
-  }), /*#__PURE__*/_react["default"].createElement(LabelContainer, {
-    labelPosition: labelPosition,
-    onClick: !disabled && handlerSwitchChange,
-    disabled: disabled,
-    backgroundType: backgroundType
-  }, required && /*#__PURE__*/_react["default"].createElement(_RequiredComponent["default"], null), label)));
+  }), labelPosition === "after" && labelComponent));
 };
 
 var sizes = {
@@ -113,10 +129,8 @@ 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 SwitchContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  display: inline-flex;\n  align-items: center;\n  flex-direction: ", ";\n  \n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n\n  .MuiSwitch-root {\n    align-items: center;\n    width: ", ";\n    height: 45px;\n    margin: 3px;\n\n    .Mui-focusVisible {\n      outline: ", ";\n      outline-offset: -3px;\n    }\n\n    .MuiSwitch-track {\n      /*Enabled and unchecked bar*/\n      background-color: ", ";\n      height: ", ";\n    }\n\n    .MuiSwitch-switchBase + .MuiSwitch-track {\n      opacity: 1;\n    }\n\n    .MuiIconButton-root {\n      /*Enabled and unchecked*/\n      top: unset;\n      .MuiSwitch-thumb {\n        /*Only for thumb in all states*/\n        width: ", ";\n        height: ", ";\n      }\n      color: ", ";\n      &:hover {\n        background-color: transparent;\n      }\n      &.Mui-disabled {\n        /*Disabled and unchecked*/\n        color: ", ";\n        + .MuiSwitch-track {\n          /*Disabled and unchecked bar*/\n          background-color: ", ";\n        }\n      }\n      &.Mui-disabled.Mui-checked {\n        /*Disabled and checked*/\n        color: ", ";\n        + .MuiSwitch-track {\n          /*Disabled and checked bar*/\n          background-color: ", ";\n        }\n      }\n      &.Mui-checked {\n        /*Enabled and checked*/\n        color: ", ";\n        transform: translateX(", ");\n        &:hover {\n          background-color: transparent;\n        }\n        + .MuiSwitch-track {\n          /*Enabled and checked bar*/\n          background-color: ", ";\n        }\n      }\n    }\n  }\n"])), function (props) {
+var SwitchContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  display: inline-flex;\n  align-items: center;\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n\n  .MuiSwitch-root {\n    align-items: center;\n    width: ", ";\n    height: 45px;\n    margin: 3px;\n\n    .Mui-focusVisible {\n      outline: ", ";\n      outline-offset: -3px;\n    }\n\n    .MuiSwitch-track {\n      /*Enabled and unchecked bar*/\n      background-color: ", ";\n      height: ", ";\n    }\n\n    .MuiSwitch-switchBase + .MuiSwitch-track {\n      opacity: 1;\n    }\n\n    .MuiIconButton-root {\n      /*Enabled and unchecked*/\n      top: unset;\n      .MuiSwitch-thumb {\n        /*Only for thumb in all states*/\n        width: ", ";\n        height: ", ";\n      }\n      color: ", ";\n      &:hover {\n        background-color: transparent;\n      }\n      &.Mui-disabled {\n        /*Disabled and unchecked*/\n        color: ", ";\n        + .MuiSwitch-track {\n          /*Disabled and unchecked bar*/\n          background-color: ", ";\n        }\n      }\n      &.Mui-disabled.Mui-checked {\n        /*Disabled and checked*/\n        color: ", ";\n        + .MuiSwitch-track {\n          /*Disabled and checked bar*/\n          background-color: ", ";\n        }\n      }\n      &.Mui-checked {\n        /*Enabled and checked*/\n        color: ", ";\n        transform: translateX(", ");\n        &:hover {\n          background-color: transparent;\n        }\n        + .MuiSwitch-track {\n          /*Enabled and checked bar*/\n          background-color: ", ";\n        }\n      }\n    }\n  }\n"])), function (props) {
   return calculateWidth(props.margin, props.size);
-}, function (props) {
-  return props.labelPosition === "after" ? "row" : "row-reverse";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -159,7 +173,7 @@ var SwitchContainer = _styledComponents["default"].div(_templateObject || (_temp
   return props.backgroundType === "dark" ? props.theme.checkedTrackBackgroundColorOnDark : props.theme.checkedTrackBackgroundColor;
 });
 
-var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  color: ", ";\n  opacity: 1;\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  cursor: ", ";\n  ", "\n"])), function (props) {
+var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  color: ", ";\n  opacity: 1;\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  cursor: ", ";\n  ", "\n\n  ", "\n"])), function (props) {
   return props.disabled ? props.backgroundType === "dark" ? props.theme.disabledLabelFontColorOnDark : props.theme.disabledLabelFontColor : props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.theme.labelFontColor;
 }, function (props) {
   return props.theme.labelFontFamily;
@@ -173,6 +187,8 @@ var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_tem
   return props.disabled === true ? "not-allowed" : "pointer";
 }, function (props) {
   return props.labelPosition === "after" ? "margin-left: ".concat(props.theme.spaceBetweenLabelSwitch, ";") : "margin-right: ".concat(props.theme.spaceBetweenLabelSwitch, ";");
+}, function (props) {
+  return props.labelPosition === "before" && "order: -1";
 });
 
 var _default = DxcSwitch;

package/switch/Switch.stories.tsx

@@ -23,23 +23,23 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Checked" theme="light" level={4} />
-      <DxcSwitch label="Switch" checked />
+      <DxcSwitch label="Switch" defaultChecked />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Required" theme="light" level={4} />
-      <DxcSwitch label="Switch" required />
+      <Title title="Optional" theme="light" level={4} />
+      <DxcSwitch label="Switch" optional />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled" theme="light" level={4} />
       <DxcSwitch label="Switch" disabled />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Disabled required" theme="light" level={4} />
-      <DxcSwitch label="Switch" disabled required labelPosition="after" />
+      <Title title="Disabled optional" theme="light" level={4} />
+      <DxcSwitch label="Switch" disabled optional labelPosition="after" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled checked" theme="light" level={4} />
-      <DxcSwitch label="Switch" disabled checked labelPosition="after" />
+      <DxcSwitch label="Switch" disabled defaultChecked labelPosition="after" />
     </ExampleContainer>
     <BackgroundColorProvider color="#333333">
       <DarkContainer>
@@ -49,23 +49,23 @@ export const Chromatic = () => (
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Checked" theme="dark" level={4} />
-          <DxcSwitch label="Switch" checked />
+          <DxcSwitch label="Switch" defaultChecked />
         </ExampleContainer>
         <ExampleContainer>
-          <Title title="Required" theme="dark" level={4} />
-          <DxcSwitch label="Switch" required />
+          <Title title="Optional" theme="dark" level={4} />
+          <DxcSwitch label="Switch" optional />
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Disabled" theme="dark" level={4} />
           <DxcSwitch label="Switch" disabled />
         </ExampleContainer>
         <ExampleContainer>
-          <Title title="Disabled required" theme="dark" level={4} />
-          <DxcSwitch label="Switch" disabled required labelPosition="after" />
+          <Title title="Disabled optional" theme="dark" level={4} />
+          <DxcSwitch label="Switch" disabled optional labelPosition="after" />
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Disabled checked" theme="dark" level={4} />
-          <DxcSwitch label="Switch" disabled checked labelPosition="after" />
+          <DxcSwitch label="Switch" disabled defaultChecked labelPosition="after" />
         </ExampleContainer>
       </DarkContainer>
     </BackgroundColorProvider>
@@ -139,7 +139,7 @@ const Switch = () => (
 export const FocusedSwitch = Switch.bind({});
 FocusedSwitch.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  canvas.getByRole("checkbox").focus();
+  canvas.getByRole("switch").focus();
 };
 
 const DarkSwitch = () => (
@@ -156,5 +156,5 @@ const DarkSwitch = () => (
 export const FocusedSwitchOnDark = DarkSwitch.bind({});
 FocusedSwitchOnDark.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  canvas.getByRole("checkbox").focus();
+  canvas.getByRole("switch").focus();
 };

package/switch/Switch.test.js

@@ -70,4 +70,29 @@ describe("Switch component tests", function () {
     expect(onChange.mock.calls[0][0]).toBe(true);
     expect(onChange.mock.calls[1][0]).toBe(false);
   });
+  test("Renders with correct initial value and initial state when it is uncontrolled", function () {
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
+      label: "Default label",
+      defaultChecked: true,
+      value: "test-defaultChecked"
+    })),
+        getByRole = _render5.getByRole;
+
+    var inputEl = getByRole("switch");
+    expect(inputEl.checked).toBe(true);
+    expect(inputEl.value).toBe("test-defaultChecked");
+    expect(inputEl.getAttribute("aria-checked")).toBe("true");
+  });
+  test("Renders with correct aria attributes", function () {
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
+      label: "Default label"
+    })),
+        getByRole = _render6.getByRole,
+        getByText = _render6.getByText;
+
+    var inputEl = getByRole("switch");
+    var label = getByText("Default label");
+    expect(inputEl.getAttribute("aria-labelledby")).toBe(label.id);
+    expect(inputEl.getAttribute("aria-checked")).toBe("false");
+  });
 });

package/switch/types.d.ts

@@ -6,6 +6,10 @@ declare type Margin = {
     right?: Space;
 };
 declare type Props = {
+    /**
+     * Initial state of the switch, only when it is uncontrolled.
+     */
+    defaultChecked?: boolean;
     /**
      * If true, the component is checked. If undefined, the component will be uncontrolled
      * and the checked attribute will be managed internally by the component.
@@ -38,9 +42,9 @@ declare type Props = {
      */
     onChange?: (checked: boolean) => void;
     /**
-     * If true, the switch will change its appearence, showing that the value is required.
+     * If true, the component will display '(Optional)' next to the label.
      */
-    required?: boolean;
+    optional?: boolean;
     /**
      * Size of the margin to be applied to the component ('xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge').
      * You can pass an object with 'top', 'bottom', 'left' and 'right' properties in order to specify different margin sizes.

package/tabs/Tabs.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import TabsPropsType from "./types";
-declare const DxcTabs: ({ activeTabIndex, tabs, onTabClick, onTabHover, margin, iconPosition, tabIndex, }: TabsPropsType) => JSX.Element;
+declare const DxcTabs: ({ defaultActiveTabIndex, activeTabIndex, tabs, onTabClick, onTabHover, margin, iconPosition, tabIndex, }: TabsPropsType) => JSX.Element;
 export default DxcTabs;

package/tabs/Tabs.js

@@ -15,7 +15,7 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 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"));
 
@@ -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);
   };
 
@@ -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"

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";
@@ -79,13 +78,6 @@ export const Chromatic = () => (
       <Title title="With icon on the left and notification number" theme="light" level={4} />
       <DxcTabs tabs={tabsNotificationIcon} iconPosition="left" />
     </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Scrollable" theme="light" level={4} />
-      <div style={{ width: "400px" }}>
-        <DxcTabs tabs={tabsNotificationIcon} iconPosition="left" activeTabIndex={1} />
-      </div>
-    </ExampleContainer>
-
     <Title title="Margins" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Xxsmall margin" theme="light" level={4} />

package/tabs/Tabs.test.js

@@ -30,11 +30,16 @@ describe("Tabs component tests", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
       tabs: sampleTabs
     })),
-        getByText = _render.getByText;
+        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"], {
@@ -46,8 +51,20 @@ describe("Tabs component tests", function () {
     expect(getByText("20")).toBeTruthy();
     expect(getByText("+99")).toBeTruthy();
   });
-  test("Tabs render with correct icons", function () {
+  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"
@@ -59,14 +76,14 @@ describe("Tabs component tests", function () {
         icon: "/testIcon3.png"
       }]
     })),
-        getAllByRole = _render3.getAllByRole;
+        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 _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
       tabs: [{
         label: "Tab-1",
         isDisabled: true
@@ -74,7 +91,7 @@ describe("Tabs component tests", function () {
         label: "Tab-2"
       }]
     })),
-        getAllByRole = _render4.getAllByRole;
+        getAllByRole = _render5.getAllByRole;
 
     expect(getAllByRole("tab")[0].hasAttribute("disabled")).toBeTruthy();
     expect(getAllByRole("tab")[1].hasAttribute("disabled")).toBeFalsy();
@@ -82,11 +99,11 @@ describe("Tabs component tests", function () {
   test("Uncontrolled tabs", function () {
     var onTabClick = jest.fn();
 
-    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
       tabs: sampleTabs,
       onTabClick: onTabClick
     })),
-        getByText = _render5.getByText;
+        getByText = _render6.getByText;
 
     var tab1 = getByText("Tab-1");
     var tab2 = getByText("Tab-2");
@@ -102,12 +119,12 @@ describe("Tabs component tests", function () {
   test("Controlled tabs", function () {
     var onTabClick = jest.fn();
 
-    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
+    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
       tabs: sampleTabs,
       onTabClick: onTabClick,
       activeTabIndex: 0
     })),
-        getByText = _render6.getByText;
+        getByText = _render7.getByText;
 
     var tab2 = getByText("Tab-2");
     var tab3 = getByText("Tab-3");

package/tabs/types.d.ts

@@ -50,6 +50,10 @@ declare type Props = {
      * 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.js

@@ -66,11 +66,11 @@ var DxcTag = function DxcTag(_ref) {
     shadowDepth: isHovered && (onClick || linkHref) && 2 || 1
   }, /*#__PURE__*/_react["default"].createElement(TagContent, {
     labelPosition: labelPosition
-  }, icon && /*#__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
   }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(TagIcon, {
     src: icon
-  }) : icon), size !== "small" && label && /*#__PURE__*/_react["default"].createElement(TagLabel, null, label)));
+  }) : icon), labelPosition === "after" && size !== "small" && label && /*#__PURE__*/_react["default"].createElement(TagLabel, null, label)));
 
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.tag
@@ -130,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;
 });
 
@@ -145,8 +142,8 @@ var StyledButton = _styledComponents["default"].button(_templateObject4 || (_tem
   return props.theme.focusColor;
 });
 
-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;
+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;

package/text-input/Suggestion.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+import { SuggestionProps } from "./types";
+declare const _default: React.MemoExoticComponent<({ id, value, onClick, suggestion, isLast, visuallyFocused, highlighted, }: SuggestionProps) => JSX.Element>;
+export default _default;

package/text-input/Suggestion.js

@@ -0,0 +1,55 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+
+var _templateObject, _templateObject2;
+
+var Suggestion = function Suggestion(_ref) {
+  var id = _ref.id,
+      value = _ref.value,
+      onClick = _ref.onClick,
+      suggestion = _ref.suggestion,
+      isLast = _ref.isLast,
+      visuallyFocused = _ref.visuallyFocused,
+      highlighted = _ref.highlighted;
+  var regEx = new RegExp(value, "i");
+  var matchedWords = suggestion.match(regEx);
+  var noMatchedWords = suggestion.replace(regEx, "");
+  return /*#__PURE__*/_react["default"].createElement(SuggestionContainer, {
+    id: id,
+    onClick: onClick,
+    visuallyFocused: visuallyFocused,
+    role: "option",
+    "aria-selected": visuallyFocused ? "true" : undefined
+  }, /*#__PURE__*/_react["default"].createElement(StyledSuggestion, {
+    last: isLast,
+    visuallyFocused: visuallyFocused
+  }, highlighted ? suggestion : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("strong", null, matchedWords), noMatchedWords)));
+};
+
+var SuggestionContainer = _styledComponents["default"].li(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  padding: 0 0.5rem;\n  line-height: 1.715em;\n  cursor: pointer;\n\n  box-shadow: inset 0 0 0 2px\n    ", ";\n  &:hover {\n    background-color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n"])), function (props) {
+  return props.visuallyFocused ? props.theme.focusListOptionBorderColor : "transparent";
+}, function (props) {
+  return props.theme.hoverListOptionBackgroundColor;
+}, function (props) {
+  return props.theme.activeListOptionBackgroundColor;
+});
+
+var StyledSuggestion = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 100%;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  padding: 0.25rem 0.5rem 0.188rem 0.5rem;\n  ", ";\n"])), function (props) {
+  return props.last || props.visuallyFocused ? "border-bottom: 1px solid transparent" : "border-bottom: 1px solid ".concat(props.theme.listOptionDividerColor);
+});
+
+var _default = /*#__PURE__*/_react["default"].memo(Suggestion);
+
+exports["default"] = _default;