willba-component-library 0.2.56 → 0.2.58

package/lib/components/FilterCalendar/FilterCalendar.stories.d.ts

@@ -5,3 +5,4 @@ export default meta;
 type Story = StoryObj<typeof FilterCalendar>;
 export declare const Default: Story;
 export declare const RangeContext: Story;
+export declare const DisabledRangeContextDates: Story;

package/lib/index.esm.js

@@ -10968,27 +10968,28 @@ var calendarSelectionRules = function (_a) {
     var _b;
     var range = _a.range, newDisableCalendarDates = _a.newDisableCalendarDates, setCalendarRange = _a.setCalendarRange, setDisabledDates = _a.setDisabledDates, calendarRange = _a.calendarRange, overlappingDate = _a.overlappingDate, setCalendarHasError = _a.setCalendarHasError, rangeContext = _a.rangeContext;
     // Get and parse needed data
-    var dateFormat = 'dd-MM-yyyy';
-    var rangeFrom = (range === null || range === void 0 ? void 0 : range.from) ? format(range.from, dateFormat) : null;
-    var rangeTo = (range === null || range === void 0 ? void 0 : range.to) ? format(range.to, dateFormat) : null;
-    var calendarFrom = (calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from)
-        ? format(calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from, dateFormat)
+    var rangeFrom = (range === null || range === void 0 ? void 0 : range.from) ? endOfDay(range.from) : null;
+    var rangeTo = (range === null || range === void 0 ? void 0 : range.to) ? endOfDay(range.to) : null;
+    var calendarRangeFrom = (calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from)
+        ? endOfDay(calendarRange.from)
         : null;
-    (calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.to)
-        ? format(calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.to, dateFormat)
-        : null;
-    (rangeContext === null || rangeContext === void 0 ? void 0 : rangeContext.from)
-        ? format(rangeContext.from, dateFormat)
+    var calendarRangeTo = (calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.to) ? endOfDay(calendarRange.to) : null;
+    var rangeContextFrom = (rangeContext === null || rangeContext === void 0 ? void 0 : rangeContext.from)
+        ? endOfDay(rangeContext.from)
         : null;
+    var rangeContextTo = (rangeContext === null || rangeContext === void 0 ? void 0 : rangeContext.to) ? endOfDay(rangeContext.to) : null;
     var overlappingDateFrom = (overlappingDate === null || overlappingDate === void 0 ? void 0 : overlappingDate.length)
         ? overlappingDate.find(function (date) {
-            return date.from ? format(date.from, dateFormat) === rangeFrom : false;
+            return !!(date.from && rangeFrom)
+                ? isEqual(endOfDay(date.from), rangeFrom)
+                : false;
         })
         : null;
     var checkOutRange = ((_b = newDisableCalendarDates === null || newDisableCalendarDates === void 0 ? void 0 : newDisableCalendarDates.availableDates) === null || _b === void 0 ? void 0 : _b.length)
         ? newDisableCalendarDates.availableDates.find(function (checkInDate) {
-            return format(checkInDate.checkIn || 1, dateFormat) ===
-                format((range === null || range === void 0 ? void 0 : range.from) || 1, dateFormat);
+            return !!(checkInDate.checkIn && rangeFrom)
+                ? isEqual(endOfDay(checkInDate.checkIn), rangeFrom)
+                : false;
         })
         : null;
     // On check-in, disable future dates that are unavailable for checkout
@@ -10996,56 +10997,79 @@ var calendarSelectionRules = function (_a) {
         rangeFrom: rangeFrom,
         checkOutRange: checkOutRange,
         setDisabledDates: setDisabledDates,
-        dateFormat: dateFormat,
         newDisableCalendarDates: newDisableCalendarDates,
     });
-    // Calendar selection rules
-    switch (true) {
-        case !!overlappingDateFrom:
-            // Clear the selection when overlapping dates are detected
-            return setCalendarRange(undefined);
-        case !!((!rangeTo && !rangeFrom && calendarFrom) || rangeTo === rangeFrom):
-            // Handle double-click on the same date
-            return setCalendarRange({ from: calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from, to: undefined });
-        case (range === null || range === void 0 ? void 0 : range.to) &&
-            (calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.to) &&
-            isAfter(endOfDay(range.to), endOfDay(calendarRange.to)) &&
-            !((range === null || range === void 0 ? void 0 : range.to) &&
-                (rangeContext === null || rangeContext === void 0 ? void 0 : rangeContext.to) &&
-                isAfter(startOfDay(range.to), startOfDay(rangeContext.to))):
-            // Handle checkout selection greater than current checkout
-            return setCalendarRange({ from: range === null || range === void 0 ? void 0 : range.to, to: undefined });
-        case calendarFrom && rangeFrom && rangeFrom !== calendarFrom:
-            // Handle check-in selection prior to current check-in
-            return setCalendarRange({ from: range === null || range === void 0 ? void 0 : range.from, to: undefined });
-        case checkOutRange && (range === null || range === void 0 ? void 0 : range.to) && checkOutRange.lastCheckOut < range.to:
-            return setCalendarRange({ from: range === null || range === void 0 ? void 0 : range.to, to: undefined });
-        // Handle checkout selection between the range context and first passible check-in
-        case (range === null || range === void 0 ? void 0 : range.to) &&
-            (rangeContext === null || rangeContext === void 0 ? void 0 : rangeContext.from) &&
-            isBefore(startOfDay(range.to), startOfDay(rangeContext.from)):
-            return setCalendarRange({ from: range === null || range === void 0 ? void 0 : range.to, to: undefined });
-        case (range === null || range === void 0 ? void 0 : range.from) &&
-            (rangeContext === null || rangeContext === void 0 ? void 0 : rangeContext.to) &&
-            isAfter(startOfDay(range.from), startOfDay(rangeContext.to)):
-            return (setCalendarRange(undefined),
-                setCalendarHasError && setCalendarHasError(true));
-        //
-        default:
-            // Apply the given range
-            return setCalendarRange(range);
-    }
+    // Calendar selection rules: The cases are handled sequentially, starting from simple selections to more complex contextual selections.
+    // The rules are processed in a specific order, so one case is handled before another.
+    // Changing the order will cause the rules to break or not work properly.
+    if (!!overlappingDateFrom) {
+        // 1. If dates overlap, clear the selection.
+        return setCalendarRange(undefined);
+    }
+    if (
+    // 2. If selected "start" is after "range context end", clear selection and display error
+    (rangeFrom && rangeContextTo && isAfter(rangeFrom, rangeContextTo)) ||
+        (calendarRangeFrom &&
+            calendarRangeTo &&
+            rangeContextTo &&
+            rangeTo &&
+            isAfter(rangeTo, rangeContextTo))) {
+        setCalendarHasError && setCalendarHasError(true);
+        return setCalendarRange(undefined);
+    }
+    if (rangeFrom && rangeTo && isEqual(rangeFrom, rangeTo)) {
+        // 3. If "start" is selected and the same date is clicked again, keep the current "start" selection.
+        return setCalendarRange({ from: rangeFrom, to: undefined });
+    }
+    if (calendarRangeFrom && calendarRangeTo && !range) {
+        // 4. If "calendarRange" has dates selected and the same "start" date is clicked, the "range" will become undefined.
+        // Set the current selection (calendarRange) to the initial "start" of calendarRange.
+        return setCalendarRange({ from: calendarRangeFrom, to: undefined });
+    }
+    // 5. Handle gap selection backwards and forwards
+    if (
+    // Enforce on every date selection before current "start", mark as "start" selection
+    rangeFrom &&
+        calendarRangeFrom &&
+        isBefore(rangeFrom, calendarRangeFrom)) {
+        return setCalendarRange({ from: rangeFrom, to: undefined });
+    }
+    if (
+    // Every date selection that is after selected "start" last checkout, mark as "start"
+    rangeTo &&
+        (checkOutRange === null || checkOutRange === void 0 ? void 0 : checkOutRange.lastCheckOut) &&
+        isAfter(rangeTo, endOfDay(checkOutRange.lastCheckOut))) {
+        return setCalendarRange({ from: rangeTo, to: undefined });
+    }
+    if (calendarRangeFrom &&
+        rangeFrom &&
+        !isEqual(calendarRangeFrom, rangeFrom)) {
+        // 6. If "calendarRange" has selected dates and the new selection "start" differs from the current "calendarRange start", reset and make a new "start" selection.
+        return setCalendarRange({ from: rangeFrom, to: undefined });
+    }
+    else if (calendarRangeTo && rangeTo && !isEqual(calendarRangeTo, rangeTo)) {
+        // 7. If "calendarRange" has selected dates and the new selection "end" differs from the current "calendarRange end", reset and make a new "start" selection.
+        return setCalendarRange({ from: rangeTo, to: undefined });
+    }
+    if (
+    // 8. If selected "end" is before "context start", mark as "start" and display error
+    rangeFrom &&
+        rangeTo &&
+        rangeContextFrom &&
+        isBefore(rangeTo, rangeContextFrom)) {
+        setCalendarHasError && setCalendarHasError(true);
+        return setCalendarRange({ from: rangeTo, to: undefined });
+    }
+    setCalendarRange(range);
 };
 /////////
 var disableFutureDates = function (_a) {
-    var rangeFrom = _a.rangeFrom, checkOutRange = _a.checkOutRange, setDisabledDates = _a.setDisabledDates, dateFormat = _a.dateFormat, newDisableCalendarDates = _a.newDisableCalendarDates;
+    var rangeFrom = _a.rangeFrom, checkOutRange = _a.checkOutRange, setDisabledDates = _a.setDisabledDates, newDisableCalendarDates = _a.newDisableCalendarDates;
     if (rangeFrom && checkOutRange && setDisabledDates) {
         // Get and parse data
         var checkIn = addDays(checkOutRange.checkIn, 1);
         var firstCheckOut = addDays(checkOutRange.firstCheckOut, -1);
-        var noDatesRange = format(checkIn, dateFormat) ===
-            format(checkOutRange.firstCheckOut, dateFormat);
-        // -------------------
+        var noDatesRange = isEqual(checkIn, checkOutRange.firstCheckOut);
         setDisabledDates(__spreadArray$1(__spreadArray$1([], __read(((newDisableCalendarDates === null || newDisableCalendarDates === void 0 ? void 0 : newDisableCalendarDates.disabledDates) || [])), false), [
             {
                 from: noDatesRange ? undefined : checkIn,