@dxc-technology/halstack-react 0.0.0-ebf4fe2 → 0.0.0-ec06b53

package/header/Header.js

@@ -19,8 +19,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _AppBar = _interopRequireDefault(require("@material-ui/core/AppBar"));
-
 var _Dropdown = _interopRequireDefault(require("../dropdown/Dropdown"));
 
 var _Icons = require("./Icons");
@@ -67,30 +65,37 @@ var Dropdown = function Dropdown(props) {
 var HeaderDropdown = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  button {\n    background-color: transparent;\n    :hover {\n      background-color: transparent;\n    }\n  }\n"])));
 
 var getLogoElement = function getLogoElement(themeInput, logoLabel) {
-  if (!themeInput) {
-    return _Icons.dxcLogo;
-  }
-
-  if (typeof themeInput === "string") {
-    return /*#__PURE__*/_react["default"].createElement(LogoImg, {
-      alt: logoLabel,
-      src: themeInput
-    });
-  }
-
-  return themeInput;
+  if (!themeInput) return _Icons.dxcLogo;else if (typeof themeInput === "string") return /*#__PURE__*/_react["default"].createElement(LogoImg, {
+    alt: logoLabel,
+    src: themeInput
+  });else return themeInput;
 };
 
-var DxcHeader = function DxcHeader(_ref) {
-  var _ref$underlined = _ref.underlined,
-      underlined = _ref$underlined === void 0 ? false : _ref$underlined,
-      content = _ref.content,
+var Content = function Content(_ref) {
+  var isResponsive = _ref.isResponsive,
       responsiveContent = _ref.responsiveContent,
-      onClick = _ref.onClick,
-      margin = _ref.margin,
+      handleMenu = _ref.handleMenu,
       padding = _ref.padding,
-      _ref$tabIndex = _ref.tabIndex,
-      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
+      content = _ref.content;
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
+  return isResponsive ? /*#__PURE__*/_react["default"].createElement(MenuContent, {
+    backgroundType: backgroundType
+  }, responsiveContent(handleMenu)) : /*#__PURE__*/_react["default"].createElement(ContentContainer, {
+    padding: padding,
+    backgroundType: backgroundType
+  }, content);
+};
+
+var DxcHeader = function DxcHeader(_ref2) {
+  var _ref2$underlined = _ref2.underlined,
+      underlined = _ref2$underlined === void 0 ? false : _ref2$underlined,
+      content = _ref2.content,
+      responsiveContent = _ref2.responsiveContent,
+      onClick = _ref2.onClick,
+      margin = _ref2.margin,
+      padding = _ref2.padding,
+      _ref2$tabIndex = _ref2.tabIndex,
+      tabIndex = _ref2$tabIndex === void 0 ? 0 : _ref2$tabIndex;
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var ref = (0, _react.useRef)(null);
@@ -106,17 +111,7 @@ var DxcHeader = function DxcHeader(_ref) {
       setIsMenuVisible = _useState4[1];
 
   var handleResize = function handleResize() {
-    setIsResponsive(window.matchMedia("(max-width: ".concat(_variables.responsiveSizes.medium, "rem)")).matches && !isResponsive);
-  };
-
-  var ContentContainerComponent = function ContentContainerComponent() {
-    var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
-    return isResponsive && /*#__PURE__*/_react["default"].createElement(MenuContent, {
-      backgroundType: backgroundType
-    }, responsiveContent(handleMenu)) || /*#__PURE__*/_react["default"].createElement(ContentContainer, {
-      padding: padding,
-      backgroundType: backgroundType
-    }, content);
+    setIsResponsive(window.matchMedia("(max-width: ".concat(_variables.responsiveSizes.medium, "rem)")).matches);
   };
 
   var handleMenu = function handleMenu() {
@@ -134,67 +129,74 @@ var DxcHeader = function DxcHeader(_ref) {
     return getLogoElement(colorsTheme.header.logoResponsive, translatedLabels.formFields.logoAlternativeText);
   }, [colorsTheme.header.logoResponsive]);
   (0, _react.useEffect)(function () {
-    if (ref.current) {
-      window.addEventListener("resize", handleResize);
-      handleResize();
-    }
-
+    handleResize();
+    window.addEventListener("resize", handleResize);
     return function () {
       window.removeEventListener("resize", handleResize);
     };
   }, []);
+  (0, _react.useEffect)(function () {
+    !isResponsive && setIsMenuVisible(false);
+  }, [isResponsive]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.header
   }, /*#__PURE__*/_react["default"].createElement(HeaderContainer, {
-    $underlined: underlined,
-    position: "static",
+    underlined: underlined,
     margin: margin,
     ref: ref
   }, /*#__PURE__*/_react["default"].createElement(LogoAnchor, {
-    tabIndex: typeof onClick === "function" ? tabIndex : -1,
-    interactuable: typeof onClick === "function",
+    tabIndex: onClick ? tabIndex : -1,
+    interactuable: onClick ? true : false,
     onClick: onClick
   }, /*#__PURE__*/_react["default"].createElement(LogoContainer, null, headerLogo)), isResponsive && responsiveContent && /*#__PURE__*/_react["default"].createElement(MainContainer, null, /*#__PURE__*/_react["default"].createElement(ChildContainer, {
     padding: padding
-  }, /*#__PURE__*/_react["default"].createElement(HamburguerItem, {
+  }, /*#__PURE__*/_react["default"].createElement(HamburguerTrigger, {
     tabIndex: tabIndex,
-    underlined: underlined,
     onClick: handleMenu
-  }, hamburgerIcon, /*#__PURE__*/_react["default"].createElement(HamburguerTitle, null, "Menu"))), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(ResponsiveMenu, {
+  }, hamburgerIcon, translatedLabels.header.hamburguerTitle)), /*#__PURE__*/_react["default"].createElement(ResponsiveMenu, {
     hasVisibility: isMenuVisible
-  }, /*#__PURE__*/_react["default"].createElement(ResponsiveLogoContainer, null, headerResponsiveLogo), /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
-    color: colorsTheme.header.menuBackgroundColor
-  }, /*#__PURE__*/_react["default"].createElement(ContentContainerComponent, null)), /*#__PURE__*/_react["default"].createElement(CloseContainer, {
+  }, /*#__PURE__*/_react["default"].createElement(ResponsiveIconsContainer, null, /*#__PURE__*/_react["default"].createElement(ResponsiveLogoContainer, null, headerResponsiveLogo), /*#__PURE__*/_react["default"].createElement(CloseAction, {
     tabIndex: tabIndex,
     onClick: handleMenu,
-    className: "closeIcon"
-  }, closeIcon)), /*#__PURE__*/_react["default"].createElement(Overlay, {
+    "aria-label": translatedLabels.header.closeIcon
+  }, closeIcon)), /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
+    color: colorsTheme.header.menuBackgroundColor
+  }, /*#__PURE__*/_react["default"].createElement(Content, {
+    isResponsive: isResponsive,
+    responsiveContent: responsiveContent,
+    handleMenu: handleMenu,
+    padding: padding,
+    content: content
+  }))), /*#__PURE__*/_react["default"].createElement(Overlay, {
     onClick: handleMenu,
     hasVisibility: isMenuVisible
-  }))), !isResponsive && /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
+  })), !isResponsive && /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
     color: colorsTheme.header.backgroundColor
-  }, /*#__PURE__*/_react["default"].createElement(ContentContainerComponent, null))));
+  }, /*#__PURE__*/_react["default"].createElement(Content, {
+    isResponsive: isResponsive,
+    responsiveContent: responsiveContent,
+    handleMenu: handleMenu,
+    padding: padding,
+    content: content
+  }))));
 };
 
 DxcHeader.Dropdown = Dropdown;
-var HeaderContainer = (0, _styledComponents["default"])(_AppBar["default"])(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-bottom: ", ";\n\n  &.MuiAppBar-colorPrimary {\n    background-color: ", ";\n    border-bottom: ", ";\n\n    &.MuiPaper-elevation4 {\n      box-shadow: none;\n    }\n    .ChildComponents {\n      display: flex;\n      align-items: center;\n    }\n  }\n  & {\n    min-height: ", ";\n  }\n  &.MuiAppBar-root {\n    flex-direction: row;\n    align-items: center;\n    padding: ", ";\n    justify-content: space-between;\n  }\n"])), function (props) {
+
+var HeaderContainer = _styledComponents["default"].header(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-bottom: ", ";\n  padding: ", ";\n  background-color: ", ";\n  border-bottom: ", ";\n  min-height: ", ";\n  box-shadow: none;\n  display: flex;\n  align-items: center;\n  flex-direction: row;\n  justify-content: space-between;\n  box-sizing: border-box;\n"])), function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
+}, function (props) {
+  return "".concat(props.theme.paddingTop, " ").concat(props.theme.paddingRight, " ").concat(props.theme.paddingBottom, " ").concat(props.theme.paddingLeft);
 }, function (props) {
   return props.theme.backgroundColor;
 }, function (props) {
-  return props.$underlined && "".concat(props.theme.underlinedThickness, " ").concat(props.theme.underlinedStyle, " ").concat(props.theme.underlinedColor);
+  return props.underlined && "".concat(props.theme.underlinedThickness, " ").concat(props.theme.underlinedStyle, " ").concat(props.theme.underlinedColor);
 }, function (props) {
   return props.theme.minHeight;
-}, function (props) {
-  return "".concat(props.theme.paddingTop, " ").concat(props.theme.paddingRight, " ").concat(props.theme.paddingBottom, " ").concat(props.theme.paddingLeft);
 });
 
-var LogoAnchor = _styledComponents["default"].a(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  ", "\n"])), function (props) {
-  if (!props.interactuable) {
-    return "cursor: default; outline:none;";
-  }
-
-  return "cursor: pointer;";
+var LogoAnchor = _styledComponents["default"].a(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  ", ";\n"])), function (props) {
+  return props.interactuable ? "cursor: pointer" : "cursor: default; outline:none";
 });
 
 var LogoImg = _styledComponents["default"].img(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: ", ";\n  width: ", ";\n"])), function (props) {
@@ -235,15 +237,13 @@ var ContentContainer = _styledComponents["default"].div(_templateObject7 || (_te
   return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.left ? _variables.spaces[props.padding.left] : "";
 });
 
-var HamburguerItem = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  align-items: center;\n  width: 54px;\n  cursor: pointer;\n  :hover {\n    background-color: ", ";\n  }\n  &:focus {\n    outline: ", " auto 1px;\n  }\n  & > svg {\n    fill: ", ";\n  }\n"])), function (props) {
+var HamburguerTrigger = _styledComponents["default"].button(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  align-items: center;\n  width: 54px;\n  cursor: pointer;\n  border: 1px solid transparent;\n  border-radius: 2px;\n  background-color: transparent;\n  :hover {\n    background-color: ", ";\n  }\n  &:focus {\n    outline: ", " auto 1px;\n  }\n  & > svg {\n    fill: ", ";\n  }\n  font-family: ", ";\n  font-style: ", ";\n  font-size: ", ";\n  text-transform: ", ";\n  font-weight: ", ";\n  color: ", ";\n"])), function (props) {
   return props.theme.hamburguerHoverColor;
 }, function (props) {
   return props.theme.hamburguerFocusColor;
 }, function (props) {
   return props.theme.hamburguerIconColor;
-});
-
-var HamburguerTitle = _styledComponents["default"].span(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-style: ", ";\n  font-size: ", ";\n  text-transform: ", ";\n  font-weight: ", ";\n  color: ", ";\n"])), function (props) {
+}, function (props) {
   return props.theme.hamburguerFontFamily;
 }, function (props) {
   return props.theme.hamburguerFontStyle;
@@ -257,9 +257,9 @@ var HamburguerTitle = _styledComponents["default"].span(_templateObject9 || (_te
   return props.theme.hamburguerFontColor;
 });
 
-var MainContainer = _styledComponents["default"].div(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-grow: 1;\n"])));
+var MainContainer = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-grow: 1;\n"])));
 
-var ResponsiveMenu = _styledComponents["default"].div(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  align-items: flex-start;\n  justify-content: space-evenly;\n  background-color: ", ";\n  position: fixed;\n  top: 0;\n  right: 0;\n  z-index: ", ";\n\n  @media (max-width: ", "rem) and (min-width: ", "rem) {\n    //tablet\n    width: ", ";\n  }\n\n  @media not((max-width: ", "rem) and (min-width: ", "rem)) {\n    //mobile phones\n    width: ", ";\n  }\n\n  height: 100vh;\n  padding: 20px;\n  transform: ", ";\n  opacity: ", ";\n  transition-property: transform, opacity;\n  transition-duration: 0.6s;\n  transition-timing-function: ease-in-out;\n  box-sizing: border-box;\n"])), function (props) {
+var ResponsiveMenu = _styledComponents["default"].div(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  background-color: ", ";\n  position: fixed;\n  top: 0;\n  right: 0;\n  z-index: ", ";\n\n  @media (max-width: ", "rem) and (min-width: ", "rem) {\n    //tablet\n    width: ", ";\n  }\n\n  @media (not((max-width: ", "rem) and (min-width: ", "rem))) {\n    //mobile phones\n    width: ", ";\n  }\n\n  height: 100vh;\n  padding: 20px;\n  transform: ", ";\n  opacity: ", ";\n  transition-property: transform, opacity;\n  transition-duration: 0.6s;\n  transition-timing-function: ease-in-out;\n  box-sizing: border-box;\n"])), function (props) {
   return props.theme.menuBackgroundColor;
 }, function (props) {
   return props.theme.menuZindex;
@@ -273,17 +273,19 @@ var ResponsiveMenu = _styledComponents["default"].div(_templateObject11 || (_tem
   return props.hasVisibility ? "1" : "0.96";
 });
 
-var ResponsiveLogoContainer = _styledComponents["default"].div(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: ", ";\n  width: ", ";\n  position: absolute;\n  top: 23px;\n  left: 20px;\n"])), function (props) {
+var ResponsiveLogoContainer = _styledComponents["default"].div(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: ", ";\n  width: ", ";\n  display: flex;\n"])), function (props) {
   return props.theme.logoHeight;
 }, function (props) {
   return props.theme.logoWidth;
 });
 
-var CloseContainer = _styledComponents["default"].div(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2["default"])(["\n  cursor: pointer;\n  :focus {\n    outline: ", " auto 1px;\n  }\n  position: fixed;\n  top: 23px;\n  right: 20px;\n  width: 24px;\n  height: 24px;\n  padding: ", ";\n"])), function (props) {
+var ResponsiveIconsContainer = _styledComponents["default"].div(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n"])));
+
+var CloseAction = _styledComponents["default"].button(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2["default"])(["\n  cursor: pointer;\n  padding: 6px;\n  height: 36px;\n  width: 36px;\n  border: 1px solid transparent;\n  border-radius: 2px;\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  background-color: transparent;\n  :focus,\n  :focus-visible {\n    outline: ", " auto 1px;\n  }\n"])), function (props) {
   return props.theme.hamburguerFocusColor;
-}, _variables.spaces.xxsmall);
+});
 
-var MenuContent = _styledComponents["default"].div(_templateObject14 || (_templateObject14 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 100%;\n  margin-top: 40px;\n  display: flex;\n  flex-direction: column;\n  align-items: flex-start;\n  color: ", ";\n"])), function (props) {
+var MenuContent = _styledComponents["default"].div(_templateObject14 || (_templateObject14 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 100%;\n  display: flex;\n  flex-direction: column;\n  align-items: flex-start;\n  color: ", ";\n"])), function (props) {
   return props.backgroundType === "dark" ? props.theme.contentColorOnDark : props.theme.contentColor;
 });
 

package/header/Header.stories.tsx

@@ -131,7 +131,7 @@ ResponsiveHeader.parameters = {
   viewport: {
     defaultViewport: "iphonex",
   },
-  chromatic: { viewports: [720] },
+  chromatic: { viewports: [375] },
 };
 
 export const ResponsiveHeaderFocus = RespHeaderFocus.bind({});
@@ -139,7 +139,7 @@ ResponsiveHeaderFocus.parameters = {
   viewport: {
     defaultViewport: "iphonex",
   },
-  chromatic: { viewports: [720] },
+  chromatic: { viewports: [375] },
 };
 ResponsiveHeaderFocus.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
@@ -151,7 +151,7 @@ ResponsiveHeaderHover.parameters = {
   viewport: {
     defaultViewport: "iphonex",
   },
-  chromatic: { viewports: [720] },
+  chromatic: { viewports: [375] },
 };
 ResponsiveHeaderHover.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
@@ -163,7 +163,7 @@ ResponsiveHeaderMenu.parameters = {
   viewport: {
     defaultViewport: "iphonex",
   },
-  chromatic: { viewports: [720] },
+  chromatic: { viewports: [375] },
 };
 ResponsiveHeaderMenu.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);

package/header/Icons.js

@@ -23,12 +23,12 @@ var dxcLogo = /*#__PURE__*/_react["default"].createElement("svg", {
   id: "path14",
   d: "M91.613-28.177v2.514H90.231V-28.15l-2.415-3.82h1.616l1.5,2.532,1.526-2.532h1.571ZM83.9-25.555A3.15,3.15,0,0,1,80.6-28.8v-.018a3.231,3.231,0,0,1,3.294-3.262,3.442,3.442,0,0,1,2.469.865l-.87,1.054a2.311,2.311,0,0,0-1.643-.64,1.891,1.891,0,0,0-1.8,1.964v.018a1.886,1.886,0,0,0,1.9,2,2.2,2.2,0,0,0,1.3-.378v-.9H83.858v-1.2h2.729v2.738A4.071,4.071,0,0,1,83.9-25.555Zm-6.416-3.261a1.913,1.913,0,0,0-1.9-1.982A1.883,1.883,0,0,0,73.7-28.835v.018a1.913,1.913,0,0,0,1.9,1.982A1.883,1.883,0,0,0,77.486-28.8Zm-1.9,3.261a3.225,3.225,0,0,1-3.33-3.243v-.018A3.255,3.255,0,0,1,75.6-32.078a3.225,3.225,0,0,1,3.331,3.243v.018A3.255,3.255,0,0,1,75.583-25.555Zm-9.173-.108V-31.97h1.382v5.045h3.133v1.261Zm-3.433-3.153a1.913,1.913,0,0,0-1.9-1.982,1.883,1.883,0,0,0-1.886,1.964v.018a1.913,1.913,0,0,0,1.9,1.982A1.883,1.883,0,0,0,62.978-28.8Zm-1.9,3.261a3.225,3.225,0,0,1-3.33-3.243v-.018a3.255,3.255,0,0,1,3.348-3.262,3.225,3.225,0,0,1,3.331,3.243v.018A3.255,3.255,0,0,1,61.075-25.555Zm-6.508-.108-3.043-4.009v4.009H50.159V-31.97h1.275l2.944,3.883V-31.97h1.364v6.306Zm-8.246,0v-2.531h-2.55v2.531H42.389V-31.97h1.382v2.5h2.55v-2.5H47.7v6.306Zm-8.432.108A3.178,3.178,0,0,1,34.666-28.8v-.018a3.2,3.2,0,0,1,3.276-3.262,3.237,3.237,0,0,1,2.478.973l-.88,1.018a2.315,2.315,0,0,0-1.606-.712,1.866,1.866,0,0,0-1.822,1.964v.018a1.87,1.87,0,0,0,1.822,1.982,2.265,2.265,0,0,0,1.651-.739l.88.891A3.206,3.206,0,0,1,37.889-25.555Zm-9.805-.108V-31.97h4.739v1.235H29.458v1.279h2.962v1.234H29.458V-26.9h3.411v1.234ZM24.322-30.69v5.027H22.939V-30.69H21.028v-1.28h5.206v1.28H24.322",
   transform: "translate(-21.028 65.555)",
-  fill: "#100f0d"
+  fill: "#010101"
 }), /*#__PURE__*/_react["default"].createElement("path", {
   id: "path16",
   d: "M75.836-76.712a8.975,8.975,0,0,1,2.246-3.9,8.393,8.393,0,0,1,6.058-2.457h9.824v-5.67H84.139a14.611,14.611,0,0,0-10.232,4.221,14.509,14.509,0,0,0-3.076,4.536,11.913,11.913,0,0,0-.973,3.271Zm0,4.325a8.978,8.978,0,0,0,2.246,3.9,8.394,8.394,0,0,0,6.058,2.457h9.824v5.67H84.139A14.611,14.611,0,0,1,73.907-64.58a14.506,14.506,0,0,1-3.076-4.536,11.91,11.91,0,0,1-.973-3.271ZM57.522-69.832l-7.5,9.473H42.581L53.818-74.55,42.581-88.739H50.02l7.5,9.472,7.5-9.472h7.439L61.225-74.55l11.237,14.19H65.023Zm-12.336-6.88a11.935,11.935,0,0,0-.973-3.271,14.515,14.515,0,0,0-3.076-4.536A14.612,14.612,0,0,0,30.9-88.739H21.081v5.67H30.9a8.394,8.394,0,0,1,6.058,2.457,8.978,8.978,0,0,1,2.246,3.9Zm0,4.325a11.932,11.932,0,0,1-.973,3.271,14.511,14.511,0,0,1-3.076,4.536A14.611,14.611,0,0,1,30.9-60.359H21.081v-5.67H30.9a8.4,8.4,0,0,0,6.058-2.457,8.981,8.981,0,0,0,2.246-3.9h5.978",
   transform: "translate(-21.049 88.739)",
-  fill: "#100f0d"
+  fill: "#603494"
 }))));
 
 exports.dxcLogo = dxcLogo;

package/header/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Padding = {
+export declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+export declare type Padding = {
     top?: Space;
     bottom?: Space;
     left?: Space;
@@ -32,6 +32,7 @@ declare type Props = {
      */
     margin?: Space;
     /**
+     * @deprecated This prop will be removed shortly, consider using the Inset component for this purpose.
      * Size of the padding to be applied to the custom area of the component
      * ('xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge').
      * You can pass an object with 'top', 'bottom', 'left' and 'right' properties in

package/inset/Inset.stories.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import Title from "../../.storybook/components/Title";
 import styled from "styled-components";
-import DxcStack from "./../stack/Stack";
+import DxcFlex from "./../flex/Flex";
 import DxcInset from "./Inset";
 
 export default {
@@ -203,15 +203,15 @@ export const Chromatic = () => (
         <Placeholder></Placeholder>
       </DxcInset>
     </Container>
-    <Title title="Inside a stack" level={4} />
+    <Title title="Inside a flex column" level={4} />
     <Container>
-      <DxcStack gutter="0.75rem" divider>
+      <DxcFlex direction="column" gap="0.75rem">
         <Placeholder></Placeholder>
         <DxcInset top="0.25rem" right="1.5rem" bottom="2rem" left="4rem">
           <Placeholder></Placeholder>
         </DxcInset>
         <Placeholder></Placeholder>
-      </DxcStack>
+      </DxcFlex>
     </Container>
   </>
 );

package/layout/ApplicationLayout.d.ts

@@ -1,11 +1,20 @@
-/// <reference types="react" />
-import AppLayoutPropsType, { AppLayoutSidenavPropsType, AppLayoutFooterPropsType, AppLayoutMainPropsType, AppLayoutHeaderPropsType } from "./types";
+import React from "react";
+import AppLayoutPropsType, { AppLayoutMainPropsType } from "./types";
 declare const DxcApplicationLayout: {
-    ({ visibilityToggleLabel, children }: AppLayoutPropsType): JSX.Element;
-    Header: ({ children }: AppLayoutHeaderPropsType) => JSX.Element;
+    ({ visibilityToggleLabel, header, sidenav, footer, children, }: AppLayoutPropsType): JSX.Element;
+    Header: {
+        ({ underlined, content, responsiveContent, onClick, margin, padding, tabIndex, }: import("../header/types").default): JSX.Element;
+        Dropdown: (props: any) => JSX.Element;
+    };
     Main: ({ children }: AppLayoutMainPropsType) => JSX.Element;
-    Footer: ({ children }: AppLayoutFooterPropsType) => JSX.Element;
-    SideNav: ({ ...childProps }: AppLayoutSidenavPropsType) => JSX.Element;
+    Footer: ({ socialLinks, bottomLinks, copyright, children, padding, margin, tabIndex, }: import("../footer/types").default) => JSX.Element;
+    SideNav: {
+        ({ children, title }: import("../sidenav/types").default): JSX.Element;
+        Section: ({ children }: import("../sidenav/types").SidenavSectionPropsType) => JSX.Element;
+        Group: ({ children, title, collapsable, icon }: import("../sidenav/types").SidenavGroupPropsType) => JSX.Element;
+        Link: React.ForwardRefExoticComponent<import("../sidenav/types").SidenavLinkPropsType & React.RefAttributes<HTMLAnchorElement>>;
+        Title: ({ children }: import("../sidenav/types").SidenavTitlePropsType) => JSX.Element;
+    };
     useResponsiveSidenavVisibility: () => (isSidenavVisible: boolean) => void;
 };
 export default DxcApplicationLayout;

package/layout/ApplicationLayout.js

@@ -13,8 +13,6 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _Header = _interopRequireDefault(require("../header/Header"));
@@ -29,13 +27,11 @@ var _variables = require("../common/variables.js");
 
 var _Icons = require("./Icons");
 
-var _uuid = require("uuid");
-
 var _SidenavContext = require("./SidenavContext");
 
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
 
 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); }
 
@@ -43,24 +39,15 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var year = new Date().getFullYear();
 
-var Header = function Header(_ref) {
+var Main = function Main(_ref) {
   var children = _ref.children;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, children);
 };
 
-var Main = function Main(_ref2) {
-  var children = _ref2.children;
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, children);
-};
-
-var Footer = function Footer(_ref3) {
-  var children = _ref3.children;
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, children);
-};
-
-var Sidenav = function Sidenav(_ref4) {
-  var childProps = (0, _extends2["default"])({}, _ref4);
-  return /*#__PURE__*/_react["default"].createElement(_Sidenav["default"], childProps, childProps.children);
+var defaultHeader = function defaultHeader() {
+  return /*#__PURE__*/_react["default"].createElement(_Header["default"], {
+    underlined: true
+  });
 };
 
 var defaultFooter = function defaultFooter() {
@@ -89,47 +76,37 @@ var defaultFooter = function defaultFooter() {
   });
 };
 
-var defaultHeader = function defaultHeader() {
-  return /*#__PURE__*/_react["default"].createElement(_Header["default"], {
-    underlined: true
-  });
-};
-
 var childTypeExists = function childTypeExists(children, childType) {
   return children.find(function (child) {
     return (child === null || child === void 0 ? void 0 : child.type) === childType;
   });
 };
 
-var DxcApplicationLayout = function DxcApplicationLayout(_ref5) {
-  var _ref5$visibilityToggl = _ref5.visibilityToggleLabel,
-      visibilityToggleLabel = _ref5$visibilityToggl === void 0 ? "" : _ref5$visibilityToggl,
-      children = _ref5.children;
-
-  var _useState = (0, _react.useState)("appLayout-".concat((0, _uuid.v4)())),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
-      appLayoutId = _useState2[0];
+var DxcApplicationLayout = function DxcApplicationLayout(_ref2) {
+  var _ref2$visibilityToggl = _ref2.visibilityToggleLabel,
+      visibilityToggleLabel = _ref2$visibilityToggl === void 0 ? "" : _ref2$visibilityToggl,
+      header = _ref2.header,
+      sidenav = _ref2.sidenav,
+      footer = _ref2.footer,
+      children = _ref2.children;
 
-  var visibilityToggleLabelId = "label-".concat(appLayoutId);
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+      isSidenavVisibleResponsive = _useState2[0],
+      setIsSidenavVisibleResponsive = _useState2[1];
 
   var _useState3 = (0, _react.useState)(false),
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      isSidenavVisibleResponsive = _useState4[0],
-      setIsSidenavVisibleResponsive = _useState4[1];
-
-  var _useState5 = (0, _react.useState)(false),
-      _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-      isResponsive = _useState6[0],
-      setIsResponsive = _useState6[1];
+      isResponsive = _useState4[0],
+      setIsResponsive = _useState4[1];
 
   var ref = (0, _react.useRef)(null);
   var translatedLabels = (0, _useTranslatedLabels["default"])();
 
   var childrenArray = _react["default"].Children.toArray(children);
 
-  var header = childTypeExists(childrenArray, _Header["default"]) || childTypeExists(childrenArray, Header) || defaultHeader();
-  var footer = childTypeExists(childrenArray, _Footer["default"]) || childTypeExists(childrenArray, Footer) || defaultFooter();
-  var sidenav = childTypeExists(childrenArray, Sidenav);
+  var headerContent = header || defaultHeader();
+  var footerContent = footer || defaultFooter();
   var main = childTypeExists(childrenArray, Main);
 
   var handleResize = function handleResize() {
@@ -142,34 +119,31 @@ var DxcApplicationLayout = function DxcApplicationLayout(_ref5) {
     });
   };
 
-  (0, _react.useEffect)(function () {
+  (0, _react.useLayoutEffect)(function () {
     handleResize();
     window.addEventListener("resize", handleResize);
     return function () {
       window.removeEventListener("resize", handleResize);
     };
-  }, [setIsResponsive]);
+  }, []);
   (0, _react.useEffect)(function () {
     !isResponsive && setIsSidenavVisibleResponsive(false);
-  }, [isResponsive, setIsSidenavVisibleResponsive]);
+  }, [isResponsive]);
   return /*#__PURE__*/_react["default"].createElement(ApplicationLayoutContainer, {
     hasSidenav: sidenav ? true : false,
     isSidenavVisible: isSidenavVisibleResponsive,
     ref: ref
-  }, /*#__PURE__*/_react["default"].createElement(HeaderContainer, null, header), sidenav && isResponsive && /*#__PURE__*/_react["default"].createElement(VisibilityToggle, null, /*#__PURE__*/_react["default"].createElement(HamburgerTrigger, {
+  }, /*#__PURE__*/_react["default"].createElement(HeaderContainer, null, headerContent), sidenav && isResponsive && /*#__PURE__*/_react["default"].createElement(VisibilityToggle, null, /*#__PURE__*/_react["default"].createElement(HamburgerTrigger, {
     onClick: handleSidenavVisibility,
-    "aria-labelledby": visibilityToggleLabel ? visibilityToggleLabelId : undefined,
     "aria-label": visibilityToggleLabel ? undefined : translatedLabels.applicationLayout.visibilityToggleTitle,
     title: translatedLabels.applicationLayout.visibilityToggleTitle
-  }, _Icons.hamburgerIcon, visibilityToggleLabel && /*#__PURE__*/_react["default"].createElement(VisibilityToggleLabel, {
-    id: visibilityToggleLabelId
-  }, visibilityToggleLabel))), /*#__PURE__*/_react["default"].createElement(BodyContainer, null, /*#__PURE__*/_react["default"].createElement(_SidenavContext.SidenavContextProvider, {
+  }, _Icons.hamburgerIcon, visibilityToggleLabel)), /*#__PURE__*/_react["default"].createElement(BodyContainer, null, /*#__PURE__*/_react["default"].createElement(_SidenavContext.SidenavContextProvider, {
     value: setIsSidenavVisibleResponsive
-  }, sidenav && (isResponsive ? isSidenavVisibleResponsive : true) && /*#__PURE__*/_react["default"].createElement(SidenavContainer, null, sidenav)), /*#__PURE__*/_react["default"].createElement(MainContainer, null, /*#__PURE__*/_react["default"].createElement(MainContentContainer, null, main), footer)));
+  }, sidenav && (isResponsive ? isSidenavVisibleResponsive : true) && /*#__PURE__*/_react["default"].createElement(SidenavContainer, null, sidenav)), /*#__PURE__*/_react["default"].createElement(MainContainer, null, /*#__PURE__*/_react["default"].createElement(MainContentContainer, null, main), footerContent)));
 };
 
 var ApplicationLayoutContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  position: absolute;\n  top: 64px;\n  bottom: 0;\n  left: 0;\n  right: 0;\n  display: flex;\n  flex-direction: column;\n\n  @media (max-width: ", "rem) {\n    ", ";\n    ", "\n  }\n"])), _variables.responsiveSizes.medium, function (props) {
-  return props.hasSidenav && "top: 112px";
+  return props.hasSidenav && "top: 116px";
 }, function (props) {
   return props.isSidenavVisible && "overflow: hidden;";
 });
@@ -178,22 +152,20 @@ var HeaderContainer = _styledComponents["default"].div(_templateObject2 || (_tem
 
 var VisibilityToggle = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  position: fixed;\n  top: 64px;\n  left: 0;\n  right: 0;\n  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  padding: 4px 16px;\n  width: 100%;\n  background-color: #f2f2f2;\n  user-select: none;\n  z-index: 2;\n"])));
 
-var HamburgerTrigger = _styledComponents["default"].button(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  gap: 10px;\n  flex-wrap: wrap;\n  align-content: center;\n  border: 0px solid transparent;\n  border-radius: 2px;\n  padding: 15px 3px;\n  background-color: transparent;\n  box-shadow: 0 0 0 2px transparent;\n  cursor: pointer;\n  :active {\n    background-color: #cccccc;\n  }\n  :focus,\n  :focus-visible {\n    outline: none;\n    box-shadow: 0 0 0 2px #0095ff;\n  }\n  & > svg {\n    height: 20px;\n    width: 20px;\n  }\n"])));
-
-var VisibilityToggleLabel = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: Open Sans, sans-serif;\n  font-weight: 600;\n  font-size: 14px;\n"])));
+var HamburgerTrigger = _styledComponents["default"].button(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  gap: 10px;\n  border: 0px solid transparent;\n  border-radius: 2px;\n  padding: 12px 4px;\n  background-color: transparent;\n  box-shadow: 0 0 0 2px transparent;\n  font-family: Open Sans, sans-serif;\n  font-weight: 600;\n  font-size: 14px;\n  color: #000;\n  cursor: pointer;\n  :active {\n    background-color: #cccccc;\n  }\n  :focus,\n  :focus-visible {\n    outline: none;\n    box-shadow: 0 0 0 2px #0095ff;\n  }\n  & > svg {\n    height: 20px;\n    width: 20px;\n  }\n"])));
 
-var BodyContainer = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  flex: 1;\n"])));
+var BodyContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  flex: 1;\n"])));
 
-var SidenavContainer = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  position: sticky;\n  top: 64px;\n  display: flex;\n  height: calc(100vh - 64px);\n  z-index: 1;\n\n  @media (max-width: ", "rem) {\n    position: fixed;\n    top: 112px;\n  }\n"])), _variables.responsiveSizes.medium);
+var SidenavContainer = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  position: sticky;\n  top: 64px;\n  display: flex;\n  height: calc(100vh - 64px);\n  z-index: 1;\n\n  @media (max-width: ", "rem) {\n    position: absolute;\n    top: 0px;\n    height: 100%;\n  }\n"])), _variables.responsiveSizes.medium);
 
-var MainContainer = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  width: 100%;\n"])));
+var MainContainer = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  width: 100%;\n"])));
 
-var MainContentContainer = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  flex: 1;\n"])));
+var MainContentContainer = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  flex: 1;\n"])));
 
-DxcApplicationLayout.Header = Header;
+DxcApplicationLayout.Header = _Header["default"];
 DxcApplicationLayout.Main = Main;
-DxcApplicationLayout.Footer = Footer;
-DxcApplicationLayout.SideNav = Sidenav;
+DxcApplicationLayout.Footer = _Footer["default"];
+DxcApplicationLayout.SideNav = _Sidenav["default"];
 DxcApplicationLayout.useResponsiveSidenavVisibility = _SidenavContext.useResponsiveSidenavVisibility;
 var _default = DxcApplicationLayout;
 exports["default"] = _default;