@dxc-technology/halstack-react 0.0.0-74ba970 → 0.0.0-752ca0a

package/flex/Flex.stories.tsx

@@ -14,36 +14,36 @@ export const Chromatic = () => (
     <Container>
       <DxcFlex>
         <Placeholder />
-        <Placeholder width="50px" />
+        <Placeholder minWidth="50px" />
         <Placeholder />
-        <Placeholder width="50px" />
-        <Placeholder width="50px" />
+        <Placeholder minWidth="50px" />
+        <Placeholder minWidth="50px" />
       </DxcFlex>
     </Container>
     <Title title="Direction column, wrap, justify content end, align items center and gap" level={4} />
     <Container>
-      <DxcFlex direction="column" wrap="wrap" justifyContent="end" alignItems="center" gap="20px">
+      <DxcFlex direction="column" wrap="wrap" justifyContent="end" alignItems="center" gap="1.5rem">
         <Placeholder />
-        <Placeholder width="100px" />
+        <Placeholder minWidth="100px" />
         <Placeholder />
-        <Placeholder width="100px" />
+        <Placeholder minWidth="100px" />
         <Placeholder />
       </DxcFlex>
     </Container>
     <Title title="Wrap with align content space between, row and column gaps, and as a span" level={4} />
     <Container height="250px">
-      <DxcFlex wrap="wrap" alignContent="space-between" as="span" gap={{ rowGap: "10px", columnGap: "20px" }}>
+      <DxcFlex wrap="wrap" alignContent="space-between" as="span" gap={{ rowGap: "0.5rem", columnGap: "1.5rem" }}>
         <Placeholder />
         <Placeholder />
         <Placeholder />
         <Placeholder />
-        <Placeholder width="100px" />
+        <Placeholder minWidth="100px" />
         <Placeholder />
         <Placeholder />
-        <Placeholder width="100px" />
+        <Placeholder minWidth="100px" />
         <Placeholder />
         <Placeholder />
-        <Placeholder width="100px" />
+        <Placeholder minWidth="100px" />
         <Placeholder />
       </DxcFlex>
     </Container>
@@ -51,16 +51,24 @@ export const Chromatic = () => (
     <Container height="75px">
       <DxcFlex basis="100%">
         <DxcFlex order={3} grow={1} alignSelf="flex-end">
-          <PlaceholderGrowAndShrink>order 3, grow 1, align self end</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            order 3, grow 1, align self end
+          </Placeholder>
         </DxcFlex>
         <DxcFlex order={-1} grow={4}>
-          <PlaceholderGrowAndShrink>order -1, grow 4</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            order -1, grow 4
+          </Placeholder>
         </DxcFlex>
         <DxcFlex order={5} grow={1}>
-          <PlaceholderGrowAndShrink>order 5, grow 1</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            order 5, grow 1
+          </Placeholder>
         </DxcFlex>
         <DxcFlex order={2} grow={2}>
-          <PlaceholderGrowAndShrink>order 2. grow 2</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            order 2. grow 2
+          </Placeholder>
         </DxcFlex>
       </DxcFlex>
     </Container>
@@ -68,13 +76,19 @@ export const Chromatic = () => (
     <Container>
       <DxcFlex basis="600px">
         <DxcFlex shrink={4} basis="400px">
-          <PlaceholderGrowAndShrink>shrink 4</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            shrink 4
+          </Placeholder>
         </DxcFlex>
         <DxcFlex shrink={2} basis="400px">
-          <PlaceholderGrowAndShrink>shrink 2</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            shrink 2
+          </Placeholder>
         </DxcFlex>
         <DxcFlex shrink={1} basis="400px">
-          <PlaceholderGrowAndShrink>shrink 1</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            shrink 1
+          </Placeholder>
         </DxcFlex>
       </DxcFlex>
     </Container>
@@ -88,16 +102,11 @@ const Container = styled.div<{ height?: string }>`
   ${({ height }) => (height ? `height: ${height}` : "max-height: 150px")};
 `;
 
-const Placeholder = styled.div<{ width?: string }>`
+const Placeholder = styled.div<{ minWidth?: string; width?: string }>`
   height: 40px;
-  min-width: ${({ width }) => width || "200px"};
-  border: 1px solid #a46ede;
-  background-color: #e5d5f6;
-`;
-
-const PlaceholderGrowAndShrink = styled.div`
-  height: 40px;
-  width: 100%;
+  min-width: ${({ minWidth }) => minWidth ?? "200px"};
+  width: ${({ width }) => width};
   border: 1px solid #a46ede;
+  border-radius: 0.5rem;
   background-color: #e5d5f6;
 `;

package/flex/types.d.ts

@@ -1,21 +1,97 @@
 /// <reference types="react" />
+declare type Spaces = "0rem" | "0.125rem" | "0.25rem" | "0.5rem" | "1rem" | "1.5rem" | "2rem" | "3rem" | "4rem" | "5rem";
 declare type Gap = {
-    rowGap: string;
-    columnGap: string;
-};
-declare type Props = {
-    direction?: "row" | "row-reverse" | "column" | "column-reverse";
-    wrap?: "nowrap" | "wrap" | "wrap-reverse";
+    rowGap: Spaces;
+    columnGap?: Spaces;
+} | {
+    rowGap?: Spaces;
+    columnGap?: Spaces;
+} | Spaces;
+declare type CommonProps = {
+    /**
+     * Sets the justify-content CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content
+     */
     justifyContent?: "flex-start" | "flex-end" | "start" | "end" | "left" | "right" | "center" | "space-between" | "space-around" | "space-evenly";
+    /**
+     * Sets the align-items CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/align-items
+     */
     alignItems?: "stretch" | "flex-start" | "flex-end" | "start" | "end" | "self-start" | "self-end" | "center" | "baseline";
+    /**
+     * Sets the align-content CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/align-content
+     */
     alignContent?: "normal" | "flex-start" | "flex-end" | "start" | "end" | "center" | "space-between" | "space-around" | "space-evenly" | "stretch";
+    /**
+     * Sets the align-self CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/align-self
+     */
     alignSelf?: "auto" | "flex-start" | "flex-end" | "center" | "baseline" | "stretch";
-    gap?: string | Gap;
+};
+declare type Props = CommonProps & {
+    /**
+     * Sets the flex-direction CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-direction
+     */
+    direction?: "row" | "row-reverse" | "column" | "column-reverse";
+    /**
+     * Sets the flex-wrap CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-wrap
+     */
+    wrap?: "nowrap" | "wrap" | "wrap-reverse";
+    /**
+     * Sets the gap CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/gap
+     */
+    gap?: Gap;
+    /**
+     * Sets the order CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/order
+     */
     order?: number;
+    /**
+     * Sets the flex-grow CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-grow
+     */
     grow?: number;
+    /**
+     * Sets the flex-shrink CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-shrink
+     */
     shrink?: number;
+    /**
+     * Sets the flex-basis CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-basis
+     */
     basis?: string;
+    /**
+     * Sets a custom HTML tag.
+     */
     as?: keyof HTMLElementTagNameMap;
+    /**
+     * Custom content inside the flex container.
+     */
     children: React.ReactNode;
 };
+export declare type StyledProps = CommonProps & {
+    $direction?: "row" | "row-reverse" | "column" | "column-reverse";
+    $wrap?: "nowrap" | "wrap" | "wrap-reverse";
+    $gap?: Spaces | Gap;
+    $order?: number;
+    $grow?: number;
+    $shrink?: number;
+    $basis?: string;
+};
 export default Props;

package/footer/Footer.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import FooterPropsType from "./types";
-declare const DxcFooter: ({ socialLinks, bottomLinks, copyright, children, padding, margin, tabIndex, }: FooterPropsType) => JSX.Element;
+declare const DxcFooter: ({ socialLinks, bottomLinks, copyright, children, margin, tabIndex, }: FooterPropsType) => JSX.Element;
 export default DxcFooter;

package/footer/Footer.js

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
@@ -27,7 +27,9 @@ var _BackgroundColorContext = require("../BackgroundColorContext");
 
 var _Icons = require("./Icons");
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14;
+var _Flex = _interopRequireDefault(require("../flex/Flex"));
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
 
 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); }
 
@@ -38,7 +40,6 @@ var DxcFooter = function DxcFooter(_ref) {
       bottomLinks = _ref.bottomLinks,
       copyright = _ref.copyright,
       children = _ref.children,
-      padding = _ref.padding,
       margin = _ref.margin,
       _ref$tabIndex = _ref.tabIndex,
       tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
@@ -57,71 +58,56 @@ var DxcFooter = function DxcFooter(_ref) {
     }
 
     return colorsTheme.footer.logo;
-  }, [colorsTheme.footer.logo]);
-  var socialLink = socialLinks === null || socialLinks === void 0 ? void 0 : socialLinks.map(function (link, index) {
+  }, [colorsTheme]);
+  return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
+    theme: colorsTheme.footer
+  }, /*#__PURE__*/_react["default"].createElement(FooterContainer, {
+    margin: margin
+  }, /*#__PURE__*/_react["default"].createElement(_Flex["default"], {
+    justifyContent: "space-between",
+    alignItems: "center",
+    wrap: "wrap",
+    gap: "1.5rem"
+  }, /*#__PURE__*/_react["default"].createElement(LogoContainer, null, footerLogo), /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, socialLinks === null || socialLinks === void 0 ? void 0 : socialLinks.map(function (link, index) {
     return /*#__PURE__*/_react["default"].createElement(SocialAnchor, {
+      href: link.href,
       tabIndex: tabIndex,
+      title: link.title,
+      "aria-label": link.title,
       key: "social".concat(index).concat(link.href),
-      index: index,
-      href: link && link.href ? link.href : ""
-    }, /*#__PURE__*/_react["default"].createElement(SocialIconContainer, null, typeof link.logo === "string" ? /*#__PURE__*/_react["default"].createElement(SocialIconImg, {
+      index: index
+    }, /*#__PURE__*/_react["default"].createElement(SocialIconContainer, null, typeof link.logo === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
       src: link.logo
     }) : link.logo));
-  });
-  var bottomLink = bottomLinks === null || bottomLinks === void 0 ? void 0 : bottomLinks.map(function (link, index) {
+  }))), /*#__PURE__*/_react["default"].createElement(ChildComponents, null, /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
+    color: colorsTheme.footer.backgroundColor
+  }, children)), /*#__PURE__*/_react["default"].createElement(BottomContainer, null, /*#__PURE__*/_react["default"].createElement(BottomLinks, null, bottomLinks === null || bottomLinks === void 0 ? void 0 : bottomLinks.map(function (link, index) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       key: "bottom".concat(index).concat(link.text)
     }, /*#__PURE__*/_react["default"].createElement(BottomLink, {
-      tabIndex: tabIndex,
-      href: link && link.href ? link.href : ""
-    }, link && link.text ? link.text : ""), /*#__PURE__*/_react["default"].createElement(Point, {
-      index: index
-    }, "\xB7"));
-  });
-  return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme.footer
-  }, /*#__PURE__*/_react["default"].createElement(FooterContainer, {
-    margin: margin
-  }, /*#__PURE__*/_react["default"].createElement(FooterHeader, null, /*#__PURE__*/_react["default"].createElement(LogoContainer, null, footerLogo), /*#__PURE__*/_react["default"].createElement(SocialLinkContainer, null, socialLink)), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(ChildComponents, {
-    padding: padding
-  }, /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
-    color: colorsTheme.footer.backgroundColor
-  }, children)), /*#__PURE__*/_react["default"].createElement(FooterFooter, {
-    className: "footerFooter"
-  }, /*#__PURE__*/_react["default"].createElement(BottomLinks, null, bottomLink), /*#__PURE__*/_react["default"].createElement(Copyright, null, copyright || translatedLabels.footer.copyrightText(new Date().getFullYear()))))));
+      href: link.href,
+      tabIndex: tabIndex
+    }, link.text));
+  })), /*#__PURE__*/_react["default"].createElement(Copyright, null, copyright || translatedLabels.footer.copyrightText(new Date().getFullYear())))));
 };
 
-var FooterContainer = _styledComponents["default"].footer(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  @media (min-width: ", "rem) {\n    padding: 24px 36px 24px 36px;\n  }\n\n  @media (max-width: ", "rem) {\n    //mobile phones\n    padding: 20px;\n  }\n\n  background-color: ", ";\n  margin-top: ", ";\n  width: 100%;\n  box-sizing: border-box;\n  min-height: ", ";\n  display: flex;\n  flex-direction: column;\n  justify-content: space-between;\n"])), _variables.responsiveSizes.small, _variables.responsiveSizes.small, function (props) {
-  return props.theme.backgroundColor;
+var FooterContainer = _styledComponents["default"].footer(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: column;\n  justify-content: space-between;\n  width: 100%;\n  min-height: ", ";\n  margin-top: ", ";\n  background-color: ", ";\n\n  @media (min-width: ", "rem) {\n    padding: 24px 36px 24px 36px;\n  }\n  @media (max-width: ", "rem) {\n    padding: 20px;\n  }\n"])), function (props) {
+  return props.theme.height;
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
-  return props.theme.height;
-});
-
-var FooterHeader = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  flex-wrap: wrap;\n  row-gap: 24px;\n"])));
+  return props.theme.backgroundColor;
+}, _variables.responsiveSizes.small, _variables.responsiveSizes.small);
 
-var FooterFooter = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  align-items: flex-end;\n\n  @media (min-width: ", "rem) {\n    flex-direction: row;\n  }\n\n  @media (max-width: ", "rem) {\n    //mobile phones\n    flex-direction: column;\n    align-items: center;\n  }\n\n  border-top: ", ";\n  margin-top: 16px;\n"])), _variables.responsiveSizes.small, _variables.responsiveSizes.small, function (props) {
+var BottomContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  align-items: flex-end;\n\n  @media (min-width: ", "rem) {\n    flex-direction: row;\n  }\n  @media (max-width: ", "rem) {\n    flex-direction: column;\n    align-items: center;\n  }\n\n  border-top: ", ";\n  margin-top: 16px;\n"])), _variables.responsiveSizes.small, _variables.responsiveSizes.small, function (props) {
   return "".concat(props.theme.bottomLinksDividerThickness, " ").concat(props.theme.bottomLinksDividerStyle, " ").concat(props.theme.bottomLinksDividerColor);
 });
 
-var BottomLinks = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  padding-top: ", ";\n  display: inline-flex;\n  flex-wrap: wrap;\n\n  @media (min-width: ", "rem) {\n    max-width: 60%;\n  }\n\n  @media (max-width: ", "rem) {\n    //mobile phones\n    max-width: 100%;\n    width: 100%;\n  }\n\n  & > span:last-child span {\n    display: none;\n  }\n  align-self: center;\n"])), function (props) {
-  return props.theme.bottomLinksDividerSpacing;
-}, _variables.responsiveSizes.small, _variables.responsiveSizes.small);
+var ChildComponents = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  min-height: 16px;\n  overflow: hidden;\n"])));
 
-var ChildComponents = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  min-height: 16px;\n  padding: ", ";\n  padding-top: ", ";\n  padding-right: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  overflow: hidden;\n"])), function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) !== "object" ? _variables.spaces[props.padding] : "0px";
-}, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.top ? _variables.spaces[props.padding.top] : "";
-}, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.right ? _variables.spaces[props.padding.right] : "";
-}, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.bottom ? _variables.spaces[props.padding.bottom] : "";
+var Copyright = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  padding-top: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n\n  @media (min-width: ", "rem) {\n    max-width: 40%;\n    text-align: right;\n  }\n\n  @media (max-width: ", "rem) {\n    max-width: 100%;\n    width: 100%;\n    text-align: left;\n  }\n"])), function (props) {
+  return props.theme.bottomLinksDividerSpacing;
 }, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.left ? _variables.spaces[props.padding.left] : "";
-});
-
-var Copyright = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  color: ", ";\n\n  @media (min-width: ", "rem) {\n    max-width: 40%;\n    text-align: right;\n  }\n\n  @media (max-width: ", "rem) {\n    //mobile phones\n    max-width: 100%;\n    width: 100%;\n    text-align: left;\n  }\n\n  padding-top: ", ";\n"])), function (props) {
   return props.theme.copyrightFontFamily;
 }, function (props) {
   return props.theme.copyrightFontSize;
@@ -131,31 +117,25 @@ var Copyright = _styledComponents["default"].div(_templateObject6 || (_templateO
   return props.theme.copyrightFontWeight;
 }, function (props) {
   return props.theme.copyrightFontColor;
-}, _variables.responsiveSizes.small, _variables.responsiveSizes.small, function (props) {
-  return props.theme.bottomLinksDividerSpacing;
-});
+}, _variables.responsiveSizes.small, _variables.responsiveSizes.small);
 
-var LogoContainer = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: ", ";\n  width: ", ";\n"])), function (props) {
+var LogoContainer = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: ", ";\n  width: ", ";\n"])), function (props) {
   return props.theme.logoHeight;
 }, function (props) {
   return props.theme.logoWidth;
 });
 
-var LogoImg = _styledComponents["default"].img(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: ", ";\n  width: ", ";\n"])), function (props) {
+var LogoImg = _styledComponents["default"].img(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  max-height: ", ";\n  width: ", ";\n"])), function (props) {
   return props.theme.logoHeight;
 }, function (props) {
   return props.theme.logoWidth;
 });
 
-var SocialLinkContainer = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-self: center;\n"])));
-
-var SocialAnchor = _styledComponents["default"].a(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  & {\n    display: inline-flex;\n    margin-left: ", ";\n  }\n"])), function (props) {
+var SocialAnchor = _styledComponents["default"].a(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  margin-left: ", ";\n  border-radius: 4px;\n\n  &:focus {\n    outline: 2px solid #0095ff;\n    outline-offset: 2px;\n  }\n"])), function (props) {
   return props.index === 0 ? "0px" : props.theme.socialLinksGutter;
 });
 
-var SocialIconImg = _styledComponents["default"].img(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2["default"])([""])));
-
-var SocialIconContainer = _styledComponents["default"].div(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2["default"])(["\n  & {\n    display: inline-flex;\n    height: ", ";\n    width: ", ";\n    color: ", ";\n  }\n\n  overflow: hidden;\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
+var SocialIconContainer = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  height: ", ";\n  width: ", ";\n  color: ", ";\n  overflow: hidden;\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
   return props.theme.socialLinksSize;
 }, function (props) {
   return props.theme.socialLinksSize;
@@ -163,11 +143,11 @@ var SocialIconContainer = _styledComponents["default"].div(_templateObject12 ||
   return props.theme.socialLinksColor;
 });
 
-var Point = _styledComponents["default"].span(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2["default"])(["\n  margin: 0px 10px;\n  color: ", ";\n"])), function (props) {
-  return props.theme.bottomLinksFontColor;
-});
+var BottomLinks = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-wrap: wrap;\n  align-self: center;\n  padding-top: ", ";\n  color: #fff;\n\n  @media (min-width: ", "rem) {\n    max-width: 60%;\n  }\n  @media (max-width: ", "rem) {\n    max-width: 100%;\n    width: 100%;\n  }\n\n  & > span:not(:first-child):before {\n    content: \"\xB7\";\n    padding: 0 0.5rem;\n  }\n"])), function (props) {
+  return props.theme.bottomLinksDividerSpacing;
+}, _variables.responsiveSizes.small, _variables.responsiveSizes.small);
 
-var BottomLink = _styledComponents["default"].a(_templateObject14 || (_templateObject14 = (0, _taggedTemplateLiteral2["default"])(["\n  text-decoration: ", ";\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n"])), function (props) {
+var BottomLink = _styledComponents["default"].a(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  text-decoration: ", ";\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  border-radius: 2px;\n\n  &:focus {\n    outline: 2px solid #0095ff;\n  }\n"])), function (props) {
   return props.theme.bottomLinksTextDecoration;
 }, function (props) {
   return props.theme.bottomLinksFontColor;

package/footer/Footer.stories.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import DxcFooter from "./Footer";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import { HalstackProvider } from "../HalstackContext";
 
 const social = [
   {
@@ -25,17 +26,20 @@ const social = [
         </g>
       </svg>
     ),
+    title: "Linkedin",
   },
   {
-    href: "https://twitter.com/dxctechnology",
+    href: "https://x.com/dxctechnology",
     logo: (
-      <svg viewBox="0 0 248 204" fill="currentColor">
+      <svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <rect width="256" height="256" rx="40" fill="white" />
         <path
-          fill="#1d9bf0"
-          d="M221.95 51.29c.15 2.17.15 4.34.15 6.53 0 66.73-50.8 143.69-143.69 143.69v-.04c-27.44.04-54.31-7.82-77.41-22.64 3.99.48 8 .72 12.02.73 22.74.02 44.83-7.61 62.72-21.66-21.61-.41-40.56-14.5-47.18-35.07 7.57 1.46 15.37 1.16 22.8-.87-23.56-4.76-40.51-25.46-40.51-49.5v-.64c7.02 3.91 14.88 6.08 22.92 6.32C11.58 63.31 4.74 33.79 18.14 10.71c25.64 31.55 63.47 50.73 104.08 52.76-4.07-17.54 1.49-35.92 14.61-48.25 20.34-19.12 52.33-18.14 71.45 2.19 11.31-2.23 22.15-6.38 32.07-12.26-3.77 11.69-11.66 21.62-22.2 27.93 10.01-1.18 19.79-3.86 29-7.95-6.78 10.16-15.32 19.01-25.2 26.16z"
+          d="M140.192 118.205L187.848 64H176.556L135.158 111.056L102.117 64H64L113.975 135.163L64 192H75.2914L118.982 142.296L153.883 192H192L140.192 118.205ZM124.722 135.787L119.65 128.697L79.3634 72.3294H96.7094L129.232 117.837L134.282 124.927L176.551 184.076H159.205L124.722 135.787Z"
+          fill="#0F1419"
         />
       </svg>
     ),
+    title: "X",
   },
   {
     href: "https://www.facebook.com/DXCTechnology/",
@@ -62,6 +66,7 @@ const social = [
         </g>
       </svg>
     ),
+    title: "Facebook",
   },
 ];
 
@@ -71,8 +76,8 @@ const bottom = [
     text: "Linkedin",
   },
   {
-    href: "https://twitter.com/dxctechnology",
-    text: "Twitter",
+    href: "https://x.com/dxctechnology",
+    text: "X",
   },
   {
     href: "https://www.facebook.com/DXCTechnology/",
@@ -85,6 +90,15 @@ export default {
   component: DxcFooter,
 };
 
+const opinionatedTheme = {
+  footer: {
+    baseColor: "#000000",
+    fontColor: "#ffffff",
+    accentColor: "#0095ff",
+    logo: "https://upload.wikimedia.org/wikipedia/commons/thumb/b/b8/2021_Facebook_icon.svg/2048px-2021_Facebook_icon.svg.png",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <ExampleContainer>
@@ -99,6 +113,14 @@ export const Chromatic = () => (
         </div>
       </DxcFooter>
     </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused bottom and social links" theme="light" level={4} />
+      <DxcFooter copyright="Copyright" socialLinks={social} bottomLinks={bottom}>
+        <div>
+          <a href="https://www.linkedin.com/company/dxctechnology">Linkedin</a>
+        </div>
+      </DxcFooter>
+    </ExampleContainer>
     <Title title="Margins" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Xxsmall margin" theme="light" level={4} />
@@ -116,22 +138,15 @@ export const Chromatic = () => (
       <Title title="Xxlarge margin" theme="light" level={4} />
       <DxcFooter margin="xxlarge"></DxcFooter>
     </ExampleContainer>
-    <Title title="Padding" theme="light" level={2} />
+    <Title title="Opinionated theme" theme="light" level={2} />
     <ExampleContainer>
-      <Title title="Xxsmall padding" theme="light" level={4} />
-      <DxcFooter padding="xxsmall"></DxcFooter>
-      <Title title="Xsmall padding" theme="light" level={4} />
-      <DxcFooter padding="xsmall"></DxcFooter>
-      <Title title="Small padding" theme="light" level={4} />
-      <DxcFooter padding="small"></DxcFooter>
-      <Title title="Medium padding" theme="light" level={4} />
-      <DxcFooter padding="medium"></DxcFooter>
-      <Title title="Large padding" theme="light" level={4} />
-      <DxcFooter padding="large"></DxcFooter>
-      <Title title="Xlarge padding" theme="light" level={4} />
-      <DxcFooter padding="xlarge"></DxcFooter>
-      <Title title="Xxlarge padding" theme="light" level={4} />
-      <DxcFooter padding="xxlarge"></DxcFooter>
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcFooter copyright="Copyright" socialLinks={social} bottomLinks={bottom}>
+          <div>
+            <a href="https://www.linkedin.com/company/dxctechnology">Linkedin</a>
+          </div>
+        </DxcFooter>
+      </HalstackProvider>
     </ExampleContainer>
   </>
 );

package/footer/Footer.test.js

@@ -6,10 +6,17 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _linkedin = _interopRequireDefault(require("../../app/src/images/linkedin.svg"));
-
-var _Footer = _interopRequireDefault(require("./Footer"));
-
+var _Footer = _interopRequireDefault(require("./Footer.tsx"));
+
+var social = [{
+  href: "https://www.test.com/social",
+  logo: "https://developer.apple.com/design/human-interface-guidelines/foundations/app-icons/images/icon-and-image-large-icon-settings_2x.png",
+  title: "test"
+}];
+var bottom = [{
+  href: "https://www.test.com/bottom",
+  text: "bottom-link-text"
+}];
 describe("Footer component tests", function () {
   test("Footer renders with default logo", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Footer["default"], null)),
@@ -18,32 +25,22 @@ describe("Footer component tests", function () {
     expect(getByTitle("DXC Logo")).toBeTruthy();
   });
   test("Footer renders with social links", function () {
-    var social = [{
-      href: "https://www.test.com/test",
-      logo: _linkedin["default"]
-    }];
-
     var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Footer["default"], {
       socialLinks: social
     })),
         getByRole = _render2.getByRole;
 
     var socialIcon = getByRole("link");
-    expect(socialIcon.getAttribute("href")).toBe("https://www.test.com/test");
+    expect(socialIcon.getAttribute("href")).toBe("https://www.test.com/social");
   });
   test("Footer renders with bottom links", function () {
-    var bottom = [{
-      href: "https://www.test.com/test",
-      text: "bottom-link-text"
-    }];
-
     var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Footer["default"], {
       bottomLinks: bottom
     })),
         getByText = _render3.getByText;
 
     var link = getByText("bottom-link-text");
-    expect(link.getAttribute("href")).toBe("https://www.test.com/test");
+    expect(link.getAttribute("href")).toBe("https://www.test.com/bottom");
   });
   test("Footer renders with copyright text", function () {
     var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Footer["default"], {
@@ -54,7 +51,7 @@ describe("Footer component tests", function () {
     expect(getByText("test-copyright")).toBeTruthy();
   });
   test("Footer renders with correct children", function () {
-    //We need to force the offsetWidth value
+    // We need to force the offsetWidth value
     Object.defineProperty(HTMLElement.prototype, "offsetWidth", {
       configurable: true,
       value: 1024
@@ -66,7 +63,7 @@ describe("Footer component tests", function () {
     expect(getByText("footer-child-text")).toBeTruthy();
   });
   test("Footer renders with children in mobile", function () {
-    //425 is mobile width
+    // 425 is mobile width
     Object.defineProperty(HTMLElement.prototype, "offsetWidth", {
       configurable: true,
       value: 425
@@ -82,14 +79,6 @@ describe("Footer component tests", function () {
       configurable: true,
       value: 1024
     });
-    var social = [{
-      href: "https://www.test.com/social",
-      logo: _linkedin["default"]
-    }];
-    var bottom = [{
-      href: "https://www.test.com/bottom",
-      text: "bottom-link-text"
-    }];
 
     var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Footer["default"], {
       socialLinks: social,
@@ -101,6 +90,7 @@ describe("Footer component tests", function () {
 
     var socialIcon = getAllByRole("link")[0];
     expect(socialIcon.getAttribute("href")).toBe("https://www.test.com/social");
+    expect(socialIcon.getAttribute("aria-label")).toBe("test");
     var bottomLink = getByText("bottom-link-text");
     expect(bottomLink.getAttribute("href")).toBe("https://www.test.com/bottom");
     expect(getByText("test-copyright")).toBeTruthy();