@dhis2-ui/calendar 10.16.3-alpha.1 → 10.16.4

package/build/cjs/calendar/calendar-container.js

@@ -10,30 +10,28 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _calendarTable = require("./calendar-table.js");
 var _navigationContainer = require("./navigation-container.js");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const backgroundColor = _uiConstants.colors.white;
-const CalendarContainer = exports.CalendarContainer = /*#__PURE__*/_react.default.memo(function CalendarContainer(_ref) {
-  let {
-    date,
-    width = '240px',
-    cellSize = '32px',
-    calendarWeekDays,
-    weekDayLabels,
-    currMonth,
-    currYear,
-    nextMonth,
-    nextYear,
-    prevMonth,
-    prevYear,
-    navigateToYear,
-    navigateToMonth,
-    months,
-    years,
-    languageDirection,
-    calendarRef
-  } = _ref;
+const CalendarContainer = exports.CalendarContainer = /*#__PURE__*/_react.default.memo(function CalendarContainer({
+  date,
+  width = '240px',
+  cellSize = '32px',
+  calendarWeekDays,
+  weekDayLabels,
+  currMonth,
+  currYear,
+  nextMonth,
+  nextYear,
+  prevMonth,
+  prevYear,
+  navigateToYear,
+  navigateToMonth,
+  months,
+  years,
+  languageDirection,
+  calendarRef
+}) {
   const navigationProps = (0, _react.useMemo)(() => {
     return {
       currMonth,

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

@@ -10,12 +10,11 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const CalendarTableCell = _ref => {
-  let {
-    day,
-    cellSize,
-    selectedDate
-  } = _ref;
+const CalendarTableCell = ({
+  day,
+  cellSize,
+  selectedDate
+}) => {
   const dayHoverBackgroundColor = _uiConstants.colors.grey200;
   const selectedDayBackgroundColor = _uiConstants.colors.teal700;
   return /*#__PURE__*/_react.default.createElement("td", {

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

@@ -9,10 +9,9 @@ var _uiConstants = require("@dhis2/ui-constants");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const CalendarTableDaysHeader = _ref => {
-  let {
-    weekDayLabels
-  } = _ref;
+const CalendarTableDaysHeader = ({
+  weekDayLabels
+}) => {
   const dayNamesColor = _uiConstants.colors.grey700;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("thead", {
     className: _style.default.dynamic([["1577512909", [dayNamesColor]]])

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

@@ -11,36 +11,33 @@ var _react = _interopRequireDefault(require("react"));
 var _calendarTableCell = require("./calendar-table-cell.js");
 var _calendarTableDaysHeader = require("./calendar-table-days-header.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const CalendarTable = _ref => {
-  let {
-    weekDayLabels,
-    calendarWeekDays,
-    width,
-    cellSize,
-    selectedDate
-  } = _ref;
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: _style.default.dynamic([["890354150", [_uiConstants.spacers.dp4, _uiConstants.spacers.dp4]]]) + " " + "calendar-table-wrapper"
-  }, /*#__PURE__*/_react.default.createElement("table", {
-    className: _style.default.dynamic([["890354150", [_uiConstants.spacers.dp4, _uiConstants.spacers.dp4]]]) + " " + "calendar-table"
-  }, /*#__PURE__*/_react.default.createElement(_calendarTableDaysHeader.CalendarTableDaysHeader, {
-    weekDayLabels: weekDayLabels
-  }), /*#__PURE__*/_react.default.createElement("tbody", {
-    className: _style.default.dynamic([["890354150", [_uiConstants.spacers.dp4, _uiConstants.spacers.dp4]]])
-  }, calendarWeekDays.map((week, weekIndex) => /*#__PURE__*/_react.default.createElement("tr", {
-    key: `week-${weekIndex + 1}`,
-    className: _style.default.dynamic([["890354150", [_uiConstants.spacers.dp4, _uiConstants.spacers.dp4]]])
-  }, week.map(day => /*#__PURE__*/_react.default.createElement(_calendarTableCell.CalendarTableCell, {
-    selectedDate: selectedDate,
-    day: day,
-    key: day === null || day === void 0 ? void 0 : day.dateValue,
-    cellSize: cellSize,
-    width: width
-  })))))), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: "890354150",
-    dynamic: [_uiConstants.spacers.dp4, _uiConstants.spacers.dp4]
-  }, [`.calendar-table.__jsx-style-dynamic-selector{border:none;border-collapse:collapse;width:100%;margin-block:0 ${_uiConstants.spacers.dp4};}`, ".calendar-table.__jsx-style-dynamic-selector tr.__jsx-style-dynamic-selector,.calendar-table.__jsx-style-dynamic-selector td.__jsx-style-dynamic-selector{border:none;}", `.calendar-table-wrapper.__jsx-style-dynamic-selector{padding-inline:${_uiConstants.spacers.dp4};}`]));
-};
+const CalendarTable = ({
+  weekDayLabels,
+  calendarWeekDays,
+  width,
+  cellSize,
+  selectedDate
+}) => /*#__PURE__*/_react.default.createElement("div", {
+  className: _style.default.dynamic([["890354150", [_uiConstants.spacers.dp4, _uiConstants.spacers.dp4]]]) + " " + "calendar-table-wrapper"
+}, /*#__PURE__*/_react.default.createElement("table", {
+  className: _style.default.dynamic([["890354150", [_uiConstants.spacers.dp4, _uiConstants.spacers.dp4]]]) + " " + "calendar-table"
+}, /*#__PURE__*/_react.default.createElement(_calendarTableDaysHeader.CalendarTableDaysHeader, {
+  weekDayLabels: weekDayLabels
+}), /*#__PURE__*/_react.default.createElement("tbody", {
+  className: _style.default.dynamic([["890354150", [_uiConstants.spacers.dp4, _uiConstants.spacers.dp4]]])
+}, calendarWeekDays.map((week, weekIndex) => /*#__PURE__*/_react.default.createElement("tr", {
+  key: `week-${weekIndex + 1}`,
+  className: _style.default.dynamic([["890354150", [_uiConstants.spacers.dp4, _uiConstants.spacers.dp4]]])
+}, week.map(day => /*#__PURE__*/_react.default.createElement(_calendarTableCell.CalendarTableCell, {
+  selectedDate: selectedDate,
+  day: day,
+  key: day === null || day === void 0 ? void 0 : day.dateValue,
+  cellSize: cellSize,
+  width: width
+})))))), /*#__PURE__*/_react.default.createElement(_style.default, {
+  id: "890354150",
+  dynamic: [_uiConstants.spacers.dp4, _uiConstants.spacers.dp4]
+}, [`.calendar-table.__jsx-style-dynamic-selector{border:none;border-collapse:collapse;width:100%;margin-block:0 ${_uiConstants.spacers.dp4};}`, ".calendar-table.__jsx-style-dynamic-selector tr.__jsx-style-dynamic-selector,.calendar-table.__jsx-style-dynamic-selector td.__jsx-style-dynamic-selector{border:none;}", `.calendar-table-wrapper.__jsx-style-dynamic-selector{padding-inline:${_uiConstants.spacers.dp4};}`]));
 exports.CalendarTable = CalendarTable;
 const CalendarTableProps = exports.CalendarTableProps = {
   calendarWeekDays: _propTypes.default.arrayOf(_propTypes.default.arrayOf(_propTypes.default.shape({

package/build/cjs/calendar/calendar.js

@@ -8,23 +8,21 @@ var _multiCalendarDates = require("@dhis2/multi-calendar-dates");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _calendarContainer = require("./calendar-container.js");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const Calendar = _ref => {
-  let {
-    onDateSelect,
-    calendar,
-    date,
-    dir,
-    locale,
-    numberingSystem,
-    weekDayFormat = 'narrow',
-    timeZone,
-    width = '240px',
-    cellSize = '32px',
-    pastOnly
-  } = _ref;
+const Calendar = ({
+  onDateSelect,
+  calendar,
+  date,
+  dir,
+  locale,
+  numberingSystem,
+  weekDayFormat = 'narrow',
+  timeZone,
+  width = '240px',
+  cellSize = '32px',
+  pastOnly
+}) => {
   const [selectedDateString, setSelectedDateString] = (0, _react.useState)(date);
   const languageDirection = (0, _multiCalendarDates.useResolvedDirection)(dir, locale);
   const options = {

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

@@ -13,20 +13,19 @@ var _index = _interopRequireDefault(require("../locales/index.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const wrapperBorderColor = _uiConstants.colors.grey300;
 const headerBackground = _uiConstants.colors.grey100;
-const NavigationContainer = _ref => {
-  let {
-    languageDirection,
-    currMonth,
-    currYear,
-    nextMonth,
-    nextYear,
-    prevMonth,
-    prevYear,
-    navigateToYear,
-    navigateToMonth,
-    months,
-    years
-  } = _ref;
+const NavigationContainer = ({
+  languageDirection,
+  currMonth,
+  currYear,
+  nextMonth,
+  nextYear,
+  prevMonth,
+  prevYear,
+  navigateToYear,
+  navigateToMonth,
+  months,
+  years
+}) => {
   const PreviousIcon = languageDirection === 'ltr' ? _uiIcons.IconChevronLeft16 : _uiIcons.IconChevronRight16;
   const NextIcon = languageDirection === 'ltr' ? _uiIcons.IconChevronRight16 : _uiIcons.IconChevronLeft16;
   const handleYearChange = e => {

package/build/cjs/calendar-input/__tests__/calendar-input.test.js

@@ -5,8 +5,7 @@ var _react = require("@testing-library/react");
 var _react2 = _interopRequireWildcard(require("react"));
 var _reactFinalForm = require("react-final-form");
 var _calendarInput = require("../calendar-input.js");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 describe('Calendar Input', () => {
   it('allow selection of a date through the calendar widget', async () => {
@@ -271,11 +270,10 @@ const CalendarWithValidation = propsFromParent => {
   return /*#__PURE__*/_react2.default.createElement(_reactFinalForm.Form, {
     onSubmit: () => {},
     validate: errored
-  }, _ref => {
-    let {
-      handleSubmit,
-      invalid
-    } = _ref;
+  }, ({
+    handleSubmit,
+    invalid
+  }) => {
     return /*#__PURE__*/_react2.default.createElement("form", null, /*#__PURE__*/_react2.default.createElement(_reactFinalForm.Field, {
       name: "calendar"
     }, props => /*#__PURE__*/_react2.default.createElement(_calendarInput.CalendarInput, _extends({}, props, {
@@ -288,7 +286,7 @@ const CalendarWithValidation = propsFromParent => {
         var _propsFromParent$onDa;
         setDate(date === null || date === void 0 ? void 0 : date.calendarDateString);
         setValidation(date === null || date === void 0 ? void 0 : date.validation);
-        (_propsFromParent$onDa = propsFromParent.onDateSelect) === null || _propsFromParent$onDa === void 0 ? void 0 : _propsFromParent$onDa.call(propsFromParent, date);
+        (_propsFromParent$onDa = propsFromParent.onDateSelect) === null || _propsFromParent$onDa === void 0 || _propsFromParent$onDa.call(propsFromParent, date);
       }
     }))), /*#__PURE__*/_react2.default.createElement(_button.Button, {
       type: "submit",

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

@@ -15,8 +15,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _calendarContainer = require("../calendar/calendar-container.js");
 var _index = _interopRequireDefault(require("../locales/index.js"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 const offsetModifier = {
@@ -25,27 +24,26 @@ const offsetModifier = {
     offset: [0, 2]
   }
 };
-const CalendarInput = function () {
-  let {
-    onDateSelect: parentOnDateSelect,
-    calendar,
-    date,
-    dir,
-    locale,
-    numberingSystem,
-    weekDayFormat = 'narrow',
-    width = '300px',
-    cellSize = '32px',
-    clearable,
-    minDate,
-    maxDate,
-    format,
-    strictValidation,
-    inputWidth,
-    dataTest = 'dhis2-uiwidgets-calendar-inputfield',
-    pastOnly,
-    ...rest
-  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+const CalendarInput = ({
+  onDateSelect: parentOnDateSelect,
+  calendar,
+  date,
+  dir,
+  locale,
+  numberingSystem,
+  weekDayFormat = 'narrow',
+  width = '300px',
+  cellSize = '32px',
+  clearable,
+  minDate,
+  maxDate,
+  format,
+  strictValidation,
+  inputWidth,
+  dataTest = 'dhis2-uiwidgets-calendar-inputfield',
+  pastOnly,
+  ...rest
+} = {}) => {
   const ref = (0, _react.useRef)();
   const calendarRef = (0, _react.useRef)();
   const popperRef = (0, _react.useRef)();
@@ -61,7 +59,7 @@ const CalendarInput = function () {
   }), [calendar, locale, numberingSystem, weekDayFormat, pastOnly]);
   const onChooseDate = (date, validationOptions) => {
     if (!date) {
-      parentOnDateSelect === null || parentOnDateSelect === void 0 ? void 0 : parentOnDateSelect({
+      parentOnDateSelect === null || parentOnDateSelect === void 0 || parentOnDateSelect({
         calendarDateString: null,
         validation: {
           valid: true
@@ -70,7 +68,7 @@ const CalendarInput = function () {
       return;
     }
     const validation = (0, _multiCalendarDates.validateDateString)(date, validationOptions);
-    parentOnDateSelect === null || parentOnDateSelect === void 0 ? void 0 : parentOnDateSelect({
+    parentOnDateSelect === null || parentOnDateSelect === void 0 || parentOnDateSelect({
       calendarDateString: date,
       validation
     });
@@ -106,7 +104,7 @@ const CalendarInput = function () {
   const onFocus = () => {
     var _rest$onFocus;
     setOpen(true);
-    rest === null || rest === void 0 ? void 0 : (_rest$onFocus = rest.onFocus) === null || _rest$onFocus === void 0 ? void 0 : _rest$onFocus.call(rest);
+    rest === null || rest === void 0 || (_rest$onFocus = rest.onFocus) === null || _rest$onFocus === void 0 || _rest$onFocus.call(rest);
   };
   const languageDirection = (0, _multiCalendarDates.useResolvedDirection)(dir, locale);
   const calendarProps = (0, _react.useMemo)(() => ({
@@ -160,7 +158,7 @@ const CalendarInput = function () {
     modifiers: [offsetModifier],
     onFirstUpdate: component => {
       var _component$elements;
-      popperRef.current = component === null || component === void 0 ? void 0 : (_component$elements = component.elements) === null || _component$elements === void 0 ? void 0 : _component$elements.popper;
+      popperRef.current = component === null || component === void 0 || (_component$elements = component.elements) === null || _component$elements === void 0 ? void 0 : _component$elements.popper;
     }
   }, /*#__PURE__*/_react.default.createElement(_calendarContainer.CalendarContainer, _extends({}, calendarProps, {
     calendarRef: calendarRef

package/build/cjs/locales/index.js

@@ -17,5 +17,10 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 //------------------------------------------------------------------------------
 
 const namespace = 'default';
-_d2I18n.default.addResources('en', namespace, _translations.default);
+
+// Use 'deep' = true and 'overwrite' = false to add to, but not overwrite,
+// custom translations from the datastore (added by the app adapter)
+
+_d2I18n.default.addResourceBundle('en', namespace, _translations.default, true, false);
+_d2I18n.default.addResourceBundle('en', namespace, _translations.default, true, false);
 var _default = exports.default = _d2I18n.default;

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

@@ -12,8 +12,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactFinalForm = require("react-final-form");
 var _calendarInput = require("../calendar-input/calendar-input.js");
 var _calendarStoryWrapper = require("./calendar-story-wrapper.js");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 const subtitle = `[Experimental] Calendar Input is a wrapper around Calendar displaying an input that triggers the calendar`;
 const description = `
@@ -37,23 +36,20 @@ var _default = exports.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,
-    onDateSelect: () => {}
-  });
-};
+const buildCalendar = ({
+  date,
+  locale,
+  calendar
+}) => () => /*#__PURE__*/_react.default.createElement(_calendarStoryWrapper.CalendarStoryWrapper, {
+  component: _calendarInput.CalendarInput,
+  dir: "ltr",
+  timeZone: "Africa/Khartoum",
+  weekDayFormat: "short",
+  date: date,
+  locale: locale,
+  calendar: calendar,
+  onDateSelect: () => {}
+});
 const EthiopicWithAmharic = exports.EthiopicWithAmharic = buildCalendar({
   calendar: 'ethiopic',
   locale: 'am-ET',
@@ -103,11 +99,10 @@ const IslamicWithArabic = () => {
   }));
 };
 exports.IslamicWithArabic = IslamicWithArabic;
-const CalendarWithClearButton = _ref2 => {
-  let {
-    calendar = 'gregory',
-    date: initialDate = null
-  } = _ref2;
+const CalendarWithClearButton = ({
+  calendar = 'gregory',
+  date: initialDate = null
+}) => {
   const [date, setDate] = (0, _react.useState)(initialDate);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_calendarInput.CalendarInput, {
     calendar: calendar,
@@ -141,11 +136,10 @@ function CalendarWithStrictValidation() {
       calendar: '2022-10-12'
     },
     validate: errored
-  }, _ref3 => {
-    let {
-      handleSubmit,
-      invalid
-    } = _ref3;
+  }, ({
+    handleSubmit,
+    invalid
+  }) => {
     return /*#__PURE__*/_react.default.createElement("form", {
       onSubmit: handleSubmit
     }, /*#__PURE__*/_react.default.createElement(_reactFinalForm.Field, {
@@ -195,11 +189,10 @@ function CalendarWithNonStrictValidation() {
       calendar: '2022-10-12'
     },
     validate: errored
-  }, _ref4 => {
-    let {
-      handleSubmit,
-      invalid
-    } = _ref4;
+  }, ({
+    handleSubmit,
+    invalid
+  }) => {
     return /*#__PURE__*/_react.default.createElement("form", {
       onSubmit: handleSubmit
     }, /*#__PURE__*/_react.default.createElement(_reactFinalForm.Field, {

package/build/cjs/stories/calendar-story-wrapper.js

@@ -8,8 +8,7 @@ var _multiCalendarDates = require("@dhis2/multi-calendar-dates");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _calendar = require("../calendar/calendar.js");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 const {
@@ -34,48 +33,43 @@ const CalendarStoryWrapper = props => {
   const [selectedDate, setSelectedDate] = (0, _react.useState)({
     calendarDateString: date
   });
-  const changeCalendar = _ref => {
-    let {
-      target: {
-        value
-      }
-    } = _ref;
+  const changeCalendar = ({
+    target: {
+      value
+    }
+  }) => {
     setSelectedCalendar(value);
   };
-  const changeNumberingSystem = _ref2 => {
-    let {
-      target: {
-        value
-      }
-    } = _ref2;
+  const changeNumberingSystem = ({
+    target: {
+      value
+    }
+  }) => {
     if (value === '-1') {
       setSelectedNumberingSystem(null);
     } else {
       setSelectedNumberingSystem(value);
     }
   };
-  const changeDirection = _ref3 => {
-    let {
-      target: {
-        value
-      }
-    } = _ref3;
+  const changeDirection = ({
+    target: {
+      value
+    }
+  }) => {
     setSelectedDirection(value);
   };
-  const changeWeekFormat = _ref4 => {
-    let {
-      target: {
-        value
-      }
-    } = _ref4;
+  const changeWeekFormat = ({
+    target: {
+      value
+    }
+  }) => {
     setWeekDayFormat(value);
   };
-  const onLocaleChanged = _ref5 => {
-    let {
-      target: {
-        value
-      }
-    } = _ref5;
+  const onLocaleChanged = ({
+    target: {
+      value
+    }
+  }) => {
     setLocale(value);
   };
   return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {

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

@@ -5,26 +5,25 @@ import React, { useMemo } from 'react';
 import { CalendarTable, CalendarTableProps } from './calendar-table.js';
 import { NavigationContainer, NavigationContainerProps } from './navigation-container.js';
 const backgroundColor = colors.white;
-export const CalendarContainer = /*#__PURE__*/React.memo(function CalendarContainer(_ref) {
-  let {
-    date,
-    width = '240px',
-    cellSize = '32px',
-    calendarWeekDays,
-    weekDayLabels,
-    currMonth,
-    currYear,
-    nextMonth,
-    nextYear,
-    prevMonth,
-    prevYear,
-    navigateToYear,
-    navigateToMonth,
-    months,
-    years,
-    languageDirection,
-    calendarRef
-  } = _ref;
+export const CalendarContainer = /*#__PURE__*/React.memo(function CalendarContainer({
+  date,
+  width = '240px',
+  cellSize = '32px',
+  calendarWeekDays,
+  weekDayLabels,
+  currMonth,
+  currYear,
+  nextMonth,
+  nextYear,
+  prevMonth,
+  prevYear,
+  navigateToYear,
+  navigateToMonth,
+  months,
+  years,
+  languageDirection,
+  calendarRef
+}) {
   const navigationProps = useMemo(() => {
     return {
       currMonth,

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

@@ -3,12 +3,11 @@ 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,
-    selectedDate
-  } = _ref;
+export const CalendarTableCell = ({
+  day,
+  cellSize,
+  selectedDate
+}) => {
   const dayHoverBackgroundColor = colors.grey200;
   const selectedDayBackgroundColor = colors.teal700;
   return /*#__PURE__*/React.createElement("td", {

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

@@ -2,10 +2,9 @@ import _JSXStyle from "styled-jsx/style";
 import { colors } from '@dhis2/ui-constants';
 import PropTypes from 'prop-types';
 import React from 'react';
-export const CalendarTableDaysHeader = _ref => {
-  let {
-    weekDayLabels
-  } = _ref;
+export const CalendarTableDaysHeader = ({
+  weekDayLabels
+}) => {
   const dayNamesColor = colors.grey700;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("thead", {
     className: _JSXStyle.dynamic([["1577512909", [dayNamesColor]]])

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

@@ -4,36 +4,33 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { CalendarTableCell } from './calendar-table-cell.js';
 import { CalendarTableDaysHeader } from './calendar-table-days-header.js';
-export const CalendarTable = _ref => {
-  let {
-    weekDayLabels,
-    calendarWeekDays,
-    width,
-    cellSize,
-    selectedDate
-  } = _ref;
-  return /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["890354150", [spacers.dp4, spacers.dp4]]]) + " " + "calendar-table-wrapper"
-  }, /*#__PURE__*/React.createElement("table", {
-    className: _JSXStyle.dynamic([["890354150", [spacers.dp4, spacers.dp4]]]) + " " + "calendar-table"
-  }, /*#__PURE__*/React.createElement(CalendarTableDaysHeader, {
-    weekDayLabels: weekDayLabels
-  }), /*#__PURE__*/React.createElement("tbody", {
-    className: _JSXStyle.dynamic([["890354150", [spacers.dp4, spacers.dp4]]])
-  }, calendarWeekDays.map((week, weekIndex) => /*#__PURE__*/React.createElement("tr", {
-    key: `week-${weekIndex + 1}`,
-    className: _JSXStyle.dynamic([["890354150", [spacers.dp4, spacers.dp4]]])
-  }, week.map(day => /*#__PURE__*/React.createElement(CalendarTableCell, {
-    selectedDate: selectedDate,
-    day: day,
-    key: day === null || day === void 0 ? void 0 : day.dateValue,
-    cellSize: cellSize,
-    width: width
-  })))))), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "890354150",
-    dynamic: [spacers.dp4, spacers.dp4]
-  }, [`.calendar-table.__jsx-style-dynamic-selector{border:none;border-collapse:collapse;width:100%;margin-block:0 ${spacers.dp4};}`, ".calendar-table.__jsx-style-dynamic-selector tr.__jsx-style-dynamic-selector,.calendar-table.__jsx-style-dynamic-selector td.__jsx-style-dynamic-selector{border:none;}", `.calendar-table-wrapper.__jsx-style-dynamic-selector{padding-inline:${spacers.dp4};}`]));
-};
+export const CalendarTable = ({
+  weekDayLabels,
+  calendarWeekDays,
+  width,
+  cellSize,
+  selectedDate
+}) => /*#__PURE__*/React.createElement("div", {
+  className: _JSXStyle.dynamic([["890354150", [spacers.dp4, spacers.dp4]]]) + " " + "calendar-table-wrapper"
+}, /*#__PURE__*/React.createElement("table", {
+  className: _JSXStyle.dynamic([["890354150", [spacers.dp4, spacers.dp4]]]) + " " + "calendar-table"
+}, /*#__PURE__*/React.createElement(CalendarTableDaysHeader, {
+  weekDayLabels: weekDayLabels
+}), /*#__PURE__*/React.createElement("tbody", {
+  className: _JSXStyle.dynamic([["890354150", [spacers.dp4, spacers.dp4]]])
+}, calendarWeekDays.map((week, weekIndex) => /*#__PURE__*/React.createElement("tr", {
+  key: `week-${weekIndex + 1}`,
+  className: _JSXStyle.dynamic([["890354150", [spacers.dp4, spacers.dp4]]])
+}, week.map(day => /*#__PURE__*/React.createElement(CalendarTableCell, {
+  selectedDate: selectedDate,
+  day: day,
+  key: day === null || day === void 0 ? void 0 : day.dateValue,
+  cellSize: cellSize,
+  width: width
+})))))), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "890354150",
+  dynamic: [spacers.dp4, spacers.dp4]
+}, [`.calendar-table.__jsx-style-dynamic-selector{border:none;border-collapse:collapse;width:100%;margin-block:0 ${spacers.dp4};}`, ".calendar-table.__jsx-style-dynamic-selector tr.__jsx-style-dynamic-selector,.calendar-table.__jsx-style-dynamic-selector td.__jsx-style-dynamic-selector{border:none;}", `.calendar-table-wrapper.__jsx-style-dynamic-selector{padding-inline:${spacers.dp4};}`]));
 export const CalendarTableProps = {
   calendarWeekDays: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.shape({
     calendarDate: PropTypes.string,

package/build/es/calendar/calendar.js

@@ -2,20 +2,19 @@ import { useDatePicker, useResolvedDirection } from '@dhis2/multi-calendar-dates
 import PropTypes from 'prop-types';
 import React, { useMemo, useState } from 'react';
 import { CalendarContainer } from './calendar-container.js';
-export const Calendar = _ref => {
-  let {
-    onDateSelect,
-    calendar,
-    date,
-    dir,
-    locale,
-    numberingSystem,
-    weekDayFormat = 'narrow',
-    timeZone,
-    width = '240px',
-    cellSize = '32px',
-    pastOnly
-  } = _ref;
+export const Calendar = ({
+  onDateSelect,
+  calendar,
+  date,
+  dir,
+  locale,
+  numberingSystem,
+  weekDayFormat = 'narrow',
+  timeZone,
+  width = '240px',
+  cellSize = '32px',
+  pastOnly
+}) => {
   const [selectedDateString, setSelectedDateString] = useState(date);
   const languageDirection = useResolvedDirection(dir, locale);
   const options = {

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

@@ -6,20 +6,19 @@ import React from 'react';
 import i18n from '../locales/index.js';
 const wrapperBorderColor = colors.grey300;
 const headerBackground = colors.grey100;
-export const NavigationContainer = _ref => {
-  let {
-    languageDirection,
-    currMonth,
-    currYear,
-    nextMonth,
-    nextYear,
-    prevMonth,
-    prevYear,
-    navigateToYear,
-    navigateToMonth,
-    months,
-    years
-  } = _ref;
+export const NavigationContainer = ({
+  languageDirection,
+  currMonth,
+  currYear,
+  nextMonth,
+  nextYear,
+  prevMonth,
+  prevYear,
+  navigateToYear,
+  navigateToMonth,
+  months,
+  years
+}) => {
   const PreviousIcon = languageDirection === 'ltr' ? IconChevronLeft16 : IconChevronRight16;
   const NextIcon = languageDirection === 'ltr' ? IconChevronRight16 : IconChevronLeft16;
   const handleYearChange = e => {

package/build/es/calendar-input/__tests__/calendar-input.test.js

@@ -267,11 +267,10 @@ const CalendarWithValidation = propsFromParent => {
   return /*#__PURE__*/React.createElement(Form, {
     onSubmit: () => {},
     validate: errored
-  }, _ref => {
-    let {
-      handleSubmit,
-      invalid
-    } = _ref;
+  }, ({
+    handleSubmit,
+    invalid
+  }) => {
     return /*#__PURE__*/React.createElement("form", null, /*#__PURE__*/React.createElement(Field, {
       name: "calendar"
     }, props => /*#__PURE__*/React.createElement(CalendarInput, _extends({}, props, {
@@ -284,7 +283,7 @@ const CalendarWithValidation = propsFromParent => {
         var _propsFromParent$onDa;
         setDate(date === null || date === void 0 ? void 0 : date.calendarDateString);
         setValidation(date === null || date === void 0 ? void 0 : date.validation);
-        (_propsFromParent$onDa = propsFromParent.onDateSelect) === null || _propsFromParent$onDa === void 0 ? void 0 : _propsFromParent$onDa.call(propsFromParent, date);
+        (_propsFromParent$onDa = propsFromParent.onDateSelect) === null || _propsFromParent$onDa === void 0 || _propsFromParent$onDa.call(propsFromParent, date);
       }
     }))), /*#__PURE__*/React.createElement(Button, {
       type: "submit",

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

@@ -16,27 +16,26 @@ const offsetModifier = {
     offset: [0, 2]
   }
 };
-export const CalendarInput = function () {
-  let {
-    onDateSelect: parentOnDateSelect,
-    calendar,
-    date,
-    dir,
-    locale,
-    numberingSystem,
-    weekDayFormat = 'narrow',
-    width = '300px',
-    cellSize = '32px',
-    clearable,
-    minDate,
-    maxDate,
-    format,
-    strictValidation,
-    inputWidth,
-    dataTest = 'dhis2-uiwidgets-calendar-inputfield',
-    pastOnly,
-    ...rest
-  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+export const CalendarInput = ({
+  onDateSelect: parentOnDateSelect,
+  calendar,
+  date,
+  dir,
+  locale,
+  numberingSystem,
+  weekDayFormat = 'narrow',
+  width = '300px',
+  cellSize = '32px',
+  clearable,
+  minDate,
+  maxDate,
+  format,
+  strictValidation,
+  inputWidth,
+  dataTest = 'dhis2-uiwidgets-calendar-inputfield',
+  pastOnly,
+  ...rest
+} = {}) => {
   const ref = useRef();
   const calendarRef = useRef();
   const popperRef = useRef();
@@ -52,7 +51,7 @@ export const CalendarInput = function () {
   }), [calendar, locale, numberingSystem, weekDayFormat, pastOnly]);
   const onChooseDate = (date, validationOptions) => {
     if (!date) {
-      parentOnDateSelect === null || parentOnDateSelect === void 0 ? void 0 : parentOnDateSelect({
+      parentOnDateSelect === null || parentOnDateSelect === void 0 || parentOnDateSelect({
         calendarDateString: null,
         validation: {
           valid: true
@@ -61,7 +60,7 @@ export const CalendarInput = function () {
       return;
     }
     const validation = validateDateString(date, validationOptions);
-    parentOnDateSelect === null || parentOnDateSelect === void 0 ? void 0 : parentOnDateSelect({
+    parentOnDateSelect === null || parentOnDateSelect === void 0 || parentOnDateSelect({
       calendarDateString: date,
       validation
     });
@@ -97,7 +96,7 @@ export const CalendarInput = function () {
   const onFocus = () => {
     var _rest$onFocus;
     setOpen(true);
-    rest === null || rest === void 0 ? void 0 : (_rest$onFocus = rest.onFocus) === null || _rest$onFocus === void 0 ? void 0 : _rest$onFocus.call(rest);
+    rest === null || rest === void 0 || (_rest$onFocus = rest.onFocus) === null || _rest$onFocus === void 0 || _rest$onFocus.call(rest);
   };
   const languageDirection = useResolvedDirection(dir, locale);
   const calendarProps = useMemo(() => ({
@@ -151,7 +150,7 @@ export const CalendarInput = function () {
     modifiers: [offsetModifier],
     onFirstUpdate: component => {
       var _component$elements;
-      popperRef.current = component === null || component === void 0 ? void 0 : (_component$elements = component.elements) === null || _component$elements === void 0 ? void 0 : _component$elements.popper;
+      popperRef.current = component === null || component === void 0 || (_component$elements = component.elements) === null || _component$elements === void 0 ? void 0 : _component$elements.popper;
     }
   }, /*#__PURE__*/React.createElement(CalendarContainer, _extends({}, calendarProps, {
     calendarRef: calendarRef

package/build/es/locales/index.js

@@ -9,5 +9,10 @@
 import i18n from '@dhis2/d2-i18n';
 import enTranslations from './en/translations.json';
 const namespace = 'default';
-i18n.addResources('en', namespace, enTranslations);
+
+// Use 'deep' = true and 'overwrite' = false to add to, but not overwrite,
+// custom translations from the datastore (added by the app adapter)
+
+i18n.addResourceBundle('en', namespace, enTranslations, true, false);
+i18n.addResourceBundle('en', namespace, enTranslations, true, false);
 export default i18n;

package/build/es/stories/calendar-input.prod.stories.js

@@ -26,23 +26,20 @@ export default {
     }
   }
 };
-const buildCalendar = _ref => {
-  let {
-    date,
-    locale,
-    calendar
-  } = _ref;
-  return () => /*#__PURE__*/React.createElement(CalendarStoryWrapper, {
-    component: CalendarInput,
-    dir: "ltr",
-    timeZone: "Africa/Khartoum",
-    weekDayFormat: "short",
-    date: date,
-    locale: locale,
-    calendar: calendar,
-    onDateSelect: () => {}
-  });
-};
+const buildCalendar = ({
+  date,
+  locale,
+  calendar
+}) => () => /*#__PURE__*/React.createElement(CalendarStoryWrapper, {
+  component: CalendarInput,
+  dir: "ltr",
+  timeZone: "Africa/Khartoum",
+  weekDayFormat: "short",
+  date: date,
+  locale: locale,
+  calendar: calendar,
+  onDateSelect: () => {}
+});
 export const EthiopicWithAmharic = buildCalendar({
   calendar: 'ethiopic',
   locale: 'am-ET',
@@ -91,11 +88,10 @@ export const IslamicWithArabic = () => {
     onDateSelect: () => {}
   }));
 };
-export const CalendarWithClearButton = _ref2 => {
-  let {
-    calendar = 'gregory',
-    date: initialDate = null
-  } = _ref2;
+export const CalendarWithClearButton = ({
+  calendar = 'gregory',
+  date: initialDate = null
+}) => {
   const [date, setDate] = useState(initialDate);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CalendarInput, {
     calendar: calendar,
@@ -128,11 +124,10 @@ export function CalendarWithStrictValidation() {
       calendar: '2022-10-12'
     },
     validate: errored
-  }, _ref3 => {
-    let {
-      handleSubmit,
-      invalid
-    } = _ref3;
+  }, ({
+    handleSubmit,
+    invalid
+  }) => {
     return /*#__PURE__*/React.createElement("form", {
       onSubmit: handleSubmit
     }, /*#__PURE__*/React.createElement(Field, {
@@ -182,11 +177,10 @@ export function CalendarWithNonStrictValidation() {
       calendar: '2022-10-12'
     },
     validate: errored
-  }, _ref4 => {
-    let {
-      handleSubmit,
-      invalid
-    } = _ref4;
+  }, ({
+    handleSubmit,
+    invalid
+  }) => {
     return /*#__PURE__*/React.createElement("form", {
       onSubmit: handleSubmit
     }, /*#__PURE__*/React.createElement(Field, {

package/build/es/stories/calendar-story-wrapper.js

@@ -25,48 +25,43 @@ export const CalendarStoryWrapper = props => {
   const [selectedDate, setSelectedDate] = useState({
     calendarDateString: date
   });
-  const changeCalendar = _ref => {
-    let {
-      target: {
-        value
-      }
-    } = _ref;
+  const changeCalendar = ({
+    target: {
+      value
+    }
+  }) => {
     setSelectedCalendar(value);
   };
-  const changeNumberingSystem = _ref2 => {
-    let {
-      target: {
-        value
-      }
-    } = _ref2;
+  const changeNumberingSystem = ({
+    target: {
+      value
+    }
+  }) => {
     if (value === '-1') {
       setSelectedNumberingSystem(null);
     } else {
       setSelectedNumberingSystem(value);
     }
   };
-  const changeDirection = _ref3 => {
-    let {
-      target: {
-        value
-      }
-    } = _ref3;
+  const changeDirection = ({
+    target: {
+      value
+    }
+  }) => {
     setSelectedDirection(value);
   };
-  const changeWeekFormat = _ref4 => {
-    let {
-      target: {
-        value
-      }
-    } = _ref4;
+  const changeWeekFormat = ({
+    target: {
+      value
+    }
+  }) => {
     setWeekDayFormat(value);
   };
-  const onLocaleChanged = _ref5 => {
-    let {
-      target: {
-        value
-      }
-    } = _ref5;
+  const onLocaleChanged = ({
+    target: {
+      value
+    }
+  }) => {
     setLocale(value);
   };
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/calendar",
-    "version": "10.16.3-alpha.1",
+    "version": "10.16.4",
     "description": "UI Calendar",
     "repository": {
         "type": "git",
@@ -33,15 +33,15 @@
         "styled-jsx": "^4"
     },
     "dependencies": {
-        "@dhis2-ui/button": "10.16.3-alpha.1",
-        "@dhis2-ui/card": "10.16.3-alpha.1",
-        "@dhis2-ui/input": "10.16.3-alpha.1",
-        "@dhis2-ui/layer": "10.16.3-alpha.1",
-        "@dhis2-ui/popper": "10.16.3-alpha.1",
+        "@dhis2-ui/button": "10.16.4",
+        "@dhis2-ui/card": "10.16.4",
+        "@dhis2-ui/input": "10.16.4",
+        "@dhis2-ui/layer": "10.16.4",
+        "@dhis2-ui/popper": "10.16.4",
         "@dhis2/multi-calendar-dates": "2.1.2",
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "10.16.3-alpha.1",
-        "@dhis2/ui-icons": "10.16.3-alpha.1",
+        "@dhis2/ui-constants": "10.16.4",
+        "@dhis2/ui-icons": "10.16.4",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

package/src/locales/index.js

@@ -11,6 +11,11 @@ import i18n from '@dhis2/d2-i18n'
 import enTranslations from './en/translations.json'
 
 const namespace = 'default'
-i18n.addResources('en', namespace, enTranslations)
+
+// Use 'deep' = true and 'overwrite' = false to add to, but not overwrite,
+// custom translations from the datastore (added by the app adapter)
+
+i18n.addResourceBundle('en', namespace, enTranslations, true, false)
+i18n.addResourceBundle('en', namespace, enTranslations, true, false)
 
 export default i18n