@dxc-technology/halstack-react 0.0.0-ecc45e2 → 0.0.0-ede733c

package/header/Header.stories.tsx

@@ -1,8 +1,12 @@
 import React from "react";
 import DxcHeader from "./Header";
+import DxcButton from "../button/Button";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import { userEvent, waitFor, within } from "@storybook/testing-library";
+import DxcFlex from "../flex/Flex";
+import DxcLink from "../link/Link";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Header",
@@ -16,16 +20,99 @@ const options: any = [
   },
 ];
 
+const options2: any = [
+  {
+    value: 1,
+    label: "Home",
+  },
+  {
+    value: 2,
+    label: "Release notes",
+  },
+  {
+    value: 3,
+    label: "Sign out",
+  },
+];
+
+const opinionatedTheme = {
+  header: {
+    baseColor: "#ffffff",
+    accentColor: "#000000",
+    fontColor: "#000000",
+    menuBaseColor: "#ffffff",
+    hamburguerColor: "#000000",
+    logo: (
+      <svg xmlns="http://www.w3.org/2000/svg" width="73" height="40" viewBox="0 0 73 40">
+        <g id="g10" transform="translate(0)">
+          <g id="g12">
+            <path
+              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"
+            />
+            <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="#5f249f"
+            />
+          </g>
+        </g>
+      </svg>
+    ),
+    logoResponsive: (
+      <svg xmlns="http://www.w3.org/2000/svg" width="73" height="40" viewBox="0 0 73 40">
+        <g id="g10" transform="translate(0)">
+          <g id="g12">
+            <path
+              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"
+            />
+            <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="#5f249f"
+            />
+          </g>
+        </g>
+      </svg>
+    ),
+    contentColor: "#000000",
+    overlayColor: "#000000b3",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <ExampleContainer>
       <Title title="Default with dropdown" theme="light" level={4} />
-      <DxcHeader content={<DxcHeader.Dropdown options={options} label="Default Dropdown" />} />
+      <DxcHeader
+        content={<DxcHeader.Dropdown options={options} label="Default Dropdown" onSelectOption={() => {}} />}
+      />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Underlined with text" theme="light" level={4} />
       <DxcHeader underlined content={<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras felis.</p>} />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Underlined, dropdown and links" theme="light" level={4} />
+      <DxcHeader
+        content={
+          <DxcFlex alignItems="center" gap="4rem">
+            <DxcLink>Link 1</DxcLink>
+            <DxcLink>Link 2</DxcLink>
+            <DxcLink>Link 3</DxcLink>
+            <DxcHeader.Dropdown options={options2} label="Label" onSelectOption={() => {}} />
+          </DxcFlex>
+        }
+        underlined
+      />
+    </ExampleContainer>
     <Title title="Margins" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Xxsmall margin" theme="light" level={4} />
@@ -62,7 +149,6 @@ export const Chromatic = () => (
       <DxcHeader underlined margin="xxlarge" />
       <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras felis.</p>
     </ExampleContainer>
-
     <Title title="Paddings" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Xxsmall padding" theme="light" level={4} />
@@ -92,6 +178,21 @@ export const Chromatic = () => (
       <Title title="Xxlarge padding" theme="light" level={4} />
       <DxcHeader underlined padding="xxlarge" />
     </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcHeader
+          underlined
+          content={<DxcButton label={"Custom Button"} />}
+          responsiveContent={(closeHandler) => (
+            <>
+              <DxcButton label={"Custom Button"} onClick={closeHandler} />
+              Custom content
+            </>
+          )}
+        />
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );
 
@@ -120,18 +221,34 @@ const RespHeaderHover = () => (
   </ExampleContainer>
 );
 
-const RespHeaderMenu = () => (
+const RespHeaderMenuMobile = () => (
+  <ExampleContainer>
+    <Title title="Responsive menu" theme="light" level={4} />
+    <DxcHeader responsiveContent={(closeHandler) => <p>Lorem ipsum dolor sit amet.</p>} underlined />
+  </ExampleContainer>
+);
+
+const RespHeaderMenuTablet = () => (
   <ExampleContainer>
     <Title title="Responsive menu" theme="light" level={4} />
     <DxcHeader responsiveContent={(closeHandler) => <p>Lorem ipsum dolor sit amet.</p>} underlined />
   </ExampleContainer>
 );
 
+const RespHeaderMenuOpinionated = () => (
+  <ExampleContainer>
+    <Title title="Responsive menu" theme="light" level={4} />
+    <HalstackProvider theme={opinionatedTheme}>
+      <DxcHeader responsiveContent={(closeHandler) => <p>Lorem ipsum dolor sit amet.</p>} underlined />
+    </HalstackProvider>
+  </ExampleContainer>
+);
+
 ResponsiveHeader.parameters = {
   viewport: {
     defaultViewport: "iphonex",
   },
-  chromatic: { viewports: [720] },
+  chromatic: { viewports: [375] },
 };
 
 export const ResponsiveHeaderFocus = RespHeaderFocus.bind({});
@@ -139,7 +256,7 @@ ResponsiveHeaderFocus.parameters = {
   viewport: {
     defaultViewport: "iphonex",
   },
-  chromatic: { viewports: [720] },
+  chromatic: { viewports: [375] },
 };
 ResponsiveHeaderFocus.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
@@ -151,21 +268,47 @@ ResponsiveHeaderHover.parameters = {
   viewport: {
     defaultViewport: "iphonex",
   },
-  chromatic: { viewports: [720] },
+  chromatic: { viewports: [375] },
 };
 ResponsiveHeaderHover.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   await waitFor(() => canvas.findByText("Menu"));
 };
 
-export const ResponsiveHeaderMenu = RespHeaderMenu.bind({});
-ResponsiveHeaderMenu.parameters = {
+export const ResponsiveHeaderMenuMobile = RespHeaderMenuMobile.bind({});
+ResponsiveHeaderMenuMobile.parameters = {
   viewport: {
     defaultViewport: "iphonex",
   },
+  chromatic: { viewports: [375] },
+};
+ResponsiveHeaderMenuMobile.play = async ({ canvasElement }) => {
+  const canvas = within(canvasElement);
+  await waitFor(() => canvas.findByText("Menu"));
+  await userEvent.click(canvas.getByText("Menu"));
+};
+
+export const ResponsiveHeaderMenuTablet = RespHeaderMenuTablet.bind({});
+ResponsiveHeaderMenuTablet.parameters = {
+  viewport: {
+    defaultViewport: "pixelxl",
+  },
+  chromatic: { viewports: [720] },
+};
+ResponsiveHeaderMenuTablet.play = async ({ canvasElement }) => {
+  const canvas = within(canvasElement);
+  await waitFor(() => canvas.findByText("Menu"));
+  await userEvent.click(canvas.getByText("Menu"));
+};
+
+export const ResponsiveHeaderMenuOpinionated = RespHeaderMenuOpinionated.bind({});
+ResponsiveHeaderMenuOpinionated.parameters = {
+  viewport: {
+    defaultViewport: "pixelxl",
+  },
   chromatic: { viewports: [720] },
 };
-ResponsiveHeaderMenu.play = async ({ canvasElement }) => {
+ResponsiveHeaderMenuOpinionated.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   await waitFor(() => canvas.findByText("Menu"));
   await userEvent.click(canvas.getByText("Menu"));

package/header/Header.test.js

@@ -6,7 +6,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _Header = _interopRequireDefault(require("./Header"));
+var _Header = _interopRequireDefault(require("./Header.tsx"));
 
 describe("Header component tests", function () {
   beforeAll(function () {
@@ -68,7 +68,7 @@ describe("Header component tests", function () {
     });
 
     var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Header["default"], {
-      responsiveContent: function responsiveContent(closeMenu) {
+      responsiveContent: function responsiveContent() {
         return /*#__PURE__*/_react["default"].createElement("p", null, "header-child-text");
       }
     })),

package/header/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-export declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-export declare type Padding = {
+declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+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/heading/Heading.js

@@ -17,7 +17,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 

package/heading/Heading.test.js

@@ -6,7 +6,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _Heading = _interopRequireDefault(require("./Heading"));
+var _Heading = _interopRequireDefault(require("./Heading.tsx"));
 
 describe("Heading component tests", function () {
   test("Heading renders with default level", function () {

package/inset/Inset.stories.tsx

@@ -205,7 +205,7 @@ export const Chromatic = () => (
     </Container>
     <Title title="Inside a flex column" level={4} />
     <Container>
-      <DxcFlex direction="column" gap="0.75rem">
+      <DxcFlex direction="column" gap="1rem">
         <Placeholder></Placeholder>
         <DxcInset top="0.25rem" right="1.5rem" bottom="2rem" left="4rem">
           <Placeholder></Placeholder>
@@ -225,5 +225,6 @@ const Placeholder = styled.div`
   min-height: 40px;
   min-width: 120px;
   border: 1px solid #a46ede;
+  border-radius: 0.5rem;
   background-color: #e5d5f6;
 `;

package/layout/ApplicationLayout.d.ts

@@ -4,14 +4,14 @@ declare const DxcApplicationLayout: {
     ({ 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;
+        Dropdown: (props: import("../dropdown/types").default) => JSX.Element;
     };
     Main: ({ children }: AppLayoutMainPropsType) => 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;
+        ({ title, children }: 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;
+        Group: ({ title, collapsable, icon, children }: import("../sidenav/types").SidenavGroupPropsType) => JSX.Element;
         Link: React.ForwardRefExoticComponent<import("../sidenav/types").SidenavLinkPropsType & React.RefAttributes<HTMLAnchorElement>>;
         Title: ({ children }: import("../sidenav/types").SidenavTitlePropsType) => JSX.Element;
     };

package/layout/ApplicationLayout.js

@@ -23,7 +23,7 @@ var _Sidenav = _interopRequireDefault(require("../sidenav/Sidenav"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
 var _Icons = require("./Icons");
 

package/layout/ApplicationLayout.stories.tsx

@@ -94,6 +94,7 @@ ApplicationLayoutWithResponsiveSidenav.parameters = {
   viewport: {
     defaultViewport: "pixel",
   },
+  chromatic: { viewports: [540] },
 };
 
 export const ApplicationLayoutWithCustomHeader = () => (

package/layout/types.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-declare type ChildrenType = AppLayoutMainPropsType | AppLayoutSidenavPropsType;
 export declare type AppLayoutMainPropsType = {
     /**
      * Everything between the tags will be displayed as the content of the main part of the application.
@@ -35,8 +34,8 @@ declare type AppLayoutPropsType = {
      */
     footer?: React.ReactNode;
     /**
-     * The area inside the sidenav. This area can be used to render custom content.
+     * Use the DxcApplicationLayout.Main provided to render main content.
      */
-    children: React.ReactElement<ChildrenType> | React.ReactElement<ChildrenType>[];
+    children: React.ReactElement<AppLayoutMainPropsType>;
 };
 export default AppLayoutPropsType;

package/link/Link.js

@@ -21,7 +21,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"));
 
@@ -68,7 +68,7 @@ var DxcLink = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   }, /*#__PURE__*/_react["default"].createElement(StyledLink, (0, _extends2["default"])({
     as: href ? "a" : "button",
     tabIndex: tabIndex,
-    onClick: !disabled && onClick,
+    onClick: !disabled ? onClick : undefined,
     href: !disabled && href ? href : undefined,
     target: href ? newWindow ? "_blank" : "_self" : undefined,
     disabled: disabled,
@@ -82,7 +82,7 @@ var DxcLink = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   })));
 });
 
-var StyledLink = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: baseline;\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n\n  background: none;\n  border: none;\n  padding: 0;\n  cursor: pointer;\n  font-size: ", ";\n  font-weight: ", ";\n  font-style: ", ";\n  font-family: ", ";\n  text-decoration-color: transparent;\n  width: fit-content;\n\n  ", "\n  ", "\n  color: ", ";\n  ", "\n\n  &:visited {\n    color: ", ";\n    &:hover {\n      ", "\n    }\n  }\n  &:hover {\n    ", "\n  }\n  &:focus {\n    border-radius: 2px;\n    outline: 2px solid ", ";\n    ", "\n  }\n  &:active {\n    ", "\n  }\n"])), function (props) {
+var StyledLink = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: baseline;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  background: none;\n  border: none;\n  padding: 0;\n  cursor: pointer;\n  font-size: ", ";\n  font-weight: ", ";\n  font-style: ", ";\n  font-family: ", ";\n  text-decoration-color: transparent;\n  width: fit-content;\n  ", "\n  ", "\n  color: ", ";\n  ", "\n  &:visited {\n    color: ", ";\n    &:hover {\n      ", "\n    }\n  }\n  &:hover {\n    ", "\n  }\n  &:focus {\n    border-radius: 2px;\n    outline: 2px solid ", ";\n    ", "\n  }\n  &:active {\n    ", "\n  }\n"])), function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.top ? _variables.spaces[props.margin.top] : "";
@@ -105,7 +105,7 @@ var StyledLink = _styledComponents["default"].div(_templateObject || (_templateO
 }, function (props) {
   return props.disabled && "cursor: default;";
 }, function (props) {
-  return props.inheritColor ? "inherit" : !props.disabled ? props.theme.fontColor : props.theme.disabledColor;
+  return props.inheritColor ? "inherit" : !props.disabled ? props.theme.fontColor : props.theme.disabledFontColor;
 }, function (props) {
   return props.disabled ? "pointer-events: none;" : "";
 }, function (props) {

package/link/Link.stories.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import DxcLink from "./Link";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Link",
@@ -19,6 +20,12 @@ const icon = (
   </svg>
 );
 
+const opinionatedTheme = {
+  link: {
+    baseColor: "#5f249f",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <Title title="With anchor" theme="light" level={2} />
@@ -189,5 +196,58 @@ export const Chromatic = () => (
         Test
       </DxcLink>
     </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcLink disabled>Test</DxcLink>
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Icon before" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcLink href="https://www.google.com" icon={icon} iconPosition="before">
+          Test
+        </DxcLink>
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcLink disabled>Test</DxcLink>
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Icon after" theme="light" level={4} />{" "}
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcLink onClick={() => {}} icon={icon} iconPosition="after">
+          Test
+        </DxcLink>
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="With link hovered" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcLink onClick={() => {}}>Test</DxcLink>
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="With link focused" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcLink onClick={() => {}}>Test</DxcLink>
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="With link active" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcLink onClick={() => {}}>Test</DxcLink>
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-visited">
+      <HalstackProvider theme={opinionatedTheme}>
+        <Title title="With link visited" theme="light" level={4} />
+        <DxcLink href="https://www.google.com">Test</DxcLink>
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );

package/link/Link.test.js

@@ -6,7 +6,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _Link = _interopRequireDefault(require("./Link"));
+var _Link = _interopRequireDefault(require("./Link.tsx"));
 
 describe("Link component tests", function () {
   test("Link renders with correct text", function () {
@@ -33,9 +33,7 @@ describe("Link component tests", function () {
     expect(getByText("Link").hasAttribute("href")).toBeFalsy();
 
     var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Link["default"], {
-      onClick: function onClick() {
-        return console.log("Andorra");
-      },
+      onClick: function onClick() {},
       disabled: true
     }, "LinkButton")),
         getByTextLinkButton = _render4.getByText;

package/link/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-export declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-export declare type Margin = {
+declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+declare type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;

package/main.d.ts

@@ -34,11 +34,12 @@ import DxcRadioGroup from "./radio-group/RadioGroup";
 import DxcBleed from "./bleed/Bleed";
 import DxcInset from "./inset/Inset";
 import DxcQuickNav from "./quick-nav/QuickNav";
-import DxcNavTabs from "./tabs-nav/NavTabs";
+import DxcNavTabs from "./nav-tabs/NavTabs";
 import DxcFlex from "./flex/Flex";
 import DxcTypography from "./typography/Typography";
 import DxcParagraph from "./paragraph/Paragraph";
 import DxcBulletedList from "./bulleted-list/BulletedList";
+import DxcGrid from "./grid/Grid";
 import HalstackContext, { HalstackProvider, HalstackLanguageContext } from "./HalstackContext";
 import { BackgroundColorProvider } from "./BackgroundColorContext";
-export { DxcAlert, DxcButton, DxcCheckbox, DxcTextInput, DxcDropdown, DxcSwitch, DxcSlider, DxcTable, DxcTabs, DxcToggleGroup, DxcDialog, DxcCard, DxcProgressBar, DxcAccordion, DxcSpinner, DxcBox, DxcTag, DxcPaginator, DxcWizard, DxcLink, DxcHeading, DxcResultsetTable, DxcChip, DxcApplicationLayout, HalstackContext, HalstackLanguageContext, HalstackProvider, BackgroundColorProvider, DxcAccordionGroup, DxcBadge, DxcPasswordInput, DxcDateInput, DxcNumberInput, DxcTextarea, DxcSelect, DxcFileInput, DxcRadioGroup, DxcBleed, DxcInset, DxcQuickNav, DxcNavTabs, DxcFlex, DxcTypography, DxcParagraph, DxcBulletedList, };
+export { DxcAlert, DxcButton, DxcCheckbox, DxcTextInput, DxcDropdown, DxcSwitch, DxcSlider, DxcTable, DxcTabs, DxcToggleGroup, DxcDialog, DxcCard, DxcProgressBar, DxcAccordion, DxcSpinner, DxcBox, DxcTag, DxcPaginator, DxcWizard, DxcLink, DxcHeading, DxcResultsetTable, DxcChip, DxcApplicationLayout, HalstackContext, HalstackLanguageContext, HalstackProvider, BackgroundColorProvider, DxcAccordionGroup, DxcBadge, DxcPasswordInput, DxcDateInput, DxcNumberInput, DxcTextarea, DxcSelect, DxcFileInput, DxcRadioGroup, DxcBleed, DxcInset, DxcQuickNav, DxcNavTabs, DxcFlex, DxcTypography, DxcParagraph, DxcBulletedList, DxcGrid, };

package/main.js

@@ -115,6 +115,12 @@ Object.defineProperty(exports, "DxcFlex", {
     return _Flex["default"];
   }
 });
+Object.defineProperty(exports, "DxcGrid", {
+  enumerable: true,
+  get: function get() {
+    return _Grid["default"];
+  }
+});
 Object.defineProperty(exports, "DxcHeading", {
   enumerable: true,
   get: function get() {
@@ -350,7 +356,7 @@ var _Inset = _interopRequireDefault(require("./inset/Inset"));
 
 var _QuickNav = _interopRequireDefault(require("./quick-nav/QuickNav"));
 
-var _NavTabs = _interopRequireDefault(require("./tabs-nav/NavTabs"));
+var _NavTabs = _interopRequireDefault(require("./nav-tabs/NavTabs"));
 
 var _Flex = _interopRequireDefault(require("./flex/Flex"));
 
@@ -360,6 +366,8 @@ var _Paragraph = _interopRequireDefault(require("./paragraph/Paragraph"));
 
 var _BulletedList = _interopRequireDefault(require("./bulleted-list/BulletedList"));
 
+var _Grid = _interopRequireDefault(require("./grid/Grid"));
+
 var _HalstackContext = _interopRequireWildcard(require("./HalstackContext"));
 
 var _BackgroundColorContext = require("./BackgroundColorContext");

package/{tabs-nav → nav-tabs}/NavTabs.js

@@ -107,7 +107,7 @@ var DxcNavTabs = function DxcNavTabs(_ref) {
   };
 
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme.tabs
+    theme: colorsTheme.navTabs
   }, /*#__PURE__*/_react["default"].createElement(NavTabsContainer, {
     onKeyDown: handleOnKeyDown,
     role: "tablist",