willba-component-library 0.2.32 → 0.2.34

package/lib/core/components/calendar/CalendarTypes.d.ts

@@ -1,5 +1,5 @@
 import { DateRange, Matcher } from 'react-day-picker';
-import { Palette } from 'src/themes/useTheme';
+import { Palette } from '../../../themes/useTheme';
 export type CalendarOffset = {
     [key: string]: number;
 };

package/lib/index.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 import { DateRange, Matcher } from 'react-day-picker';
-import { Palette as Palette$1 } from 'src/themes/useTheme';
 
 interface ButtonProps {
     /**
@@ -29,6 +28,11 @@ interface ButtonProps {
  */
 declare const Button: ({ type, textColor, size, onClick, label, }: ButtonProps) => React.JSX.Element;
 
+type Palette = {
+    primary: string;
+    secondary: string;
+};
+
 type CalendarOffset = {
     [key: string]: number;
 };
@@ -61,17 +65,12 @@ type CalendarTypes = {
     initialCalendarRange?: DateRange | undefined;
     showFeedback?: boolean;
     noActiveSelection?: boolean;
-    palette?: Palette$1;
+    palette?: Palette;
     updateCalendarMonthNavigation?: boolean;
     setUpdateCalendarMonthNavigation?: (arg: (prev: boolean) => boolean) => void;
     updateCalendarDefaultMoth?: number;
 };
 
-type Palette = {
-    primary: string;
-    secondary: string;
-};
-
 type FilterBarProps = {
     language?: string;
     ageCategories?: AgeCategoryType[];

package/lib/index.esm.js

@@ -10826,21 +10826,40 @@ var Calendar = forwardRef(function (_a, ref) {
     // Handle overlapping availableDates.lastCheckOut and disabledDates.start
     var _c = __read(useState(undefined), 2), overlappingDate = _c[0], setOverlappingDate = _c[1];
     useMemo(function () {
-        var _a, _b;
+        var _a;
         if (disableCalendarDates === null || disableCalendarDates === void 0 ? void 0 : disableCalendarDates.availableDates) {
             var dateFormat_1 = 'dd-MM-yyyy';
-            var availableDateMap_1 = new Map();
-            (_a = disableCalendarDates.availableDates) === null || _a === void 0 ? void 0 : _a.forEach(function (available) {
-                availableDateMap_1.set(format(available.lastCheckOut, dateFormat_1), available);
-            });
-            var updatedDisabledDates = (_b = disableCalendarDates.disabledDates) === null || _b === void 0 ? void 0 : _b.map(function (dateRange) {
+            var newOverlappingDates_1 = [];
+            var updatedDisabledDates = (_a = disableCalendarDates.disabledDates) === null || _a === void 0 ? void 0 : _a.map(function (dateRange) {
+                var _a, _b;
                 var formattedFromDate = format(dateRange.from, dateFormat_1);
-                if (availableDateMap_1.has(formattedFromDate)) {
-                    setOverlappingDate(dateRange);
+                var hasTwoOverlappingDates = (_a = disableCalendarDates.disabledDates) === null || _a === void 0 ? void 0 : _a.some(function (item) {
+                    return format(item.from, dateFormat_1) === formattedFromDate &&
+                        format(item.to, dateFormat_1) === formattedFromDate;
+                });
+                var hasOneOverlappingDate = (_b = disableCalendarDates.disabledDates) === null || _b === void 0 ? void 0 : _b.some(function (item) {
+                    return format(item.from, dateFormat_1) === formattedFromDate &&
+                        format(item.to, dateFormat_1) !== formattedFromDate;
+                });
+                if (hasTwoOverlappingDates) {
+                    newOverlappingDates_1.push(dateRange);
+                    return {
+                        from: new Date(1),
+                        to: new Date(1),
+                    };
+                }
+                else if (hasOneOverlappingDate) {
+                    newOverlappingDates_1.push(dateRange);
                     return __assign$2(__assign$2({}, dateRange), { from: addDays(dateRange.from, 1) });
                 }
                 return dateRange;
             });
+            if (newOverlappingDates_1.length) {
+                setOverlappingDate(function (prev) {
+                    if (prev === void 0) { prev = []; }
+                    return __spreadArray$1(__spreadArray$1([], __read(prev), false), __read(newOverlappingDates_1), false);
+                });
+            }
             disableCalendarDates.disabledDates = updatedDisabledDates;
         }
     }, [disableCalendarDates]);
@@ -10864,14 +10883,15 @@ var Calendar = forwardRef(function (_a, ref) {
         var calendarButtonsCheckOut = document.querySelectorAll('.will-filter-bar-calendar .rdp-cell:has(.booked.disabled-after-check-in)');
         var calendarMonthContainer = document.querySelector('.will-filter-bar-calendar .rdp-months');
         var calendarOverlappingDate = document.querySelectorAll('.will-filter-bar-calendar .rdp-cell:has(.overlapping-date)');
-        var tooltipClones = [];
+        var tooltipClonesCheckIn = [];
         var tooltipClonesCheckOut = [];
+        var tooltipClonesSpinner = [];
         var tooltipClonesOverlappingDates = [];
         if (calendarTooltip && calendarButtons.length > 0) {
             calendarButtons.forEach(function (element) {
                 var tooltipClone = calendarTooltip.cloneNode(true);
                 element.appendChild(tooltipClone);
-                tooltipClones.push(tooltipClone);
+                tooltipClonesCheckIn.push(tooltipClone);
             });
         }
         if (calendarTooltipCheckOut && calendarButtonsCheckOut.length > 0) {
@@ -10882,7 +10902,9 @@ var Calendar = forwardRef(function (_a, ref) {
             });
         }
         if (loadingSpinner && calendarMonthContainer) {
-            calendarMonthContainer.appendChild(loadingSpinner);
+            var tooltipClone = loadingSpinner.cloneNode(true);
+            calendarMonthContainer.appendChild(tooltipClone);
+            tooltipClonesSpinner.push(tooltipClone);
         }
         if (calendarTooltipOverlappingDate &&
             calendarOverlappingDate.length > 0) {
@@ -10893,8 +10915,9 @@ var Calendar = forwardRef(function (_a, ref) {
             });
         }
         return function () {
-            tooltipClones.forEach(function (clone) { return clone.remove(); });
+            tooltipClonesCheckIn.forEach(function (clone) { return clone.remove(); });
             tooltipClonesCheckOut.forEach(function (clone) { return clone.remove(); });
+            tooltipClonesSpinner.forEach(function (clone) { return clone.remove(); });
             tooltipClonesOverlappingDates.forEach(function (clone) { return clone.remove(); });
         };
     }, [
@@ -10902,6 +10925,7 @@ var Calendar = forwardRef(function (_a, ref) {
         updateCalendarMonthNavigation,
         overlappingDate,
         initialCalendarRange,
+        updateCalendarDefaultMoth,
     ]);
     return (React__default__default.createElement("div", { className: "will-filter-bar-calendar", ref: ref },
         React__default__default.createElement("div", { className: "will-calendar-filter-container" },
@@ -10960,7 +10984,11 @@ var Calendar = forwardRef(function (_a, ref) {
                     noActiveSelectionEnd: !calendarRange
                         ? (initialCalendarRange === null || initialCalendarRange === void 0 ? void 0 : initialCalendarRange.to) || []
                         : [],
-                    overlappingDate: (!(calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from) && (overlappingDate === null || overlappingDate === void 0 ? void 0 : overlappingDate.from)) || [],
+                    overlappingDate: (!(calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from) &&
+                        (overlappingDate === null || overlappingDate === void 0 ? void 0 : overlappingDate.map(function (item) { return ({
+                            from: item.from,
+                        }); }))) ||
+                        [],
                 } }),
             React__default__default.createElement("div", { className: 'will-calendar-tooltip' },
                 React__default__default.createElement("div", null, t('noCheckIn'))),
@@ -10982,9 +11010,13 @@ var handleSelectedCheckIn = function (_a) {
     var calendarFrom = (calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from)
         ? format(calendarRange === null || calendarRange === void 0 ? void 0 : calendarRange.from, dateFormat)
         : null;
-    var overlappingDateFrom = (overlappingDate === null || overlappingDate === void 0 ? void 0 : overlappingDate.from)
-        ? format(overlappingDate.from, dateFormat)
+    // const overlappingDateFrom = overlappingDate?.from
+    //   ? format(overlappingDate.from, dateFormat)
+    //   : null
+    var overlappingDateFrom = (overlappingDate === null || overlappingDate === void 0 ? void 0 : overlappingDate.length)
+        ? overlappingDate.find(function (date) { return format(date.from || 1, dateFormat) === rangeFrom; })
         : null;
+    console.log(overlappingDateFrom);
     var checkOutRange = ((_b = disableCalendarDates === null || disableCalendarDates === void 0 ? void 0 : disableCalendarDates.availableDates) === null || _b === void 0 ? void 0 : _b.length)
         ? disableCalendarDates.availableDates.find(function (checkInDate) {
             return format(checkInDate.checkIn || 1, dateFormat) ===
@@ -11006,7 +11038,8 @@ var handleSelectedCheckIn = function (_a) {
     }
     if ((rangeTo && rangeFrom && rangeFrom === rangeTo) ||
         (!rangeTo && !rangeFrom) ||
-        rangeFrom === overlappingDateFrom) {
+        // rangeFrom === overlappingDateFrom
+        overlappingDateFrom) {
         setCalendarRange(undefined);
         setDisabledDates && setDisabledDates([]);
     }