@dxc-technology/halstack-react 0.0.0-d0735cc → 0.0.0-d123a22

package/date-input/DateInput.js

@@ -1,372 +1,222 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _react = _interopRequireWildcard(require("react"));
-
-var _pickers = require("@material-ui/pickers");
-
-var _core = require("@material-ui/core");
-
-var _ClickAwayListener = _interopRequireDefault(require("@material-ui/core/ClickAwayListener"));
-
-var _Popover = _interopRequireDefault(require("@material-ui/core/Popover"));
-
 var _dayjs = _interopRequireDefault(require("dayjs"));
-
-var _dayjs2 = _interopRequireDefault(require("@date-io/dayjs"));
-
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
 var _useTheme = _interopRequireDefault(require("../useTheme"));
-
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
-
 var _TextInput = _interopRequireDefault(require("../text-input/TextInput"));
-
+var _DatePicker = _interopRequireDefault(require("./DatePicker"));
+var Popover = _interopRequireWildcard(require("@radix-ui/react-popover"));
+var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
 var _templateObject;
-
-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 || _typeof(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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
+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" != _typeof(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 && {}.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; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+_dayjs["default"].extend(_customParseFormat["default"]);
 var getValueForPicker = function getValueForPicker(value, format) {
-  return (0, _dayjs["default"])(value, format.toUpperCase(), true).format();
+  return (0, _dayjs["default"])(value, format.toUpperCase(), true);
+};
+var getDate = function getDate(value, format, lastValidYear, setLastValidYear) {
+  if ((value || value === "") && format.toUpperCase().includes("YYYY")) return getValueForPicker(value, format);else {
+    var newDate = getValueForPicker(value, format);
+    if (!lastValidYear) {
+      if (+newDate.format("YY") < 68) {
+        setLastValidYear(2000 + +newDate.format("YY"));
+        newDate = newDate.set("year", 2000 + +newDate.format("YY"));
+      } else {
+        setLastValidYear(1900 + +newDate.format("YY"));
+        newDate = newDate.set("year", 1900 + +newDate.format("YY"));
+      }
+    } else {
+      newDate = newDate.set("year", (lastValidYear <= 1999 ? 1900 : 2000) + +newDate.format("YY"));
+    }
+    return newDate;
+  }
 };
-
 var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
+  var _ref2;
   var label = _ref.label,
-      name = _ref.name,
-      _ref$defaultValue = _ref.defaultValue,
-      defaultValue = _ref$defaultValue === void 0 ? "" : _ref$defaultValue,
-      value = _ref.value,
-      _ref$format = _ref.format,
-      format = _ref$format === void 0 ? "dd-MM-yyyy" : _ref$format,
-      helperText = _ref.helperText,
-      _ref$placeholder = _ref.placeholder,
-      placeholder = _ref$placeholder === void 0 ? false : _ref$placeholder,
-      clearable = _ref.clearable,
-      disabled = _ref.disabled,
-      optional = _ref.optional,
-      onChange = _ref.onChange,
-      onBlur = _ref.onBlur,
-      error = _ref.error,
-      autocomplete = _ref.autocomplete,
-      margin = _ref.margin,
-      size = _ref.size,
-      tabIndex = _ref.tabIndex;
-
+    name = _ref.name,
+    _ref$defaultValue = _ref.defaultValue,
+    defaultValue = _ref$defaultValue === void 0 ? "" : _ref$defaultValue,
+    value = _ref.value,
+    _ref$format = _ref.format,
+    format = _ref$format === void 0 ? "dd-MM-yyyy" : _ref$format,
+    helperText = _ref.helperText,
+    _ref$placeholder = _ref.placeholder,
+    placeholder = _ref$placeholder === void 0 ? false : _ref$placeholder,
+    clearable = _ref.clearable,
+    disabled = _ref.disabled,
+    readOnly = _ref.readOnly,
+    optional = _ref.optional,
+    onChange = _ref.onChange,
+    onBlur = _ref.onBlur,
+    error = _ref.error,
+    autocomplete = _ref.autocomplete,
+    margin = _ref.margin,
+    size = _ref.size,
+    tabIndex = _ref.tabIndex;
   var _useState = (0, _react.useState)(defaultValue),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      innerValue = _useState2[0],
-      setInnerValue = _useState2[1];
-
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    innerValue = _useState2[0],
+    setInnerValue = _useState2[1];
   var _useState3 = (0, _react.useState)(false),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      isOpen = _useState4[0],
-      setIsOpen = _useState4[1];
-
-  var _useState5 = (0, _react.useState)(null),
-      _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-      anchorEl = _useState6[0],
-      setAnchorEl = _useState6[1];
-
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    isOpen = _useState4[0],
+    setIsOpen = _useState4[1];
+  var calendarId = "date-picker-".concat((0, _react.useId)());
+  var _useState5 = (0, _react.useState)(getValueForPicker((_ref2 = value !== null && value !== void 0 ? value : defaultValue) !== null && _ref2 !== void 0 ? _ref2 : "", format)),
+    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+    dayjsDate = _useState6[0],
+    setDayjsDate = _useState6[1];
+  var _useState7 = (0, _react.useState)(innerValue || value ? !format.toUpperCase().includes("YYYY") && +getValueForPicker(value !== null && value !== void 0 ? value : innerValue, format).format("YY") < 68 ? 2000 : 1900 : undefined),
+    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
+    lastValidYear = _useState8[0],
+    setLastValidYear = _useState8[1];
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
-  var refDate = ref || (0, _react.useRef)(null);
-
-  var handleCalendarOnKeyDown = function handleCalendarOnKeyDown(event) {
-    switch (event.keyCode) {
-      case 27:
-        // Esc
-        event.preventDefault();
-        setIsOpen(false);
-        break;
+  var dateRef = (0, _react.useRef)(null);
+  (0, _react.useEffect)(function () {
+    if (value || value === "") setDayjsDate(getDate(value, format, lastValidYear, setLastValidYear));
+  }, [value, format, lastValidYear]);
+  (0, _react.useEffect)(function () {
+    if (!disabled) {
+      var actionButtonRef = dateRef === null || dateRef === void 0 ? void 0 : dateRef.current.querySelector("[title='Select date']");
+      actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("aria-haspopup", true);
+      actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("role", "combobox");
+      actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("aria-expanded", isOpen);
+      actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("aria-controls", calendarId);
+      actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("aria-describedby", calendarId);
     }
-  };
-
+  }, [isOpen, disabled, calendarId]);
   var handleCalendarOnClick = function handleCalendarOnClick(newDate) {
-    var newValue = (0, _dayjs["default"])(newDate).format(format.toUpperCase());
-    value !== null && value !== void 0 ? value : setInnerValue(newValue);
-    newDate !== null && newDate !== void 0 && newDate.toJSON() ? onChange === null || onChange === void 0 ? void 0 : onChange({
+    var newValue = newDate.format(format.toUpperCase());
+    if (!value) {
+      setDayjsDate(newDate);
+      setInnerValue(newValue);
+    }
+    setLastValidYear(newDate.get("year"));
+    newDate !== null && newDate !== void 0 && newDate.set("day", newDate.get("date")).toJSON() ? onChange === null || onChange === void 0 ? void 0 : onChange({
       value: newValue,
-      date: newDate
+      date: newDate.toDate()
     }) : onChange === null || onChange === void 0 ? void 0 : onChange({
       value: newValue
     });
   };
-
-  var handleIOnChange = function handleIOnChange(_ref2) {
-    var newValue = _ref2.value,
-        inputError = _ref2.error;
+  var handleOnChange = function handleOnChange(_ref3) {
+    var newValue = _ref3.value,
+      inputError = _ref3.error;
     value !== null && value !== void 0 ? value : setInnerValue(newValue);
-    var dayjsDate = (0, _dayjs["default"])(newValue, format.toUpperCase(), true);
-    var invalidDateMessage = newValue !== "" && !dayjsDate.isValid() && translatedLabels.dateInput.invalidDateErrorMessage;
+    var newDate = getDate(newValue, format, lastValidYear, setLastValidYear);
+    var invalidDateMessage = newValue !== "" && !newDate.isValid() && translatedLabels.dateInput.invalidDateErrorMessage;
     var callbackParams = inputError || invalidDateMessage ? {
       value: newValue,
       error: inputError || invalidDateMessage
     } : {
       value: newValue
     };
-    dayjsDate.isValid() ? onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread(_objectSpread({}, callbackParams), {}, {
-      date: dayjsDate.toDate()
-    })) : onChange === null || onChange === void 0 ? void 0 : onChange(callbackParams);
+    if (newDate.isValid()) {
+      setDayjsDate(newDate);
+      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread(_objectSpread({}, callbackParams), {}, {
+        date: newDate.toDate()
+      }));
+    } else {
+      onChange === null || onChange === void 0 ? void 0 : onChange(callbackParams);
+      setLastValidYear(function (validYear) {
+        var _dayjsDate$get;
+        return (_dayjsDate$get = dayjsDate === null || dayjsDate === void 0 ? void 0 : dayjsDate.get("year")) !== null && _dayjsDate$get !== void 0 ? _dayjsDate$get : validYear;
+      });
+      setDayjsDate(null);
+    }
   };
-
-  var handleIOnBlur = function handleIOnBlur(_ref3) {
-    var value = _ref3.value,
-        inputError = _ref3.error;
-    var dayjsDate = (0, _dayjs["default"])(value, format.toUpperCase(), true);
-    var invalidDateMessage = value !== "" && !dayjsDate.isValid() && translatedLabels.dateInput.invalidDateErrorMessage;
+  var handleOnBlur = function handleOnBlur(_ref4) {
+    var value = _ref4.value,
+      inputError = _ref4.error;
+    var date = getDate(value, format, lastValidYear, setLastValidYear);
+    var invalidDateMessage = value !== "" && !date.isValid() && translatedLabels.dateInput.invalidDateErrorMessage;
     var callbackParams = inputError || invalidDateMessage ? {
       value: value,
       error: inputError || invalidDateMessage
     } : {
       value: value
     };
-    dayjsDate.isValid() ? onBlur === null || onBlur === void 0 ? void 0 : onBlur(_objectSpread(_objectSpread({}, callbackParams), {}, {
-      date: dayjsDate.toDate()
+    date.isValid() ? onBlur === null || onBlur === void 0 ? void 0 : onBlur(_objectSpread(_objectSpread({}, callbackParams), {}, {
+      date: date.toDate()
     })) : onBlur === null || onBlur === void 0 ? void 0 : onBlur(callbackParams);
   };
-
   var openCalendar = function openCalendar() {
-    var dateBtn = refDate.current.getElementsByTagName("button")[0];
     setIsOpen(!isOpen);
-    setAnchorEl(dateBtn);
   };
-
   var closeCalendar = function closeCalendar() {
     setIsOpen(false);
   };
-
-  var calendarAction = {
-    onClick: openCalendar,
-    icon: /*#__PURE__*/_react["default"].createElement("svg", {
-      xmlns: "http://www.w3.org/2000/svg",
-      height: "24",
-      viewBox: "0 0 24 24",
-      width: "24",
-      fill: "currentColor"
-    }, /*#__PURE__*/_react["default"].createElement("path", {
-      d: "M0 0h24v24H0z",
-      fill: "none"
-    }), /*#__PURE__*/_react["default"].createElement("path", {
-      d: "M20 3h-1V1h-2v2H7V1H5v2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 18H4V8h16v13z"
-    }))
-  };
-  var dateTheme = (0, _core.createMuiTheme)({
-    overrides: {
-      MuiTypography: {
-        root: {
-          fontFamily: "".concat(colorsTheme.dateInput.pickerFontFamily, " !important")
-        }
-      },
-      MuiPickersYearSelection: {
-        container: {
-          color: colorsTheme.dateInput.pickerYearFontColor,
-          "&::-webkit-scrollbar": {
-            width: "3px"
-          },
-          "&::-webkit-scrollbar-track": {
-            backgroundColor: "#D9D9D9",
-            borderRadius: "3px"
-          },
-          "&::-webkit-scrollbar-thumb": {
-            backgroundColor: "#666666",
-            borderRadius: "3px"
-          }
-        }
-      },
-      MuiPickersToolbar: {
-        toolbar: {
-          backgroundColor: colorsTheme.dateInput.pickerBackgroundColor,
-          color: colorsTheme.dateInput.pickerDayFontColor
-        }
-      },
-      MuiIconButton: {
-        root: {
-          height: "36px",
-          width: "36px",
-          padding: "0px"
-        }
-      },
-      MuiTouchRipple: {
-        child: {
-          opacity: "0"
-        }
-      },
-      MuiButtonBase: {
-        root: {
-          "&:focus": {
-            outline: colorsTheme.dateInput.pickerFocusColor + " solid 2px"
-          }
-        }
-      },
-      MuiPickersBasePicker: {
-        pickerView: {
-          minWidth: "unset",
-          maxWidth: "unset",
-          minHeight: "unset",
-          padding: "0px 10px",
-          height: colorsTheme.dateInput.pickerHeight,
-          width: colorsTheme.dateInput.pickerWidth,
-          backgroundColor: colorsTheme.dateInput.pickerBackgroundColor,
-          fontFamily: colorsTheme.dateInput.pickerFontFamily
-        }
-      },
-      MuiPickersToolbarText: {
-        toolbarTxt: {
-          color: colorsTheme.dateInput.pickerActualDateFontColor,
-          fontFamily: colorsTheme.dateInput.pickerFontFamily,
-          fontSize: "2rem"
-        },
-        toolbarBtnSelected: {
-          color: colorsTheme.dateInput.pickerActualDateFontColor
-        }
-      },
-      MuiPickersCalendarHeader: {
-        transitionContainer: {
-          color: colorsTheme.dateInput.pickerMonthFontColor
-        },
-        dayLabel: {
-          color: colorsTheme.dateInput.pickerWeekFontColor,
-          fontFamily: colorsTheme.dateInput.pickerFontFamily
-        },
-        switchHeader: {
-          backgroundColor: "#ffffff",
-          color: colorsTheme.dateInput.pickerDayFontColor
-        },
-        iconButton: {
-          backgroundColor: colorsTheme.dateInput.pickerMonthArrowsBackgroundColor,
-          "&:hover": {
-            backgroundColor: colorsTheme.dateInput.pickerMonthArrowsBackgroundColor
-          }
-        }
-      },
-      MuiPickersCalendar: {
-        week: {
-          marginBottom: "2px"
-        }
-      },
-      MuiPickersDay: {
-        current: {
-          color: colorsTheme.dateInput.pickerDayFontColor
-        },
-        day: {
-          fontFamily: colorsTheme.dateInput.pickerFontFamily,
-          color: colorsTheme.dateInput.pickerDayFontColor,
-          "&:hover": {
-            backgroundColor: colorsTheme.dateInput.pickerHoverDateBackgroundColor,
-            color: colorsTheme.dateInput.pickerHoverDateFontColor
-          }
-        },
-        daySelected: {
-          backgroundColor: colorsTheme.dateInput.pickerSelectedDateBackgroundColor,
-          color: colorsTheme.dateInput.pickerSelectedDateColor,
-          "&:hover": {
-            backgroundColor: colorsTheme.dateInput.pickerSelectedDateBackgroundColor,
-            color: colorsTheme.dateInput.pickerSelectedDateColor,
-            opacity: "1"
-          }
-        }
-      },
-      MuiPickersYear: {
-        yearSelected: {
-          color: colorsTheme.dateInput.pickerSelectedDateColor,
-          backgroundColor: colorsTheme.dateInput.pickerSelectedDateBackgroundColor,
-          margin: "0px 100px",
-          borderRadius: "20px"
-        },
-        root: {
-          "&:focus": {
-            color: colorsTheme.dateInput.pickerHoverDateFontColor,
-            backgroundColor: colorsTheme.dateInput.pickerHoverDateBackgroundColor
-          }
-        }
-      },
-      MuiPickersModal: {
-        dialogAction: {
-          color: "pink"
-        }
-      }
+  var handleDatePickerEscKeydown = function handleDatePickerEscKeydown(event) {
+    if (event.key === "Escape") {
+      event.preventDefault();
+      isOpen && event.stopPropagation();
+      closeCalendar();
+      dateRef === null || dateRef === void 0 ? void 0 : dateRef.current.getElementsByTagName("input")[0].focus();
     }
-  });
+  };
+  var handleDatePickerOnBlur = function handleDatePickerOnBlur(event) {
+    if (!(event !== null && event !== void 0 && event.currentTarget.contains(event.relatedTarget))) closeCalendar();
+  };
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme
-  }, /*#__PURE__*/_react["default"].createElement(_core.MuiThemeProvider, {
-    theme: dateTheme
-  }, /*#__PURE__*/_react["default"].createElement(_pickers.MuiPickersUtilsProvider, {
-    utils: _dayjs2["default"]
-  }, /*#__PURE__*/_react["default"].createElement(StyledDPicker, null, /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    ref: ref
+  }, /*#__PURE__*/_react["default"].createElement(Popover.Root, {
+    open: isOpen
+  }, /*#__PURE__*/_react["default"].createElement(Popover.Trigger, {
+    asChild: true,
+    "aria-controls": undefined
+  }, /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
     label: label,
     name: name,
     defaultValue: defaultValue,
     value: value !== null && value !== void 0 ? value : innerValue,
     helperText: helperText,
     placeholder: placeholder ? format.toUpperCase() : null,
-    action: calendarAction,
+    action: {
+      onClick: openCalendar,
+      icon: "filled_calendar_today",
+      title: "Select date"
+    },
     clearable: clearable,
     disabled: disabled,
+    readOnly: readOnly,
     optional: optional,
-    onChange: handleIOnChange,
-    onBlur: handleIOnBlur,
+    onChange: handleOnChange,
+    onBlur: handleOnBlur,
     error: error,
     autocomplete: autocomplete,
     margin: margin,
     size: size,
     tabIndex: tabIndex,
-    ref: refDate
-  }), /*#__PURE__*/_react["default"].createElement(_Popover["default"], {
-    onKeyDown: handleCalendarOnKeyDown,
-    open: isOpen,
-    anchorEl: anchorEl,
-    anchorOrigin: {
-      vertical: "bottom",
-      horizontal: "left"
-    },
-    transformOrigin: {
-      vertical: "top",
-      horizontal: "center"
-    },
-    PaperProps: {
-      style: {
-        marginTop: "10px"
-      }
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_ClickAwayListener["default"], {
-    onClickAway: closeCalendar
-  }, /*#__PURE__*/_react["default"].createElement(_core.Paper, {
-    role: "dialog",
-    "aria-modal": "true"
-  }, /*#__PURE__*/_react["default"].createElement(_pickers.DatePicker, {
-    variant: "static",
-    value: getValueForPicker(value !== null && value !== void 0 ? value : innerValue, format),
-    onChange: function onChange(date) {
-      return handleCalendarOnClick(date);
-    },
-    format: format,
-    disabled: disabled
-  }))))))));
+    ref: dateRef
+  })), /*#__PURE__*/_react["default"].createElement(Popover.Portal, null, /*#__PURE__*/_react["default"].createElement(StyledPopoverContent, {
+    sideOffset: error ? -18 : 2,
+    align: "end",
+    "aria-modal": true,
+    onBlur: handleDatePickerOnBlur,
+    onKeyDown: handleDatePickerEscKeydown,
+    avoidCollisions: false
+  }, /*#__PURE__*/_react["default"].createElement(_DatePicker["default"], {
+    id: calendarId,
+    onDateSelect: handleCalendarOnClick,
+    date: dayjsDate
+  }))))));
 });
-
-var StyledDPicker = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])([""])));
-
-var _default = DxcDateInput;
-exports["default"] = _default;
+var StyledPopoverContent = (0, _styledComponents["default"])(Popover.Content)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  z-index: 2147483647;\n  &:focus-visible {\n    outline: none;\n  }\n"])));
+var _default = exports["default"] = DxcDateInput;