@dxc-technology/halstack-react 0.0.0-1b3d457 → 0.0.0-1b8b460

package/date-input/DateInput.js

@@ -17,18 +17,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 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"));
@@ -37,6 +27,14 @@ var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabel
 
 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 _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); }
@@ -47,8 +45,23 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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; }
 
+_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).format();
+  return (0, _dayjs["default"])(value, format.toUpperCase(), true);
 };
 
 var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
@@ -83,29 +96,28 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
       isOpen = _useState4[0],
       setIsOpen = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(null),
-      _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-      anchorEl = _useState6[0],
-      setAnchorEl = _useState6[1];
+  var _useState5 = (0, _react.useState)("date-picker-".concat((0, _uuid.v4)())),
+      _useState6 = (0, _slicedToArray2["default"])(_useState5, 1),
+      calendarId = _useState6[0];
 
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
-  var refDate = ref || (0, _react.useRef)(null);
-
-  var handleCalendarOnKeyDown = function handleCalendarOnKeyDown(event) {
-    switch (event.key) {
-      case "Esc":
-      case "Escape":
-        event.preventDefault();
-        setIsOpen(false);
-        break;
+  var dateRef = (0, _react.useRef)(null);
+  (0, _react.useLayoutEffect)(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);
+      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());
+    var newValue = 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({
+    newDate !== null && newDate !== void 0 && newDate.set("day", newDate.get("date")).toJSON() ? onChange === null || onChange === void 0 ? void 0 : onChange({
       value: newValue,
       date: newDate
     }) : onChange === null || onChange === void 0 ? void 0 : onChange({
@@ -117,7 +129,7 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
     var newValue = _ref2.value,
         inputError = _ref2.error;
     value !== null && value !== void 0 ? value : setInnerValue(newValue);
-    var dayjsDate = (0, _dayjs["default"])(newValue, format.toUpperCase(), true);
+    var dayjsDate = getValueForPicker(newValue, format);
     var invalidDateMessage = newValue !== "" && !dayjsDate.isValid() && translatedLabels.dateInput.invalidDateErrorMessage;
     var callbackParams = inputError || invalidDateMessage ? {
       value: newValue,
@@ -133,7 +145,7 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
   var handleIOnBlur = function handleIOnBlur(_ref3) {
     var value = _ref3.value,
         inputError = _ref3.error;
-    var dayjsDate = (0, _dayjs["default"])(value, format.toUpperCase(), true);
+    var dayjsDate = getValueForPicker(value, format);
     var invalidDateMessage = value !== "" && !dayjsDate.isValid() && translatedLabels.dateInput.invalidDateErrorMessage;
     var callbackParams = inputError || invalidDateMessage ? {
       value: value,
@@ -147,181 +159,44 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
   };
 
   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 handleDatePickerEscKeydown = function handleDatePickerEscKeydown(event) {
+    event.preventDefault();
+    closeCalendar();
+    dateRef === null || dateRef === void 0 ? void 0 : dateRef.current.getElementsByTagName("input")[0].focus();
   };
-  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 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: calendarIcon,
+      title: "Open calendar"
+    },
     clearable: clearable,
     disabled: disabled,
     optional: optional,
@@ -332,41 +207,21 @@ var DxcDateInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref
     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(StyledContent, {
+    sideOffset: error ? -18 : 2,
+    align: "end",
+    "aria-modal": true,
+    onBlur: handleDatePickerOnBlur,
+    onEscapeKeyDown: handleDatePickerEscKeydown,
+    avoidCollisions: false
+  }, /*#__PURE__*/_react["default"].createElement(_DatePicker["default"], {
+    id: calendarId,
+    onDateSelect: handleCalendarOnClick,
+    date: getValueForPicker(value !== null && value !== void 0 ? value : innerValue, format.toUpperCase())
+  })))));
 });
 
-var StyledDPicker = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])([""])));
-
+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;

package/date-input/DateInput.stories.tsx

@@ -19,7 +19,13 @@ export const Chromatic = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled" theme="light" level={4} />
-      <DxcDateInput label="Disabled date input" helperText="Help message" defaultValue="06-04-2027" clearable disabled />
+      <DxcDateInput
+        label="Disabled date input"
+        helperText="Help message"
+        defaultValue="06-04-2027"
+        clearable
+        disabled
+      />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Invalid" theme="light" level={4} />
@@ -38,7 +44,13 @@ export const Chromatic = () => (
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Disabled" theme="dark" level={4} />
-          <DxcDateInput label="Disabled Date input" helperText="Help message" defaultValue="06-04-2027" clearable disabled />
+          <DxcDateInput
+            label="Disabled Date input"
+            helperText="Help message"
+            defaultValue="06-04-2027"
+            clearable
+            disabled
+          />
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Invalid" theme="dark" level={4} />
@@ -97,42 +109,43 @@ export const Chromatic = () => (
 
 const DatePicker = () => (
   <ExampleContainer expanded>
-    <Title title="Show date input" theme="light" level={4} />
-    <DxcDateInput label="Date input" defaultValue="10-06-2023" />
+    <Title title="Show date picker" theme="light" level={4} />
+    <DxcDateInput label="Date input" defaultValue="06-04-2027" />
   </ExampleContainer>
 );
 
 export const ShowDatePicker = DatePicker.bind({});
 ShowDatePicker.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  const dateBtn = canvas.getByRole("button");
+  const dateBtn = canvas.getByRole("combobox");
   await userEvent.click(dateBtn);
-  await userEvent.tab();
 };
 
 const YearPicker = () => (
   <ExampleContainer expanded>
-    <Title title="Show date input" theme="light" level={4} />
-    <DxcDateInput label="Date input" defaultValue="10-06-2023" />
+    <Title title="Show year picker" theme="light" level={4} />
+    <DxcDateInput label="Date input" defaultValue="06-04-2027" />
   </ExampleContainer>
 );
 
 export const ShowYearPicker = YearPicker.bind({});
-ShowYearPicker.play = async () => {
-  await fireEvent.click(screen.getByRole("button"));
-  await fireEvent.click(screen.getByText("2023"));
+ShowYearPicker.play = async ({ canvasElement }) => {
+  const canvas = within(canvasElement);
+  await userEvent.click(canvas.getByRole("combobox"));
+  await fireEvent.click(screen.getByText("April 2027"));
 };
 
 const YearPickerFocus = () => (
   <ExampleContainer expanded>
-    <Title title="Show date input" theme="light" level={4} />
-    <DxcDateInput label="Date input" defaultValue="10-06-2023" />
+    <Title title="Show year picker and focus" theme="light" level={4} />
+    <DxcDateInput label="Date input" defaultValue="06-04-2027" />
   </ExampleContainer>
 );
 
 export const ShowYearPickerFocus = YearPickerFocus.bind({});
-ShowYearPickerFocus.play = async () => {
-  await fireEvent.click(screen.getByRole("button"));
-  await fireEvent.click(screen.getByText("2023"));
-  await screen.getByText("2021").focus();
+ShowYearPickerFocus.play = async ({ canvasElement }) => {
+  const canvas = within(canvasElement);
+  await userEvent.click(canvas.getByRole("combobox"));
+  await fireEvent.click(screen.getByText("April 2027"));
+  await userEvent.tab();
 };