willba-component-library 0.2.64 → 0.2.67

package/lib/index.js

@@ -3610,6 +3610,53 @@ function min(dirtyDatesArray) {
   return result || new Date(NaN);
 }
 
+/**
+ * @name compareAsc
+ * @category Common Helpers
+ * @summary Compare the two dates and return -1, 0 or 1.
+ *
+ * @description
+ * Compare the two dates and return 1 if the first date is after the second,
+ * -1 if the first date is before the second or 0 if dates are equal.
+ *
+ * @param {Date|Number} dateLeft - the first date to compare
+ * @param {Date|Number} dateRight - the second date to compare
+ * @returns {Number} the result of the comparison
+ * @throws {TypeError} 2 arguments required
+ *
+ * @example
+ * // Compare 11 February 1987 and 10 July 1989:
+ * const result = compareAsc(new Date(1987, 1, 11), new Date(1989, 6, 10))
+ * //=> -1
+ *
+ * @example
+ * // Sort the array of dates:
+ * const result = [
+ *   new Date(1995, 6, 2),
+ *   new Date(1987, 1, 11),
+ *   new Date(1989, 6, 10)
+ * ].sort(compareAsc)
+ * //=> [
+ * //   Wed Feb 11 1987 00:00:00,
+ * //   Mon Jul 10 1989 00:00:00,
+ * //   Sun Jul 02 1995 00:00:00
+ * // ]
+ */
+function compareAsc(dirtyDateLeft, dirtyDateRight) {
+  requiredArgs(2, arguments);
+  var dateLeft = toDate(dirtyDateLeft);
+  var dateRight = toDate(dirtyDateRight);
+  var diff = dateLeft.getTime() - dateRight.getTime();
+  if (diff < 0) {
+    return -1;
+  } else if (diff > 0) {
+    return 1;
+    // Return 0 if diff is 0; return NaN if diff is NaN
+  } else {
+    return diff;
+  }
+}
+
 /**
  * @name isSameDay
  * @category Day Helpers
@@ -11159,10 +11206,11 @@ var calendarSelectionRules = function (_a) {
 var disableFutureDates = function (_a) {
     var rangeFrom = _a.rangeFrom, checkOutRange = _a.checkOutRange, setDisabledDates = _a.setDisabledDates, newDisableCalendarDates = _a.newDisableCalendarDates;
     if (rangeFrom && checkOutRange && setDisabledDates) {
-        // Get and parse data
+        // Get parse data
         var checkIn = addDays(checkOutRange.checkIn, 1);
         var firstCheckOut = addDays(checkOutRange.firstCheckOut, -1);
         var noDatesRange = isEqual(checkIn, checkOutRange.firstCheckOut);
+        console.log('test update', { newDisableCalendarDates: newDisableCalendarDates });
         setDisabledDates(__spreadArray$1(__spreadArray$1([], __read(((newDisableCalendarDates === null || newDisableCalendarDates === void 0 ? void 0 : newDisableCalendarDates.disabledDates) || [])), false), [
             {
                 from: noDatesRange ? undefined : checkIn,
@@ -11298,11 +11346,16 @@ var handleRangeContextDisabledDates = function (_a) {
     var findLastPossibleRangeContextCheckOut;
     var firstPossibleRangeContextCheckIn = [];
     var lastPossibleRangeContextCheckOut = [];
+    // Parse data
+    var rangeContextFrom = (rangeContext === null || rangeContext === void 0 ? void 0 : rangeContext.from) && endOfDay(rangeContext.from);
+    var rangeContextTo = (rangeContext === null || rangeContext === void 0 ? void 0 : rangeContext.to) && endOfDay(rangeContext.to);
+    var calendarRangeFrom = (calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from) && endOfDay(calendarRange.from);
     if (rangeContext && (availableDates === null || availableDates === void 0 ? void 0 : availableDates.length)) {
         // Find the first possible check-in after the last date gap till the range context
         findFirstPossibleRangeContextCheckIn = availableDates === null || availableDates === void 0 ? void 0 : availableDates.find(function (date) {
-            return date.checkIn < rangeContext.from &&
-                date.lastCheckOut >= rangeContext.from;
+            return rangeContextFrom &&
+                endOfDay(date.checkIn) < rangeContextFrom &&
+                endOfDay(date.lastCheckOut) >= rangeContextFrom;
         });
         if (findFirstPossibleRangeContextCheckIn === null || findFirstPossibleRangeContextCheckIn === void 0 ? void 0 : findFirstPossibleRangeContextCheckIn.checkIn) {
             firstPossibleRangeContextCheckIn.push({
@@ -11311,7 +11364,7 @@ var handleRangeContextDisabledDates = function (_a) {
         }
         // Find the last possible checkout before the first date gap till the range context
         findLastPossibleRangeContextCheckOut = availableDates === null || availableDates === void 0 ? void 0 : availableDates.find(function (date) {
-            return isEqual(rangeContext.to, date.checkIn);
+            return rangeContextTo && isEqual(rangeContextTo, endOfDay(date.checkIn));
         });
         if (findLastPossibleRangeContextCheckOut === null || findLastPossibleRangeContextCheckOut === void 0 ? void 0 : findLastPossibleRangeContextCheckOut.checkIn) {
             lastPossibleRangeContextCheckOut.push({
@@ -11321,11 +11374,9 @@ var handleRangeContextDisabledDates = function (_a) {
     }
     // Get last possible check-out dates for current check-in
     var currentSelectionLastCheckoutDate = availableDates === null || availableDates === void 0 ? void 0 : availableDates.find(function (date) {
-        var calendarCheckIn = (calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from)
-            ? format(calendarRange.from, 'dd.MM.yyyy')
-            : null;
-        var itemCheckIn = format(date.checkIn, 'dd.MM.yyyy');
-        return calendarCheckIn ? itemCheckIn === calendarCheckIn : false;
+        return calendarRangeFrom
+            ? isEqual(endOfDay(date.checkIn), calendarRangeFrom)
+            : false;
     });
     return {
         findFirstPossibleRangeContextCheckIn: findFirstPossibleRangeContextCheckIn,
@@ -11497,9 +11548,6 @@ var useUpdateDisabledDates = function (_a) {
                     return __spreadArray$1(__spreadArray$1([], __read(prev), false), __read(newOverlappingDates_1), false);
                 });
             }
-            if (newOverlappingDates_1.length) {
-                console.log(newOverlappingDates_1);
-            }
             var newDisableCalendarDates_1 = __assign$2(__assign$2({}, disableCalendarDates), { disabledDates: updatedDisabledDates });
             return newDisableCalendarDates_1;
         }
@@ -11520,7 +11568,7 @@ var css_248z$8 = ".will-calendar-filter-container {\n  display: flex;\n  justify
 styleInject(css_248z$8);
 
 var Calendar = React__default.forwardRef(function (_a, ref) {
-    var _b, _c;
+    var _b, _c, _d;
     var selectedPath = _a.selectedPath, calendarRange = _a.calendarRange, setCalendarRange = _a.setCalendarRange, language = _a.language, disableCalendarDates = _a.disableCalendarDates, requestDates = _a.requestDates, disabledDates = _a.disabledDates, setDisabledDates = _a.setDisabledDates, updateCalendarMonthNavigation = _a.updateCalendarMonthNavigation, setUpdateCalendarMonthNavigation = _a.setUpdateCalendarMonthNavigation, updateCalendarDefaultMonth = _a.updateCalendarDefaultMonth, loadingData = _a.loadingData, showFeedback = _a.showFeedback, palette = _a.palette, setCalendarHasError = _a.setCalendarHasError, setUpdatedForSubmit = _a.setUpdatedForSubmit, rangeContext = _a.rangeContext, calendarHasError = _a.calendarHasError;
     // Translations
     var t = useTranslation('common').t;
@@ -11528,15 +11576,13 @@ var Calendar = React__default.forwardRef(function (_a, ref) {
     var today = startOfDay(new Date());
     var selectedStartDate = calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from;
     var rangeContextStartDate = rangeContext === null || rangeContext === void 0 ? void 0 : rangeContext.from;
-    console.log({ disableCalendarDates: disableCalendarDates });
     // Handle initial disable dates including overlapping availableDates.lastCheckOut and disabledDates.start
-    var _d = useUpdateDisabledDates({
+    var _e = useUpdateDisabledDates({
         disableCalendarDates: disableCalendarDates,
         calendarRange: calendarRange,
         updateCalendarMonthNavigation: updateCalendarMonthNavigation,
         updateCalendarDefaultMonth: updateCalendarDefaultMonth,
-    }), newDisableCalendarDates = _d.newDisableCalendarDates, overlappingDate = _d.overlappingDate, lastPossibleCheckout = _d.lastPossibleCheckout;
-    console.log({ newDisableCalendarDates: newDisableCalendarDates });
+    }), newDisableCalendarDates = _e.newDisableCalendarDates, overlappingDate = _e.overlappingDate, lastPossibleCheckout = _e.lastPossibleCheckout;
     // Handle disable dates by page
     var disabledDatesByPage$1 = disabledDatesByPage({
         today: today,
@@ -11566,13 +11612,12 @@ var Calendar = React__default.forwardRef(function (_a, ref) {
         });
         setUpdatedForSubmit && setUpdatedForSubmit(true);
     };
-    console.log({ disabledDates: disabledDates });
     // Handle disabled dates for range context
-    var _e = handleRangeContextDisabledDates({
+    var _f = handleRangeContextDisabledDates({
         rangeContext: rangeContext,
         availableDates: newDisableCalendarDates === null || newDisableCalendarDates === void 0 ? void 0 : newDisableCalendarDates.availableDates,
         calendarRange: calendarRange,
-    }), findFirstPossibleRangeContextCheckIn = _e.findFirstPossibleRangeContextCheckIn, findLastPossibleRangeContextCheckOut = _e.findLastPossibleRangeContextCheckOut, firstPossibleRangeContextCheckIn = _e.firstPossibleRangeContextCheckIn, lastPossibleRangeContextCheckOut = _e.lastPossibleRangeContextCheckOut, currentSelectionLastCheckoutDate = _e.currentSelectionLastCheckoutDate;
+    }), findFirstPossibleRangeContextCheckIn = _f.findFirstPossibleRangeContextCheckIn, findLastPossibleRangeContextCheckOut = _f.findLastPossibleRangeContextCheckOut, firstPossibleRangeContextCheckIn = _f.firstPossibleRangeContextCheckIn, lastPossibleRangeContextCheckOut = _f.lastPossibleRangeContextCheckOut, currentSelectionLastCheckoutDate = _f.currentSelectionLastCheckoutDate;
     // Handle check for continuous selection in the range context
     checkForContinuousSelection({
         setCalendarHasError: setCalendarHasError,
@@ -11580,19 +11625,28 @@ var Calendar = React__default.forwardRef(function (_a, ref) {
         calendarRange: calendarRange,
         calendarHasError: calendarHasError,
     });
+    console.log('test', disabledDatesByPage$1.length
+        ? disabledDatesByPage$1
+        : (disabledDates === null || disabledDates === void 0 ? void 0 : disabledDates.length)
+            ? __spreadArray$1(__spreadArray$1(__spreadArray$1([
+                lastPossibleCheckout && lastPossibleCheckout
+            ], __read(disabledDates), false), __read(firstPossibleRangeContextCheckIn), false), __read(lastPossibleRangeContextCheckOut), false) : ((_b = newDisableCalendarDates === null || newDisableCalendarDates === void 0 ? void 0 : newDisableCalendarDates.disabledDates) === null || _b === void 0 ? void 0 : _b.length)
+            ? __spreadArray$1(__spreadArray$1(__spreadArray$1([
+                lastPossibleCheckout && lastPossibleCheckout
+            ], __read(newDisableCalendarDates.disabledDates), false), __read(firstPossibleRangeContextCheckIn), false), __read(lastPossibleRangeContextCheckOut), false) : []);
     return (React__default.createElement("div", { className: "will-filter-bar-calendar", ref: ref },
         React__default.createElement("div", { className: "will-calendar-filter-container" },
             React__default.createElement(DayPicker, { key: updateCalendarDefaultMonth, id: "will-calendar", mode: "range", locale: language === 'en' ? enUS : fi, numberOfMonths: !isTablet ? 2 : 1, weekStartsOn: 1, selected: calendarRange, onSelect: function (range) { return handleOnSelect(range); }, captionLayout: "dropdown-buttons", defaultMonth: (calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from) ||
                     selectedStartDate ||
                     rangeContextStartDate ||
-                    (((_b = newDisableCalendarDates === null || newDisableCalendarDates === void 0 ? void 0 : newDisableCalendarDates.disabledDates) === null || _b === void 0 ? void 0 : _b.length)
+                    (((_c = newDisableCalendarDates === null || newDisableCalendarDates === void 0 ? void 0 : newDisableCalendarDates.disabledDates) === null || _c === void 0 ? void 0 : _c.length)
                         ? newDisableCalendarDates.disabledDates[0].from
                         : today), disabled: disabledDatesByPage$1.length
                     ? disabledDatesByPage$1
                     : (disabledDates === null || disabledDates === void 0 ? void 0 : disabledDates.length)
                         ? __spreadArray$1(__spreadArray$1(__spreadArray$1([
                             lastPossibleCheckout && lastPossibleCheckout
-                        ], __read(disabledDates), false), __read(firstPossibleRangeContextCheckIn), false), __read(lastPossibleRangeContextCheckOut), false) : ((_c = newDisableCalendarDates === null || newDisableCalendarDates === void 0 ? void 0 : newDisableCalendarDates.disabledDates) === null || _c === void 0 ? void 0 : _c.length)
+                        ], __read(disabledDates), false), __read(firstPossibleRangeContextCheckIn), false), __read(lastPossibleRangeContextCheckOut), false) : ((_d = newDisableCalendarDates === null || newDisableCalendarDates === void 0 ? void 0 : newDisableCalendarDates.disabledDates) === null || _d === void 0 ? void 0 : _d.length)
                         ? __spreadArray$1(__spreadArray$1(__spreadArray$1([
                             lastPossibleCheckout && lastPossibleCheckout
                         ], __read(newDisableCalendarDates.disabledDates), false), __read(firstPossibleRangeContextCheckIn), false), __read(lastPossibleRangeContextCheckOut), false) : [], fromMonth: today, onMonthChange: function (val) {
@@ -12027,8 +12081,16 @@ var useFilterCalendar = function (_a) {
     // Lifecycle
     // Handle update component with new data
     React__default.useEffect(function () {
-        if (outerDisableCalendarDates) {
-            setDisableCalendarDates(outerDisableCalendarDates);
+        if (outerDisableCalendarDates === null || outerDisableCalendarDates === void 0 ? void 0 : outerDisableCalendarDates.availableDates) {
+            setDisableCalendarDates({
+                availableDates: __spreadArray$1([], __read(outerDisableCalendarDates.availableDates.sort(function (a, b) {
+                    return compareAsc(a.checkIn, b.checkIn);
+                })), false),
+                disabledDates: outerDisableCalendarDates.disabledDates
+                    ? __spreadArray$1([], __read(outerDisableCalendarDates.disabledDates.sort(function (a, b) {
+                        return compareAsc(a.from, b.from);
+                    })), false) : [],
+            });
         }
     }, [outerDisableCalendarDates]);
     // Handle Range Context initial selections
@@ -12125,7 +12187,6 @@ function FilterCalendar(_a) {
     useUpdateTranslations({ language: language });
     var t = useTranslation().t;
     var isMobile = reactResponsiveExports.useMediaQuery({ maxWidth: 690 });
-    console.log('1', { outerDisableCalendarDates: outerDisableCalendarDates });
     var _b = useFilterCalendar({
         onSubmit: onSubmit,
         setToggleCalendar: setToggleCalendar,
@@ -12134,7 +12195,6 @@ function FilterCalendar(_a) {
         outerRangeContext: outerRangeContext,
         outerDisableCalendarDates: outerDisableCalendarDates,
     }), setCalendarRange = _b.setCalendarRange, handleClearDates = _b.handleClearDates, calendarRange = _b.calendarRange, disabledDates = _b.disabledDates, setDisabledDates = _b.setDisabledDates, updateCalendarMonthNavigation = _b.updateCalendarMonthNavigation, updateCalendarDefaultMonth = _b.updateCalendarDefaultMonth, setUpdateCalendarMonthNavigation = _b.setUpdateCalendarMonthNavigation, calendarHasError = _b.calendarHasError, setCalendarHasError = _b.setCalendarHasError, setUpdatedForSubmit = _b.setUpdatedForSubmit, rangeContext = _b.rangeContext, disableCalendarDates = _b.disableCalendarDates;
-    console.log('1', { disableCalendarDates: disableCalendarDates });
     // Display component after fully loaded
     useAwaitRender();
     // Handle close filter section