@dxc-technology/halstack-react 0.0.0-fdc49d2 → 0.0.0-ff5083e

package/select/types.d.ts

@@ -79,9 +79,12 @@ declare type CommonProps = {
      */
     searchable?: boolean;
     /**
-     * If it is defined, the component will change its appearance, showing
-     * the error below the select component. If it is not defined, the error
-     * messages will be managed internally, but never displayed on its own.
+     * If it is a defined value and also a truthy string, the component will
+     * change its appearance, showing the error below the select component.
+     * If the defined value is an empty string, it will reserve a space below
+     * the component for a future error, but it would not change its look. In
+     * case of being undefined or null, both the appearance and the space for
+     * the error message would not be modified.
      */
     error?: string;
     /**
@@ -117,21 +120,21 @@ declare type SingleSelect = CommonProps & {
     /**
      * This function will be called when the user selects an option.
      * An object including the current value and the error (if the value entered is not valid)
-     * will be passed to this function. If there is no error, error will be null.
+     * will be passed to this function. If there is no error, error will not be defined.
      */
     onChange?: (val: {
         value: string;
-        error: string;
+        error?: string;
     }) => void;
     /**
      * This function will be called when the select loses the focus. An
      * object including the value and the error (if the value
      * selected is not valid) will be passed to this function. If there is no error,
-     * error will be null.
+     * error will not be defined.
      */
     onBlur?: (val: {
         value: string;
-        error: string;
+        error?: string;
     }) => void;
 };
 declare type MultipleSelect = CommonProps & {
@@ -157,7 +160,7 @@ declare type MultipleSelect = CommonProps & {
      */
     onChange?: (val: {
         value: string[];
-        error: string;
+        error?: string;
     }) => void;
     /**
      * This function will be called when the select loses the focus. An
@@ -167,7 +170,7 @@ declare type MultipleSelect = CommonProps & {
      */
     onBlur?: (val: {
         value: string[];
-        error: string;
+        error?: string;
     }) => void;
 };
 declare type Props = SingleSelect | MultipleSelect;
@@ -180,12 +183,31 @@ export declare type OptionProps = {
     onClick: (option: Option) => void;
     multiple: boolean;
     visualFocused: boolean;
-    isGroupedOption: boolean;
+    isGroupedOption?: boolean;
     isLastOption: boolean;
     isSelected: boolean;
 };
 /**
- * Reference to the component.
+ * Listbox from the select component.
+ */
+export declare type ListboxProps = {
+    id: string;
+    currentValue: string | string[];
+    options: Option[] | OptionGroup[];
+    visualFocusIndex: number;
+    lastOptionIndex: number;
+    multiple: boolean;
+    optional: boolean;
+    optionalItem: Option;
+    searchable: boolean;
+    handleOptionOnClick: (option: Option) => void;
+};
+/**
+ * Reference to the listbox component.
+ */
+export declare type ListboxRefType = HTMLUListElement;
+/**
+ * Reference to the select component.
  */
 export declare type RefType = HTMLDivElement;
 export default Props;

package/sidenav/Sidenav.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import SidenavPropsType, { SidenavTitlePropsType, SidenavSubtitlePropsType, SidenavLinkPropsType } from "./types.js";
+import SidenavPropsType, { SidenavTitlePropsType, SidenavSubtitlePropsType, SidenavLinkPropsType } from "./types";
 declare const DxcSidenav: {
     ({ padding, children }: SidenavPropsType): JSX.Element;
     Title: ({ children }: SidenavTitlePropsType) => JSX.Element;

package/sidenav/Sidenav.js

@@ -21,6 +21,8 @@ var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _BackgroundColorContext = require("../BackgroundColorContext");
 
+var _SidenavContext = require("../layout/SidenavContext");
+
 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); }
@@ -33,7 +35,7 @@ var DxcSidenav = function DxcSidenav(_ref) {
   var colorsTheme = (0, _useTheme["default"])();
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.sidenav
-  }, /*#__PURE__*/_react["default"].createElement(SideNavContainer, {
+  }, /*#__PURE__*/_react["default"].createElement(SidenavContainer, {
     padding: padding
   }, /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
     color: colorsTheme.sidenav.backgroundColor
@@ -42,12 +44,12 @@ var DxcSidenav = function DxcSidenav(_ref) {
 
 var Title = function Title(_ref2) {
   var children = _ref2.children;
-  return /*#__PURE__*/_react["default"].createElement(SideNavMenuTitle, null, children);
+  return /*#__PURE__*/_react["default"].createElement(SidenavMenuTitle, null, children);
 };
 
 var Subtitle = function Subtitle(_ref3) {
   var children = _ref3.children;
-  return /*#__PURE__*/_react["default"].createElement(SideNavMenuSubTitle, null, children);
+  return /*#__PURE__*/_react["default"].createElement(SidenavMenuSubTitle, null, children);
 };
 
 var Link = function Link(_ref4) {
@@ -56,15 +58,24 @@ var Link = function Link(_ref4) {
       href = _ref4.href,
       onClick = _ref4.onClick,
       children = _ref4.children;
-  return /*#__PURE__*/_react["default"].createElement(SideNavMenuLink, {
+  var setIsSidenavVisibleResponsive = (0, _SidenavContext.useResponsiveSidenavVisibility)();
+
+  var handleClick = function handleClick() {
+    onClick === null || onClick === void 0 ? void 0 : onClick();
+    setIsSidenavVisibleResponsive === null || setIsSidenavVisibleResponsive === void 0 ? void 0 : setIsSidenavVisibleResponsive(false);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(SidenavMenuLink, {
     tabIndex: tabIndex,
     href: href,
-    onClick: onClick
+    onClick: handleClick
   }, children);
 };
 
-var SideNavContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  background-color: ", ";\n  max-width: 300px;\n  width: ", ";\n  padding: ", ";\n\n  overflow-y: auto;\n  overflow-x: hidden;\n  ::-webkit-scrollbar {\n    width: 2px;\n  }\n  ::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n  ::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n"])), function (props) {
+var SidenavContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  background-color: ", ";\n\n  @media (max-width: ", "rem) {\n    width: ", ";\n  }\n\n  width: ", ";\n  padding: ", ";\n\n  overflow-y: auto;\n  overflow-x: hidden;\n  ::-webkit-scrollbar {\n    width: 2px;\n  }\n  ::-webkit-scrollbar-track {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n  ::-webkit-scrollbar-thumb {\n    background-color: ", ";\n    border-radius: 3px;\n  }\n"])), function (props) {
   return props.theme.backgroundColor;
+}, _variables.responsiveSizes.medium, function (props) {
+  return props.padding ? "calc(100vw - ".concat(_variables.spaces[props.padding], " - ").concat(_variables.spaces[props.padding], ")") : "100vw";
 }, function (props) {
   return props.padding ? "calc(300px - ".concat(_variables.spaces[props.padding], " - ").concat(_variables.spaces[props.padding], ")") : "300px";
 }, function (props) {
@@ -75,7 +86,7 @@ var SideNavContainer = _styledComponents["default"].div(_templateObject || (_tem
   return props.theme.scrollBarThumbColor;
 });
 
-var SideNavMenuTitle = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  margin-bottom: 16px;\n"])), function (props) {
+var SidenavMenuTitle = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  margin-bottom: 16px;\n"])), function (props) {
   return props.theme.titleFontFamily;
 }, function (props) {
   return props.theme.titleFontSize;
@@ -91,7 +102,7 @@ var SideNavMenuTitle = _styledComponents["default"].div(_templateObject2 || (_te
   return props.theme.titleFontTextTransform;
 });
 
-var SideNavMenuSubTitle = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  margin-bottom: 4px;\n"])), function (props) {
+var SidenavMenuSubTitle = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  margin-bottom: 4px;\n"])), function (props) {
   return props.theme.subtitleFontFamily;
 }, function (props) {
   return props.theme.subtitleFontSize;
@@ -107,7 +118,7 @@ var SideNavMenuSubTitle = _styledComponents["default"].div(_templateObject3 || (
   return props.theme.subtitleFontTextTransform;
 });
 
-var SideNavMenuLink = _styledComponents["default"].a(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  text-decoration: ", ";\n  margin: ", ";\n  cursor: pointer;\n\n  :focus-visible {\n    outline: 2px solid ", ";\n    outline-offset: 1px;\n  }\n"])), function (props) {
+var SidenavMenuLink = _styledComponents["default"].a(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  text-decoration: ", ";\n  margin: ", ";\n  cursor: pointer;\n\n  :focus-visible {\n    outline: 2px solid ", ";\n    outline-offset: 1px;\n  }\n"])), function (props) {
   return props.theme.linkFontFamily;
 }, function (props) {
   return props.theme.linkFontSize;

package/slider/Slider.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import SliderPropsType from "./types";
-declare const DxcSlider: ({ label, name, value, helperText, minValue, maxValue, step, showLimitsValues, showInput, disabled, marks, onChange, onDragEnd, labelFormatCallback, margin, size, }: SliderPropsType) => JSX.Element;
+declare const DxcSlider: ({ label, name, defaultValue, value, helperText, minValue, maxValue, step, showLimitsValues, showInput, disabled, marks, onChange, onDragEnd, labelFormatCallback, margin, size, }: SliderPropsType) => JSX.Element;
 export default DxcSlider;

package/slider/Slider.js

@@ -44,6 +44,7 @@ var DxcSlider = function DxcSlider(_ref) {
       label = _ref$label === void 0 ? "" : _ref$label,
       _ref$name = _ref.name,
       name = _ref$name === void 0 ? "" : _ref$name,
+      defaultValue = _ref.defaultValue,
       value = _ref.value,
       _ref$helperText = _ref.helperText,
       helperText = _ref$helperText === void 0 ? "" : _ref$helperText,
@@ -68,7 +69,7 @@ var DxcSlider = function DxcSlider(_ref) {
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? "fillParent" : _ref$size;
 
-  var _useState = (0, _react.useState)(0),
+  var _useState = (0, _react.useState)(defaultValue !== null && defaultValue !== void 0 ? defaultValue : 0),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
       innerValue = _useState2[0],
       setInnerValue = _useState2[1];

package/slider/Slider.stories.tsx

@@ -37,7 +37,7 @@ export const Chromatic = () => (
         label="Slider"
         helperText="Help message"
         disabled
-        value={40}
+        defaultValue={40}
         minValue={0}
         maxValue={50}
         showLimitsValues
@@ -49,16 +49,16 @@ export const Chromatic = () => (
     <Title title="Variants" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Continuous slider" theme="light" level={4} />
-      <DxcSlider value={65} label="Slider" helperText="Help message" showLimitsValues />
+      <DxcSlider defaultValue={65} label="Slider" helperText="Help message" showLimitsValues />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Discrete slider" theme="light" level={4} />
-      <DxcSlider value={20} label="Slider" helperText="Help message" showLimitsValues marks step={5} />
+      <DxcSlider defaultValue={20} label="Slider" helperText="Help message" showLimitsValues marks step={5} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Discrete slider with input" theme="light" level={4} />
       <DxcSlider
-        value={20}
+        defaultValue={20}
         minValue={0}
         maxValue={50}
         label="Slider"
@@ -94,7 +94,7 @@ export const Chromatic = () => (
             label="Slider"
             helperText="Help message"
             disabled
-            value={40}
+            defaultValue={40}
             minValue={0}
             maxValue={50}
             showLimitsValues
@@ -105,16 +105,16 @@ export const Chromatic = () => (
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Continuous slider" theme="dark" level={4} />
-          <DxcSlider value={65} label="Slider" helperText="Help message" showLimitsValues />
+          <DxcSlider defaultValue={65} label="Slider" helperText="Help message" showLimitsValues />
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Discrete slider" theme="dark" level={4} />
-          <DxcSlider value={20} label="Slider" helperText="Help message" showLimitsValues marks step={5} />
+          <DxcSlider defaultValue={20} label="Slider" helperText="Help message" showLimitsValues marks step={5} />
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Discrete slider with input" theme="dark" level={4} />
           <DxcSlider
-            value={20}
+            defaultValue={20}
             minValue={0}
             maxValue={50}
             label="Slider"

package/slider/Slider.test.js

@@ -20,10 +20,25 @@ describe("Slider component tests", function () {
     expect(getByText("0")).toBeTruthy();
     expect(getByText("100")).toBeTruthy();
   });
+  test("Slider renders with correct initial value when it is uncontrolled", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+      defaultValue: 30,
+      minValue: 0,
+      maxValue: 100,
+      showLimitsValues: true,
+      showInput: true
+    })),
+        getByRole = _render2.getByRole;
+
+    var slider = getByRole("slider");
+    var input = getByRole("textbox");
+    expect(slider.getAttribute("aria-valuenow")).toBe("30");
+    expect(input.value).toBe("30");
+  });
   test("Calls correct function onChange in controlled slider", function () {
     var onChange = jest.fn();
 
-    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       onChange: onChange,
@@ -31,8 +46,10 @@ describe("Slider component tests", function () {
       value: 13,
       showInput: true
     })),
-        getByRole = _render2.getByRole;
+        getByRole = _render3.getByRole;
 
+    expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("13");
+    expect(getByRole("textbox").value).toBe("13");
     (0, _react2.act)(function () {
       _react2.fireEvent.change(getByRole("textbox"), {
         target: {
@@ -41,18 +58,20 @@ describe("Slider component tests", function () {
       });
     });
     expect(onChange).toHaveBeenCalledWith(25);
+    expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("13");
+    expect(getByRole("textbox").value).toBe("13");
   });
   test("Calls correct function onChange in uncontrolled slider", function () {
     var onChange = jest.fn();
 
-    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       onChange: onChange,
       showLimitsValues: true,
       showInput: true
     })),
-        getByRole = _render3.getByRole;
+        getByRole = _render4.getByRole;
 
     (0, _react2.act)(function () {
       _react2.fireEvent.change(getByRole("textbox"), {
@@ -62,11 +81,13 @@ describe("Slider component tests", function () {
       });
     });
     expect(onChange).toHaveBeenCalledWith(25);
+    expect(getByRole("slider").getAttribute("aria-valuenow")).toBe("25");
+    expect(getByRole("textbox").value).toBe("25");
   });
   test("Disabled slider have disabled input", function () {
     var onChange = jest.fn();
 
-    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       onChange: onChange,
@@ -75,7 +96,7 @@ describe("Slider component tests", function () {
       showInput: true,
       value: 13
     })),
-        getByRole = _render4.getByRole;
+        getByRole = _render5.getByRole;
 
     (0, _react2.act)(function () {
       _react2.fireEvent.change(getByRole("textbox"), {
@@ -90,7 +111,7 @@ describe("Slider component tests", function () {
   test("Calls correct function onDragEnd", function () {
     var onDragEnd = jest.fn();
 
-    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       showLimitsValues: true,
@@ -98,7 +119,7 @@ describe("Slider component tests", function () {
       onDragEnd: onDragEnd,
       value: 25
     })),
-        getByRole = _render5.getByRole;
+        getByRole = _render6.getByRole;
 
     (0, _react2.act)(function () {
       _react2.fireEvent.mouseDown(getByRole("slider"));
@@ -112,7 +133,7 @@ describe("Slider component tests", function () {
       return "".concat(x, "$");
     });
 
-    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
       minValue: 0,
       maxValue: 100,
       showLimitsValues: true,
@@ -120,7 +141,7 @@ describe("Slider component tests", function () {
       value: 25,
       labelFormatCallback: labelFormatCallback
     })),
-        getByText = _render6.getByText;
+        getByText = _render7.getByText;
 
     expect(getByText("0$")).toBeTruthy();
     expect(getByText("100$")).toBeTruthy();

package/slider/types.d.ts

@@ -14,6 +14,10 @@ declare type Props = {
      * Name attribute of the input element.
      */
     name?: string;
+    /**
+     * Initial value of the slider, only when it is uncontrolled.
+     */
+    defaultValue?: number;
     /**
      * The selected value. If undefined, the component will be uncontrolled and the value will be managed internally by the component.
      */

package/spinner/Spinner.js

@@ -199,7 +199,7 @@ var SVGSpinner = _styledComponents["default"].svg(_templateObject8 || (_template
 var CircleSpinner = _styledComponents["default"].circle(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  fill: transparent;\n  stroke-linecap: initial;\n  vector-effect: non-scaling-stroke;\n  animation: ", ";\n  stroke: ", ";\n  transform-origin: ", ";\n  stroke-dasharray: ", ";\n  stroke-width: ", ";\n  stroke-dashoffset: ", ";\n"])), function (props) {
   return props.isDeterminated ? "none" : props.mode !== "small" ? "1.4s ease-in-out infinite both svg-circle-large" : "1.4s ease-in-out infinite both svg-circle-small";
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.trackCircleColorOnDark : props.theme.trackCircleColor;
+  return props.backgroundType === "dark" || props.mode === "overlay" ? props.theme.trackCircleColorOverlay : props.theme.trackCircleColor;
 }, function (props) {
   return !props.isDeterminated ? "50% 50%" : "";
 }, function (props) {

package/switch/Switch.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import SwitchPropsType from "./types";
-declare const DxcSwitch: ({ defaultChecked, checked, value, label, labelPosition, name, disabled, onChange, required, margin, size, tabIndex, }: SwitchPropsType) => JSX.Element;
+declare const DxcSwitch: ({ defaultChecked, checked, value, label, labelPosition, name, disabled, optional, onChange, margin, size, tabIndex, }: SwitchPropsType) => JSX.Element;
 export default DxcSwitch;

package/switch/Switch.js

@@ -21,8 +21,6 @@ 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");
@@ -31,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;
@@ -51,9 +51,9 @@ 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,
@@ -72,6 +72,7 @@ var DxcSwitch = function DxcSwitch(_ref) {
       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) {
@@ -84,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, {
@@ -92,7 +101,7 @@ 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,
@@ -105,13 +114,7 @@ var DxcSwitch = function DxcSwitch(_ref) {
     value: value,
     disabled: disabled,
     disableRipple: true
-  }), /*#__PURE__*/_react["default"].createElement(LabelContainer, {
-    id: labelId,
-    labelPosition: labelPosition,
-    onClick: !disabled && handlerSwitchChange,
-    disabled: disabled,
-    backgroundType: backgroundType
-  }, required && /*#__PURE__*/_react["default"].createElement(_RequiredComponent["default"], null), label)));
+  }), labelPosition === "after" && labelComponent));
 };
 
 var sizes = {
@@ -126,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  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) {
@@ -172,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;
@@ -186,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

@@ -26,16 +26,16 @@ export const Chromatic = () => (
       <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} />
@@ -52,16 +52,16 @@ export const Chromatic = () => (
           <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} />

package/switch/types.d.ts

@@ -42,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;