react-day-picker 8.0.0-beta.38 → 8.0.0-beta.39

package/dist/index.js

@@ -525,7 +525,7 @@ function MonthsDropdown(props) {
  * Render the "previous month" button in the navigation.
  */
 function IconLeft(props) {
-    return (React__default["default"].createElement("svg", __assign({ width: "16px", height: "16px", viewBox: "0 0 120 120", "data-testid": "iconLeft" }, props),
+    return (React__default["default"].createElement("svg", __assign({ width: "16px", height: "16px", viewBox: "0 0 120 120" }, props),
         React__default["default"].createElement("path", { d: "M69.490332,3.34314575 C72.6145263,0.218951416 77.6798462,0.218951416 80.8040405,3.34314575 C83.8617626,6.40086786 83.9268205,11.3179931 80.9992143,14.4548388 L80.8040405,14.6568542 L35.461,60 L80.8040405,105.343146 C83.8617626,108.400868 83.9268205,113.317993 80.9992143,116.454839 L80.8040405,116.656854 C77.7463184,119.714576 72.8291931,119.779634 69.6923475,116.852028 L69.490332,116.656854 L18.490332,65.6568542 C15.4326099,62.5991321 15.367552,57.6820069 18.2951583,54.5451612 L18.490332,54.3431458 L69.490332,3.34314575 Z", fill: "currentColor", fillRule: "nonzero" })));
 }
 
@@ -533,7 +533,7 @@ function IconLeft(props) {
  * Render the "next month" button in the navigation.
  */
 function IconRight(props) {
-    return (React__default["default"].createElement("svg", __assign({ width: "16px", height: "16px", viewBox: "0 0 120 120" }, props, { "data-testid": "iconRight" }),
+    return (React__default["default"].createElement("svg", __assign({ width: "16px", height: "16px", viewBox: "0 0 120 120" }, props),
         React__default["default"].createElement("path", { d: "M49.8040405,3.34314575 C46.6798462,0.218951416 41.6145263,0.218951416 38.490332,3.34314575 C35.4326099,6.40086786 35.367552,11.3179931 38.2951583,14.4548388 L38.490332,14.6568542 L83.8333725,60 L38.490332,105.343146 C35.4326099,108.400868 35.367552,113.317993 38.2951583,116.454839 L38.490332,116.656854 C41.5480541,119.714576 46.4651794,119.779634 49.602025,116.852028 L49.8040405,116.656854 L100.804041,65.6568542 C103.861763,62.5991321 103.926821,57.6820069 100.999214,54.5451612 L100.804041,54.3431458 L49.8040405,3.34314575 Z", fill: "currentColor" })));
 }
 
@@ -556,32 +556,26 @@ var Button = React.forwardRef(function (props, ref) {
 
 /** A component rendering the navigation buttons or the drop-downs. */
 function Navigation(props) {
-    var _a;
-    var _b, _c;
-    var _d = useDayPicker(), dir = _d.dir, locale = _d.locale, classNames = _d.classNames, styles = _d.styles, _e = _d.labels, labelPrevious = _e.labelPrevious, labelNext = _e.labelNext, components = _d.components;
-    var onPreviousClick = props.onPreviousClick, onNextClick = props.onNextClick;
-    if (dir === 'rtl') {
-        _a = [onPreviousClick, onNextClick], onNextClick = _a[0], onPreviousClick = _a[1];
+    var _a, _b;
+    var _c = useDayPicker(), dir = _c.dir, locale = _c.locale, classNames = _c.classNames, styles = _c.styles, _d = _c.labels, labelPrevious = _d.labelPrevious, labelNext = _d.labelNext, components = _c.components;
+    if (!props.nextMonth && !props.previousMonth) {
+        return React__default["default"].createElement(React__default["default"].Fragment, null);
     }
-    var previousMonth = props.previousMonth, nextMonth = props.nextMonth;
-    var previousLabel = labelPrevious(previousMonth, { locale: locale });
+    var previousLabel = labelPrevious(props.previousMonth, { locale: locale });
     var previousClassName = [
         classNames.nav_button,
         classNames.nav_button_previous
     ].join(' ');
-    var nextLabel = labelNext(nextMonth, { locale: locale });
+    var nextLabel = labelNext(props.nextMonth, { locale: locale });
     var nextClassName = [
         classNames.nav_button,
         classNames.nav_button_next
     ].join(' ');
-    if (!nextMonth && !previousMonth) {
-        return React__default["default"].createElement(React__default["default"].Fragment, null);
-    }
-    var IconRightComponent = (_b = components === null || components === void 0 ? void 0 : components.IconRight) !== null && _b !== void 0 ? _b : IconRight;
-    var IconLeftComponent = (_c = components === null || components === void 0 ? void 0 : components.IconLeft) !== null && _c !== void 0 ? _c : IconLeft;
+    var IconRightComponent = (_a = components === null || components === void 0 ? void 0 : components.IconRight) !== null && _a !== void 0 ? _a : IconRight;
+    var IconLeftComponent = (_b = components === null || components === void 0 ? void 0 : components.IconLeft) !== null && _b !== void 0 ? _b : IconLeft;
     return (React__default["default"].createElement("div", { className: classNames.nav, style: styles.nav },
-        !props.hidePrevious && (React__default["default"].createElement(Button, { "aria-label": previousLabel, className: previousClassName, style: styles.nav_button_next, disabled: !previousMonth, onClick: dir === 'rtl' ? onNextClick : onPreviousClick }, dir === 'rtl' ? (React__default["default"].createElement(IconRightComponent, { className: classNames.nav_icon, style: styles.nav_icon })) : (React__default["default"].createElement(IconLeftComponent, { className: classNames.nav_icon, style: styles.nav_icon })))),
-        !props.hideNext && (React__default["default"].createElement(Button, { "aria-label": nextLabel, className: nextClassName, style: styles.nav_button_next, disabled: !nextMonth, onClick: dir === 'rtl' ? onPreviousClick : onNextClick }, dir === 'rtl' ? (React__default["default"].createElement(IconLeftComponent, { className: classNames.nav_icon, style: styles.nav_icon })) : (React__default["default"].createElement(IconRightComponent, { className: classNames.nav_icon, style: styles.nav_icon }))))));
+        !props.hidePrevious && (React__default["default"].createElement(Button, { "aria-label": previousLabel, className: previousClassName, style: styles.nav_button_previous, disabled: !props.previousMonth, onClick: props.onPreviousClick }, dir === 'rtl' ? (React__default["default"].createElement(IconRightComponent, { className: classNames.nav_icon, style: styles.nav_icon })) : (React__default["default"].createElement(IconLeftComponent, { className: classNames.nav_icon, style: styles.nav_icon })))),
+        !props.hideNext && (React__default["default"].createElement(Button, { "aria-label": nextLabel, className: nextClassName, style: styles.nav_button_next, disabled: !props.nextMonth, onClick: props.onNextClick }, dir === 'rtl' ? (React__default["default"].createElement(IconLeftComponent, { className: classNames.nav_icon, style: styles.nav_icon })) : (React__default["default"].createElement(IconRightComponent, { className: classNames.nav_icon, style: styles.nav_icon }))))));
 }
 
 /**
@@ -651,7 +645,7 @@ function useNavigationState() {
     var goToMonth = function (date) {
         if (context.disableNavigation)
             return;
-        setMonth(date);
+        setMonth(dateFns.startOfMonth(date));
     };
     return [month, goToMonth];
 }
@@ -741,10 +735,10 @@ var NavigationContext = React.createContext(undefined);
 /** Provides the values for the [[NavigationContext]]. */
 function NavigationProvider(props) {
     var dayPicker = useDayPicker();
-    var _a = useNavigationState(), month = _a[0], goToMonth = _a[1];
-    var displayMonths = getDisplayMonths(month, dayPicker);
-    var nextMonth = getNextMonth(month, dayPicker);
-    var previousMonth = getPreviousMonth(month, dayPicker);
+    var _a = useNavigationState(), currentMonth = _a[0], goToMonth = _a[1];
+    var displayMonths = getDisplayMonths(currentMonth, dayPicker);
+    var nextMonth = getNextMonth(currentMonth, dayPicker);
+    var previousMonth = getPreviousMonth(currentMonth, dayPicker);
     var isDateDisplayed = function (date) {
         return displayMonths.some(function (displayMonth) {
             return dateFns.isSameMonth(date, displayMonth);
@@ -762,7 +756,7 @@ function NavigationProvider(props) {
         }
     };
     var value = {
-        month: month,
+        currentMonth: currentMonth,
         displayMonths: displayMonths,
         goToMonth: goToMonth,
         goToDate: goToDate,
@@ -912,53 +906,47 @@ function SelectMultipleProvider(props) {
 }
 function SelectMultipleProviderInternal(_a) {
     var initialProps = _a.initialProps, children = _a.children;
-    var selected = initialProps.selected;
-    var onDayClick = function (day, modifiers, e) {
+    var selected = initialProps.selected, min = initialProps.min, max = initialProps.max;
+    var onDayClick = function (day, activeModifiers, e) {
         var _a, _b;
-        (_a = initialProps.onDayClick) === null || _a === void 0 ? void 0 : _a.call(initialProps, day, modifiers, e);
-        var isMinSelected = Boolean(initialProps.min &&
-            modifiers.selected &&
-            selected &&
-            selected.length === initialProps.min);
+        (_a = initialProps.onDayClick) === null || _a === void 0 ? void 0 : _a.call(initialProps, day, activeModifiers, e);
+        var isMinSelected = Boolean(activeModifiers.selected && min && (selected === null || selected === void 0 ? void 0 : selected.length) === min);
         if (isMinSelected) {
             return;
         }
-        var isMaxSelected = Boolean(initialProps.max &&
-            !modifiers.selected &&
-            selected &&
-            selected.length === initialProps.max);
+        var isMaxSelected = Boolean(!activeModifiers.selected && max && (selected === null || selected === void 0 ? void 0 : selected.length) === max);
         if (isMaxSelected) {
             return;
         }
-        var days = selected ? __spreadArray([], selected, true) : [];
-        if (modifiers.selected) {
-            var index = days.findIndex(function (selectedDay) {
+        var selectedDays = selected ? __spreadArray([], selected, true) : [];
+        if (activeModifiers.selected) {
+            var index = selectedDays.findIndex(function (selectedDay) {
                 return dateFns.isSameDay(day, selectedDay);
             });
-            days.splice(index, 1);
+            selectedDays.splice(index, 1);
         }
         else {
-            days.push(day);
+            selectedDays.push(day);
         }
-        (_b = initialProps.onSelect) === null || _b === void 0 ? void 0 : _b.call(initialProps, days, day, modifiers, e);
+        (_b = initialProps.onSelect) === null || _b === void 0 ? void 0 : _b.call(initialProps, selectedDays, day, activeModifiers, e);
     };
     var modifiers = {
         disabled: []
     };
     if (selected) {
-        modifiers.disabled = [
-            function disableDay(day) {
-                var isMaxSelected = initialProps.max &&
-                    selected &&
-                    selected.length > initialProps.max - 1;
-                var isSelected = selected === null || selected === void 0 ? void 0 : selected.some(function (selectedDay) {
-                    return dateFns.isSameDay(selectedDay, day);
-                });
-                return Boolean(isMaxSelected && !isSelected);
-            }
-        ];
+        modifiers.disabled.push(function (day) {
+            var isMaxSelected = max && selected.length > max - 1;
+            var isSelected = selected.some(function (selectedDay) {
+                return dateFns.isSameDay(selectedDay, day);
+            });
+            return Boolean(isMaxSelected && !isSelected);
+        });
     }
-    var contextValue = { selected: selected, onDayClick: onDayClick, modifiers: modifiers };
+    var contextValue = {
+        selected: selected,
+        onDayClick: onDayClick,
+        modifiers: modifiers
+    };
     return (React__default["default"].createElement(SelectMultipleContext.Provider, { value: contextValue }, children));
 }
 
@@ -1037,26 +1025,24 @@ function SelectRangeProvider(props) {
 function SelectRangeProviderInternal(_a) {
     var initialProps = _a.initialProps, children = _a.children;
     var selected = initialProps.selected;
+    var _b = selected || {}, selectedFrom = _b.from, selectedTo = _b.to;
     var min = initialProps.min;
     var max = initialProps.max;
-    var onDayClick = function (day, modifiers, e) {
+    var onDayClick = function (day, activeModifiers, e) {
         var _a, _b;
-        (_a = initialProps.onDayClick) === null || _a === void 0 ? void 0 : _a.call(initialProps, day, modifiers, e);
-        var newValue = addToRange(day, selected);
+        (_a = initialProps.onDayClick) === null || _a === void 0 ? void 0 : _a.call(initialProps, day, activeModifiers, e);
+        var range = addToRange(day, selected);
         if ((min || max) &&
             selected &&
-            (newValue === null || newValue === void 0 ? void 0 : newValue.to) &&
-            newValue.from &&
-            newValue.from !== newValue.to) {
-            var diff = Math.abs(dateFns.differenceInCalendarDays(newValue === null || newValue === void 0 ? void 0 : newValue.to, newValue === null || newValue === void 0 ? void 0 : newValue.from));
-            if (min && diff < min) {
-                return;
-            }
-            if (max && diff >= max) {
+            (range === null || range === void 0 ? void 0 : range.to) &&
+            range.from &&
+            range.from !== range.to) {
+            var diff = Math.abs(dateFns.differenceInCalendarDays(range === null || range === void 0 ? void 0 : range.to, range === null || range === void 0 ? void 0 : range.from));
+            if ((min && diff < min) || (max && diff >= max)) {
                 return;
             }
         }
-        (_b = initialProps.onSelect) === null || _b === void 0 ? void 0 : _b.call(initialProps, newValue, day, modifiers, e);
+        (_b = initialProps.onSelect) === null || _b === void 0 ? void 0 : _b.call(initialProps, range, day, activeModifiers, e);
     };
     var modifiers = {
         range_start: [],
@@ -1064,63 +1050,37 @@ function SelectRangeProviderInternal(_a) {
         range_middle: [],
         disabled: []
     };
-    if (selected) {
-        if (selected.from) {
-            modifiers.range_start = [selected.from];
-            if (selected.to) {
-                modifiers.range_middle = [
-                    {
-                        after: selected.from,
-                        before: selected.to
-                    }
-                ];
-                if (max || min) {
-                    modifiers.disabled = [
-                        function (date) {
-                            if (max &&
-                                selected.to &&
-                                selected.from &&
-                                dateFns.isBefore(date, selected.from)) {
-                                var diff = dateFns.differenceInCalendarDays(selected.to, date);
-                                if (diff >= max) {
-                                    return true;
-                                }
-                            }
-                            if (max &&
-                                selected.to &&
-                                selected.from &&
-                                dateFns.isAfter(date, selected.to)) {
-                                var diff = dateFns.differenceInCalendarDays(date, selected.from);
-                                if (diff >= max) {
-                                    return true;
-                                }
-                            }
-                            if (min && selected.from && dateFns.isBefore(date, selected.from)) {
-                                var diff = dateFns.differenceInCalendarDays(selected.from, date);
-                                if (diff < min) {
-                                    return true;
-                                }
-                            }
-                            if (min &&
-                                selected.to &&
-                                selected.from &&
-                                dateFns.isAfter(date, selected.to)) {
-                                var diff = dateFns.differenceInCalendarDays(date, selected.from);
-                                if (diff < min) {
-                                    return true;
-                                }
-                            }
-                            return false;
-                        }
-                    ];
+    if (selectedFrom) {
+        modifiers.range_start = [selectedFrom];
+        if (!selectedTo) {
+            modifiers.range_end = [selectedFrom];
+        }
+        else {
+            modifiers.range_end = [selectedTo];
+            modifiers.range_middle = [
+                {
+                    after: selectedFrom,
+                    before: selectedTo
                 }
-                modifiers.range_end = [selected.to];
-            }
-            else {
-                modifiers.range_end = [selected.from];
-            }
+            ];
         }
     }
+    if (min && selectedFrom && selectedTo) {
+        modifiers.disabled.push(function (date) {
+            return ((dateFns.isBefore(date, selectedFrom) &&
+                dateFns.differenceInCalendarDays(selectedFrom, date) < min) ||
+                (dateFns.isAfter(date, selectedTo) &&
+                    dateFns.differenceInCalendarDays(date, selectedFrom) < min));
+        });
+    }
+    if (max && selectedFrom && selectedTo) {
+        modifiers.disabled.push(function (date) {
+            return ((dateFns.isBefore(date, selectedFrom) &&
+                dateFns.differenceInCalendarDays(selectedTo, date) >= max) ||
+                (dateFns.isAfter(date, selectedTo) &&
+                    dateFns.differenceInCalendarDays(date, selectedFrom) >= max));
+        });
+    }
     return (React__default["default"].createElement(SelectRangeContext.Provider, { value: { selected: selected, onDayClick: onDayClick, modifiers: modifiers } }, children));
 }
 
@@ -1287,7 +1247,23 @@ function isDateType(value) {
 function isArrayOfDates(value) {
     return Array.isArray(value) && value.every(dateFns.isDate);
 }
-/** Returns `true` whether the day matches against the given matchers. */
+/**
+ * Returns whether a day matches against at least one of the given Matchers.
+ *
+ * ```
+ * const day = new Date(2022, 5, 19);
+ * const matcher1: DateRange = {
+ *    from: new Date(2021, 12, 21),
+ *    to: new Date(2021, 12, 30)
+ * }
+ * const matcher2: DateRange = {
+ *    from: new Date(2022, 5, 1),
+ *    to: new Date(2022, 5, 23)
+ * }
+ *
+ * const isMatch(day, [matcher1, matcher2]); // true, since day is in the matcher1 range.
+ * ```
+ * */
 function isMatch(day, matchers) {
     return matchers.some(function (matcher) {
         if (typeof matcher === 'boolean') {
@@ -1537,13 +1513,14 @@ function SelectSingleProvider(props) {
 }
 function SelectSingleProviderInternal(_a) {
     var initialProps = _a.initialProps, children = _a.children;
-    var onDayClick = function (day, dayModifiers, e) {
-        var _a, _b;
-        if (dayModifiers.selected && !initialProps.required) {
-            (_a = initialProps.onSelect) === null || _a === void 0 ? void 0 : _a.call(initialProps, undefined, day, dayModifiers, e);
+    var onDayClick = function (day, activeModifiers, e) {
+        var _a, _b, _c;
+        (_a = initialProps.onDayClick) === null || _a === void 0 ? void 0 : _a.call(initialProps, day, activeModifiers, e);
+        if (activeModifiers.selected && !initialProps.required) {
+            (_b = initialProps.onSelect) === null || _b === void 0 ? void 0 : _b.call(initialProps, undefined, day, activeModifiers, e);
             return;
         }
-        (_b = initialProps.onSelect) === null || _b === void 0 ? void 0 : _b.call(initialProps, day, day, dayModifiers, e);
+        (_c = initialProps.onSelect) === null || _c === void 0 ? void 0 : _c.call(initialProps, day, day, activeModifiers, e);
     };
     var contextValue = {
         selected: initialProps.selected,
@@ -1833,14 +1810,14 @@ function Day(props) {
 function WeekNumber(props) {
     var weekNumber = props.number, dates = props.dates;
     var _a = useDayPicker(), onWeekNumberClick = _a.onWeekNumberClick, styles = _a.styles, classNames = _a.classNames, locale = _a.locale, labelWeekNumber = _a.labels.labelWeekNumber, formatWeekNumber = _a.formatters.formatWeekNumber;
-    var handleClick = function (e) {
-        onWeekNumberClick === null || onWeekNumberClick === void 0 ? void 0 : onWeekNumberClick(weekNumber, dates, e);
-    };
     var content = formatWeekNumber(Number(weekNumber), { locale: locale });
     if (!onWeekNumberClick) {
         return (React__default["default"].createElement("span", { className: classNames.weeknumber, style: styles.weeknumber }, content));
     }
     var label = labelWeekNumber(Number(weekNumber), { locale: locale });
+    var handleClick = function (e) {
+        onWeekNumberClick(weekNumber, dates, e);
+    };
     return (React__default["default"].createElement(Button, { "aria-label": label, className: classNames.weeknumber, style: styles.weeknumber, onClick: handleClick }, content));
 }
 
@@ -1861,77 +1838,61 @@ function Row(props) {
             React__default["default"].createElement(DayComponent, { displayMonth: props.displayMonth, date: date }))); })));
 }
 
-function getOutsideEndDays(month, options) {
-    var days = [];
-    var lastDayOfWeek = dateFns.endOfWeek(month, options);
-    var endDiff = dateFns.differenceInCalendarDays(lastDayOfWeek, month);
-    for (var i = 1; i <= endDiff; i++) {
-        var dayDate = dateFns.addDays(month, i);
-        days.push(dayDate);
-    }
-    return days;
-}
-
-function getOutsideStartDays(month, options) {
+/** Return the weeks between two dates.  */
+function daysToMonthWeeks(fromDate, toDate, options) {
+    var toWeek = dateFns.endOfWeek(toDate, options);
+    var fromWeek = dateFns.startOfWeek(fromDate, options);
+    var nOfDays = dateFns.differenceInCalendarDays(toWeek, fromWeek);
     var days = [];
-    var firstDayOfWeek = dateFns.startOfWeek(month, options);
-    var startDiff = dateFns.differenceInCalendarDays(month, firstDayOfWeek);
-    for (var i = 0; i < startDiff; i++) {
-        var newDay = dateFns.addDays(firstDayOfWeek, i);
-        days.push(newDay);
-    }
-    return days;
+    for (var i = 0; i <= nOfDays; i++) {
+        days.push(dateFns.addDays(fromWeek, i));
+    }
+    var weeksInMonth = days.reduce(function (result, date) {
+        var weekNumber = dateFns.getWeek(date, options);
+        var existingWeek = result.find(function (value) { return value.weekNumber === weekNumber; });
+        if (existingWeek) {
+            existingWeek.dates.push(date);
+            return result;
+        }
+        result.push({
+            weekNumber: weekNumber,
+            dates: [date]
+        });
+        return result;
+    }, []);
+    return weeksInMonth;
 }
 
 /**
- * Return the weeks belonging to the given month.
+ * Return the weeks belonging to the given month, adding the "outside days" to
+ * the first and last week.
  */
-function getWeeks(month, _a) {
-    var locale = _a.locale, fixedWeeks = _a.fixedWeeks;
-    var monthStart = dateFns.startOfMonth(month);
-    var monthEnd = dateFns.endOfMonth(month);
-    var diff = dateFns.differenceInCalendarDays(monthEnd, monthStart);
-    var weeks = [];
-    var lastWeek = { weekNumber: 0, dates: [] };
-    for (var i = 0; i <= diff; i++) {
-        var date = dateFns.addDays(monthStart, i);
-        var week = dateFns.getWeek(date, { locale: locale });
-        if (lastWeek.weekNumber !== week) {
-            // Create a new week by adding outside start days
-            var startDays = getOutsideStartDays(date, { locale: locale });
-            lastWeek = { weekNumber: week, dates: startDays };
-            weeks.push(lastWeek);
-        }
-        lastWeek.dates.push(date);
-    }
-    var lastDay = lastWeek.dates[lastWeek.dates.length - 1];
-    var endDays = getOutsideEndDays(lastDay, { locale: locale });
-    lastWeek.dates = lastWeek.dates.concat(endDays);
+function getMonthWeeks(
+/** The month to get the weeks from */
+month, options) {
+    var weeksInMonth = daysToMonthWeeks(dateFns.startOfMonth(month), dateFns.endOfMonth(month), options);
     // Add extra weeks to the month, up to 6 weeks
-    if (fixedWeeks) {
-        var lastWeekDate = lastWeek.dates[lastWeek.dates.length - 1];
-        var weeksInMonth = dateFns.getWeeksInMonth(month, { locale: locale });
-        if (weeksInMonth < 6) {
-            var diffDays = dateFns.differenceInCalendarDays(dateFns.addWeeks(lastWeekDate, 6 - weeksInMonth), lastWeekDate);
-            for (var i = 0; i < diffDays; i++) {
-                var date = dateFns.addDays(lastWeekDate, i + 1);
-                var week = dateFns.getWeek(date, { locale: locale });
-                if (lastWeek.weekNumber !== week) {
-                    lastWeek = { weekNumber: week, dates: [] };
-                    weeks.push(lastWeek);
-                }
-                lastWeek.dates.push(date);
-            }
+    if (options === null || options === void 0 ? void 0 : options.useFixedWeeks) {
+        var nrOfMonthWeeks = dateFns.getWeeksInMonth(month, options);
+        if (nrOfMonthWeeks < 6) {
+            var lastWeek = weeksInMonth[weeksInMonth.length - 1];
+            var lastDate = lastWeek.dates[lastWeek.dates.length - 1];
+            var toDate = dateFns.addWeeks(lastDate, 6 - nrOfMonthWeeks);
+            var extraWeeks = daysToMonthWeeks(dateFns.addWeeks(lastDate, 1), toDate, options);
+            weeksInMonth.push.apply(weeksInMonth, extraWeeks);
         }
     }
-    return weeks;
+    return weeksInMonth;
 }
 
 /** Render the table with the calendar. */
 function Table(props) {
     var _a, _b, _c;
     var _d = useDayPicker(), locale = _d.locale, classNames = _d.classNames, styles = _d.styles, hideHead = _d.hideHead, fixedWeeks = _d.fixedWeeks, components = _d.components;
-    var weeks = getWeeks(props.displayMonth, { locale: locale, fixedWeeks: fixedWeeks });
+    var weeks = getMonthWeeks(props.displayMonth, {
+        useFixedWeeks: Boolean(fixedWeeks),
+        locale: locale
+    });
     var HeadComponent = (_a = components === null || components === void 0 ? void 0 : components.Head) !== null && _a !== void 0 ? _a : Head;
     var RowComponent = (_b = components === null || components === void 0 ? void 0 : components.Row) !== null && _b !== void 0 ? _b : Row;
     var FooterComponent = (_c = components === null || components === void 0 ? void 0 : components.Footer) !== null && _c !== void 0 ? _c : Footer;
@@ -2257,6 +2218,7 @@ exports.isDayPickerCustom = isDayPickerCustom;
 exports.isDayPickerMultiple = isDayPickerMultiple;
 exports.isDayPickerRange = isDayPickerRange;
 exports.isDayPickerSingle = isDayPickerSingle;
+exports.isMatch = isMatch;
 exports.useActiveModifiers = useActiveModifiers;
 exports.useDayPicker = useDayPicker;
 exports.useDayRender = useDayRender;