@dxc-technology/halstack-react 0.0.0-d4fec82 → 0.0.0-d53aaf7

package/dialog/Dialog.js

@@ -9,8 +9,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
@@ -23,13 +21,11 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _Dialog = _interopRequireDefault(require("@material-ui/core/Dialog"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _variables = require("../common/variables.js");
 
-var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _BackgroundColorContext = require("../BackgroundColorContext.js");
+var _BackgroundColorContext = require("../BackgroundColorContext");
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
@@ -45,11 +41,12 @@ var DxcDialog = function DxcDialog(_ref) {
       _ref$overlay = _ref.overlay,
       overlay = _ref$overlay === void 0 ? true : _ref$overlay,
       onBackgroundClick = _ref.onBackgroundClick,
-      padding = _ref.padding,
+      _ref$padding = _ref.padding,
+      padding = _ref$padding === void 0 ? "small" : _ref$padding,
       _ref$tabIndex = _ref.tabIndex,
       tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
-  var _useState = (0, _react.useState)(),
+  var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
       isResponsive = _useState2[0],
       setIsResponsive = _useState2[1];
@@ -57,15 +54,15 @@ var DxcDialog = function DxcDialog(_ref) {
   var colorsTheme = (0, _useTheme["default"])();
 
   var handleClose = function handleClose() {
-    typeof onCloseClick === "function" && onCloseClick();
+    onCloseClick === null || onCloseClick === void 0 ? void 0 : onCloseClick();
   };
 
   var handleOverlayClick = function handleOverlayClick() {
-    typeof onBackgroundClick === "function" && onBackgroundClick();
+    onBackgroundClick === null || onBackgroundClick === void 0 ? void 0 : onBackgroundClick();
   };
 
   var handleResize = function handleResize(width) {
-    width && width <= _variables.responsiveSizes.tablet ? setIsResponsive(true) : setIsResponsive(false);
+    setIsResponsive(width && width <= _variables.responsiveSizes.tablet);
   };
 
   var handleEventListener = function handleEventListener() {
@@ -165,20 +162,5 @@ var CloseIcon = _styledComponents["default"].svg(_templateObject4 || (_templateO
   return props.theme.closeIconBorderColor;
 });
 
-DxcDialog.propTypes = {
-  padding: _propTypes["default"].oneOfType([_propTypes["default"].shape({
-    top: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
-    right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
-  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
-  isVisible: _propTypes["default"].bool,
-  isCloseVisible: _propTypes["default"].bool,
-  onClose: _propTypes["default"].func,
-  onCloseClick: _propTypes["default"].func,
-  onBackgroundClick: _propTypes["default"].func,
-  overlay: _propTypes["default"].bool,
-  tabIndex: _propTypes["default"].number
-};
 var _default = DxcDialog;
 exports["default"] = _default;

package/dialog/Dialog.stories.tsx

@@ -0,0 +1,212 @@
+import React from "react";
+import { userEvent, within } from "@storybook/testing-library";
+import DxcDialog from "./Dialog";
+import Title from "../../.storybook/components/Title";
+import ExampleContainer from "../../.storybook/components/ExampleContainer";
+
+export default {
+  title: "Dialog ",
+  component: DxcDialog,
+};
+
+export const DefaultDialog = () => (
+  <>
+    <ExampleContainer expanded={true}>
+      <Title title="Default dialog" theme="light" level={4} />
+      <DxcDialog>
+        {" "}
+        <p>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi egestas luctus porttitor. Donec massa magna,
+          placerat sit amet felis eget, venenatis fringilla ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing
+          elit. Donec congue laoreet orci, nec elementum dolor consequat quis. Curabitur rhoncus justo sed dapibus
+          tincidunt. Vestibulum cursus ut risus sit amet congue. Nunc luctus, urna ullamcorper facilisis Jia Le, risus
+          eros aliquam erat, ut efficitur ante neque id odio. Nam orci leo, dignissim sit amet dolor ut, congue gravida
+          enim. Donec rhoncus aliquam nisl, ac cursus enim bibendum vitae. Nunc sit amet elit ornare, malesuada urna eu,
+          fringilla mauris. Vivamus bibendum turpis est, id elementum purus euismod sit amet. Etiam sit amet maximus
+          augue. Vivamus erat sapien, ultricies fringilla tellus id, condimentum blandit justo. Praesent quis nunc
+          dignissim, pharetra neque molestie, molestie lectus.
+        </p>{" "}
+      </DxcDialog>
+    </ExampleContainer>
+  </>
+);
+
+export const DialogWithoutOverlay = () => (
+  <ExampleContainer expanded={true}>
+    <Title title="Dialog Without Overlay" theme="light" level={4} />
+    <DxcDialog overlay={false}>
+      {" "}
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi egestas luctus porttitor. Donec massa magna,
+        placerat sit amet felis eget, venenatis fringilla ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing
+        elit. Donec congue laoreet orci, nec elementum dolor consequat quis. Curabitur rhoncus justo sed dapibus
+        tincidunt. Vestibulum cursus ut risus sit amet congue. Nunc luctus, urna ullamcorper facilisis Jia Le, risus
+        eros aliquam erat, ut efficitur ante neque id odio. Nam orci leo, dignissim sit amet dolor ut, congue gravida
+        enim. Donec rhoncus aliquam nisl, ac cursus enim bibendum vitae. Nunc sit amet elit ornare, malesuada urna eu,
+        fringilla mauris. Vivamus bibendum turpis est, id elementum purus euismod sit amet. Etiam sit amet maximus
+        augue. Vivamus erat sapien, ultricies fringilla tellus id, condimentum blandit justo. Praesent quis nunc
+        dignissim, pharetra neque molestie, molestie lectus.
+      </p>{" "}
+    </DxcDialog>
+  </ExampleContainer>
+);
+
+export const DialogCloseVisibleFalse = () => (
+  <ExampleContainer expanded={true}>
+    <Title title="Dialog Close Visible" theme="dark" level={4} />
+    <DxcDialog isCloseVisible={false}>
+      {" "}
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi egestas luctus porttitor. Donec massa magna,
+        placerat sit amet felis eget, venenatis fringilla ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing
+        elit. Donec congue laoreet orci, nec elementum dolor consequat quis. Curabitur rhoncus justo sed dapibus
+        tincidunt. Vestibulum cursus ut risus sit amet congue. Nunc luctus, urna ullamcorper facilisis Jia Le, risus
+        eros aliquam erat, ut efficitur ante neque id odio. Nam orci leo, dignissim sit amet dolor ut, congue gravida
+        enim. Donec rhoncus aliquam nisl, ac cursus enim bibendum vitae. Nunc sit amet elit ornare, malesuada urna eu,
+        fringilla mauris. Vivamus bibendum turpis est, id elementum purus euismod sit amet. Etiam sit amet maximus
+        augue. Vivamus erat sapien, ultricies fringilla tellus id, condimentum blandit justo. Praesent quis nunc
+        dignissim, pharetra neque molestie, molestie lectus.
+      </p>{" "}
+    </DxcDialog>
+  </ExampleContainer>
+);
+
+export const DialogWithXxsmallPadding = () => (
+  <ExampleContainer expanded={true}>
+    <Title title="Dialog With Xxsmall Padding" theme="light" level={4} />
+    <DxcDialog padding={"xxsmall"}>
+      {" "}
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi egestas luctus porttitor. Donec massa magna,
+        placerat sit amet felis eget, venenatis fringilla ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing
+        elit. Donec congue laoreet orci, nec elementum dolor consequat quis. Curabitur rhoncus justo sed dapibus
+        tincidunt. Vestibulum cursus ut risus sit amet congue. Nunc luctus, urna ullamcorper facilisis Jia Le, risus
+        eros aliquam erat, ut efficitur ante neque id odio. Nam orci leo, dignissim sit amet dolor ut, congue gravida
+        enim. Donec rhoncus aliquam nisl, ac cursus enim bibendum vitae. Nunc sit amet elit ornare, malesuada urna eu,
+        fringilla mauris. Vivamus bibendum turpis est, id elementum purus euismod sit amet. Etiam sit amet maximus
+        augue. Vivamus erat sapien, ultricies fringilla tellus id, condimentum blandit justo. Praesent quis nunc
+        dignissim, pharetra neque molestie, molestie lectus.
+      </p>{" "}
+    </DxcDialog>
+  </ExampleContainer>
+);
+
+export const DialogWithXsmallPadding = () => (
+  <ExampleContainer expanded={true}>
+    <Title title="Dialog With Xsmall Padding" theme="light" level={4} />
+    <DxcDialog padding={"xsmall"}>
+      {" "}
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi egestas luctus porttitor. Donec massa magna,
+        placerat sit amet felis eget, venenatis fringilla ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing
+        elit. Donec congue laoreet orci, nec elementum dolor consequat quis. Curabitur rhoncus justo sed dapibus
+        tincidunt. Vestibulum cursus ut risus sit amet congue. Nunc luctus, urna ullamcorper facilisis Jia Le, risus
+        eros aliquam erat, ut efficitur ante neque id odio. Nam orci leo, dignissim sit amet dolor ut, congue gravida
+        enim. Donec rhoncus aliquam nisl, ac cursus enim bibendum vitae. Nunc sit amet elit ornare, malesuada urna eu,
+        fringilla mauris. Vivamus bibendum turpis est, id elementum purus euismod sit amet. Etiam sit amet maximus
+        augue. Vivamus erat sapien, ultricies fringilla tellus id, condimentum blandit justo. Praesent quis nunc
+        dignissim, pharetra neque molestie, molestie lectus.
+      </p>{" "}
+    </DxcDialog>
+  </ExampleContainer>
+);
+
+export const DialogWithSmallPadding = () => (
+  <ExampleContainer expanded={true}>
+    <Title title="Dialog With Small Padding" theme="light" level={4} />
+    <DxcDialog padding={"small"}>
+      {" "}
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi egestas luctus porttitor. Donec massa magna,
+        placerat sit amet felis eget, venenatis fringilla ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing
+        elit. Donec congue laoreet orci, nec elementum dolor consequat quis. Curabitur rhoncus justo sed dapibus
+        tincidunt. Vestibulum cursus ut risus sit amet congue. Nunc luctus, urna ullamcorper facilisis Jia Le, risus
+        eros aliquam erat, ut efficitur ante neque id odio. Nam orci leo, dignissim sit amet dolor ut, congue gravida
+        enim. Donec rhoncus aliquam nisl, ac cursus enim bibendum vitae. Nunc sit amet elit ornare, malesuada urna eu,
+        fringilla mauris. Vivamus bibendum turpis est, id elementum purus euismod sit amet. Etiam sit amet maximus
+        augue. Vivamus erat sapien, ultricies fringilla tellus id, condimentum blandit justo. Praesent quis nunc
+        dignissim, pharetra neque molestie, molestie lectus.
+      </p>{" "}
+    </DxcDialog>
+  </ExampleContainer>
+);
+
+export const DialogWithMediumPadding = () => (
+  <ExampleContainer expanded={true}>
+    <Title title="Dialog With Medium Padding" theme="light" level={4} />
+    <DxcDialog padding={"medium"}>
+      {" "}
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi egestas luctus porttitor. Donec massa magna,
+        placerat sit amet felis eget, venenatis fringilla ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing
+        elit. Donec congue laoreet orci, nec elementum dolor consequat quis. Curabitur rhoncus justo sed dapibus
+        tincidunt. Vestibulum cursus ut risus sit amet congue. Nunc luctus, urna ullamcorper facilisis Jia Le, risus
+        eros aliquam erat, ut efficitur ante neque id odio. Nam orci leo, dignissim sit amet dolor ut, congue gravida
+        enim. Donec rhoncus aliquam nisl, ac cursus enim bibendum vitae. Nunc sit amet elit ornare, malesuada urna eu,
+        fringilla mauris. Vivamus bibendum turpis est, id elementum purus euismod sit amet. Etiam sit amet maximus
+        augue. Vivamus erat sapien, ultricies fringilla tellus id, condimentum blandit justo. Praesent quis nunc
+        dignissim, pharetra neque molestie, molestie lectus.
+      </p>{" "}
+    </DxcDialog>
+  </ExampleContainer>
+);
+
+export const DialogWithLargePadding = () => (
+  <ExampleContainer expanded={true}>
+    <Title title="Dialog With Large Padding" theme="light" level={4} />
+    <DxcDialog padding={"large"}>
+      {" "}
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi egestas luctus porttitor. Donec massa magna,
+        placerat sit amet felis eget, venenatis fringilla ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing
+        elit. Donec congue laoreet orci, nec elementum dolor consequat quis. Curabitur rhoncus justo sed dapibus
+        tincidunt. Vestibulum cursus ut risus sit amet congue. Nunc luctus, urna ullamcorper facilisis Jia Le, risus
+        eros aliquam erat, ut efficitur ante neque id odio. Nam orci leo, dignissim sit amet dolor ut, congue gravida
+        enim. Donec rhoncus aliquam nisl, ac cursus enim bibendum vitae. Nunc sit amet elit ornare, malesuada urna eu,
+        fringilla mauris. Vivamus bibendum turpis est, id elementum purus euismod sit amet. Etiam sit amet maximus
+        augue. Vivamus erat sapien, ultricies fringilla tellus id, condimentum blandit justo. Praesent quis nunc
+        dignissim, pharetra neque molestie, molestie lectus.
+      </p>{" "}
+    </DxcDialog>
+  </ExampleContainer>
+);
+
+export const DialogWithXlargePadding = () => (
+  <ExampleContainer expanded={true}>
+    <Title title="Dialog With Xlarge Padding" theme="light" level={4} />
+    <DxcDialog padding={"xlarge"}>
+      {" "}
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi egestas luctus porttitor. Donec massa magna,
+        placerat sit amet felis eget, venenatis fringilla ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing
+        elit. Donec congue laoreet orci, nec elementum dolor consequat quis. Curabitur rhoncus justo sed dapibus
+        tincidunt. Vestibulum cursus ut risus sit amet congue. Nunc luctus, urna ullamcorper facilisis Jia Le, risus
+        eros aliquam erat, ut efficitur ante neque id odio. Nam orci leo, dignissim sit amet dolor ut, congue gravida
+        enim. Donec rhoncus aliquam nisl, ac cursus enim bibendum vitae. Nunc sit amet elit ornare, malesuada urna eu,
+        fringilla mauris. Vivamus bibendum turpis est, id elementum purus euismod sit amet. Etiam sit amet maximus
+        augue. Vivamus erat sapien, ultricies fringilla tellus id, condimentum blandit justo. Praesent quis nunc
+        dignissim, pharetra neque molestie, molestie lectus.
+      </p>{" "}
+    </DxcDialog>
+  </ExampleContainer>
+);
+
+export const DialogWithXxlargePadding = () => (
+  <ExampleContainer expanded={true}>
+    <Title title="Dialog With Xxlarge Padding" theme="light" level={4} />
+    <DxcDialog padding={"xxlarge"}>
+      {" "}
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi egestas luctus porttitor. Donec massa magna,
+        placerat sit amet felis eget, venenatis fringilla ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing
+        elit. Donec congue laoreet orci, nec elementum dolor consequat quis. Curabitur rhoncus justo sed dapibus
+        tincidunt. Vestibulum cursus ut risus sit amet congue. Nunc luctus, urna ullamcorper facilisis Jia Le, risus
+        eros aliquam erat, ut efficitur ante neque id odio. Nam orci leo, dignissim sit amet dolor ut, congue gravida
+        enim. Donec rhoncus aliquam nisl, ac cursus enim bibendum vitae. Nunc sit amet elit ornare, malesuada urna eu,
+        fringilla mauris. Vivamus bibendum turpis est, id elementum purus euismod sit amet. Etiam sit amet maximus
+        augue. Vivamus erat sapien, ultricies fringilla tellus id, condimentum blandit justo. Praesent quis nunc
+        dignissim, pharetra neque molestie, molestie lectus.
+      </p>{" "}
+    </DxcDialog>
+  </ExampleContainer>
+);

package/dialog/Dialog.test.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _Dialog = _interopRequireDefault(require("./Dialog"));
+
+describe("Dialog component tests", function () {
+  test("Dialog renders with correct text", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, "dialog-text")),
+        getByText = _render.getByText;
+
+    expect(getByText("dialog-text")).toBeTruthy();
+  });
+  test("Dialog renders without close button", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
+      isCloseVisible: false
+    }, "dialog-text")),
+        queryByRole = _render2.queryByRole;
+
+    expect(queryByRole("button")).toBeFalsy();
+  });
+  test("Calls correct function onCloseClick", function () {
+    var onCloseClick = jest.fn();
+
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
+      onCloseClick: onCloseClick
+    }, "dialog-text")),
+        getByRole = _render3.getByRole;
+
+    var closeButton = getByRole("button");
+
+    _react2.fireEvent.click(closeButton);
+
+    expect(onCloseClick).toHaveBeenCalled();
+  });
+});

package/dialog/types.d.ts

@@ -0,0 +1,43 @@
+/// <reference types="react" />
+declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+declare type Padding = {
+    top?: Space;
+    bottom?: Space;
+    left?: Space;
+    right?: Space;
+};
+declare type Props = {
+    /**
+     * If true, the close 'x' button will be visible.
+     */
+    isCloseVisible?: boolean;
+    /**
+     * This function will be called when the user clicks the close 'x' button.
+     * The responsibility of hiding the modal lies with the user.
+     */
+    onCloseClick?: () => void;
+    /**
+     * If true, the dialog will be displayed over a darker background that covers the content behind.
+     */
+    overlay?: boolean;
+    /**
+     * This function will be called when the user clicks background of the modal.
+     * The responsibility of hiding the modal lies with the user.
+     */
+    onBackgroundClick?: () => void;
+    /**
+     * Size of the padding to be applied to the component ('xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge').
+     * You can pass an object with 'top', 'bottom', 'left' and 'right' properties in order to specify different padding sizes.
+     */
+    padding?: Padding | Space;
+    /**
+     * Value of the tabindex given to the close 'x' button.
+     */
+    tabIndex?: number;
+    /**
+     * The area inside the dialog. This area can be used to render
+     * custom content.
+     */
+    children: React.ReactNode;
+};
+export default Props;

package/dialog/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dropdown/Dropdown.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import DropdownPropsType from "./types";
-declare const DxcDropdown: ({ options, optionsIconPosition, icon, iconSrc, iconPosition, label, caretHidden, onSelectOption, expandOnHover, margin, size, tabIndex, disabled, }: DropdownPropsType) => JSX.Element;
+declare const DxcDropdown: ({ options, optionsIconPosition, icon, iconPosition, label, caretHidden, onSelectOption, expandOnHover, margin, size, tabIndex, disabled, }: DropdownPropsType) => JSX.Element;
 export default DxcDropdown;

package/dropdown/Dropdown.js

@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 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"));
@@ -35,7 +35,7 @@ var _variables = require("../common/variables.js");
 
 var _utils = require("../common/utils.js");
 
-var _useTheme = _interopRequireDefault(require("../useTheme.js"));
+var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
 
@@ -48,8 +48,6 @@ var DxcDropdown = function DxcDropdown(_ref) {
       _ref$optionsIconPosit = _ref.optionsIconPosition,
       optionsIconPosition = _ref$optionsIconPosit === void 0 ? "before" : _ref$optionsIconPosit,
       icon = _ref.icon,
-      _ref$iconSrc = _ref.iconSrc,
-      iconSrc = _ref$iconSrc === void 0 ? "" : _ref$iconSrc,
       _ref$iconPosition = _ref.iconPosition,
       iconPosition = _ref$iconPosition === void 0 ? "before" : _ref$iconPosition,
       _ref$label = _ref.label,
@@ -164,15 +162,13 @@ var DxcDropdown = function DxcDropdown(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(DropdownTriggerContainer, {
     iconPosition: iconPosition,
     caretHidden: caretHidden
-  }, icon ? /*#__PURE__*/_react["default"].createElement(ButtonIconContainer, {
+  }, icon && /*#__PURE__*/_react["default"].createElement(ButtonIconContainer, {
     label: label,
     iconPosition: iconPosition,
     disabled: disabled
-  }, (0, _typeof2["default"])(icon) === "object" ? icon : /*#__PURE__*/_react["default"].createElement(icon)) : iconSrc && /*#__PURE__*/_react["default"].createElement(ButtonIcon, {
-    label: label,
-    src: iconSrc,
-    iconPosition: iconPosition
-  }), /*#__PURE__*/_react["default"].createElement(DropdownTriggerLabel, {
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(ButtonIcon, {
+    src: icon
+  }) : icon), /*#__PURE__*/_react["default"].createElement(DropdownTriggerLabel, {
     iconPosition: iconPosition,
     label: label
   }, label)), /*#__PURE__*/_react["default"].createElement(CaretIconContainer, {
@@ -213,14 +209,12 @@ var DxcDropdown = function DxcDropdown(_ref) {
         onClick: function onClick(event) {
           return handleMenuItemClick(option);
         }
-      }, option.icon ? /*#__PURE__*/_react["default"].createElement(ListIconContainer, {
-        label: option.label,
-        iconPosition: optionsIconPosition
-      }, (0, _typeof2["default"])(option.icon) === "object" ? option.icon : /*#__PURE__*/_react["default"].createElement(option.icon)) : option.iconSrc && /*#__PURE__*/_react["default"].createElement(ListIcon, {
+      }, option.icon && /*#__PURE__*/_react["default"].createElement(ListIconContainer, {
         label: option.label,
-        src: option.iconSrc,
         iconPosition: optionsIconPosition
-      }), /*#__PURE__*/_react["default"].createElement("span", {
+      }, typeof option.icon === "string" ? /*#__PURE__*/_react["default"].createElement(ListIcon, {
+        src: option.icon
+      }) : option.icon), /*#__PURE__*/_react["default"].createElement("span", {
         className: "optionLabel"
       }, option.label));
     })))));
@@ -357,15 +351,7 @@ var DropdownTriggerContainer = _styledComponents["default"].span(_templateObject
   return props.caretHidden ? "100%" : "calc(100% - 36px)";
 });
 
-var ButtonIcon = _styledComponents["default"].img(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n"])), function (props) {
-  return props.theme.buttonIconSize;
-}, function (props) {
-  return props.theme.buttonIconSize;
-}, function (props) {
-  return props.iconPosition === "after" && props.label !== "" && props.theme.buttonIconSpacing || "0px";
-}, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && props.theme.buttonIconSpacing || "0px";
-});
+var ButtonIcon = _styledComponents["default"].img(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])([""])));
 
 var ButtonIconContainer = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  color: ", ";\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
   return props.theme.buttonIconSize;
@@ -379,15 +365,7 @@ var ButtonIconContainer = _styledComponents["default"].div(_templateObject7 || (
   return props.disabled ? props.theme.disabledColor : props.theme.buttonIconColor;
 });
 
-var ListIcon = _styledComponents["default"].img(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n"])), function (props) {
-  return props.theme.optionIconSize;
-}, function (props) {
-  return props.theme.optionIconSize;
-}, function (props) {
-  return props.iconPosition === "after" && props.label !== "" && props.theme.optionIconSpacing || "0px";
-}, function (props) {
-  return props.iconPosition === "before" && props.label !== "" && props.theme.optionIconSpacing || "0px";
-});
+var ListIcon = _styledComponents["default"].img(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])([""])));
 
 var ListIconContainer = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  width: ", ";\n  height: ", ";\n  margin-left: ", ";\n  margin-right: ", ";\n  color: ", ";\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
   return props.theme.optionIconSize;