@vitality-ds/components 4.12.0 → 4.15.0

package/dist/AuditTrail/components/AuditItem/index.spec.js

@@ -255,20 +255,6 @@ describe("<AuditItem />", function () {
           });
         });
       });
-      describe("and dateTime is invalid because date is impossible", function () {
-        var item = {
-          action: "create",
-          dateTime: "2024-22-22 15:30:00"
-        };
-        it("does not render the date time or leading text", function () {
-          (0, _react.render)(/*#__PURE__*/_react2["default"].createElement(_index["default"], {
-            item: item
-          }));
-
-          // this regex should match any word that isn't Created
-          expect(_react.screen.queryAllByText(/\b(?!Created)\w+\b/)).toHaveLength(0);
-        });
-      });
     });
     describe("and dateTime is invalid because not resembling a date", function () {
       var item = {
@@ -280,20 +266,6 @@ describe("<AuditItem />", function () {
           item: item
         }));
 
-        // this regex should match any word that isn't Created
-        expect(_react.screen.queryAllByText(/\b(?!Created)\w+\b/)).toHaveLength(0);
-      });
-    });
-    describe("and dateTime is not given", function () {
-      var item = {
-        action: "create",
-        dateTime: "2024-22-22 15:30:00"
-      };
-      it("does not render the date time or leading text", function () {
-        (0, _react.render)(/*#__PURE__*/_react2["default"].createElement(_index["default"], {
-          item: item
-        }));
-
         // this regex should match any word that isn't Created
         expect(_react.screen.queryAllByText(/\b(?!Created)\w+\b/)).toHaveLength(0);
       });

package/dist/AuditTrail/logic.js

@@ -1,11 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getTimes = exports.getInitials = exports.getBrand = void 0;
-var _luxon = require("luxon");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _relativeTime = _interopRequireDefault(require("dayjs/plugin/relativeTime"));
 var _constants = require("./constants");
+_dayjs["default"].extend(_relativeTime["default"]);
 var getTimes = exports.getTimes = function getTimes(timestamp) {
   if (!timestamp) {
     return {
@@ -15,19 +18,15 @@ var getTimes = exports.getTimes = function getTimes(timestamp) {
       invalidTime: null
     };
   }
-  var dateTime = _luxon.DateTime.fromISO(timestamp.replace(" ", "T"));
-  // need to express date in dd/MM/yyyy format explicitly instead of relying on locale because windows 11 prevents luxon from reading language settings -> this becomes problematic because luxons default is US
-  var date = dateTime.toFormat("dd/MM/yyyy");
-  // needs to be 'en-US' format to show in AM/PM 12 hour time where 'en-GB' likes 24-hour time.
-  var time = dateTime.toFormat("tt", {
-    locale: "en-US"
-  });
-  var humanTime = dateTime.toRelative();
+  var dateTime = (0, _dayjs["default"])(timestamp);
+  var date = dateTime.format("DD/MM/YYYY");
+  var time = dateTime.format("h:mm:ss A");
+  var humanTime = dateTime.isValid() ? dateTime.fromNow() : null;
   return {
     date: date,
     time: time,
     humanTime: humanTime,
-    invalidTime: dateTime.invalid !== null
+    invalidTime: !dateTime.isValid()
   };
 };
 var getBrand = exports.getBrand = function getBrand(name) {

package/dist/AuditTrail/logic.spec.js

@@ -25,8 +25,8 @@ describe("auditTrail logic", function () {
     test("should return null for date, time, and human time and true for invalid when timestamp is invalid", function () {
       var timestamp = "invalid_timestamp";
       var result = (0, _logic.getTimes)(timestamp);
-      expect(result.date).toBe("Invalid DateTime");
-      expect(result.time).toBe("Invalid DateTime");
+      expect(result.date).toBe("Invalid Date");
+      expect(result.time).toBe("Invalid Date");
       expect(result.humanTime).toBeNull();
       expect(result.invalidTime).toBeTruthy();
     });

package/dist/Input/DatePicker/components/Calendar/index.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = Calendar;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _icons = require("@vitality-ds/icons");
-var _luxon = require("luxon");
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactCalendar = require("react-calendar");
 var _IconButton = _interopRequireDefault(require("../../../../IconButton"));
@@ -28,7 +28,7 @@ function Calendar(_ref) {
     onSelectedDateChange = _ref.onSelectedDateChange;
   var _useReducer = (0, _react.useReducer)(function (reducerState, action) {
       return (0, _logic.stateManager)(reducerState, action, minYear, maxYear);
-    }, (0, _logic.getInitialState)(_luxon.DateTime.now(), (0, _logic.determineSelectedDate)(selectedDate, showFirstDateInRangeOnOpen))),
+    }, (0, _logic.getInitialState)((0, _dayjs["default"])(), (0, _logic.determineSelectedDate)(selectedDate, showFirstDateInRangeOnOpen))),
     _useReducer2 = (0, _slicedToArray2["default"])(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
@@ -82,7 +82,7 @@ function Calendar(_ref) {
       });
     }
   })), /*#__PURE__*/_react["default"].createElement(_reactCalendar.MonthView, {
-    activeStartDate: (0, _logic.convertLuxonYearMonthStateToDate)(state.selectedYear.yearInt, state.selectedMonth.monthInt),
+    activeStartDate: (0, _logic.convertYearMonthStateToDate)(state.selectedYear.yearInt, state.selectedMonth.monthInt),
     onMouseOver: handleMouseOver,
     hover: Array.isArray(selectedDate) && hoverValue,
     value: selectedDate,

package/dist/Input/DatePicker/components/Calendar/logic.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.convertLuxonYearMonthStateToDate = convertLuxonYearMonthStateToDate;
+exports.convertYearMonthStateToDate = convertYearMonthStateToDate;
 exports.dateObjectToShortHand = dateObjectToShortHand;
 exports.determineSelectedDate = void 0;
 exports.generateMonths = generateMonths;
@@ -14,7 +14,7 @@ exports.getTooltipContents = getTooltipContents;
 exports.stateManager = stateManager;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _luxon = require("luxon");
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _constants = require("./constants");
 function generateYears(minYear, maxYear) {
   var arr = [];
@@ -36,7 +36,7 @@ function generateMonths() {
   }
   return arr;
 }
-function convertLuxonYearMonthStateToDate(year, month) {
+function convertYearMonthStateToDate(year, month) {
   return new Date(year, month);
 }
 var determineSelectedDate = exports.determineSelectedDate = function determineSelectedDate(selectedDate, showFirstDateInRangeOnOpen) {
@@ -56,47 +56,45 @@ var determineSelectedDate = exports.determineSelectedDate = function determineSe
 };
 function getInitialState(currentTime, selectedDate) {
   if (selectedDate) {
-    var selectedDateAsLuxon = _luxon.DateTime.fromJSDate(selectedDate);
+    var selectedDateAsDayjs = (0, _dayjs["default"])(selectedDate);
     return {
       selectedMonth: {
-        // -1 to align the luxon current time with Date constructor and array indexes
         value: {
-          value: _constants.MONTHS[selectedDateAsLuxon.month - 1],
-          label: _constants.MONTHS[selectedDateAsLuxon.month - 1]
+          value: _constants.MONTHS[selectedDateAsDayjs.month()],
+          label: _constants.MONTHS[selectedDateAsDayjs.month()]
         },
-        monthInt: selectedDateAsLuxon.month - 1
+        monthInt: selectedDateAsDayjs.month()
       },
       selectedYear: {
         value: {
-          value: selectedDateAsLuxon.year.toString(),
-          label: selectedDateAsLuxon.year.toString()
+          value: selectedDateAsDayjs.year().toString(),
+          label: selectedDateAsDayjs.year().toString()
         },
-        yearInt: selectedDateAsLuxon.year
+        yearInt: selectedDateAsDayjs.year()
       }
     };
   }
   return {
     selectedMonth: {
-      // -1 to align the luxon current time with Date constructor and array indexes
       value: {
-        value: _constants.MONTHS[currentTime.month - 1],
-        label: _constants.MONTHS[currentTime.month - 1]
+        value: _constants.MONTHS[currentTime.month()],
+        label: _constants.MONTHS[currentTime.month()]
       },
-      monthInt: currentTime.month - 1
+      monthInt: currentTime.month()
     },
     selectedYear: {
       value: {
-        value: currentTime.year.toString(),
-        label: currentTime.year.toString()
+        value: currentTime.year().toString(),
+        label: currentTime.year().toString()
       },
-      yearInt: currentTime.year
+      yearInt: currentTime.year()
     }
   };
 }
 function dateObjectToShortHand(date) {
   if (date instanceof Date) {
-    var time = _luxon.DateTime.fromJSDate(date);
-    return time.toFormat("dd/MM/yyyy");
+    var time = (0, _dayjs["default"])(date);
+    return time.format("DD/MM/YYYY");
   }
   throw new Error("Parsed value is not an instance of the JS Date object, and therefore cannot be converted, ensure inputted value is an instance of Date");
 }

package/dist/Input/DatePicker/components/Calendar/logic.spec.js

@@ -1,8 +1,11 @@
 "use strict";
 
-var _luxon = require("luxon");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _objectSupport = _interopRequireDefault(require("dayjs/plugin/objectSupport"));
 var _constants = require("./constants");
 var _logic = require("./logic");
+_dayjs["default"].extend(_objectSupport["default"]);
 describe("generateYears", function () {
   it("should return an array of objects with label and value properties", function () {
     var minYear = 2000;
@@ -72,17 +75,17 @@ describe("generateMonths", function () {
     expect(monthValues).toEqual(["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]);
   });
 });
-describe("convertLuxonYearMonthStateToDate", function () {
+describe("convertYearMonthStateToDate", function () {
   it("should return a valid Date object", function () {
     var year = 2021;
     var month = 0; // January
-    var date = (0, _logic.convertLuxonYearMonthStateToDate)(year, month);
+    var date = (0, _logic.convertYearMonthStateToDate)(year, month);
     expect(date instanceof Date).toBeTruthy();
   });
   it("should return the correct date for the given year and month", function () {
     var year = 2020;
     var month = 4; // May
-    var date = (0, _logic.convertLuxonYearMonthStateToDate)(year, month);
+    var date = (0, _logic.convertYearMonthStateToDate)(year, month);
     expect(date.getFullYear()).toBe(year);
     expect(date.getMonth()).toBe(month);
   });
@@ -91,7 +94,7 @@ describe("getInitialState", function () {
   it("returns the correct initial state when selectedDate is provided", function () {
     var selectedDate = new Date("2022-01-01");
     // the currentTime call doesn't matter and doesn't need to remain consistant
-    var currentTime = _luxon.DateTime.now();
+    var currentTime = (0, _dayjs["default"])();
     var initialState = (0, _logic.getInitialState)(currentTime, selectedDate);
     expect(initialState).toEqual({
       selectedMonth: {
@@ -111,10 +114,9 @@ describe("getInitialState", function () {
     });
   });
   it("returns the correct initial state when selectedDate is not provided", function () {
-    // can't use DateTime.now, so made a luxon object for porposes of testing.
-    var currentTime = _luxon.DateTime.fromObject({
+    var currentTime = (0, _dayjs["default"])({
       year: 2022,
-      month: 5
+      month: 4
     });
     var selectedDate = null;
     var initialState = (0, _logic.getInitialState)(currentTime, selectedDate);
@@ -257,9 +259,9 @@ describe("stateManager", function () {
   var minYear;
   var maxYear;
   beforeEach(function () {
-    state = (0, _logic.getInitialState)(_luxon.DateTime.fromObject({
+    state = (0, _logic.getInitialState)((0, _dayjs["default"])({
       year: 2022,
-      month: 1
+      month: 0
     }), null);
     minYear = 2020;
     maxYear = 2030;

package/dist/Input/DatePicker/components/Calendar/styles/BaseCalendar.styles.js

@@ -62,7 +62,6 @@ var _default = exports["default"] = (0, _system.css)({
         backgroundImage: "linear-gradient(to right, $$underlineColor, $$underlineColor)",
         backgroundPosition: "4px 26px",
         backgroundRepeat: "no-repeat",
-        backgroundClip: "content-box",
         backgroundSize: "32px 2px",
         "&:hover": {
           backgroundColor: (0, _system.getColorScaleValueByUseCase)("neutral", backgrounds.uiElement_hovered),

package/dist/Input/DatePicker/constants.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ISO_FORMAT = exports.ERRORS = exports.AUS_FORMAT = void 0;
-var ISO_FORMAT = exports.ISO_FORMAT = "yyyy-MM-dd";
-var AUS_FORMAT = exports.AUS_FORMAT = "dd/MM/yyyy";
+var ISO_FORMAT = exports.ISO_FORMAT = "YYYY-MM-DD";
+var AUS_FORMAT = exports.AUS_FORMAT = "DD/MM/YYYY";
 var ERRORS = exports.ERRORS = {
   incomplete: "Incomplete Date Provided",
   invalid: "Invalid Date Provided"

package/dist/Input/DatePicker/index.js

@@ -8,7 +8,7 @@ exports["default"] = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _icons = require("@vitality-ds/icons");
-var _luxon = require("luxon");
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _react = _interopRequireDefault(require("react"));
 var _Popover = _interopRequireDefault(require("../../Popover"));
 var _TextInput = _interopRequireDefault(require("../TextInput"));
@@ -47,7 +47,7 @@ var DatePicker = /*#__PURE__*/_react["default"].forwardRef(function (_ref, forwa
       return null;
     } : _ref$onKeyDown,
     restProps = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
-  var currentTime = _luxon.DateTime.now();
+  var currentTime = (0, _dayjs["default"])();
   var iconButtonId = "".concat(id, "IconButton");
   var _useDatePicker = (0, _useDatePicker2["default"])(onChange, onSelectedDateChange, value, openCalendarOnFocus, onKeyDown, id, iconButtonId),
     onCalendarCallbackValueChange = _useDatePicker.onCalendarCallbackValueChange,
@@ -96,8 +96,8 @@ var DatePicker = /*#__PURE__*/_react["default"].forwardRef(function (_ref, forwa
       selectedDate: calendarValue || (0, _logic.shortHandToDateObject)(textValue),
       name: name,
       id: id,
-      minYear: minYear || currentTime.year - 5,
-      maxYear: maxYear || currentTime.year + 5
+      minYear: minYear || currentTime.year() - 5,
+      maxYear: maxYear || currentTime.year() + 5
     })
   }));
 });

package/dist/Input/DatePicker/logic.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -7,13 +8,15 @@ exports.convertISOToAusDate = exports.convertAusToISODate = void 0;
 exports.createEventObject = createEventObject;
 exports.handleOnInteractOutside = void 0;
 exports.shortHandToDateObject = shortHandToDateObject;
-var _luxon = require("luxon");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
 var _constants = require("./constants");
+_dayjs["default"].extend(_customParseFormat["default"]);
 function shortHandToDateObject(date) {
   if (date) {
-    var time = _luxon.DateTime.fromString(date, "dd/MM/yyyy");
-    if (time.isValid) {
-      return time.toJSDate();
+    var time = (0, _dayjs["default"])(date, _constants.AUS_FORMAT, true);
+    if (time.isValid()) {
+      return time.toDate();
     }
   }
   return null;
@@ -37,16 +40,16 @@ var handleOnInteractOutside = exports.handleOnInteractOutside = function handleO
 };
 var convertISOToAusDate = exports.convertISOToAusDate = function convertISOToAusDate() {
   var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
-  return _luxon.DateTime.fromFormat(date, _constants.ISO_FORMAT).toFormat(_constants.AUS_FORMAT);
+  return (0, _dayjs["default"])(date, _constants.ISO_FORMAT, true).format(_constants.AUS_FORMAT);
 };
 var convertAusToISODate = exports.convertAusToISODate = function convertAusToISODate() {
   var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
-  return _luxon.DateTime.fromFormat(date, _constants.AUS_FORMAT).toFormat(_constants.ISO_FORMAT);
+  return (0, _dayjs["default"])(date, _constants.AUS_FORMAT, true).format(_constants.ISO_FORMAT);
 };
 function createEventObject(textValue) {
   var incompleteDate = textValue.includes("_");
   var errorMessage = incompleteDate ? _constants.ERRORS.incomplete : _constants.ERRORS.invalid;
-  var validISO = convertAusToISODate(textValue) !== "Invalid DateTime";
+  var validISO = convertAusToISODate(textValue) !== "Invalid Date";
   var isoDate = validISO ? convertAusToISODate(textValue) : "";
   var isValid = validISO;
   isValid = textValue !== "" ? isValid : true;

package/dist/Input/DatePicker/logic.spec.js

@@ -12,7 +12,7 @@ describe("shortHandToDateObject", function () {
     expect((0, _logic.shortHandToDateObject)(dateString)).toEqual(expectedDateObject);
   });
   it("handles invalid date strings and returns null", function () {
-    var invalidDateString = "32/01/2021";
+    var invalidDateString = "33/13/2021";
     expect((0, _logic.shortHandToDateObject)(invalidDateString)).toBeNull();
   });
   it("handles empty input and returns null", function () {

package/dist/Input/DateRangePicker/constants.js

@@ -1,91 +1,95 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _luxon = require("luxon");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _quarterOfYear = _interopRequireDefault(require("dayjs/plugin/quarterOfYear"));
+var _constants = require("../DatePicker/constants");
 var _determineFinancialYear = require("./helpers/determineFinancialYear");
-var time = _luxon.DateTime.now();
+_dayjs["default"].extend(_quarterOfYear["default"]);
+var time = (0, _dayjs["default"])();
 var PRESET_OPTIONS = [{
   key: "today",
   label: "Today",
-  from: time.startOf("day").toFormat("yyyy-MM-dd"),
-  to: time.endOf("day").toFormat("yyyy-MM-dd")
+  from: time.startOf("day").format(_constants.ISO_FORMAT),
+  to: time.endOf("day").format(_constants.ISO_FORMAT)
 }, {
   key: "yesterday",
   label: "Yesterday",
-  from: time.minus({
+  from: time.subtract({
     day: 1
-  }).startOf("day").toFormat("yyyy-MM-dd"),
-  to: time.minus({
+  }).startOf("day").format(_constants.ISO_FORMAT),
+  to: time.subtract({
     day: 1
-  }).endOf("day").toFormat("yyyy-MM-dd")
+  }).endOf("day").format(_constants.ISO_FORMAT)
 }, {
   key: "this_week",
   label: "This week",
-  from: time.startOf("week").toFormat("yyyy-MM-dd"),
-  to: time.endOf("week").toFormat("yyyy-MM-dd")
+  from: time.startOf("week").format(_constants.ISO_FORMAT),
+  to: time.endOf("week").format(_constants.ISO_FORMAT)
 }, {
   key: "last_week",
   label: "Last week",
-  from: time.minus({
+  from: time.subtract({
     week: 1
-  }).startOf("week").toFormat("yyyy-MM-dd"),
-  to: time.minus({
+  }).startOf("week").format(_constants.ISO_FORMAT),
+  to: time.subtract({
     week: 1
-  }).endOf("week").toFormat("yyyy-MM-dd")
+  }).endOf("week").format(_constants.ISO_FORMAT)
 }, {
   key: "this_month",
   label: "This month",
-  from: time.startOf("month").toFormat("yyyy-MM-dd"),
-  to: time.endOf("month").toFormat("yyyy-MM-dd")
+  from: time.startOf("month").format(_constants.ISO_FORMAT),
+  to: time.endOf("month").format(_constants.ISO_FORMAT)
 }, {
   key: "last_month",
   label: "Last month",
-  from: time.minus({
+  from: time.subtract({
     month: 1
-  }).startOf("month").toFormat("yyyy-MM-dd"),
-  to: time.minus({
+  }).startOf("month").format(_constants.ISO_FORMAT),
+  to: time.subtract({
     month: 1
-  }).endOf("month").toFormat("yyyy-MM-dd")
+  }).endOf("month").format(_constants.ISO_FORMAT)
 }, {
   key: "this_quarter",
   label: "This quarter",
-  from: time.startOf("quarter").toFormat("yyyy-MM-dd"),
-  to: time.endOf("quarter").toFormat("yyyy-MM-dd")
+  from: time.startOf("quarter").format(_constants.ISO_FORMAT),
+  to: time.endOf("quarter").format(_constants.ISO_FORMAT)
 }, {
   key: "last_quarter",
   label: "Last quarter",
-  from: time.minus({
+  from: time.subtract({
     quarter: 1
-  }).startOf("quarter").toFormat("yyyy-MM-dd"),
-  to: time.minus({
+  }).startOf("quarter").format(_constants.ISO_FORMAT),
+  to: time.subtract({
     quarter: 1
-  }).endOf("quarter").toFormat("yyyy-MM-dd")
+  }).endOf("quarter").format(_constants.ISO_FORMAT)
 }, {
   key: "past_12_months",
   label: "Past 12 months",
-  from: time.minus({
+  from: time.subtract({
     month: 12
-  }).toFormat("yyyy-MM-dd"),
-  to: time.toFormat("yyyy-MM-dd")
+  }).format(_constants.ISO_FORMAT),
+  to: time.format(_constants.ISO_FORMAT)
 }, {
   key: "past_24_months",
   label: "Past 24 months",
-  from: time.minus({
+  from: time.subtract({
     month: 24
-  }).toFormat("yyyy-MM-dd"),
-  to: time.toFormat("yyyy-MM-dd")
+  }).format(_constants.ISO_FORMAT),
+  to: time.format(_constants.ISO_FORMAT)
 }, {
   key: "this_financial_year",
   label: "This financial year",
-  from: (0, _determineFinancialYear.determineThisFinancialYear)("from", time),
-  to: (0, _determineFinancialYear.determineThisFinancialYear)("to", time)
+  from: (0, _determineFinancialYear.determineThisFinancialYear)("from"),
+  to: (0, _determineFinancialYear.determineThisFinancialYear)("to")
 }, {
   key: "last_financial_year",
   label: "Last financial year",
-  from: (0, _determineFinancialYear.determineLastFinancialYear)("from", time),
-  to: (0, _determineFinancialYear.determineLastFinancialYear)("to", time)
+  from: (0, _determineFinancialYear.determineLastFinancialYear)("from"),
+  to: (0, _determineFinancialYear.determineLastFinancialYear)("to")
 }];
 var _default = exports["default"] = PRESET_OPTIONS;

package/dist/Input/DateRangePicker/helpers/determineFinancialYear.js

@@ -1,64 +1,74 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.determineLastFinancialYear = determineLastFinancialYear;
 exports.determineThisFinancialYear = determineThisFinancialYear;
-var _luxon = require("luxon");
-var june = _luxon.DateTime.fromObject({
-  month: 6,
-  day: 30,
-  hour: 0,
-  second: 0
-});
-var july = _luxon.DateTime.fromObject({
-  month: 7,
-  day: 1,
-  hour: 0,
-  second: 0
-});
-function determineThisFinancialYear(toOrFrom, currentTime) {
-  var paramJune = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : june;
-  var paramJuly = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : july;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _objectSupport = _interopRequireDefault(require("dayjs/plugin/objectSupport"));
+var _constants = require("../../DatePicker/constants");
+_dayjs["default"].extend(_objectSupport["default"]);
+var currentYearJune = function currentYearJune(year) {
+  return (0, _dayjs["default"])({
+    year: year,
+    month: 5,
+    // June is month 5 in dayjs (0-indexed)
+    day: 30,
+    hour: 0,
+    second: 0
+  });
+};
+var currentYearJuly = function currentYearJuly(year) {
+  return (0, _dayjs["default"])({
+    year: year,
+    month: 6,
+    // July is month 6 in dayjs (0-indexed)
+    day: 1,
+    hour: 0,
+    second: 0
+  });
+};
+function determineThisFinancialYear(toOrFrom) {
+  var currentTime = (0, _dayjs["default"])();
   if (toOrFrom === "from") {
-    if (paramJuly > currentTime) {
-      return paramJuly.minus({
+    if (currentYearJuly(currentTime.year()) > currentTime) {
+      return currentYearJuly(currentTime.year()).subtract({
         year: 1
-      }).toFormat("yyyy-MM-dd");
+      }).format(_constants.ISO_FORMAT);
     }
-    return paramJuly.toFormat("yyyy-MM-dd");
+    return currentYearJuly(currentTime.year()).format(_constants.ISO_FORMAT);
   }
   if (toOrFrom === "to") {
-    if (paramJune < currentTime) {
-      return paramJune.plus({
+    if (currentYearJune(currentTime.year()) < currentTime) {
+      return currentYearJune(currentTime.year()).add({
         year: 1
-      }).toFormat("yyyy-MM-dd");
+      }).format(_constants.ISO_FORMAT);
     }
-    return paramJune.toFormat("yyyy-MM-dd");
+    return currentYearJune(currentTime.year()).format(_constants.ISO_FORMAT);
   }
   return null;
 }
-function determineLastFinancialYear(toOrFrom, currentTime) {
-  var paramJune = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : june;
-  var paramJuly = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : july;
+function determineLastFinancialYear(toOrFrom) {
+  var currentTime = (0, _dayjs["default"])();
   if (toOrFrom === "from") {
-    if (paramJuly > currentTime) {
-      return paramJuly.minus({
+    if (currentYearJuly(currentTime.year()) > currentTime) {
+      return currentYearJuly(currentTime.year()).subtract({
         year: 2
-      }).toFormat("yyyy-MM-dd");
+      }).format(_constants.ISO_FORMAT);
     }
-    return paramJuly.minus({
+    return currentYearJuly(currentTime.year()).subtract({
       year: 1
-    }).toFormat("yyyy-MM-dd");
+    }).format(_constants.ISO_FORMAT);
   }
   if (toOrFrom === "to") {
-    if (paramJune > currentTime) {
-      return paramJune.minus({
+    if (currentYearJune(currentTime.year()) > currentTime) {
+      return currentYearJune(currentTime.year()).subtract({
         year: 1
-      }).toFormat("yyyy-MM-dd");
+      }).format(_constants.ISO_FORMAT);
     }
-    return paramJune.toFormat("yyyy-MM-dd");
+    return currentYearJune(currentTime.year()).format(_constants.ISO_FORMAT);
   }
   return null;
 }