@dxc-technology/halstack-react 0.0.0-63ee6f9 → 0.0.0-64ec938

package/stack/Stack.stories.tsx

@@ -13,152 +13,251 @@ export const Chromatic = () => (
     <Title title="Default" theme="light" level={4} />
     <Container>
       <DxcStack>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+        <Placeholder height="small" width="small" />
+        <Placeholder height="medium" width="medium" />
+        <Placeholder height="large" width="large" />
+        <Placeholder height="small" width="large" />
       </DxcStack>
     </Container>
-    <Title title="Align = baseline" theme="light" level={4} />
+    <Title title="Default with divider" theme="light" level={4} />
     <Container>
-      <DxcStack align="baseline">
-        <Placeholder paddingLeft={20}></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder paddingRight={60}></Placeholder>
+      <DxcStack divider>
+        <Placeholder height="medium" width="medium" />
+        <Placeholder height="large" width="large" />
+        <Placeholder height="small" width="large" />
       </DxcStack>
     </Container>
-    <Title title="Align = center" theme="light" level={4} />
+    <Title title="Alignment with divider" theme="light" level={4} />
     <Container>
-      <DxcStack align="center">
-        <Placeholder paddingLeft={20}></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder paddingLeft={60}></Placeholder>
+      <DxcStack alignX="end" divider>
+        <Placeholder height="small" width="small" />
+        <Placeholder height="small" width="medium" />
+        <Placeholder height="medium" width="small" />
       </DxcStack>
     </Container>
-    <Title title="Align = end" theme="light" level={4} />
+    <Title title="Default with one child" theme="light" level={4} />
     <Container>
-      <DxcStack align="end">
-        <Placeholder paddingLeft={20}></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder paddingLeft={60}></Placeholder>
+      <DxcStack divider>
+        <Placeholder height="large" width="xlarge" />
       </DxcStack>
     </Container>
-    <Title title="Align = start" theme="light" level={4} />
+    <Title title="Wrap" theme="light" level={4} />
+    <FlexContainer customHeight>
+      <DxcStack wrap>
+        <Placeholder height="small" width="small" />
+        <Placeholder height="large" width="medium" />
+        <Placeholder height="medium" width="small" />
+        <Placeholder height="large" width="medium" />
+      </DxcStack>
+    </FlexContainer>
+    <Title title="No wrap in a flex container" theme="light" level={4} />
+    <FlexContainer customHeight>
+      <DxcStack>
+        <Placeholder height="small" width="small" />
+        <Placeholder height="medium" width="small" />
+        <Placeholder height="small" width="medium" />
+      </DxcStack>
+    </FlexContainer>
+    <Title title="No wrap (default)" theme="light" level={4} />
+    <Container customHeight>
+      <DxcStack>
+        <Placeholder height="small" width="medium" />
+        <Placeholder height="small" width="small" />
+      </DxcStack>
+    </Container>
+    <Title title="AlignX = start" theme="light" level={4} />
     <Container>
-      <DxcStack align="start">
-        <Placeholder paddingLeft={20}></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder paddingLeft={60}></Placeholder>
+      <DxcStack alignX="start">
+        <Placeholder height="small" width="small" />
+        <Placeholder height="large" width="medium" />
+        <Placeholder height="medium" width="small" />
+        <Placeholder height="large" width="medium" />
       </DxcStack>
     </Container>
-    <Title title="Align = stretch" theme="light" level={4} />
+    <Title title="AlignX = end" theme="light" level={4} />
     <Container>
-      <DxcStack align="stretch">
-        <Placeholder paddingLeft={20}></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder paddingLeft={60}></Placeholder>
+      <DxcStack alignX="end">
+        <Placeholder height="small" width="small" />
+        <Placeholder height="large" width="medium" />
+        <Placeholder height="medium" width="small" />
       </DxcStack>
     </Container>
-    <Title title="gutter = xxxsmall" theme="light" level={4} />
+    <Title title="AlignX = center" theme="light" level={4} />
     <Container>
-      <DxcStack gutter="xxxsmall">
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+      <DxcStack alignX="center">
+        <Placeholder height="small" width="small" />
+        <Placeholder height="large" width="medium" />
+        <Placeholder height="medium" width="small" />
+        <Placeholder height="large" width="medium" />
       </DxcStack>
     </Container>
-    <Title title="gutter = xxsmall" theme="light" level={4} />
+    <Title title="AlignX = baseline" theme="light" level={4} />
     <Container>
-      <DxcStack gutter="xxsmall">
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+      <DxcStack alignX="baseline">
+        <Placeholder height="small" width="small" />
+        <Placeholder height="large" width="medium" />
+        <Placeholder height="medium" width="small" />
       </DxcStack>
     </Container>
-    <Title title="gutter = xsmall" theme="light" level={4} />
+    <Title title="AlignX with wrapped items" theme="light" level={4} />
+    <Container customHeight>
+      <DxcStack alignX="center" wrap>
+        <Placeholder height="small" width="medium" />
+        <Placeholder height="small" width="small" />
+      </DxcStack>
+    </Container>
+    <Title title="Gutter = 0rem" theme="light" level={4} />
+    <Container>
+      <DxcStack gutter="0rem">
+        <Placeholder height="small" width="medium" />
+        <Placeholder height="large" width="small" />
+        <Placeholder height="medium" width="medium" />
+        <Placeholder height="large" width="small" />
+        <Placeholder height="small" width="medium" />
+      </DxcStack>
+    </Container>
+    <Title title="Gutter = 0.125rem" theme="light" level={4} />
     <Container>
-      <DxcStack gutter="xsmall">
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+      <DxcStack gutter="0.125rem">
+        <Placeholder height="small" width="small" />
+        <Placeholder height="large" width="medium" />
+        <Placeholder height="medium" width="small" />
       </DxcStack>
     </Container>
-    <Title title="gutter = small" theme="light" level={4} />
+    <Title title="Gutter = 0.25rem" theme="light" level={4} />
     <Container>
-      <DxcStack gutter="small">
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+      <DxcStack gutter="0.25rem">
+        <Placeholder height="small" width="medium" />
+        <Placeholder height="large" width="small" />
+        <Placeholder height="medium" width="medium" />
+        <Placeholder height="large" width="small" />
+        <Placeholder height="small" width="medium" />
       </DxcStack>
     </Container>
-    <Title title="gutter = medium" theme="light" level={4} />
+    <Title title="Gutter = 0.5rem" theme="light" level={4} />
     <Container>
-      <DxcStack gutter="medium">
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+      <DxcStack gutter="0.5rem">
+        <Placeholder height="small" width="small" />
+        <Placeholder height="large" width="medium" />
+        <Placeholder height="medium" width="small" />
       </DxcStack>
     </Container>
-    <Title title="gutter = large" theme="light" level={4} />
+    <Title title="Gutter = 0.75rem" theme="light" level={4} />
     <Container>
-      <DxcStack gutter="large">
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+      <DxcStack gutter="0.75rem">
+        <Placeholder height="small" width="medium" />
+        <Placeholder height="large" width="small" />
+        <Placeholder height="medium" width="medium" />
+        <Placeholder height="large" width="small" />
+        <Placeholder height="small" width="medium" />
       </DxcStack>
     </Container>
-    <Title title="gutter = xlarge" theme="light" level={4} />
+    <Title title="Gutter = 1rem" theme="light" level={4} />
     <Container>
-      <DxcStack gutter="xlarge">
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+      <DxcStack gutter="1rem">
+        <Placeholder height="small" width="small" />
+        <Placeholder height="large" width="medium" />
+        <Placeholder height="medium" width="small" />
       </DxcStack>
     </Container>
-    <Title title="gutter = xxlarge" theme="light" level={4} />
+    <Title title="Gutter = 1.5rem" theme="light" level={4} />
     <Container>
-      <DxcStack gutter="xxlarge">
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+      <DxcStack gutter="1.5rem">
+        <Placeholder height="small" width="medium" />
+        <Placeholder height="large" width="small" />
+        <Placeholder height="medium" width="medium" />
+        <Placeholder height="large" width="small" />
+        <Placeholder height="small" width="medium" />
       </DxcStack>
     </Container>
-    <Title title="gutter = xxxlarge" theme="light" level={4} />
+    <Title title="Gutter = 2rem & divider" theme="light" level={4} />
     <Container>
-      <DxcStack gutter="xxxlarge">
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+      <DxcStack gutter="2rem" divider>
+        <Placeholder height="small" width="small" />
+        <Placeholder height="large" width="medium" />
+        <Placeholder height="medium" width="small" />
       </DxcStack>
     </Container>
-    <Title title="gutter = xxlarge && divider" theme="light" level={4} />
+    <Title title="Gutter = 3rem" theme="light" level={4} />
     <Container>
-      <DxcStack gutter="xxlarge" divider>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+      <DxcStack gutter="3rem">
+        <Placeholder height="small" width="small" />
+        <Placeholder height="large" width="medium" />
+        <Placeholder height="medium" width="small" />
       </DxcStack>
     </Container>
-    <Title title="gutter = none" theme="light" level={4} />
+    <Title title="Gutter = 4rem" theme="light" level={4} />
     <Container>
-      <DxcStack gutter="none">
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
-        <Placeholder></Placeholder>
+      <DxcStack gutter="4rem">
+        <Placeholder height="large" width="medium" />
+        <Placeholder height="medium" width="small" />
       </DxcStack>
     </Container>
+    <Title title="Gutter = 5rem" theme="light" level={4} />
+    <Container>
+      <DxcStack gutter="5rem">
+        <Placeholder height="small" width="small" />
+        <Placeholder height="medium" width="small" />
+      </DxcStack>
+    </Container>
+    <Title title="Reverse" theme="light" level={4} />
+    <Container>
+      <DxcStack reverse>
+        <Placeholder height="small" width="medium">
+          1
+        </Placeholder>
+        <Placeholder height="large" width="small">
+          2
+        </Placeholder>
+        <Placeholder height="medium" width="medium">
+          3
+        </Placeholder>
+        <Placeholder height="large" width="small">
+          4
+        </Placeholder>
+      </DxcStack>
+    </Container>
+    <Title title="Wrapped and reversed children" theme="light" level={4} />
+    <FlexContainer customHeight>
+      <DxcStack reverse wrap>
+        <Placeholder height="small" width="medium">
+          1
+        </Placeholder>
+        <Placeholder height="large" width="small">
+          2
+        </Placeholder>
+        <Placeholder height="medium" width="medium">
+          3
+        </Placeholder>
+        <Placeholder height="large" width="small">
+          4
+        </Placeholder>
+      </DxcStack>
+    </FlexContainer>
   </>
 );
 
-const Container = styled.div`
+const FlexContainer = styled.div<{ customHeight?: boolean }>`
+  display: flex;
+  ${({ customHeight }) => customHeight && `height: 100px;`};
   background: #f2eafa;
-  padding: 10px;
 `;
 
-const Placeholder = styled.div`
-  min-height: 40px;
-  min-width: 120px;
+const Container = styled.div<{ customHeight?: boolean }>`
+  background: #f2eafa;
+  ${({ customHeight }) => customHeight && `height: 100px;`};
+`;
+
+type PlaceholderProps = {
+  width?: "xlarge" | "large" | "medium" | "small" | "auto";
+  height?: "large" | "medium" | "small" | "auto";
+};
+
+const Placeholder = styled.div<PlaceholderProps>`
+  ${({ width }) =>
+    width &&
+    `width: ${width === "xlarge" ? "350px" : width === "large" ? "150px" : width === "medium" ? "100px" : "50px"};`};
+  ${({ height }) => height && `height: ${height === "large" ? "100px" : height === "medium" ? "80px" : "50px"};`};
   border: 1px solid #a46ede;
   background-color: #e5d5f6;
-  padding-left: ${({ paddingLeft }) => `${paddingLeft ?? 0}px`};
-  padding-right: ${({ paddingRight }) => `${paddingRight ?? 0}px`};
 `;

package/stack/types.d.ts

@@ -1,24 +1,32 @@
 /// <reference types="react" />
 declare type Props = {
     /**
-     * Space applied between each child.
+     * Alignment applied to children in the main axis.
      */
-    gutter?: "none" | "xxxsmall" | "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge" | "xxxlarge";
+    alignX?: "start" | "end" | "center" | "baseline" | "stretch";
+    /**
+     * Specifies the HTML tag or component that is rendered as the wrapper element.
+     */
+    as?: React.ElementType;
     /**
      * If true, a divider is shown between children.
      */
     divider?: boolean;
     /**
-     * Alignment applied to children.
+     * Space applied between each child.
      */
-    align?: "start" | "center" | "end" | "baseline" | "stretch";
+    gutter?: "0rem" | "0.125rem" | "0.25rem" | "0.5rem" | "0.75rem" | "1rem" | "1.5rem" | "2rem" | "3rem" | "4rem" | "5rem";
     /**
-     * Specifies the HTML tag or component that is rendered as the wrapper element.
+     * Change the direction of the stack to reverse.
      */
-    as?: React.ElementType;
+    reverse?: boolean;
+    /**
+     * Sets whether the children are forced onto one column or can wrap onto multiple columns.
+     */
+    wrap?: boolean;
     /**
      * Custom content inside the stack.
      */
-    children: React.ReactNode;
+    children: React.ReactNode[] | 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");
 
@@ -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");
+  });
 });