@dxc-technology/halstack-react 0.0.0-453c87a → 0.0.0-456a6f5

package/date-input/Calendar.js

@@ -213,32 +213,44 @@ var Calendar = function Calendar(_ref) {
   })));
 };
 
-var CalendarContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  padding: 0px 8px 8px 8px;\n  width: ", ";\n"])), function (props) {
-  return props.theme.dateInput.pickerWidth;
-});
-
-var WeekHeaderCell = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 36px;\n  height: 36px;\n  font-family: ", ";\n  font-size: 0.875rem;\n  color: ", ";\n"])), function (props) {
+var CalendarContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  padding: 0px 8px 8px 8px;\n  width: 292px;\n  font-family: ", ";\n  font-size: ", ";\n  color: ", ";\n  font-weight: ", ";\n"])), function (props) {
   return props.theme.dateInput.pickerFontFamily;
 }, function (props) {
-  return props.theme.dateInput.pickerWeekFontColor;
+  return props.theme.dateInput.pickerFontSize;
+}, function (props) {
+  return props.theme.dateInput.pickerFontColor;
+}, function (props) {
+  return props.theme.dateInput.pickerFontWeight;
 });
 
+var WeekHeaderCell = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 36px;\n  height: 36px;\n"])));
+
 var DayCellsContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  gap: 4px;\n  flex-wrap: wrap;\n  justify-content: space-between;\n"])));
 
-var DayCell = _styledComponents["default"].button(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  width: 36px;\n  height: 36px;\n  padding: 0;\n  font-size: 0.875rem;\n  font-family: ", ";\n  border: none;\n  border-radius: 50%;\n  cursor: pointer;\n\n  &:focus {\n    outline: ", " solid 2px;\n  }\n  &:hover {\n    background-color: ", ";\n    color: ", ";\n  }\n  &:active {\n    background-color: #4b1c7d;\n    color: #ffffff;\n  }\n\n  ", "\n  background-color: ", ";\n  color: ", ";\n"])), function (props) {
+var DayCell = _styledComponents["default"].button(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  justify-content: center;\n  align-items: center;\n  width: 36px;\n  height: 36px;\n  padding: 0;\n  border: none;\n  border-radius: 50%;\n  cursor: pointer;\n  font-family: ", ";\n  font-size: ", ";\n  color: ", ";\n  font-weight: ", ";\n\n  &:focus {\n    outline: ", " solid 2px;\n  }\n  &:hover {\n    background-color: ", ";\n    color: ", ";\n  }\n  &:active {\n    background-color: ", ";\n    color: ", ";\n  }\n\n  ", "\n  background-color: ", ";\n  color: ", ";\n"])), function (props) {
   return props.theme.dateInput.pickerFontFamily;
+}, function (props) {
+  return props.theme.dateInput.pickerFontSize;
+}, function (props) {
+  return props.theme.dateInput.pickerFontColor;
+}, function (props) {
+  return props.theme.dateInput.pickerFontWeight;
 }, function (props) {
   return props.theme.dateInput.pickerFocusColor;
 }, function (props) {
-  return props.selected ? props.theme.dateInput.pickerSelectedDateBackgroundColor : props.theme.dateInput.pickerHoverDateBackgroundColor;
+  return props.selected ? props.theme.dateInput.pickerSelectedBackgroundColor : props.theme.dateInput.pickerHoverBackgroundColor;
+}, function (props) {
+  return props.selected ? props.theme.dateInput.pickerSelectedFontColor : props.theme.dateInput.pickerHoverFontColor;
+}, function (props) {
+  return props.theme.dateInput.pickerActiveBackgroundColor;
 }, function (props) {
-  return props.selected ? props.theme.dateInput.pickerSelectedDateColor : props.theme.dateInput.pickerHoverDateFontColor;
+  return props.theme.dateInput.pickerActiveFontColor;
 }, function (props) {
-  return props.isCurrentDay && !props.selected && "border: 1px solid #cbacec;";
+  return props.isCurrentDay && !props.selected && "border: ".concat(props.theme.dateInput.pickerCurrentDateBorderWidth, " solid ").concat(props.theme.dateInput.pickerCurrentDateBorderColor, ";");
 }, function (props) {
-  return props.selected ? props.theme.dateInput.pickerSelectedDateBackgroundColor : "transparent";
+  return props.selected ? props.theme.dateInput.pickerSelectedBackgroundColor : "transparent";
 }, function (props) {
-  return props.selected ? props.theme.dateInput.pickerSelectedDateColor : props.isCurrentDay ? props.theme.dateInput.pickerActualDateFontColor : !props.actualMonth ? "#999999" : props.theme.dateInput.pickerDayFontColor;
+  return props.selected ? props.theme.dateInput.pickerSelectedFontColor : props.isCurrentDay ? props.theme.dateInput.pickerCurrentDateFontColor : !props.actualMonth ? props.theme.dateInput.pickerNonCurrentMonthFontColor : props.theme.dateInput.pickerFontColor;
 });
 
 var _default = /*#__PURE__*/_react["default"].memo(Calendar);

package/date-input/DateInput.stories.tsx

@@ -11,12 +11,20 @@ import DarkContainer from "../../.storybook/components/DarkSection";
 import dayjs from "dayjs";
 import useTheme from "../useTheme";
 import { ThemeProvider } from "styled-components";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Date input",
   component: DxcDateInput,
 };
 
+const opinionatedTheme = {
+  dateInput: {
+    baseColor: "#5f249f",
+    selectedFontColor: "#ffffff",
+  },
+};
+
 const DateInputChromatic = () => (
   <>
     <ExampleContainer>
@@ -124,6 +132,65 @@ Chromatic.play = async ({ canvasElement }) => {
   await fireEvent.click(screen.getByText("April 1905"));
 };
 
+const DateInputOpinionatedTheme = () => (
+  <>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Enabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcDateInput
+          label="Date input"
+          helperText="Help message"
+          format="dd/mm/yy"
+          placeholder
+          optional
+          defaultValue="10-10-2022"
+        />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcDateInput label="Date input" helperText="Help message" format="dd/mm/yy" placeholder optional />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Invalid" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcDateInput label="Error date input" error="Error message." placeholder />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer expanded>
+      <Title title="Date picker" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcDateInput label="Date input" defaultValue="06-04-1905" />
+      </HalstackProvider>
+    </ExampleContainer>
+  </>
+);
+
+export const DateInputOpinionated = DateInputOpinionatedTheme.bind({});
+DateInputOpinionated.play = async ({ canvasElement }) => {
+  const canvas = within(canvasElement);
+  await userEvent.click(canvas.getAllByRole("combobox")[canvas.getAllByRole("combobox").length - 1]);
+};
+
+const YearPickerOpinionatedTheme = () => (
+  <ExampleContainer expanded>
+    <Title title="Year picker" theme="light" level={4} />
+    <HalstackProvider theme={opinionatedTheme}>
+      <DxcDateInput label="Date input" defaultValue="06-04-1905" />
+    </HalstackProvider>
+  </ExampleContainer>
+);
+
+export const YearPickerOpinionated = YearPickerOpinionatedTheme.bind({});
+YearPickerOpinionated.play = async ({ canvasElement }) => {
+  const canvas = within(canvasElement);
+  await userEvent.click(canvas.getByRole("combobox"));
+  await fireEvent.click(screen.getByText("April 1905"));
+};
+
 const DatePickerButtonStates = () => {
   const colorsTheme: any = useTheme();
   return (

package/date-input/DatePicker.js

@@ -101,30 +101,44 @@ var DxcDatePicker = function DxcDatePicker(_ref) {
   }));
 };
 
-var DatePicker = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  padding-top: 16px;\n  background-color: ", ";\n  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);\n  border: 1px solid #bfbfbf;\n  border-radius: 4px;\n  width: fit-content;\n"])), function (props) {
+var DatePicker = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  padding-top: 16px;\n  background-color: ", ";\n  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);\n  border: ", ";\n  border-radius: 4px;\n  width: fit-content;\n  font-family: ", ";\n  font-size: ", ";\n  color: ", ";\n  font-weight: ", ";\n"])), function (props) {
   return props.theme.dateInput.pickerBackgroundColor;
+}, function (props) {
+  return "".concat(props.theme.dateInput.pickerBorderWidth, " ").concat(props.theme.dateInput.pickerBorderStyle, "\n      ").concat(props.theme.dateInput.pickerBorderColor);
+}, function (props) {
+  return props.theme.dateInput.pickerFontFamily;
+}, function (props) {
+  return props.theme.dateInput.pickerFontSize;
+}, function (props) {
+  return props.theme.dateInput.pickerFontColor;
+}, function (props) {
+  return props.theme.dateInput.pickerFontWeight;
 });
 
 var PickerHeader = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  gap: 8px;\n  align-items: center;\n  justify-content: space-between;\n  padding: 0px 16px;\n"])));
 
-var HeaderButton = _styledComponents["default"].button(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 24px;\n  height: 24px;\n  padding: 0px;\n  background-color: ", ";\n  font-size: 1.5rem;\n  border-radius: 4px;\n  border: none;\n  cursor: pointer;\n\n  &:focus {\n    outline: ", " solid 2px;\n  }\n  &:hover {\n    background-color: ", ";\n  }\n  &:active {\n    background-color: #4b1c7d;\n    color: #ffffff;\n  }\n  svg {\n    width: 24px;\n    height: 24px;\n  }\n"])), function (props) {
-  return props.theme.dateInput.pickerMonthArrowsBackgroundColor;
+var HeaderButton = _styledComponents["default"].button(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 24px;\n  height: 24px;\n  padding: 0px;\n  color: ", ";\n  background-color: ", ";\n  border-radius: 4px;\n  border: none;\n  cursor: pointer;\n\n  &:hover {\n    color: ", ";\n    background-color: ", ";\n  }\n  &:focus {\n    outline: ", ";\n  }\n  &:active {\n    color: ", ";\n    background-color: ", ";\n  }\n  svg {\n    width: 24px;\n    height: 24px;\n  }\n"])), function (props) {
+  return props.theme.dateInput.pickerHeaderFontColor;
 }, function (props) {
-  return props.theme.dateInput.pickerFocusColor;
+  return props.theme.dateInput.pickerHeaderBackgroundColor;
 }, function (props) {
-  return props.theme.dateInput.pickerHoverDateBackgroundColor;
-});
-
-var HeaderYearTrigger = _styledComponents["default"].button(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  gap: 8px;\n  align-items: center;\n  justify-content: center;\n  height: 40px;\n  width: 172px;\n  color: ", ";\n  background-color: transparent;\n  border-radius: 4px;\n  border: none;\n  cursor: pointer;\n\n  &:hover {\n    background-color: ", ";\n  }\n  &:focus {\n    outline: ", " solid 2px;\n  }\n  &:active {\n    color: #ffffff;\n    background-color: #4b1c7d;\n  }\n"])), function (props) {
-  return props.theme.dateInput.pickerMonthFontColor;
+  return props.theme.dateInput.pickerHeaderHoverFontColor;
+}, function (props) {
+  return props.theme.dateInput.pickerHeaderHoverBackgroundColor;
 }, function (props) {
-  return props.theme.dateInput.pickerHoverDateBackgroundColor;
+  return "".concat(props.theme.dateInput.pickerFocusColor, " solid\n      ").concat(props.theme.dateInput.pickerFocusWidth);
 }, function (props) {
-  return props.theme.dateInput.pickerFocusColor;
+  return props.theme.dateInput.pickerHeaderActiveFontColor;
+}, function (props) {
+  return props.theme.dateInput.pickerHeaderActiveBackgroundColor;
 });
 
-var HeaderYearTriggerLabel = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-family: ", ";\n  font-size: 0.875rem;\n"])), function (props) {
+var HeaderYearTrigger = (0, _styledComponents["default"])(HeaderButton)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  gap: 8px;\n  height: 40px;\n  width: 172px;\n"])));
+
+var HeaderYearTriggerLabel = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-family: ", ";\n  font-size: ", ";\n"])), function (props) {
   return props.theme.dateInput.pickerFontFamily;
+}, function (props) {
+  return props.theme.dateInput.pickerHeaderFontSize;
 });
 
 var _default = /*#__PURE__*/_react["default"].memo(DxcDatePicker);

package/date-input/YearPicker.js

@@ -93,22 +93,32 @@ var YearPicker = function YearPicker(_ref) {
   }));
 };
 
-var YearPickerContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n  align-items: center;\n  overflow-y: scroll;\n  width: ", ";\n  height: 312px;\n  padding: 2px 8px 8px 8px;\n"])), function (props) {
-  return props.theme.dateInput.pickerWidth;
-});
+var YearPickerContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n  align-items: center;\n  overflow-y: scroll;\n  width: 292px;\n  height: 312px;\n  padding: 2px 8px 8px 8px;\n"])));
 
-var YearPickerButton = _styledComponents["default"].button(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 80px;\n  min-height: 40px;\n  font-size: 0.875rem;\n  line-height: 21px;\n  color: ", ";\n  background-color: transparent;\n  border: none;\n  border-radius: 50px;\n  cursor: pointer;\n\n  ", "\n\n  &:hover, &:focus, &:active {\n    font-size: 1.5rem;\n    line-height: 36px;\n  }\n  &:hover {\n    color: ", ";\n    background-color: ", ";\n  }\n  &:focus {\n    color: ", ";\n    outline: ", " solid 2px;\n  }\n  &:active {\n    color: #ffffff;\n    background-color: #4b1c7d !important;\n  }\n"])), function (props) {
-  return props.theme.dateInput.pickerYearFontColor;
+var YearPickerButton = _styledComponents["default"].button(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 80px;\n  min-height: 40px;\n  line-height: 21px;\n  background-color: transparent;\n  border: none;\n  border-radius: 50px;\n  cursor: pointer;\n  font-family: ", ";\n  font-size: ", ";\n  color: ", ";\n  font-weight: ", ";\n\n  ", "\n\n  &:hover, &:focus, &:active {\n    font-size: ", ";\n    line-height: 36px;\n  }\n  &:hover {\n    color: ", ";\n    background-color: ", ";\n  }\n  &:focus {\n    color: ", ";\n    outline: ", ";\n  }\n  &:active {\n    color: ", ";\n    background-color: ", " !important;\n  }\n"])), function (props) {
+  return props.theme.dateInput.pickerFontFamily;
+}, function (props) {
+  return props.theme.dateInput.pickerFontSize;
+}, function (props) {
+  return props.theme.dateInput.pickerFontColor;
+}, function (props) {
+  return props.theme.dateInput.pickerFontWeight;
+}, function (props) {
+  return props.selected ? "font-size: ".concat(props.theme.dateInput.pickerInteractedYearFontSize, ";\n         line-height: 36px;\n         color: ").concat(props.theme.dateInput.pickerSelectedFontColor, " !important;\n         background-color: ").concat(props.theme.dateInput.pickerSelectedBackgroundColor, " !important;") : props.isCurrentYear ? "border: 1px solid ".concat(props.theme.dateInput.pickerCurrentDateBorderColor, "; \n         color: ").concat(props.theme.dateInput.pickerCurrentYearFontColor, ";") : "";
+}, function (props) {
+  return props.theme.dateInput.pickerInteractedYearFontSize;
+}, function (props) {
+  return props.theme.dateInput.pickerHoverFontColor;
 }, function (props) {
-  return props.selected ? "font-size: 1.5rem;\n         line-height: 36px;\n         color: ".concat(props.theme.dateInput.pickerSelectedDateColor, " !important;\n         background-color: ").concat(props.theme.dateInput.pickerSelectedDateBackgroundColor, " !important;") : props.isCurrentYear ? "border: 1px solid #cbacec; \n         color: #5f249f;" : "";
+  return props.theme.dateInput.pickerHoverBackgroundColor;
 }, function (props) {
-  return props.theme.dateInput.pickerHoverDateFontColor;
+  return props.theme.dateInput.pickerHoverFontColor;
 }, function (props) {
-  return props.theme.dateInput.pickerHoverDateBackgroundColor;
+  return "".concat(props.theme.dateInput.pickerFocusColor, " solid\n      ").concat(props.theme.dateInput.pickerFocusWidth);
 }, function (props) {
-  return props.theme.dateInput.pickerHoverDateFontColor;
+  return props.theme.dateInput.pickerActiveFontColor;
 }, function (props) {
-  return props.theme.dateInput.pickerFocusColor;
+  return props.theme.dateInput.pickerActiveBackgroundColor;
 });
 
 var _default = /*#__PURE__*/_react["default"].memo(YearPicker);

package/dialog/Dialog.js

@@ -17,18 +17,38 @@ 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 _BackgroundColorContext = require("../BackgroundColorContext");
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
+
+var _reactDom = require("react-dom");
+
+var _FocusLock = _interopRequireDefault(require("../utils/FocusLock"));
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 
 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; }
 
+var closeIcon = /*#__PURE__*/_react["default"].createElement("svg", {
+  role: "img",
+  xmlns: "http://www.w3.org/2000/svg",
+  width: "24",
+  height: "24",
+  viewBox: "0 0 24 24",
+  fill: "currentColor"
+}, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M0 0h24v24H0V0z",
+  fill: "none"
+}), /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
+}));
+
 var DxcDialog = function DxcDialog(_ref) {
   var _ref$isCloseVisible = _ref.isCloseVisible,
       isCloseVisible = _ref$isCloseVisible === void 0 ? true : _ref$isCloseVisible,
@@ -42,37 +62,26 @@ var DxcDialog = function DxcDialog(_ref) {
       _ref$tabIndex = _ref.tabIndex,
       tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
   var colorsTheme = (0, _useTheme["default"])();
-
-  var handleClose = function handleClose() {
-    onCloseClick === null || onCloseClick === void 0 ? void 0 : onCloseClick();
-  };
-
-  var handleOverlayClick = function handleOverlayClick() {
-    onBackgroundClick === null || onBackgroundClick === void 0 ? void 0 : onBackgroundClick();
-  };
-
-  var handleOnKeyDown = function handleOnKeyDown(event) {
-    if (event.key === "Escape") {
-      event.preventDefault();
-      handleClose();
-    }
-  };
-
+  var translatedLabels = (0, _useTranslatedLabels["default"])();
   (0, _react.useEffect)(function () {
-    if (isCloseVisible) {
-      window.addEventListener("keydown", handleOnKeyDown);
-    }
+    var handleKeyDown = function handleKeyDown(event) {
+      if (event.key === "Escape") {
+        event.preventDefault();
+        onCloseClick === null || onCloseClick === void 0 ? void 0 : onCloseClick();
+      }
+    };
 
+    document.addEventListener("keydown", handleKeyDown);
     return function () {
-      window.removeEventListener("keydown", handleOnKeyDown);
+      document.removeEventListener("keydown", handleKeyDown);
     };
-  }, [isCloseVisible]);
+  }, [onCloseClick]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.dialog
-  }, /*#__PURE__*/_react["default"].createElement(BodyStyle, null), /*#__PURE__*/_react["default"].createElement(DialogContainer, {
-    role: "presentation"
-  }, overlay && /*#__PURE__*/_react["default"].createElement(Overlay, {
-    onClick: handleOverlayClick
+  }, /*#__PURE__*/_react["default"].createElement(BodyStyle, null), /*#__PURE__*/(0, _reactDom.createPortal)( /*#__PURE__*/_react["default"].createElement(_FocusLock["default"], null, /*#__PURE__*/_react["default"].createElement(DialogContainer, null, overlay && /*#__PURE__*/_react["default"].createElement(Overlay, {
+    onClick: function onClick() {
+      onBackgroundClick === null || onBackgroundClick === void 0 ? void 0 : onBackgroundClick();
+    }
   }), /*#__PURE__*/_react["default"].createElement(Dialog, {
     role: "dialog",
     "aria-modal": overlay,
@@ -81,81 +90,59 @@ var DxcDialog = function DxcDialog(_ref) {
     padding: padding
   }, /*#__PURE__*/_react["default"].createElement(_BackgroundColorContext.BackgroundColorProvider, {
     color: colorsTheme.dialog.backgroundColor
-  }, children)), isCloseVisible && /*#__PURE__*/_react["default"].createElement(CloseIconContainer, {
-    onClick: handleClose,
+  }, children)), isCloseVisible && /*#__PURE__*/_react["default"].createElement(CloseIconAction, {
+    onClick: function onClick() {
+      onCloseClick === null || onCloseClick === void 0 ? void 0 : onCloseClick();
+    },
+    "aria-label": translatedLabels.dialog.closeIconAriaLabel,
     tabIndex: tabIndex
-  }, /*#__PURE__*/_react["default"].createElement(CloseIcon, {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "24",
-    height: "24",
-    viewBox: "0 0 24 24",
-    fill: "currentColor"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0V0z",
-    fill: "none"
-  }), /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
-  }))))));
+  }, closeIcon)))), document.body));
 };
 
 var BodyStyle = (0, _styledComponents.createGlobalStyle)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  body {\n    overflow: hidden;\n  }\n"])));
 
-var DialogContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  position: fixed;\n  inset: 0px;\n  height: 100%;\n  z-index: 1300;\n"])));
+var DialogContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  position: fixed;\n  inset: 0;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  height: 100%;\n  z-index: 2147483647;\n"])));
 
-var Overlay = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  position: fixed;\n  inset: 0px;\n  height: 100%;\n  background-color: ", ";\n  opacity: ", ";\n"])), function (props) {
+var Overlay = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  position: fixed;\n  inset: 0;\n  height: 100%;\n  background-color: ", ";\n"])), function (props) {
   return props.theme.overlayColor;
-}, function (props) {
-  return props.theme.overlayOpacity;
 });
 
-var Dialog = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  z-index: 1300;\n  background-color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  ", "\n  box-sizing: border-box;\n  box-shadow: ", ";\n  border-radius: 4px;\n  position: relative;\n\n  @media (min-width: ", "rem) {\n    max-width: 80%;\n    min-width: 800px;\n  }\n\n  @media (max-width: ", "rem) {\n    //mobile phones\n    max-width: 92%;\n    min-width: 92%;\n  }\n"])), function (props) {
+var Dialog = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  position: relative;\n  box-sizing: border-box;\n  max-width: 80%;\n  min-width: 696px;\n  border-radius: 4px;\n  background-color: ", ";\n  ", "\n  box-shadow: ", ";\n  z-index: 2147483647;\n\n  @media (max-width: ", "rem) {\n    max-width: 92%;\n    min-width: 92%;\n  }\n"])), function (props) {
   return props.theme.backgroundColor;
 }, function (props) {
-  return props.theme.fontFamily;
-}, function (props) {
-  return props.theme.fontSize;
-}, function (props) {
-  return props.theme.fontWeight;
-}, function (props) {
-  return props.isCloseVisible && "min-height: 72px; padding-top: 24px;";
+  return props.isCloseVisible && "min-height: 72px;";
 }, function (props) {
   return "".concat(props.theme.boxShadowOffsetX, " ").concat(props.theme.boxShadowOffsetY, " ").concat(props.theme.boxShadowBlur, " ").concat(props.theme.boxShadowColor);
-}, _variables.responsiveSizes.medium, _variables.responsiveSizes.medium);
+}, _variables.responsiveSizes.medium);
 
-var Children = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  width: 100%;\n  padding: ", ";\n  padding-top: ", ";\n  padding-right: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n"])), function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) !== "object" ? _variables.spaces[props.padding] : _variables.spaces["small"];
+var CloseIconAction = _styledComponents["default"].button(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  all: unset;\n  position: absolute;\n  top: 24px;\n  right: 24px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  background-color: ", ";\n  box-shadow: 0 0 0 2px transparent;\n  color: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  cursor: pointer;\n  z-index: 1;\n\n  &:focus {\n    outline: none;\n    box-shadow: 0 0 0 2px #0095ff;\n  }\n  &:hover {\n    background-color: #f2f2f2;\n  }\n  &:active {\n    background-color: #cccccc;\n  }\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
+  return props.theme.closeIconBackgroundColor;
 }, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.top ? _variables.spaces[props.padding.top] : "";
+  return props.theme.closeIconColor;
 }, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.right ? _variables.spaces[props.padding.right] : "";
+  return props.theme.closeIconBorderRadius;
 }, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.bottom ? _variables.spaces[props.padding.bottom] : "";
+  return props.theme.closeIconBorderThickness;
 }, function (props) {
-  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.left ? _variables.spaces[props.padding.left] : "";
-});
-
-var CloseIconContainer = _styledComponents["default"].button(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  cursor: pointer;\n  padding: 0;\n  margin: 0;\n  background: none;\n  border: none;\n  position: absolute;\n  top: 20px;\n  right: 20px;\n  color: ", ";\n  width: ", ";\n  height: ", ";\n"])), function (props) {
-  return props.theme.closeIconColor;
+  return props.theme.closeIconBorderStyle;
+}, function (props) {
+  return props.theme.closeIconBorderColor;
 }, function (props) {
   return props.theme.closeIconWidth;
 }, function (props) {
   return props.theme.closeIconHeight;
 });
 
-var CloseIcon = _styledComponents["default"].svg(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  width: ", ";\n  height: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n"])), function (props) {
-  return props.theme.closeIconBackgroundColor;
-}, function (props) {
-  return props.theme.closeIconWidth;
-}, function (props) {
-  return props.theme.closeIconHeight;
+var Children = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  padding: ", ";\n  padding-top: ", ";\n  padding-right: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n"])), function (props) {
+  return props.padding && (0, _typeof2["default"])(props.padding) !== "object" ? _variables.spaces[props.padding] : _variables.spaces["small"];
 }, function (props) {
-  return props.theme.closeIconBorderRadius;
+  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.top ? _variables.spaces[props.padding.top] : "";
 }, function (props) {
-  return props.theme.closeIconBorderThickness;
+  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.right ? _variables.spaces[props.padding.right] : "";
 }, function (props) {
-  return props.theme.closeIconBorderStyle;
+  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.bottom ? _variables.spaces[props.padding.bottom] : "";
 }, function (props) {
-  return props.theme.closeIconBorderColor;
+  return props.padding && (0, _typeof2["default"])(props.padding) === "object" && props.padding.left ? _variables.spaces[props.padding.left] : "";
 });
 
 var _default = DxcDialog;