@dxc-technology/halstack-react 0.0.0-301f60b → 0.0.0-335f028

package/select/types.d.ts

@@ -53,7 +53,7 @@ declare type CommonProps = {
     /**
      * An array of objects representing the selectable options.
      */
-    options?: Option[] | OptionGroup[];
+    options: Option[] | OptionGroup[];
     /**
      * Helper text to be placed above the select.
      */
@@ -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;
     /**
@@ -105,6 +108,10 @@ declare type SingleSelect = CommonProps & {
      * option value.
      */
     multiple?: false;
+    /**
+     * Initial value of the select, only when it is uncontrolled.
+     */
+    defaultValue?: string;
     /**
      * Value of the select. If undefined, the component will be uncontrolled
      * and the value will be managed internally by the component.
@@ -113,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 & {
@@ -137,6 +144,10 @@ declare type MultipleSelect = CommonProps & {
      * option value.
      */
     multiple: true;
+    /**
+     * Initial value of the select, only when it is uncontrolled.
+     */
+    defaultValue?: string[];
     /**
      * Value of the select. If undefined, the component will be uncontrolled
      * and the value will be managed internally by the component.
@@ -149,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
@@ -159,7 +170,7 @@ declare type MultipleSelect = CommonProps & {
      */
     onBlur?: (val: {
         value: string[];
-        error: string;
+        error?: string;
     }) => void;
 };
 declare type Props = SingleSelect | MultipleSelect;
@@ -172,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/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/stack/types.d.ts

@@ -1,9 +1,24 @@
 /// <reference types="react" />
 declare type Props = {
+    /**
+     * Space applied between each child.
+     */
     gutter?: "none" | "xxxsmall" | "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge" | "xxxlarge";
+    /**
+     * If true, a divider is shown between children.
+     */
     divider?: boolean;
+    /**
+     * Alignment applied to children.
+     */
     align?: "start" | "center" | "end" | "baseline" | "stretch";
+    /**
+     * Specifies the HTML tag or component that is rendered as the wrapper element.
+     */
     as?: React.ElementType;
+    /**
+     * Custom content inside the stack.
+     */
     children: React.ReactNode;
 };
 export default Props;

package/switch/Switch.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import SwitchPropsType from "./types";
-declare const DxcSwitch: ({ 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,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");
 
@@ -38,7 +38,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,19 +49,25 @@ 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 backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
@@ -75,6 +82,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, "(Optional)")) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, optional && /*#__PURE__*/_react["default"].createElement("span", null, "(Optional)"), " ", label));
+
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme["switch"]
   }, /*#__PURE__*/_react["default"].createElement(SwitchContainer, {
@@ -83,22 +98,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 +126,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 +170,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 +184,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;