@dxc-technology/halstack-react 0.0.0-7550efd → 0.0.0-75be8bf

package/image/Image.stories.tsx

@@ -0,0 +1,127 @@
+import React from "react";
+import DxcImage from "./Image";
+import Title from "../../.storybook/components/Title";
+import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import { DxcFlex, DxcInset, DxcParagraph } from "../main";
+
+export default {
+  title: "Image",
+  component: DxcImage,
+};
+
+export const Chromatic = () => (
+  <>
+    <Title title="Image component" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Simple image" theme="light" level={4} />
+      <DxcImage
+        alt="Example image"
+        width="100%"
+        src="https://images.ctfassets.net/hrltx12pl8hq/5596z2BCR9KmT1KeRBrOQa/4070fd4e2f1a13f71c2c46afeb18e41c/shutterstock_451077043-hero1.jpg"
+      />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Image with text" theme="light" level={4} />
+      <DxcParagraph>
+        Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et
+        arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra
+        lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh tristique
+        porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue diam in dui
+        morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo nisi. Vel mus
+        ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit augue. In fermentum
+        metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. Commodo sagittis
+        volutpat id lorem.
+      </DxcParagraph>
+      <DxcInset top="2rem" bottom="2rem">
+        <DxcImage
+          alt="Ratatouille is a great movie"
+          caption="Ratatouille with a smile on his face."
+          src="https://hips.hearstapps.com/es.h-cdn.co/fotoes/images/cinefilia/por-que-ratatouille-nos-sigue-enamorando-10-anos-despues/136444706-1-esl-ES/Por-que-Ratatouille-nos-sigue-enamorando-10-anos-despues.jpg"
+        />
+      </DxcInset>
+      <DxcParagraph>
+        Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et
+        arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra
+        lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh tristique
+        porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue diam in dui
+        morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo nisi. Vel mus
+        ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit augue. In fermentum
+        metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. Commodo sagittis
+        volutpat id lorem.
+      </DxcParagraph>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Example image" theme="light" level={4} />
+      <DxcFlex gap="1rem">
+        <DxcImage
+          alt="Camera pic"
+          caption="Picture of a camera and the sunset."
+          width="500px"
+          src="https://assets.entrepreneur.com/content/3x2/2000/20191009140007-GettyImages-1053962188.jpeg"
+        />
+        <DxcParagraph>
+          Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et
+          arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra
+          lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh
+          tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue
+          diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo
+          nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit
+          augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae.
+          Commodo sagittis volutpat id lorem. Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis
+          volutpat urna. Hendrerit aliquet et arcu purus. Sodales elementum sollicitudin consequat elementum tortor.
+          Lectus eget cursus ut ac pharetra lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus
+          vitae vitae aenean arcu. Nibh tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh
+          est sed. Netus venenatis congue diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu
+          nec fringilla enim purus ut justo nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper
+          nullam sit sagittis hendrerit augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed
+          enim in sed vel nec ut vitae. Commodo sagittis volutpat id lorem.
+        </DxcParagraph>
+      </DxcFlex>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Object position" theme="light" level={4} />
+      <DxcImage
+        alt="Moon pic"
+        caption="Picture of the moon."
+        width="250px"
+        src="https://interactive-examples.mdn.mozilla.net/media/examples/moon.jpg"
+        objectPosition="right top"
+        objectFit="none"
+      />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Object fit: contain" theme="light" level={4} />
+      <div style={{ display: "flex", width: "fit-content", border: "1px solid #000", padding: "0.5rem" }}>
+        <DxcImage
+          alt="Dog pic"
+          src="https://cc-prod.scene7.com/is/image/CCProdAuthor/What-is-Stock-Photography_P1_mobile?$pjpeg$&jpegSize=200&wid=720"
+          width="200px"
+          height="200px"
+          objectFit="contain"
+          caption="Pretty dog."
+        />
+      </div>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Object fit: cover" theme="light" level={4} />
+      <div style={{ width: "75%", height: "300px" }}>
+        <DxcImage
+          alt="Spaceship pic"
+          src="https://media.istockphoto.com/id/1344443930/es/foto/lanzamiento-de-cohetes-del-transbordador-espacial-en-el-cielo-y-nubes-al-espacio-exterior.jpg?s=612x612&w=0&k=20&c=CO2A96GnnWvJsgZuj9WfYCVIBVzicnQDfnzwD1nomN0="
+          objectFit="cover"
+          width="50%"
+          height="100%"
+          objectPosition="0px 0px"
+        />
+        <DxcImage
+          alt="Spaceship pic"
+          src="https://media.istockphoto.com/id/1344443930/es/foto/lanzamiento-de-cohetes-del-transbordador-espacial-en-el-cielo-y-nubes-al-espacio-exterior.jpg?s=612x612&w=0&k=20&c=CO2A96GnnWvJsgZuj9WfYCVIBVzicnQDfnzwD1nomN0="
+          objectFit="cover"
+          width="50%"
+          height="100%"
+          objectPosition="0px 0px"
+        />
+      </div>
+    </ExampleContainer>
+  </>
+);

package/image/types.d.ts

@@ -0,0 +1,72 @@
+/// <reference types="react" />
+declare type Props = {
+    /**
+     * Alternative text description displayed when the specified image is not loaded.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/alt
+     * See W3C alt decision tree: https://www.w3.org/WAI/tutorials/images/decision-tree/
+     */
+    alt: string;
+    /**
+     * Image legend with a descriptive purpose. It is placed below the image and is complementary to the alt attribute,
+     * which is required regardless of the presence of the caption or not.
+     */
+    caption?: string;
+    /**
+     * If true, the image will be loaded only when it is visible on the screen (lazy loading).
+     * Otherwise and by default, the image will be loaded as soon as the component is mounted (eager loading).
+     */
+    lazyLoading?: boolean;
+    /**
+     * URL of the image. This prop is required and must be valid.
+     */
+    src: string;
+    /**
+     * List of one or more strings separated by commas indicating a set of possible images for the user agent to use.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/srcset
+     */
+    srcSet?: string;
+    /**
+     * One or more strings separated by commas, indicating a set of source sizes.
+     * If the srcSet attribute is absent or contains no values with a width descriptor,
+     * then this attribute has no effect.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/sizes
+     */
+    sizes?: string;
+    /**
+     * Sets the rendered width of the image.
+     */
+    width?: string;
+    /**
+     * Sets the rendered height of the image.
+     */
+    height?: string;
+    /**
+     * Sets the object-fit CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit
+     */
+    objectFit?: "contain" | "cover" | "fill" | "none" | "scale-down";
+    /**
+     * Sets the object-position CSS property.
+     *
+     * See MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/object-position
+     */
+    objectPosition?: string;
+    /**
+     * This function will be called when the image is loaded.
+     */
+    onLoad?: React.ReactEventHandler<HTMLImageElement>;
+    /**
+     * This function will be called when the image fails to load.
+     */
+    onError?: React.ReactEventHandler<HTMLImageElement>;
+};
+export declare type CaptionWrapperProps = {
+    condition: boolean;
+    wrapper: (children: React.ReactNode) => JSX.Element;
+    children: React.ReactNode;
+};
+export default Props;

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

@@ -3,15 +3,15 @@ import AppLayoutPropsType, { AppLayoutMainPropsType } from "./types";
 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;
+        ({ underlined, content, responsiveContent, onClick, margin, tabIndex, }: import("../header/types").default): 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;
+    Footer: ({ socialLinks, bottomLinks, copyright, children, 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");
 
@@ -65,13 +65,16 @@ var defaultFooter = function defaultFooter() {
     }],
     socialLinks: [{
       href: "https://www.linkedin.com/company/dxctechnology",
-      logo: _Icons.linkedinLogo
+      logo: _Icons.linkedinLogo,
+      title: "Linkedin"
     }, {
       href: "https://twitter.com/dxctechnology",
-      logo: _Icons.twitterLogo
+      logo: _Icons.twitterLogo,
+      title: "Twitter"
     }, {
       href: "https://www.facebook.com/DXCTechnology/",
-      logo: _Icons.facebookLogo
+      logo: _Icons.facebookLogo,
+      title: "Facebook"
     }]
   });
 };
@@ -160,7 +163,7 @@ var SidenavContainer = _styledComponents["default"].div(_templateObject6 || (_te
 
 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(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  flex: 1;\n"])));
+var MainContentContainer = _styledComponents["default"].main(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  flex: 1;\n  background-color: #fff;\n"])));
 
 DxcApplicationLayout.Header = _Header["default"];
 DxcApplicationLayout.Main = Main;

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,13 @@ 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 DxcImage from "./image/Image";
 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, DxcImage, };

package/main.js

@@ -115,12 +115,24 @@ 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() {
     return _Heading["default"];
   }
 });
+Object.defineProperty(exports, "DxcImage", {
+  enumerable: true,
+  get: function get() {
+    return _Image["default"];
+  }
+});
 Object.defineProperty(exports, "DxcInset", {
   enumerable: true,
   get: function get() {
@@ -350,7 +362,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 +372,10 @@ var _Paragraph = _interopRequireDefault(require("./paragraph/Paragraph"));
 
 var _BulletedList = _interopRequireDefault(require("./bulleted-list/BulletedList"));
 
+var _Grid = _interopRequireDefault(require("./grid/Grid"));
+
+var _Image = _interopRequireDefault(require("./image/Image"));
+
 var _HalstackContext = _interopRequireWildcard(require("./HalstackContext"));
 
 var _BackgroundColorContext = require("./BackgroundColorContext");

package/{tabs-nav → nav-tabs}/NavTabs.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
-import { NavTabsContextProps, NavTabsProps } from "./types";
+import NavTabsPropsType, { NavTabsContextProps } from "./types";
 export declare const NavTabsContext: React.Context<NavTabsContextProps>;
 declare const DxcNavTabs: {
-    ({ iconPosition, tabIndex, children }: NavTabsProps): JSX.Element;
+    ({ iconPosition, tabIndex, children }: NavTabsPropsType): JSX.Element;
     Tab: React.ForwardRefExoticComponent<import("./types").TabProps & React.RefAttributes<HTMLAnchorElement>>;
 };
 export default DxcNavTabs;

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

@@ -68,23 +68,20 @@ var DxcNavTabs = function DxcNavTabs(_ref) {
       _ref$tabIndex = _ref.tabIndex,
       tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex,
       children = _ref.children;
-  var colorsTheme = (0, _useTheme["default"])();
 
   var _useState = (0, _react.useState)(null),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      innerFocus = _useState2[0],
-      setInnerFocus = _useState2[1];
+      innerFocusIndex = _useState2[0],
+      setInnerFocusIndex = _useState2[1];
 
+  var colorsTheme = (0, _useTheme["default"])();
   var contextValue = (0, _react.useMemo)(function () {
     return {
       iconPosition: iconPosition,
       tabIndex: tabIndex,
-      hasIcons: _react["default"].Children.toArray(children).some(function (child) {
-        return getPropInChild(child, "icon");
-      }),
-      focusedLabel: innerFocus === null ? undefined : getLabelFromTab(children[innerFocus])
+      focusedLabel: innerFocusIndex === null ? undefined : getLabelFromTab(children[innerFocusIndex])
     };
-  }, [iconPosition, tabIndex, innerFocus]);
+  }, [iconPosition, tabIndex, innerFocusIndex]);
 
   var handleOnKeyDown = function handleOnKeyDown(event) {
     var activeTab = _react["default"].Children.toArray(children).findIndex(function (child) {
@@ -95,19 +92,19 @@ var DxcNavTabs = function DxcNavTabs(_ref) {
       case "Left":
       case "ArrowLeft":
         event.preventDefault();
-        setInnerFocus(getPreviousTabIndex(children, innerFocus === null ? activeTab : innerFocus));
+        setInnerFocusIndex(getPreviousTabIndex(children, innerFocusIndex === null ? activeTab : innerFocusIndex));
         break;
 
       case "Right":
       case "ArrowRight":
         event.preventDefault();
-        setInnerFocus(getNextTabIndex(children, innerFocus === null ? activeTab : innerFocus));
+        setInnerFocusIndex(getNextTabIndex(children, innerFocusIndex === null ? activeTab : innerFocusIndex));
         break;
     }
   };
 
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme.tabs
+    theme: colorsTheme.navTabs
   }, /*#__PURE__*/_react["default"].createElement(NavTabsContainer, {
     onKeyDown: handleOnKeyDown,
     role: "tablist",