@dhis2-ui/calendar 8.11.2 → 8.12.1

package/build/cjs/stories/calendar-input.stories.js

@@ -0,0 +1,129 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.NepaliWithNepali = exports.NepaliWithEnglish = exports.IslamicWithArabic = exports.GregorianWithEnglish = exports.GregorianWithArabic = exports.EthiopicWithEnglish = exports.EthiopicWithAmharic = exports.CalendarWithClearButton = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _calendarInput = require("../calendar-input/calendar-input.js");
+
+var _calendarStoryWrapper = require("./calendar-story-wrapper.js");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (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; }
+
+const subtitle = "[Experimental] Calendar Input is a wrapper around Calendar displaying an input that triggers the calendar";
+const description = "\nUse a CalendarInput where there is a need to let the user input a date.\n\nNote that it requires a parent, like [Box](../?path=/docs/layout-box--default), to define its size.\n\n```js\nimport { CalendarInput } from '@dhis2/ui'\n```\n";
+var _default = {
+  title: 'CalendarInput',
+  component: _calendarInput.CalendarInput,
+  parameters: {
+    componentSubtitle: subtitle,
+    docs: {
+      description: {
+        component: description
+      }
+    }
+  }
+};
+exports.default = _default;
+
+const buildCalendar = _ref => {
+  let {
+    date,
+    locale,
+    calendar
+  } = _ref;
+  return () => /*#__PURE__*/_react.default.createElement(_calendarStoryWrapper.CalendarStoryWrapper, {
+    component: _calendarInput.CalendarInput,
+    dir: "ltr",
+    timeZone: "Africa/Khartoum",
+    weekDayFormat: "short",
+    date: date,
+    locale: locale,
+    calendar: calendar
+  });
+};
+
+const EthiopicWithAmharic = buildCalendar({
+  calendar: 'ethiopic',
+  locale: 'am-ET',
+  date: '2014-02-03' // 13 Oct 2021
+
+});
+exports.EthiopicWithAmharic = EthiopicWithAmharic;
+const EthiopicWithEnglish = buildCalendar({
+  calendar: 'ethiopic',
+  locale: 'en-ET',
+  date: '2014-02-03' // 13 Oct 2021
+
+});
+exports.EthiopicWithEnglish = EthiopicWithEnglish;
+const NepaliWithNepali = buildCalendar({
+  calendar: 'nepali',
+  locale: 'ne-NP',
+  date: '2078-06-27' // 13 Oct 2021
+
+});
+exports.NepaliWithNepali = NepaliWithNepali;
+const NepaliWithEnglish = buildCalendar({
+  calendar: 'nepali',
+  locale: 'en-NP',
+  date: '2078-06-27' // 13 Oct 2021
+
+});
+exports.NepaliWithEnglish = NepaliWithEnglish;
+const GregorianWithEnglish = buildCalendar({
+  calendar: 'gregorian',
+  locale: 'en-CA',
+  date: '2021-10-13'
+});
+exports.GregorianWithEnglish = GregorianWithEnglish;
+const GregorianWithArabic = buildCalendar({
+  calendar: 'gregorian',
+  locale: 'ar-SD',
+  date: '2021-10-13'
+});
+exports.GregorianWithArabic = GregorianWithArabic;
+
+const IslamicWithArabic = () => {
+  return /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      direction: 'rtl'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_calendarStoryWrapper.CalendarStoryWrapper, {
+    component: _calendarInput.CalendarInput,
+    dir: "rtl",
+    timeZone: "Africa/Khartoum",
+    weekDayFormat: "short",
+    date: "1477-01-13",
+    locale: "ar-SD",
+    calendar: "islamic-civil",
+    clearable: true
+  }));
+};
+
+exports.IslamicWithArabic = IslamicWithArabic;
+
+const CalendarWithClearButton = _ref2 => {
+  let {
+    calendar = 'gregory',
+    date: initialDate = null
+  } = _ref2;
+  const [date, setDate] = (0, _react.useState)(initialDate);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_calendarInput.CalendarInput, {
+    calendar: calendar,
+    date: date,
+    onDateSelect: date => {
+      setDate(date === null || date === void 0 ? void 0 : date.calendarDateString);
+    },
+    clearable: true
+  }), /*#__PURE__*/_react.default.createElement("div", null, "value:", /*#__PURE__*/_react.default.createElement("span", {
+    "data-test": "storybook-calendar-date-value"
+  }, date !== null && date !== void 0 ? date : 'undefined')));
+};
+
+exports.CalendarWithClearButton = CalendarWithClearButton;

package/build/cjs/stories/{calendarStoryWrapper.js → calendar-story-wrapper.js}

@@ -11,7 +11,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _index = require("../calendar/index.js");
+var _calendar = require("../calendar/calendar.js");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -27,6 +27,8 @@ const {
 } = _multiCalendarDates.constants;
 
 const CalendarStoryWrapper = props => {
+  var _selectedDate$calenda;
+
   const {
     calendar,
     locale,
@@ -41,7 +43,9 @@ const CalendarStoryWrapper = props => {
   const [selectedDirection, setSelectedDirection] = (0, _react.useState)(dir);
   const [selectedWeekFormat, setWeekDayFormat] = (0, _react.useState)(weekDayFormat);
   const [selectedLocale, setLocale] = (0, _react.useState)(locale);
-  const [selectedDate, setSelectedDate] = (0, _react.useState)();
+  const [selectedDate, setSelectedDate] = (0, _react.useState)({
+    calendarDateString: date
+  });
 
   const changeCalendar = _ref => {
     let {
@@ -155,7 +159,7 @@ const CalendarStoryWrapper = props => {
     calendar: selectedCalendar,
     dir: selectedDirection,
     locale: selectedLocale,
-    date: date,
+    date: selectedDate.calendarDateString,
     onDateSelect: date => {
       setSelectedDate(date);
     },
@@ -174,7 +178,7 @@ const CalendarStoryWrapper = props => {
     "data-test": "storybook-calendar-result"
   }, selectedDate.calendarDateString)), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("label", null, "iso date: "), /*#__PURE__*/_react.default.createElement("span", {
     "data-test": "storybook-calendar-result-iso"
-  }, selectedDate.calendarDate.withCalendar('iso8601').toLocaleString('en-GB', {
+  }, (_selectedDate$calenda = selectedDate.calendarDate) === null || _selectedDate$calenda === void 0 ? void 0 : _selectedDate$calenda.withCalendar('iso8601').toLocaleString('en-GB', {
     dateStyle: 'long'
   }))), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("label", null, "callback:"), JSON.stringify(selectedDate, null, 2))))));
 };
@@ -182,7 +186,7 @@ const CalendarStoryWrapper = props => {
 exports.CalendarStoryWrapper = CalendarStoryWrapper;
 CalendarStoryWrapper.defaultProps = {
   calendar: 'gregorian',
-  component: _index.Calendar,
+  component: _calendar.Calendar,
   weekDayFormat: 'narrow'
 };
 CalendarStoryWrapper.propTypes = {

package/build/cjs/stories/calendar.stories.js

@@ -7,9 +7,9 @@ exports.default = exports.WithAnyCalendar = exports.Nepali = exports.Ethiopic =
 
 var _react = _interopRequireDefault(require("react"));
 
-var _index = require("../calendar/index.js");
+var _calendar = require("../calendar/calendar.js");
 
-var _calendarStoryWrapper = require("./calendarStoryWrapper.js");
+var _calendarStoryWrapper = require("./calendar-story-wrapper.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -19,7 +19,7 @@ const subtitle = "[Experimental] Calendar component is useful for creating a var
 const description = "\nUse a Calendar where there is a need to let the user select a date.\n\nNote that it requires a parent, like [Box](../?path=/docs/layout-box--default), to define its size.\n\n```js\nimport { Calendar } from '@dhis2/ui'\n```\n";
 var _default = {
   title: 'Calendar',
-  component: _index.Calendar,
+  component: _calendar.Calendar,
   parameters: {
     componentSubtitle: subtitle,
     docs: {

package/build/es/__e2e__/calendar-input.stories.e2e.js

@@ -0,0 +1,19 @@
+import React from 'react';
+import { CalendarInput as component } from '../index.js';
+import { CalendarWithClearButton } from '../stories/calendar-input.stories.js';
+export default {
+  title: 'CalendarInputTesting',
+  component
+};
+export { EthiopicWithAmharic, EthiopicWithEnglish, NepaliWithEnglish, NepaliWithNepali, GregorianWithArabic, GregorianWithEnglish, IslamicWithArabic } from '../stories/calendar-input.stories.js';
+export const TestCalendarWithClearButton = () => {
+  var _params$get, _params$get2;
+
+  const params = new URLSearchParams(location.search);
+  const calendar = (_params$get = params.get('calendar')) !== null && _params$get !== void 0 ? _params$get : 'gregory';
+  const initialDate = (_params$get2 = params.get('initialDate')) !== null && _params$get2 !== void 0 ? _params$get2 : null;
+  return /*#__PURE__*/React.createElement(CalendarWithClearButton, {
+    calendar: calendar,
+    date: initialDate
+  });
+};

package/build/es/calendar/calendar-table-cell.js

@@ -1,30 +1,31 @@
 import _JSXStyle from "styled-jsx/style";
-import { colors, spacers } from '@dhis2/ui-constants';
+import { colors } from '@dhis2/ui-constants';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 export const CalendarTableCell = _ref => {
   let {
     day,
-    cellSize
+    cellSize,
+    selectedDate
   } = _ref;
   const dayHoverBackgroundColor = colors.grey200;
   const selectedDayBackgroundColor = colors.teal700;
   return /*#__PURE__*/React.createElement("td", {
     "data-test": day === null || day === void 0 ? void 0 : day.calendarDate,
     onClick: day.onClick,
-    className: _JSXStyle.dynamic([["86824133", [cellSize, cellSize, cellSize, cellSize, spacers.dp2, colors.grey900, dayHoverBackgroundColor, selectedDayBackgroundColor, colors.grey600]]])
+    className: _JSXStyle.dynamic([["2052411850", [cellSize, cellSize, cellSize, cellSize, colors.grey900, dayHoverBackgroundColor, colors.grey300, selectedDayBackgroundColor, colors.teal600, colors.teal200, colors.grey600]]])
   }, /*#__PURE__*/React.createElement("button", {
     name: "day",
-    className: _JSXStyle.dynamic([["86824133", [cellSize, cellSize, cellSize, cellSize, spacers.dp2, colors.grey900, dayHoverBackgroundColor, selectedDayBackgroundColor, colors.grey600]]]) + " " + (cx('day', {
-      isSelected: day.isSelected,
+    className: _JSXStyle.dynamic([["2052411850", [cellSize, cellSize, cellSize, cellSize, colors.grey900, dayHoverBackgroundColor, colors.grey300, selectedDayBackgroundColor, colors.teal600, colors.teal200, colors.grey600]]]) + " " + (cx('day', {
+      isSelected: selectedDate === (day === null || day === void 0 ? void 0 : day.calendarDate),
       isToday: day.isToday,
       otherMonth: !day.isInCurrentMonth
     }) || "")
   }, day.label), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "86824133",
-    dynamic: [cellSize, cellSize, cellSize, cellSize, spacers.dp2, colors.grey900, dayHoverBackgroundColor, selectedDayBackgroundColor, colors.grey600]
-  }, ["td.__jsx-style-dynamic-selector{width:".concat(cellSize, ";height:100%;height:").concat(cellSize, ";text-align:center;border:2px solid transparent;}"), "td.__jsx-style-dynamic-selector span.__jsx-style-dynamic-selector{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;padding:2px 2px;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;border:2px solid transparent;min-width:16px;}", "button.__jsx-style-dynamic-selector{border:0;overflow:hidden;width:".concat(cellSize, ";height:").concat(cellSize, ";border:2px solid transparent;border-radius:3px;background:none;margin:").concat(spacers.dp2, ";color:").concat(colors.grey900, ";}"), "button.__jsx-style-dynamic-selector:hover{background-color:".concat(dayHoverBackgroundColor, ";-webkit-text-decoration:underline;text-decoration:underline;}"), "button.isSelected.__jsx-style-dynamic-selector,button.otherMonth.isSelected.__jsx-style-dynamic-selector{background-color:".concat(selectedDayBackgroundColor, ";color:white;}"), "button.isToday.__jsx-style-dynamic-selector{-webkit-text-decoration:underline;text-decoration:underline;}", "button.otherMonth.__jsx-style-dynamic-selector{color:".concat(colors.grey600, ";}")]));
+    id: "2052411850",
+    dynamic: [cellSize, cellSize, cellSize, cellSize, colors.grey900, dayHoverBackgroundColor, colors.grey300, selectedDayBackgroundColor, colors.teal600, colors.teal200, colors.grey600]
+  }, ["td.__jsx-style-dynamic-selector{width:".concat(cellSize, ";height:100%;height:").concat(cellSize, ";text-align:center;border:2px solid transparent;padding:0;}"), "td.__jsx-style-dynamic-selector span.__jsx-style-dynamic-selector{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;padding:2px 2px;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;border:2px solid transparent;min-width:16px;}", "button.__jsx-style-dynamic-selector{border:0;overflow:hidden;width:".concat(cellSize, ";height:").concat(cellSize, ";border:2px solid transparent;border-radius:3px;background:none;color:").concat(colors.grey900, ";}"), "button.__jsx-style-dynamic-selector:hover{background-color:".concat(dayHoverBackgroundColor, ";-webkit-text-decoration:underline;text-decoration:underline;cursor:pointer;}"), "button.__jsx-style-dynamic-selector:active{background-color:".concat(colors.grey300, ";}"), "button.isSelected.__jsx-style-dynamic-selector,button.otherMonth.isSelected.__jsx-style-dynamic-selector{background-color:".concat(selectedDayBackgroundColor, ";color:white;}"), "button.isToday.__jsx-style-dynamic-selector{position:relative;}", "button.isToday.__jsx-style-dynamic-selector::after{content:'';position:absolute;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);height:4px;width:4px;bottom:2px;left:50%;border-radius:100%;background-color:".concat(colors.teal600, ";}"), "button.isSelected.isToday.__jsx-style-dynamic-selector::after{background-color:".concat(colors.teal200, ";}"), "button.otherMonth.__jsx-style-dynamic-selector{color:".concat(colors.grey600, ";}")]));
 };
 CalendarTableCell.propTypes = {
   cellSize: PropTypes.string,
@@ -33,7 +34,8 @@ CalendarTableCell.propTypes = {
     isInCurrentMonth: PropTypes.bool,
     isSelected: PropTypes.bool,
     isToday: PropTypes.bool,
-    label: PropTypes.string,
+    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     onClick: PropTypes.func
-  })
+  }),
+  selectedDate: PropTypes.string
 };

package/build/es/calendar/calendar-table-days-header.js

@@ -8,17 +8,17 @@ export const CalendarTableDaysHeader = _ref => {
   } = _ref;
   const dayNamesColor = colors.grey700;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("thead", {
-    className: _JSXStyle.dynamic([["275131861", [dayNamesColor]]])
+    className: _JSXStyle.dynamic([["1577512909", [dayNamesColor]]])
   }, /*#__PURE__*/React.createElement("tr", {
-    className: _JSXStyle.dynamic([["275131861", [dayNamesColor]]])
+    className: _JSXStyle.dynamic([["1577512909", [dayNamesColor]]])
   }, weekDayLabels.map((label, i) => /*#__PURE__*/React.createElement("th", {
     scope: "col",
     key: "weekday-".concat(i),
-    className: _JSXStyle.dynamic([["275131861", [dayNamesColor]]])
+    className: _JSXStyle.dynamic([["1577512909", [dayNamesColor]]])
   }, label)))), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "275131861",
+    id: "1577512909",
     dynamic: [dayNamesColor]
-  }, ["th.__jsx-style-dynamic-selector{color:".concat(dayNamesColor, ";font-weight:300;font-style:normal;padding:8px 8px;background:none;font-size:0.85em;border:none;}"), "tr.__jsx-style-dynamic-selector{border:none;}"]));
+  }, ["th.__jsx-style-dynamic-selector{color:".concat(dayNamesColor, ";font-weight:300;font-style:normal;padding:8px 8px;background:none;font-size:0.85em;border:none;cursor:default;}"), "tr.__jsx-style-dynamic-selector{border:none;}"]));
 };
 CalendarTableDaysHeader.propTypes = {
   weekDayLabels: PropTypes.arrayOf(PropTypes.string)

package/build/es/calendar/calendar-table.js

@@ -9,7 +9,8 @@ export const CalendarTable = _ref => {
     weekDayLabels,
     calendarWeekDays,
     width,
-    cellSize
+    cellSize,
+    selectedDate
   } = _ref;
   return /*#__PURE__*/React.createElement("div", {
     className: _JSXStyle.dynamic([["452536960", [spacers.dp4, spacers.dp4]]]) + " " + "calendar-table-wrapper"
@@ -23,6 +24,7 @@ export const CalendarTable = _ref => {
     key: "week-".concat(weekIndex + 1),
     className: _JSXStyle.dynamic([["452536960", [spacers.dp4, spacers.dp4]]])
   }, week.map(day => /*#__PURE__*/React.createElement(CalendarTableCell, {
+    selectedDate: selectedDate,
     day: day,
     key: day === null || day === void 0 ? void 0 : day.calendarDate,
     cellSize: cellSize,
@@ -38,11 +40,12 @@ CalendarTable.propTypes = {
     isInCurrentMonth: PropTypes.bool,
     isSelected: PropTypes.bool,
     isToday: PropTypes.bool,
-    label: PropTypes.string,
+    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     zdt: PropTypes.object,
     onClick: PropTypes.func
   }).isRequired).isRequired).isRequired,
   cellSize: PropTypes.string,
+  selectedDate: PropTypes.string,
   weekDayLabels: PropTypes.arrayOf(PropTypes.string),
   width: PropTypes.string
 };

package/build/es/calendar/{index.js → calendar.js}

@@ -1,8 +1,8 @@
 import _JSXStyle from "styled-jsx/style";
 import { useDatePicker, useResolvedDirection } from '@dhis2/multi-calendar-dates';
 import { colors } from '@dhis2/ui-constants';
+import PropTypes from 'prop-types';
 import React, { useState } from 'react';
-import { CalendarProps } from './calendar-prop-types.js';
 import { CalendarTable } from './calendar-table.js';
 import { NavigationContainer } from './navigation-container.js';
 export const Calendar = _ref => {
@@ -54,6 +54,7 @@ export const Calendar = _ref => {
     pickerOptions: pickerOptions,
     languageDirection: languageDirection
   }), /*#__PURE__*/React.createElement(CalendarTable, {
+    selectedDate: selectedDateString,
     calendarWeekDays: calendarWeekDays,
     weekDayLabels: weekDayLabels,
     cellSize: cellSize,
@@ -68,4 +69,35 @@ Calendar.defaultProps = {
   width: '240px',
   weekDayFormat: 'narrow'
 };
+export const CalendarProps = {
+  /** the calendar to use such gregory, ethiopic, nepali - full supported list here: https://github.com/dhis2/multi-calendar-dates/blob/main/src/constants/calendars.ts  */
+  calendar: PropTypes.any.isRequired,
+
+  /** Called with signature `(null)` \|\| `({ dateCalendarString: string, dateCalendar: Temporal.ZonedDateTime })` with `dateCalendarString` being the stringified date in the specified calendar in the format `yyyy-MM-dd` */
+  onDateSelect: PropTypes.func.isRequired,
+
+  /** the size of a single cell in the table forming the calendar */
+  cellSize: PropTypes.string,
+
+  /** the currently selected date using an iso-like format YYYY-MM-DD, in the calendar system provided (not iso8601) */
+  date: PropTypes.string,
+
+  /** the direction of the library - internally the library will use rtl for rtl-languages but this can be overridden here for more control */
+  dir: PropTypes.oneOf(['ltr', 'rtl']),
+
+  /** any valid locale -  if none provided, the internal library will fallback to the user locale (more info here: https://github.com/dhis2/multi-calendar-dates/blob/main/src/hooks/internal/useResolvedLocaleOptions.ts#L15) */
+  locale: PropTypes.string,
+
+  /** numbering system to use - full list here https://github.com/dhis2/multi-calendar-dates/blob/main/src/constants/numberingSystems.ts */
+  numberingSystem: PropTypes.string,
+
+  /** the timeZone to use */
+  timeZone: PropTypes.string,
+
+  /** the format to display for the week day, i.e. Monday (long), Mon (short), M (narrow) */
+  weekDayFormat: PropTypes.oneOf(['narrow', 'short', 'long']),
+
+  /** the width of the calendar component */
+  width: PropTypes.string
+};
 Calendar.propTypes = CalendarProps;

package/build/es/calendar/navigation-container.js

@@ -4,7 +4,6 @@ import { IconChevronLeft16, IconChevronRight16 } from '@dhis2/ui-icons';
 import PropTypes from 'prop-types';
 import React from 'react';
 import i18n from '../locales/index.js';
-const chevronColor = colors.grey600;
 const wrapperBorderColor = colors.grey300;
 const headerBackground = colors.grey050;
 export const NavigationContainer = _ref => {
@@ -23,93 +22,89 @@ export const NavigationContainer = _ref => {
     prevYear
   } = pickerOptions;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "navigation-container"
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "navigation-container"
   }, /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "month"
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "month"
   }, /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "prev"
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "prev"
   }, /*#__PURE__*/React.createElement("button", {
     onClick: prevMonth.navigateTo,
     name: "previous-month",
     "data-test": "calendar-previous-month",
     "aria-label": "".concat(i18n.t("Go to ".concat(prevMonth.label))),
     type: "button",
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
   }, /*#__PURE__*/React.createElement(PreviousIcon, {
-    color: chevronColor,
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
   }))), /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "curr"
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "curr"
   }, /*#__PURE__*/React.createElement("span", {
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "label"
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "label"
   }, currMonth.label)), /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "next"
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "next"
   }, /*#__PURE__*/React.createElement("button", {
     onClick: nextMonth.navigateTo,
     "data-test": "calendar-next-month",
     name: "next-month",
     "aria-label": "".concat(i18n.t("Go to ".concat(nextMonth.label))),
     type: "button",
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
   }, /*#__PURE__*/React.createElement(NextIcon, {
-    color: chevronColor,
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
   })))), /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "year"
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "year"
   }, /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "prev"
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "prev"
   }, /*#__PURE__*/React.createElement("button", {
     onClick: prevYear.navigateTo,
     name: "previous-year",
     "aria-label": "".concat(i18n.t('Go to previous year')),
     type: "button",
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
   }, /*#__PURE__*/React.createElement(PreviousIcon, {
-    color: chevronColor,
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
   }))), /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "curr"
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "curr"
   }, /*#__PURE__*/React.createElement("span", {
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "label"
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "label"
   }, currYear.label)), /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "next"
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]]) + " " + "next"
   }, /*#__PURE__*/React.createElement("button", {
     onClick: nextYear.navigateTo,
     name: "next-year",
     "aria-label": "".concat(i18n.t('Go to next year')),
     type: "button",
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
   }, /*#__PURE__*/React.createElement(NextIcon, {
-    color: chevronColor,
-    className: _JSXStyle.dynamic([["4112940194", [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
+    className: _JSXStyle.dynamic([["3883083596", [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]]])
   }))))), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "4112940194",
-    dynamic: [spacers.dp4, colors.grey200, spacers.dp36, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]
-  }, ["button.__jsx-style-dynamic-selector{background:none;border:0;}", ".month.__jsx-style-dynamic-selector,.year.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:100%;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".month.__jsx-style-dynamic-selector .curr.__jsx-style-dynamic-selector,.year.__jsx-style-dynamic-selector .curr.__jsx-style-dynamic-selector{-webkit-flex:2;-ms-flex:2;flex:2;white-space:nowrap;}", ".prev.__jsx-style-dynamic-selector,.next.__jsx-style-dynamic-selector{-webkit-flex:1;-ms-flex:1;flex:1;text-align:center;}", ".prev.__jsx-style-dynamic-selector button.__jsx-style-dynamic-selector,.next.__jsx-style-dynamic-selector button.__jsx-style-dynamic-selector{padding:".concat(spacers.dp4, ";}"), ".prev.__jsx-style-dynamic-selector:hover button.__jsx-style-dynamic-selector,.next.__jsx-style-dynamic-selector:hover button.__jsx-style-dynamic-selector{background-color:".concat(colors.grey200, ";cursor:pointer;}"), ".label.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;padding:4px 8px;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;min-height:16px;}", ".navigation-container.__jsx-style-dynamic-selector{height:".concat(spacers.dp36, ";gap:").concat(spacers.dp8, ";padding:").concat(spacers.dp4, ";display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;border-bottom:1px solid ").concat(wrapperBorderColor, ";background-color:").concat(headerBackground, ";font-size:1.08em;}")]));
+    id: "3883083596",
+    dynamic: [spacers.dp4, colors.grey600, colors.grey200, colors.grey900, colors.grey300, spacers.dp8, spacers.dp4, wrapperBorderColor, headerBackground]
+  }, ["button.__jsx-style-dynamic-selector{background:none;border:0;}", ".month.__jsx-style-dynamic-selector,.year.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:100%;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;cursor:default;}", ".month.__jsx-style-dynamic-selector .curr.__jsx-style-dynamic-selector,.year.__jsx-style-dynamic-selector .curr.__jsx-style-dynamic-selector{-webkit-flex:2;-ms-flex:2;flex:2;white-space:nowrap;}", ".prev.__jsx-style-dynamic-selector,.next.__jsx-style-dynamic-selector{-webkit-flex:1;-ms-flex:1;flex:1;text-align:center;}", ".prev.__jsx-style-dynamic-selector button.__jsx-style-dynamic-selector,.next.__jsx-style-dynamic-selector button.__jsx-style-dynamic-selector{padding:".concat(spacers.dp4, ";height:24px;width:24px;color:").concat(colors.grey600, ";border-radius:3px;}"), ".prev.__jsx-style-dynamic-selector button.__jsx-style-dynamic-selector svg.__jsx-style-dynamic-selector,.next.__jsx-style-dynamic-selector button.__jsx-style-dynamic-selector svg.__jsx-style-dynamic-selector{width:16px;height:16px;}", ".prev.__jsx-style-dynamic-selector:hover button.__jsx-style-dynamic-selector,.next.__jsx-style-dynamic-selector:hover button.__jsx-style-dynamic-selector{background-color:".concat(colors.grey200, ";color:").concat(colors.grey900, ";cursor:pointer;}"), ".prev.__jsx-style-dynamic-selector button.__jsx-style-dynamic-selector:active,.next.__jsx-style-dynamic-selector button.__jsx-style-dynamic-selector:active{background-color:".concat(colors.grey300, ";}"), ".label.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;padding:4px 8px;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;min-height:16px;}", ".navigation-container.__jsx-style-dynamic-selector{gap:".concat(spacers.dp8, ";padding:").concat(spacers.dp4, ";display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;border-bottom:1px solid ").concat(wrapperBorderColor, ";background-color:").concat(headerBackground, ";font-size:1.08em;}")]));
 };
 NavigationContainer.propTypes = {
   languageDirection: PropTypes.oneOf(['ltr', 'rtl']),
   pickerOptions: PropTypes.shape({
     currMonth: PropTypes.shape({
-      label: PropTypes.string
+      label: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
     }),
     currYear: PropTypes.shape({
-      label: PropTypes.string
+      label: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
     }),
     nextMonth: PropTypes.shape({
-      label: PropTypes.string,
+      label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
       navigateTo: PropTypes.func
     }),
     nextYear: PropTypes.shape({
-      label: PropTypes.string,
+      label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
       navigateTo: PropTypes.func
     }),
     prevMonth: PropTypes.shape({
-      label: PropTypes.string,
+      label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
       navigateTo: PropTypes.func
     }),
     prevYear: PropTypes.shape({
-      label: PropTypes.string,
+      label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
       navigateTo: PropTypes.func
     })
   })

package/build/es/calendar-input/{index.js → calendar-input.js}

@@ -1,19 +1,16 @@
+import _JSXStyle from "styled-jsx/style";
+
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+import { Button } from '@dhis2-ui/button';
 import { Card } from '@dhis2-ui/card';
 import { InputField, InputFieldProps } from '@dhis2-ui/input';
 import { Layer } from '@dhis2-ui/layer';
 import { Popper } from '@dhis2-ui/popper';
-import { getNowInCalendar } from '@dhis2/multi-calendar-dates';
+import cx from 'classnames';
 import React, { useRef, useState } from 'react';
-import { CalendarProps } from '../calendar/calendar-prop-types.js';
-import { Calendar } from '../calendar/index.js';
-
-const padWithZeroes = function (number) {
-  let count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
-  return String(number).padStart(count, '0');
-};
-
+import { Calendar, CalendarProps } from '../calendar/calendar.js';
+import i18n from '../locales/index.js';
 const offsetModifier = {
   name: 'offset',
   options: {
@@ -32,19 +29,13 @@ export const CalendarInput = function () {
     timeZone,
     width,
     cellSize,
+    clearable,
     ...rest
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const ref = useRef();
   const [open, setOpen] = useState(false);
-  const currentDate = getNowInCalendar(calendar, timeZone);
-  const initialDate = date || "".concat(currentDate.eraYear || currentDate.year, "-").concat(padWithZeroes(currentDate.month), "-").concat(padWithZeroes(currentDate.day));
-  const [value, setValue] = useState(initialDate);
   const calendarProps = React.useMemo(() => {
     const onDateSelectWrapper = selectedDate => {
-      const {
-        calendarDateString
-      } = selectedDate;
-      setValue(calendarDateString);
       setOpen(false);
       onDateSelect === null || onDateSelect === void 0 ? void 0 : onDateSelect(selectedDate);
     };
@@ -68,14 +59,29 @@ export const CalendarInput = function () {
   };
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    ref: ref
+    ref: ref,
+    className: "jsx-862452676" + " " + "calendar-input-wrapper"
   }, /*#__PURE__*/React.createElement(InputField, _extends({
     label: "Pick a date"
   }, rest, {
     type: "text",
     onFocus: onFocus,
-    value: value
-  }))), open && /*#__PURE__*/React.createElement(Layer, {
+    value: date
+  })), clearable && /*#__PURE__*/React.createElement("div", {
+    className: "jsx-862452676" + " " + (cx('calendar-clear-button', {
+      // ToDo: this is a workaround to show the clear button in the correct place when an icon is shown.
+      // Long-term, we should abstract and share the logic multi-select uses for the input-wrapper
+      // https://dhis2.atlassian.net/browse/DHIS2-14848
+      'with-icon': rest.valid || rest.error || rest.warning || rest.loading,
+      'with-dense-wrapper': rest.dense
+    }) || "")
+  }, /*#__PURE__*/React.createElement(Button, {
+    dataTest: "calendar-clear-button",
+    secondary: true,
+    small: true,
+    onClick: () => calendarProps.onDateSelect(null),
+    type: "button"
+  }, i18n.t('Clear')))), open && /*#__PURE__*/React.createElement(Layer, {
     onBackdropClick: () => {
       setOpen(false);
     }
@@ -84,8 +90,10 @@ export const CalendarInput = function () {
     placement: "bottom-start",
     modifiers: [offsetModifier]
   }, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(Calendar, _extends({}, calendarProps, {
-    date: value
-  }))))));
+    date: date
+  }))))), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: "862452676"
+  }, [".calendar-input-wrapper.jsx-862452676{position:relative;}", ".calendar-clear-button.jsx-862452676{position:absolute;inset-inline-end:6px;-webkit-inset-block-start:27px;-ms-intb-rlock-start:27px;inset-block-start:27px;}", ".calendar-clear-button.with-icon.jsx-862452676{inset-inline-end:36px;}", ".calendar-clear-button.with-dense-wrapper.jsx-862452676{-webkit-inset-block-start:23px;-ms-intb-rlock-start:23px;inset-block-start:23px;}"]));
 };
 CalendarInput.defaultProps = {
   dataTest: 'dhis2-uiwidgets-calendar-inputfield'