@dxc-technology/halstack-react 0.0.0-9282b45 → 0.0.0-92fa0e1

package/button/Button.stories.tsx

@@ -1,10 +1,9 @@
 import React from "react";
 import DxcButton from "./Button";
 import DxcFlex from "./../flex/Flex";
-import { BackgroundColorProvider } from "../BackgroundColorContext";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
-import DarkContainer from "../../.storybook/components/DarkSection";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Button",
@@ -12,11 +11,50 @@ export default {
 };
 
 const iconSVG = (
-  <svg viewBox="0 0 24 24" fill="currentColor">
+  <svg width="24px" height="24px" viewBox="0 0 24 24" fill="currentColor">
     <path d="M0 0h24v24H0z" fill="none" />
     <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
   </svg>
 );
+
+const facebookIcon = (
+  <svg
+    version="1.1"
+    id="Capa_1"
+    x="0px"
+    y="0px"
+    width="438.536px"
+    height="438.536px"
+    viewBox="0 0 438.536 438.536"
+    fill="currentColor"
+  >
+    <g>
+      <path
+        d="M414.41,24.123C398.333,8.042,378.963,0,356.315,0H82.228C59.58,0,40.21,8.042,24.126,24.123
+  C8.045,40.207,0.003,59.576,0.003,82.225v274.084c0,22.647,8.042,42.018,24.123,58.102c16.084,16.084,35.454,24.126,58.102,24.126
+  h274.084c22.648,0,42.018-8.042,58.095-24.126c16.084-16.084,24.126-35.454,24.126-58.102V82.225
+  C438.532,59.576,430.49,40.204,414.41,24.123z M373.155,225.548h-49.963V406.84h-74.802V225.548H210.99V163.02h37.401v-37.402
+  c0-26.838,6.283-47.107,18.843-60.813c12.559-13.706,33.304-20.555,62.242-20.555h49.963v62.526h-31.401
+  c-10.663,0-17.467,1.853-20.417,5.568c-2.949,3.711-4.428,10.23-4.428,19.558v31.119h56.534L373.155,225.548z"
+      />
+    </g>
+  </svg>
+);
+
+const smallIcon = (
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" height="20" width="20" fill="currentColor">
+    <path d="m7.646 18.333-.313-2.625q-.208-.125-.458-.27-.25-.146-.458-.271l-2.438 1.021-2.354-4.063 2.083-1.583V9.458L1.625 7.875l2.354-4.063 2.438 1.021q.208-.125.458-.27.25-.146.458-.271l.313-2.625h4.708l.313 2.625q.208.125.458.271.25.145.458.27l2.438-1.021 2.354 4.063-2.063 1.583v1.084l2.063 1.583-2.354 4.063-2.438-1.021q-.208.125-.458.271-.25.145-.458.27l-.313 2.625ZM10 12.979q1.229 0 2.104-.875T12.979 10q0-1.229-.875-2.104T10 7.021q-1.229 0-2.104.875T7.021 10q0 1.229.875 2.104t2.104.875Zm0-1.75q-.5 0-.865-.364-.364-.365-.364-.865t.364-.865q.365-.364.865-.364t.865.364q.364.365.364.865t-.364.865q-.365.364-.865.364ZM10.021 10Zm-.854 6.583h1.666l.25-2.166q.605-.167 1.167-.5.562-.334 1.021-.792l2.021.854.833-1.375-1.771-1.354q.104-.292.146-.604.042-.313.042-.646 0-.292-.042-.594t-.125-.635l1.771-1.375-.834-1.375-2.02.875q-.48-.479-1.032-.802-.552-.323-1.156-.49l-.271-2.187H9.167l-.271 2.187q-.604.167-1.156.49-.552.323-1.011.781l-2.021-.854-.833 1.375 1.75 1.354q-.083.333-.125.646-.042.312-.042.604t.042.594q.042.302.125.635l-1.75 1.375.833 1.375 2.021-.854q.459.458 1.011.781.552.323 1.156.49Z" />
+  </svg>
+);
+
+const opinionatedTheme = {
+  button: {
+    baseColor: "#5f249f",
+    primaryFontColor: "#ffffff",
+    secondaryHoverFontColor: "#ffffff",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <Title title="Primary" theme="light" level={2} />
@@ -38,7 +76,7 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled" theme="light" level={4} />
-      <DxcButton label="Primary disabled" disabled />
+      <DxcButton label="Primary disabled" disabled icon={iconSVG} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With left icon" theme="light" level={4} />
@@ -52,6 +90,18 @@ export const Chromatic = () => (
       <Title title="Only icon" theme="light" level={4} />
       <DxcButton icon={iconSVG} />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Big icon (SVG)" theme="light" level={4} />
+      <DxcButton icon={facebookIcon} />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Big icon (image)" theme="light" level={4} />
+      <DxcButton icon="https://www.freepnglogos.com/uploads/facebook-logo-design-1.png" />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Small icon" theme="light" level={4} />
+      <DxcButton icon={smallIcon} />
+    </ExampleContainer>
     <Title title="Secondary" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Enabled" theme="light" level={4} />
@@ -71,12 +121,19 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled" theme="light" level={4} />
-      <DxcButton mode="secondary" disabled label="Secondary disabled" />
+      <DxcButton mode="secondary" disabled label="Secondary disabled" icon={iconSVG} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With icon" theme="light" level={4} />
       <DxcButton mode="secondary" label="Secondary" icon={iconSVG} />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Only icon (image)" theme="light" level={4} />
+      <DxcButton
+        mode="secondary"
+        icon="https://www.freepnglogos.com/uploads/facebook-logo-design-1.png"
+      />
+    </ExampleContainer>
     <Title title="Text" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Enabled" theme="light" level={4} />
@@ -96,91 +153,19 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled" theme="light" level={4} />
-      <DxcButton mode="text" label="Text disabled" disabled />
+      <DxcButton mode="text" label="Text disabled" disabled icon={iconSVG} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With icon" theme="light" level={4} />
       <DxcButton label="Text" mode="text" icon={iconSVG} />
     </ExampleContainer>
-    <BackgroundColorProvider color="#333333">
-      <DarkContainer>
-        <Title title="Primary" theme="dark" level={2} />
-        <ExampleContainer>
-          <Title title="Enabled" theme="dark" level={4} />
-          <DxcButton label="Primary enabled" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-hover">
-          <Title title="Hovered" theme="dark" level={4} />
-          <DxcButton label="Primary hovered" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-focus">
-          <Title title="Focused" theme="dark" level={4} />
-          <DxcButton label="Primary focused" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-active">
-          <Title title="Actived" theme="dark" level={4} />
-          <DxcButton label="Primary actived" />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled" theme="dark" level={4} />
-          <DxcButton label="Primary disabled" disabled />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="With icon" theme="dark" level={4} />
-          <DxcButton label="Primary" icon={iconSVG} />
-        </ExampleContainer>
-        <Title title="Secondary" theme="dark" level={2} />
-        <ExampleContainer>
-          <Title title="Enabled" theme="dark" level={4} />
-          <DxcButton mode="secondary" label="Secondary enabled" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-hover">
-          <Title title="Hovered" theme="dark" level={4} />
-          <DxcButton mode="secondary" label="Secondary hovered" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-focus">
-          <Title title="Focused" theme="dark" level={4} />
-          <DxcButton mode="secondary" label="Secondary focused" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-active">
-          <Title title="Actived" theme="dark" level={4} />
-          <DxcButton mode="secondary" label="Secondary actived" />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled" theme="dark" level={4} />
-          <DxcButton mode="secondary" disabled label="Secondary disabled" />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="With icon" theme="dark" level={4} />
-          <DxcButton mode="secondary" label="Primary" icon={iconSVG} />
-        </ExampleContainer>
-        <Title title="Text" theme="dark" level={2} />
-        <ExampleContainer>
-          <Title title="Enabled" theme="dark" level={4} />
-          <DxcButton mode="text" label="Text enabled" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-hover">
-          <Title title="Hovered" theme="dark" level={4} />
-          <DxcButton mode="text" label="Text hovered" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-focus">
-          <Title title="Focused" theme="dark" level={4} />
-          <DxcButton mode="text" label="Text focused" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-active">
-          <Title title="Actived" theme="dark" level={4} />
-          <DxcButton mode="text" label="Text actived" />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled" theme="dark" level={4} />
-          <DxcButton mode="text" label="Text disabled" disabled />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="With icon" theme="dark" level={4} />
-          <DxcButton mode="text" label="Primary" icon={iconSVG} />
-        </ExampleContainer>
-      </DarkContainer>
-    </BackgroundColorProvider>
+    <ExampleContainer>
+      <Title title="Only icon (image)" theme="light" level={4} />
+      <DxcButton
+        mode="text"
+        icon="https://www.freepnglogos.com/uploads/facebook-logo-design-1.png"
+      />
+    </ExampleContainer>
     <Title title="Sizes" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Small size" theme="light" level={4} />
@@ -188,7 +173,7 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium size" theme="light" level={4} />
-      <DxcButton label="MediumSiz" size="medium" />
+      <DxcButton label="MediumSize" size="medium" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium size with ellipsis" theme="light" level={4} />
@@ -196,11 +181,11 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium size icon after" theme="light" level={4} />
-      <DxcButton label="Mediu" iconPosition="after" icon={iconSVG} size="medium" />
+      <DxcButton label="Medium" iconPosition="after" icon={iconSVG} size="medium" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium size icon before" theme="light" level={4} />
-      <DxcButton label="Mediu" iconPosition="before" icon={iconSVG} size="medium" />
+      <DxcButton label="Medium" iconPosition="before" icon={iconSVG} size="medium" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium size icon after with ellipsis" theme="light" level={4} />
@@ -220,11 +205,11 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Large size icon after" theme="light" level={4} />
-      <DxcButton label="LargeSizePrimaryButto" iconPosition="after" icon={iconSVG} size="large" />
+      <DxcButton label="LargeSizePrimaryButton" iconPosition="after" icon={iconSVG} size="large" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Large size icon before" theme="light" level={4} />
-      <DxcButton label="LargeSizePrimaryButto" iconPosition="before" icon={iconSVG} size="large" />
+      <DxcButton label="LargeSizePrimaryButton" iconPosition="before" icon={iconSVG} size="large" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Large size icon after with ellipsis" theme="light" level={4} />
@@ -273,11 +258,87 @@ export const Chromatic = () => (
     </ExampleContainer>
     <Title title="Inside a flex" theme="light" level={2} />
     <ExampleContainer>
-      <DxcFlex direction="column" gap="0.75rem">
+      <DxcFlex direction="column" gap="1rem">
         <DxcButton label="Button" />
         <DxcButton label="Button" />
         <DxcButton label="Button" />
       </DxcFlex>
     </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <Title title="Primary" theme="light" level={3} />
+    <ExampleContainer>
+      <Title title="Enabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton label="Primary" icon={iconSVG} />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcButton label="Primary hovered" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcButton label="Primary focused" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Actived" theme="light" level={4} />
+      <DxcButton label="Primary actived" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton label="Primary" icon={iconSVG} disabled />
+      </HalstackProvider>
+    </ExampleContainer>
+    <Title title="Secondary" theme="light" level={3} />
+    <ExampleContainer>
+      <Title title="Enabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton mode="secondary" label="Secondary" icon={iconSVG} />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcButton mode="secondary" label="Secondary hovered" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcButton mode="secondary" label="Secondary focused" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Actived" theme="light" level={4} />
+      <DxcButton mode="secondary" label="Secondary actived" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton mode="secondary" label="Secondary" icon={iconSVG} disabled />
+      </HalstackProvider>
+    </ExampleContainer>
+    <Title title="Text" theme="light" level={3} />
+    <ExampleContainer>
+      <Title title="Enabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton mode="text" label="Text" icon={iconSVG} />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcButton mode="text" label="Text hovered" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcButton mode="text" label="Text focused" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Actived" theme="light" level={4} />
+      <DxcButton mode="text" label="Text actived" icon={iconSVG} />
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcButton mode="text" label="Text disabled" icon={iconSVG} disabled />
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );

package/button/Button.test.js

@@ -1,35 +1,36 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _react = _interopRequireDefault(require("react"));
-
 var _react2 = require("@testing-library/react");
-
-var _Button = _interopRequireDefault(require("./Button"));
-
+var _Button = _interopRequireDefault(require("./Button.tsx"));
 describe("Button component tests", function () {
   test("Button renders with correct text", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-      label: "Button"
-    })),
-        getByText = _render.getByText;
-
+        label: "Button"
+      })),
+      getByText = _render.getByText;
     expect(getByText("Button")).toBeTruthy();
   });
   test("Calls correct function on click", function () {
     var onClick = jest.fn();
-
     var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-      label: "Button",
-      onClick: onClick
-    })),
-        getByText = _render2.getByText;
-
+        label: "Button",
+        onClick: onClick
+      })),
+      getByText = _render2.getByText;
     var button = getByText("Button");
-
     _react2.fireEvent.click(button);
-
     expect(onClick).toHaveBeenCalled();
   });
+  test("Renders with correct accessibility attributes", function () {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+        label: "Home",
+        title: "Go home"
+      })),
+      getByRole = _render3.getByRole;
+    var button = getByRole("button");
+    expect(button.getAttribute("aria-label")).toBe("Go home");
+    expect(button.getAttribute("title")).toBe("Go home");
+  });
 });

package/button/types.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="react" />
-export declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-export declare type Margin = {
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
     right?: Space;
 };
-export declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
-declare type Props = {
+type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
+type Props = {
     /**
      * Text to be placed in the button.
      */
@@ -24,6 +24,10 @@ declare type Props = {
      * Whether the icon should appear after or before the label.
      */
     iconPosition?: "before" | "after";
+    /**
+     * Value for the HTML properties title and aria-label.
+     */
+    title?: string;
     /**
      * 'type' html prop of the button.
      */

package/card/Card.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import CardPropsType from "./types";
-declare const DxcCard: ({ imageSrc, imageBgColor, imagePadding, imagePosition, linkHref, onClick, imageCover, margin, contentPadding, tabIndex, outlined, children, }: CardPropsType) => JSX.Element;
+declare const DxcCard: ({ imageSrc, imageBgColor, imagePadding, imagePosition, linkHref, onClick, imageCover, margin, tabIndex, outlined, children, }: CardPropsType) => JSX.Element;
 export default DxcCard;

package/card/Card.js

@@ -1,70 +1,46 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 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"));
-
 var _Box = _interopRequireDefault(require("../box/Box"));
-
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-
-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); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var DxcCard = function DxcCard(_ref) {
   var imageSrc = _ref.imageSrc,
-      _ref$imageBgColor = _ref.imageBgColor,
-      imageBgColor = _ref$imageBgColor === void 0 ? "black" : _ref$imageBgColor,
-      imagePadding = _ref.imagePadding,
-      _ref$imagePosition = _ref.imagePosition,
-      imagePosition = _ref$imagePosition === void 0 ? "before" : _ref$imagePosition,
-      linkHref = _ref.linkHref,
-      onClick = _ref.onClick,
-      _ref$imageCover = _ref.imageCover,
-      imageCover = _ref$imageCover === void 0 ? false : _ref$imageCover,
-      margin = _ref.margin,
-      contentPadding = _ref.contentPadding,
-      _ref$tabIndex = _ref.tabIndex,
-      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex,
-      _ref$outlined = _ref.outlined,
-      outlined = _ref$outlined === void 0 ? true : _ref$outlined,
-      children = _ref.children;
+    _ref$imageBgColor = _ref.imageBgColor,
+    imageBgColor = _ref$imageBgColor === void 0 ? "black" : _ref$imageBgColor,
+    imagePadding = _ref.imagePadding,
+    _ref$imagePosition = _ref.imagePosition,
+    imagePosition = _ref$imagePosition === void 0 ? "before" : _ref$imagePosition,
+    linkHref = _ref.linkHref,
+    onClick = _ref.onClick,
+    _ref$imageCover = _ref.imageCover,
+    imageCover = _ref$imageCover === void 0 ? false : _ref$imageCover,
+    margin = _ref.margin,
+    _ref$tabIndex = _ref.tabIndex,
+    tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex,
+    _ref$outlined = _ref.outlined,
+    outlined = _ref$outlined === void 0 ? true : _ref$outlined,
+    children = _ref.children;
   var colorsTheme = (0, _useTheme["default"])();
-
   var _useState = (0, _react.useState)(false),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      isHovered = _useState2[0],
-      changeIsHovered = _useState2[1];
-
-  var imageComponent = /*#__PURE__*/_react["default"].createElement(ImageContainer, {
-    imageBgColor: imageBgColor
-  }, /*#__PURE__*/_react["default"].createElement(TagImage, {
-    imagePadding: imagePadding,
-    cover: imageCover,
-    src: imageSrc
-  }));
-
-  return /*#__PURE__*/_react["default"].createElement(StyledDxcCard, {
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    isHovered = _useState2[0],
+    changeIsHovered = _useState2[1];
+  return /*#__PURE__*/_react["default"].createElement(Card, {
+    hasAction: onClick || linkHref ? true : false,
     margin: margin,
     onMouseEnter: function onMouseEnter() {
       return changeIsHovered(true);
@@ -73,7 +49,6 @@ var DxcCard = function DxcCard(_ref) {
       return changeIsHovered(false);
     },
     onClick: onClick,
-    hasAction: onClick || linkHref,
     tabIndex: onClick || linkHref ? tabIndex : -1,
     as: linkHref && "a",
     href: linkHref
@@ -82,14 +57,17 @@ var DxcCard = function DxcCard(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.card
   }, /*#__PURE__*/_react["default"].createElement(CardContainer, {
-    hasAction: onClick || linkHref,
-    imagePosition: imagePosition
-  }, imageSrc && imagePosition === "before" && imageComponent, /*#__PURE__*/_react["default"].createElement(CardContent, {
-    contentPadding: contentPadding
-  }, children), imageSrc && imagePosition === "after" && imageComponent))));
+    hasAction: onClick || linkHref ? true : false,
+    imagePosition: imageSrc ? imagePosition : "none"
+  }, imageSrc && /*#__PURE__*/_react["default"].createElement(ImageContainer, {
+    imageBgColor: imageBgColor
+  }, /*#__PURE__*/_react["default"].createElement(TagImage, {
+    imagePadding: imagePadding,
+    imageCover: imageCover,
+    src: imageSrc
+  })), /*#__PURE__*/_react["default"].createElement(CardContent, null, children)))));
 };
-
-var StyledDxcCard = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  cursor: ", ";\n  outline: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  text-decoration: none;\n\n  ", "\n"])), function (_ref2) {
+var Card = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  cursor: ", ";\n  outline: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  text-decoration: none;\n  ", "\n"])), function (_ref2) {
   var hasAction = _ref2.hasAction;
   return hasAction && "pointer" || "unset";
 }, function (_ref3) {
@@ -100,22 +78,23 @@ var StyledDxcCard = _styledComponents["default"].div(_templateObject || (_templa
   return margin && (0, _typeof2["default"])(margin) !== "object" ? _variables.spaces[margin] : "0px";
 }, function (_ref5) {
   var margin = _ref5.margin;
-  return margin && margin.top ? _variables.spaces[margin.top] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.top ? _variables.spaces[margin.top] : "";
 }, function (_ref6) {
   var margin = _ref6.margin;
-  return margin && margin.right ? _variables.spaces[margin.right] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.right ? _variables.spaces[margin.right] : "";
 }, function (_ref7) {
   var margin = _ref7.margin;
-  return margin && margin.bottom ? _variables.spaces[margin.bottom] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.bottom ? _variables.spaces[margin.bottom] : "";
 }, function (_ref8) {
   var margin = _ref8.margin;
-  return margin && margin.left ? _variables.spaces[margin.left] : "";
+  return margin && (0, _typeof2["default"])(margin) === "object" && margin.left ? _variables.spaces[margin.left] : "";
 }, function (_ref9) {
   var hasAction = _ref9.hasAction;
-  return hasAction && ":focus {\n    outline: #0095ff auto 1px;\n  }";
+  return hasAction && ":focus {\n      outline: #0095ff auto 1px;\n    }";
 });
-
-var CardContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  height: ", ";\n  width: ", ";\n  &:hover {\n    border-color: ", ";\n  }\n"])), function (props) {
+var CardContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-direction: ", ";\n  height: ", ";\n  width: ", ";\n  &:hover {\n    border-color: ", ";\n  }\n"])), function (props) {
+  return props.imagePosition === "after" ? "row-reverse" : "row";
+}, function (props) {
   return props.theme.height;
 }, function (props) {
   return props.theme.width;
@@ -123,39 +102,19 @@ var CardContainer = _styledComponents["default"].div(_templateObject2 || (_templ
   var hasAction = _ref10.hasAction;
   return hasAction ? "" : "unset";
 });
-
 var TagImage = _styledComponents["default"].img(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  height: ", ";\n  width: ", ";\n  object-fit: ", ";\n"])), function (_ref11) {
   var imagePadding = _ref11.imagePadding;
-  return !imagePadding ? "100%" : "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
+  return !imagePadding ? "100%" : (0, _typeof2["default"])(imagePadding) !== "object" && "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
 }, function (_ref12) {
   var imagePadding = _ref12.imagePadding;
-  return !imagePadding ? "100%" : "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
+  return !imagePadding ? "100%" : (0, _typeof2["default"])(imagePadding) !== "object" && "calc(100% - ".concat(_variables.spaces[imagePadding], " - ").concat(_variables.spaces[imagePadding], ")");
 }, function (_ref13) {
-  var cover = _ref13.cover;
-  return cover ? "cover" : "contain";
+  var imageCover = _ref13.imageCover;
+  return imageCover ? "cover" : "contain";
 });
-
-var ImageContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 35%;\n  height: 100%;\n  flex-shrink: 0;\n  background: ", ";\n  justify-content: center;\n  align-items: center;\n  display: inline-flex;\n"])), function (_ref14) {
+var ImageContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  flex-shrink: 0;\n  width: 35%;\n  height: 100%;\n  background-color: ", ";\n"])), function (_ref14) {
   var imageBgColor = _ref14.imageBgColor;
   return imageBgColor;
 });
-
-var CardContent = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  flex-grow: 1;\n  padding: ", ";\n  padding-top: ", ";\n  padding-right: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  overflow: hidden;\n"])), function (_ref15) {
-  var contentPadding = _ref15.contentPadding;
-  return contentPadding && (0, _typeof2["default"])(contentPadding) !== "object" ? _variables.spaces[contentPadding] : "0px";
-}, function (_ref16) {
-  var contentPadding = _ref16.contentPadding;
-  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.top ? _variables.spaces[contentPadding.top] : "";
-}, function (_ref17) {
-  var contentPadding = _ref17.contentPadding;
-  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.right ? _variables.spaces[contentPadding.right] : "";
-}, function (_ref18) {
-  var contentPadding = _ref18.contentPadding;
-  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.bottom ? _variables.spaces[contentPadding.bottom] : "";
-}, function (_ref19) {
-  var contentPadding = _ref19.contentPadding;
-  return contentPadding && (0, _typeof2["default"])(contentPadding) === "object" && contentPadding.left ? _variables.spaces[contentPadding.left] : "";
-});
-
-var _default = DxcCard;
-exports["default"] = _default;
+var CardContent = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  flex-grow: 1;\n  overflow: hidden;\n"])));
+var _default = exports["default"] = DxcCard;