@dxc-technology/halstack-react 0.0.0-f54247d → 0.0.0-f6290b3

package/date-input/DateInput.js

@@ -1,109 +1,100 @@
 "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 _dayjs = _interopRequireDefault(require("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 _uuid = require("uuid");
-
+var _Icons = require("./Icons");
 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 && 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; }
+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 calendarIcon = /*#__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 getValueForPicker = function getValueForPicker(value, 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];
-
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    isOpen = _useState4[0],
+    setIsOpen = _useState4[1];
   var _useState5 = (0, _react.useState)("date-picker-".concat((0, _uuid.v4)())),
-      _useState6 = (0, _slicedToArray2["default"])(_useState5, 1),
-      calendarId = _useState6[0];
-
+    _useState6 = (0, _slicedToArray2["default"])(_useState5, 1),
+    calendarId = _useState6[0];
+  var _useState7 = (0, _react.useState)(getValueForPicker((_ref2 = value !== null && value !== void 0 ? value : defaultValue) !== null && _ref2 !== void 0 ? _ref2 : "", format)),
+    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
+    dayjsDate = _useState8[0],
+    setDayjsDate = _useState8[1];
+  var _useState9 = (0, _react.useState)(innerValue || value ? !format.toUpperCase().includes("YYYY") && +getValueForPicker(value !== null && value !== void 0 ? value : innerValue, format).format("YY") < 68 ? 2000 : 1900 : undefined),
+    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
+    lastValidYear = _useState10[0],
+    setLastValidYear = _useState10[1];
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
   var dateRef = (0, _react.useRef)(null);
-  (0, _react.useLayoutEffect)(function () {
+  (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='Open calendar']");
       actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("aria-haspopup", true);
@@ -113,69 +104,75 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
       actionButtonRef === null || actionButtonRef === void 0 ? void 0 : actionButtonRef.setAttribute("aria-describedby", calendarId);
     }
   }, [isOpen, disabled, calendarId]);
-
   var handleCalendarOnClick = function handleCalendarOnClick(newDate) {
     var newValue = newDate.format(format.toUpperCase());
-    value !== null && value !== void 0 ? value : setInnerValue(newValue);
+    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 = getValueForPicker(newValue, format);
-    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 = getValueForPicker(value, format);
-    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() {
     setIsOpen(!isOpen);
   };
-
   var closeCalendar = function closeCalendar() {
     setIsOpen(false);
   };
-
   var handleDatePickerEscKeydown = function handleDatePickerEscKeydown(event) {
     event.preventDefault();
     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("div", {
@@ -194,21 +191,22 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
     placeholder: placeholder ? format.toUpperCase() : null,
     action: {
       onClick: openCalendar,
-      icon: calendarIcon,
+      icon: _Icons.calendarIcon,
       title: "Open calendar"
     },
     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: dateRef
-  })), /*#__PURE__*/_react["default"].createElement(StyledContent, {
+  })), /*#__PURE__*/_react["default"].createElement(Popover.Portal, null, /*#__PURE__*/_react["default"].createElement(StyledPopoverContent, {
     sideOffset: error ? -18 : 2,
     align: "end",
     "aria-modal": true,
@@ -218,10 +216,8 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
   }, /*#__PURE__*/_react["default"].createElement(_DatePicker["default"], {
     id: calendarId,
     onDateSelect: handleCalendarOnClick,
-    date: getValueForPicker(value !== null && value !== void 0 ? value : innerValue, format.toUpperCase())
-  })))));
+    date: dayjsDate
+  }))))));
 });
-
-var StyledContent = (0, _styledComponents["default"])(Popover.Content)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  &:focus-visible {\n    outline: none;\n  }\n"])));
-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;

package/date-input/DateInput.stories.tsx

@@ -1,17 +1,29 @@
 import React from "react";
 import { userEvent, within, fireEvent, screen } from "@storybook/testing-library";
 import DxcDateInput from "./DateInput";
+import DxcDatePicker from "./DatePicker";
+import YearPicker from "./YearPicker";
+import Calendar from "./Calendar";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
-import { BackgroundColorProvider } from "../BackgroundColorContext";
-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",
+  title: "Date Input",
   component: DxcDateInput,
 };
 
-export const Chromatic = () => (
+const opinionatedTheme = {
+  dateInput: {
+    baseColor: "#5f249f",
+    selectedFontColor: "#ffffff",
+  },
+};
+
+const DateInputChromatic = () => (
   <>
     <ExampleContainer>
       <Title title="Complete date input" theme="light" level={4} />
@@ -22,46 +34,29 @@ export const Chromatic = () => (
       <DxcDateInput
         label="Disabled date input"
         helperText="Help message"
-        defaultValue="06-04-2027"
+        defaultValue="06-04-2007"
         clearable
         disabled
       />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Read only" theme="light" level={4} />
+      <DxcDateInput
+        label="Example label"
+        helperText="Help message"
+        defaultValue="06-04-2007"
+        clearable
+        readOnly
+      />
+    </ExampleContainer>
     <ExampleContainer>
       <Title title="Invalid" theme="light" level={4} />
       <DxcDateInput label="Error date input" error="Error message." placeholder />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Relation between icons" theme="light" level={4} />
-      <DxcDateInput label="Error date input" error="Error message." defaultValue="06-04-2027" clearable />
-    </ExampleContainer>
-    <BackgroundColorProvider color="#333333">
-      <DarkContainer>
-        <Title title="Dark" theme="dark" level={2} />
-        <ExampleContainer>
-          <Title title="Complete date input" theme="dark" level={4} />
-          <DxcDateInput label="Date input" helperText="Help message" format="yyyy/dd/mm" placeholder optional />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled" theme="dark" level={4} />
-          <DxcDateInput
-            label="Disabled Date input"
-            helperText="Help message"
-            defaultValue="06-04-2027"
-            clearable
-            disabled
-          />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Invalid" theme="dark" level={4} />
-          <DxcDateInput label="Error date input" error="Error message." placeholder />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Relation between icons" theme="dark" level={4} />
-          <DxcDateInput label="Error date input" defaultValue="06-04-2027" error="Error message." clearable />
-        </ExampleContainer>
-      </DarkContainer>
-    </BackgroundColorProvider>
+      <DxcDateInput label="Error date input" error="Error message." defaultValue="06-04-2007" clearable />
+    </ExampleContainer>
     <Title title="Margins" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Xxsmall" theme="light" level={4} />
@@ -104,48 +99,187 @@ export const Chromatic = () => (
       <Title title="FillParent size" theme="light" level={4} />
       <DxcDateInput label="FillParent" size="fillParent" />
     </ExampleContainer>
+    <ExampleContainer expanded>
+      <Title title="Year picker" theme="light" level={4} />
+      <DxcDateInput label="Date input" defaultValue="06-04-1905" />
+    </ExampleContainer>
   </>
 );
 
-const DatePicker = () => (
-  <ExampleContainer expanded>
-    <Title title="Show date picker" theme="light" level={4} />
-    <DxcDateInput label="Date input" defaultValue="06-04-2027" />
-  </ExampleContainer>
+export const Chromatic = DateInputChromatic.bind({});
+Chromatic.play = async ({ canvasElement }) => {
+  const canvas = within(canvasElement);
+  await userEvent.click(canvas.getAllByRole("combobox")[canvas.getAllByRole("combobox").length - 1]);
+  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 ShowDatePicker = DatePicker.bind({});
-ShowDatePicker.play = async ({ canvasElement }) => {
+export const DateInputOpinionated = DateInputOpinionatedTheme.bind({});
+DateInputOpinionated.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  const dateBtn = canvas.getByRole("combobox");
-  await userEvent.click(dateBtn);
+  await userEvent.click(canvas.getAllByRole("combobox")[canvas.getAllByRole("combobox").length - 1]);
 };
 
-const YearPicker = () => (
+const YearPickerOpinionatedTheme = () => (
   <ExampleContainer expanded>
-    <Title title="Show year picker" theme="light" level={4} />
-    <DxcDateInput label="Date input" defaultValue="06-04-2027" />
+    <Title title="Year picker" theme="light" level={4} />
+    <HalstackProvider theme={opinionatedTheme}>
+      <DxcDateInput label="Date input" defaultValue="06-04-1905" />
+    </HalstackProvider>
   </ExampleContainer>
 );
 
-export const ShowYearPicker = YearPicker.bind({});
-ShowYearPicker.play = async ({ canvasElement }) => {
+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 2027"));
+  await fireEvent.click(screen.getByText("April 1905"));
 };
 
-const YearPickerFocus = () => (
-  <ExampleContainer expanded>
-    <Title title="Show year picker and focus" theme="light" level={4} />
-    <DxcDateInput label="Date input" defaultValue="06-04-2027" />
-  </ExampleContainer>
-);
+const DatePickerButtonStates = () => {
+  const colorsTheme: any = useTheme();
+  return (
+    <>
+      <ExampleContainer>
+        <Title title="Show date picker over another element with z-index 0" theme="light" level={4} />
+        <div
+          style={{
+            display: "flex",
+            flexDirection: "column",
+            gap: "20px",
+            height: "200px",
+            width: "500px",
+            marginBottom: "250px",
+            padding: "20px",
+            border: "1px solid black",
+            borderRadius: "4px",
+            overflow: "auto",
+            zIndex: "1300",
+            position: "relative",
+          }}
+        >
+          <DxcDateInput label="From" defaultValue="01-12-1995" />
+          <DxcDateInput label="To" />
+          <button style={{ zIndex: "1", width: "100px" }}>Submit</button>
+        </div>
+      </ExampleContainer>
+      <ThemeProvider theme={colorsTheme}>
+        <ExampleContainer pseudoState="pseudo-focus">
+          <Title title="Isolated calendar focused" theme="light" level={4} />
+          <DxcDatePicker date={dayjs("06-04-1950", "DD-MM-YYYY")} onDateSelect={() => {}} id="test-calendar" />
+        </ExampleContainer>
+        <ExampleContainer pseudoState="pseudo-hover">
+          <Title title="Isolated calendar hovered" theme="light" level={4} />
+          <DxcDatePicker date={dayjs("06-04-1950", "DD-MM-YYYY")} onDateSelect={() => {}} id="test-calendar" />
+        </ExampleContainer>
+        <ExampleContainer pseudoState="pseudo-active">
+          <Title title="Isolated calendar actived" theme="light" level={4} />
+          <DxcDatePicker date={dayjs("06-04-1950", "DD-MM-YYYY")} onDateSelect={() => {}} id="test-calendar" />
+        </ExampleContainer>
+      </ThemeProvider>
+    </>
+  );
+};
 
-export const ShowYearPickerFocus = YearPickerFocus.bind({});
-ShowYearPickerFocus.play = async ({ canvasElement }) => {
+export const DatePickerStates = DatePickerButtonStates.bind({});
+DatePickerStates.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  await userEvent.click(canvas.getByRole("combobox"));
-  await fireEvent.click(screen.getByText("April 2027"));
-  await userEvent.tab();
+  const dateBtn = canvas.getAllByTitle("Open calendar")[0];
+  await userEvent.click(dateBtn);
+};
+
+export const YearPickerStates = () => {
+  const colorsTheme: any = useTheme();
+  return (
+    <>
+      <ThemeProvider theme={colorsTheme}>
+        <ExampleContainer pseudoState="pseudo-focus">
+          <Title title="Isolated year picker focused" theme="light" level={4} />
+          <YearPicker
+            selectedDate={dayjs("06-04-1905", "DD-MM-YYYY")}
+            onYearSelect={() => {}}
+            today={dayjs("1904-04-03", "YYYY-MM-DD")}
+          />
+        </ExampleContainer>
+        <ExampleContainer pseudoState="pseudo-hover">
+          <Title title="Isolated year picker hovered" theme="light" level={4} />
+          <YearPicker
+            selectedDate={dayjs("06-04-1905", "DD-MM-YYYY")}
+            onYearSelect={() => {}}
+            today={dayjs("1904-04-03", "YYYY-MM-DD")}
+          />
+        </ExampleContainer>
+        <ExampleContainer pseudoState="pseudo-active">
+          <Title title="Isolated year picker actived" theme="light" level={4} />
+          <YearPicker
+            selectedDate={dayjs("06-04-1905", "DD-MM-YYYY")}
+            onYearSelect={() => {}}
+            today={dayjs("1904-04-03", "YYYY-MM-DD")}
+          />
+        </ExampleContainer>
+      </ThemeProvider>
+    </>
+  );
+};
+
+export const DatePickerWithToday = () => {
+  const colorsTheme: any = useTheme();
+  return (
+    <ThemeProvider theme={colorsTheme}>
+      <ExampleContainer>
+        <Title title="Isolated calendar with today" theme="light" level={4} />
+        <Calendar
+          selectedDate={dayjs("06-04-1904", "DD-MM-YYYY")}
+          today={dayjs("1904-04-03", "YYYY-MM-DD")}
+          onInnerDateChange={() => {}}
+          onDaySelect={() => {}}
+          innerDate={dayjs("06-04-1904", "DD-MM-YYYY")}
+        />
+      </ExampleContainer>
+      <ExampleContainer>
+        <Title title="Isolated year picker with today" theme="light" level={4} />
+        <YearPicker
+          selectedDate={dayjs("06-04-1905", "DD-MM-YYYY")}
+          onYearSelect={() => {}}
+          today={dayjs("1904-04-03", "YYYY-MM-DD")}
+        />
+      </ExampleContainer>
+    </ThemeProvider>
+  );
 };