@cerebruminc/cerebellum 16.5.10-beta.dangerous.8acc3c1 → 16.5.10-beta.dangerous.9f03af8

package/lib/esm/{InlineDatePicker-RlV9iC8j.js → InlineDatePicker-XiMGS9jI.js}

@@ -2,7 +2,7 @@ import { b as __makeTemplateObject, f as __rest, _ as __assign } from './_tslib-
 import { jsxs, jsx } from 'react/jsx-runtime';
 import dayjs from 'dayjs';
 import * as React from 'react';
-import React__default, { useLayoutEffect, cloneElement, createRef, Component, useRef, useCallback, useEffect, createElement, useState, forwardRef } from 'react';
+import React__default, { useLayoutEffect, cloneElement, createRef, Component, useRef, useEffect, useCallback, createElement, useState, forwardRef } from 'react';
 import * as ReactDOM from 'react-dom';
 import ReactDOM__default from 'react-dom';
 import { colors } from './colors.js';
@@ -9672,7 +9672,7 @@ function useFloating(options) {
 }
 
 /*!
-  react-datepicker v8.8.0
+  react-datepicker v9.1.0
   https://github.com/Hacker0x01/react-datepicker
   Released under the MIT License.
 */
@@ -9736,17 +9736,19 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 };
 
 var CalendarContainer = function (_a) {
-    var _b = _a.showTimeSelectOnly, showTimeSelectOnly = _b === void 0 ? false : _b, _c = _a.showTime, showTime = _c === void 0 ? false : _c, className = _a.className, children = _a.children;
+    var _b = _a.showTimeSelectOnly, showTimeSelectOnly = _b === void 0 ? false : _b, _c = _a.showTime, showTime = _c === void 0 ? false : _c, className = _a.className, children = _a.children, inline = _a.inline;
     var ariaLabel = showTimeSelectOnly
         ? "Choose Time"
         : "Choose Date".concat(showTime ? " and Time" : "");
-    return (React__default.createElement("div", { className: className, role: "dialog", "aria-label": ariaLabel, "aria-modal": "true" }, children));
+    return (React__default.createElement("div", { className: className, "aria-label": ariaLabel, role: inline ? undefined : "dialog", "aria-modal": inline ? undefined : "true", translate: "no" }, children));
 };
 
 var useDetectClickOutside = function (onClickOutside, ignoreClass) {
     var ref = useRef(null);
     var onClickOutsideRef = useRef(onClickOutside);
-    onClickOutsideRef.current = onClickOutside;
+    useEffect(function () {
+        onClickOutsideRef.current = onClickOutside;
+    }, [onClickOutside]);
     var handleClickOutside = useCallback(function (event) {
         var _a;
         var target = (event.composed &&
@@ -9782,6 +9784,77 @@ var ClickOutsideWrapper = function (_a) {
         } }, children));
 };
 
+// Cache for the date-fns-tz module
+var dateFnsTz = null;
+var dateFnsTzLoadAttempted = false;
+/**
+ * Attempts to load date-fns-tz module.
+ * Returns null if the module is not installed.
+ */
+function getDateFnsTz() {
+    if (dateFnsTzLoadAttempted) {
+        return dateFnsTz;
+    }
+    dateFnsTzLoadAttempted = true;
+    try {
+        // Dynamic require for date-fns-tz
+        // Use a variable to prevent webpack from statically analyzing the require
+        // and showing warnings when the optional dependency is not installed
+        // See: https://github.com/Hacker0x01/react-datepicker/issues/6154
+        var dateFnsTzModuleName = "date-fns-tz";
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        dateFnsTz = require(dateFnsTzModuleName);
+    }
+    catch (_a) {
+        /* istanbul ignore next - only executes when date-fns-tz is not installed */
+        dateFnsTz = null;
+    }
+    return dateFnsTz;
+}
+/**
+ * Converts a date to the specified timezone.
+ * If no timezone is specified or date-fns-tz is not installed, returns the original date.
+ *
+ * @param date - The date to convert
+ * @param timeZone - The IANA timezone identifier (e.g., "America/New_York", "UTC")
+ * @returns The date in the specified timezone
+ */
+function toZonedTime(date, timeZone) {
+    if (!timeZone) {
+        return date;
+    }
+    var tz = getDateFnsTz();
+    if (!tz) {
+        if (process.env.NODE_ENV !== "production") {
+            console.warn('react-datepicker: timeZone prop requires "date-fns-tz" package. ' +
+                "Please install it: npm install date-fns-tz");
+        }
+        return date;
+    }
+    return tz.toZonedTime(date, timeZone);
+}
+/**
+ * Converts a date from the specified timezone to UTC.
+ * If no timezone is specified or date-fns-tz is not installed, returns the original date.
+ *
+ * @param date - The date in the specified timezone
+ * @param timeZone - The IANA timezone identifier (e.g., "America/New_York", "UTC")
+ * @returns The date in UTC
+ */
+function fromZonedTime(date, timeZone) {
+    if (!timeZone) {
+        return date;
+    }
+    var tz = getDateFnsTz();
+    if (!tz) {
+        if (process.env.NODE_ENV !== "production") {
+            console.warn('react-datepicker: timeZone prop requires "date-fns-tz" package. ' +
+                "Please install it: npm install date-fns-tz");
+        }
+        return date;
+    }
+    return tz.fromZonedTime(date, timeZone);
+}
 var KeyType;
 (function (KeyType) {
     KeyType["ArrowUp"] = "ArrowUp";
@@ -9838,20 +9911,72 @@ function parseDate(value, dateFormat, locale, strictParsing, refDate) {
             return parsedDate;
         }
     }
+    // When strictParsing is false, try native Date parsing as a fallback
+    // This allows flexible input formats like "12/05/2025" or "2025-12-16"
+    // even when the dateFormat prop specifies a different format.
+    // Only attempt this for inputs that look like complete dates (minimum
+    // length of 8 characters, e.g., "1/1/2000") to avoid parsing partial
+    // inputs like "03/" or "2000" which should be handled by parseDateForNavigation.
+    if (!strictParsing && value && value.length >= 8) {
+        var nativeDate = new Date(value);
+        if (isValid$1(nativeDate)) {
+            return nativeDate;
+        }
+    }
     return null;
 }
 /**
- * Checks if a given date is valid and not before the minimum date.
+ * Parses a partial date string for calendar navigation purposes.
+ * Unlike parseDate, this function attempts to extract whatever date
+ * information is available (year, month) from a partial input,
+ * returning a date suitable for navigating the calendar view.
+ *
+ * @param value - The date string to parse.
+ * @param refDate - The reference date to use for missing components.
+ * @returns - A date for navigation or null if no date info could be extracted.
+ */
+function parseDateForNavigation(value, refDate) {
+    if (refDate === void 0) { refDate = newDate(); }
+    if (!value)
+        return null;
+    // Try to extract a 4-digit year from the input
+    var yearMatch = value.match(/\b(1\d{3}|2\d{3})\b/);
+    if (!yearMatch || !yearMatch[1])
+        return null;
+    var year = parseInt(yearMatch[1], 10);
+    // Try to extract a month (1-12) from the input
+    // Look for patterns like "03/", "/03", "03-", "-03" or standalone "03" at start
+    var monthMatch = value.match(/(?:^|[/\-\s])?(0?[1-9]|1[0-2])(?:[/\-\s]|$)/);
+    var month = monthMatch && monthMatch[1]
+        ? parseInt(monthMatch[1], 10) - 1
+        : refDate.getMonth();
+    // Return a date with the extracted year and month, using day 1
+    return new Date(year, month, 1);
+}
+/**
+ * Checks if a given date is a valid Date object.
  * @param date - The date to be checked.
- * @param minDate - The minimum date allowed. If not provided, defaults to "1/1/1800".
- * @returns A boolean value indicating whether the date is valid and not before the minimum date.
+ * @returns A boolean value indicating whether the date is valid.
+ */
+function isValid(date) {
+    return isValid$1(date);
+}
+/**
+ * Safely returns a valid Date or null.
+ * This handles cases where a value might be passed as a string or other
+ * invalid type at runtime, even though TypeScript expects a Date.
+ * @param date - The value to check (typed as Date but could be anything at runtime)
+ * @returns The date if it's a valid Date object, otherwise null
  */
-function isValid(date, minDate) {
-    /* the fallback date is essential to not break test case
-     * `should auto update calendar when the updated date text is after props.minDate`
-     * and backward compatibility respectfully
-     */
-    return isValid$1(date) && !isBefore(date, new Date("1/1/1800"));
+function safeToDate(date) {
+    if (date == null) {
+        return null;
+    }
+    // Check if it's actually a Date object AND is valid
+    if (isDate(date) && isValid$1(date)) {
+        return date;
+    }
+    return null;
 }
 // ** Date Formatting **
 /**
@@ -10452,6 +10577,7 @@ function isTimeInDisabledRange(time, _a) {
         valid = !isWithinInterval(baseTime, { start: min, end: max });
     }
     catch (err) {
+        /* istanbul ignore next - date-fns historically threw on invalid intervals */
         valid = false;
     }
     return valid;
@@ -11027,6 +11153,10 @@ var Day = /** @class */ (function (_super) {
             var _a;
             var _b = _this.props, day = _b.day, selectsStart = _b.selectsStart, selectsEnd = _b.selectsEnd, selectsRange = _b.selectsRange, selectsDisabledDaysInRange = _b.selectsDisabledDaysInRange, startDate = _b.startDate, swapRange = _b.swapRange, endDate = _b.endDate;
             var selectingDate = (_a = _this.props.selectingDate) !== null && _a !== void 0 ? _a : _this.props.preSelection;
+            // Don't highlight days outside the current month
+            if (_this.isAfterMonth() || _this.isBeforeMonth()) {
+                return false;
+            }
             if (!(selectsStart || selectsEnd || selectsRange) ||
                 !selectingDate ||
                 (!selectsDisabledDaysInRange && _this.isDisabled())) {
@@ -11755,7 +11885,12 @@ var Month$1 = /** @class */ (function (_super) {
             });
         };
         _this.isSelectedQuarter = function (day, q, selected) {
-            return getQuarter(day) === q && getYear(day) === getYear(selected);
+            return getQuarter(selected) === q && getYear(day) === getYear(selected);
+        };
+        _this.isSelectQuarterInList = function (day, q, selectedDates) {
+            return selectedDates.some(function (selectedDate) {
+                return _this.isSelectedQuarter(day, q, selectedDate);
+            });
         };
         _this.isMonthSelected = function () {
             var _a = _this.props, day = _a.day, selected = _a.selected, selectedDates = _a.selectedDates, selectsMultiple = _a.selectsMultiple;
@@ -11767,7 +11902,21 @@ var Month$1 = /** @class */ (function (_super) {
             }
             return !!selected && _this.isSelectedMonth(day, monthIdx, selected);
         };
+        _this.isQuarterSelected = function () {
+            var _a = _this.props, day = _a.day, selected = _a.selected, selectedDates = _a.selectedDates, selectsMultiple = _a.selectsMultiple;
+            var quarterIdx = getQuarter(day);
+            if (selectsMultiple) {
+                return selectedDates === null || selectedDates === void 0 ? void 0 : selectedDates.some(function (selectedDate) {
+                    return _this.isSelectedQuarter(day, quarterIdx, selectedDate);
+                });
+            }
+            return !!selected && _this.isSelectedQuarter(day, quarterIdx, selected);
+        };
         _this.renderWeeks = function () {
+            // Return empty array if day is invalid
+            if (!isValid(_this.props.day)) {
+                return [];
+            }
             var weeks = [];
             var isFixedHeight = _this.props.fixedHeight;
             var i = 0;
@@ -12064,7 +12213,7 @@ var Month$1 = /** @class */ (function (_super) {
             return "".concat(prefix, " ").concat(formatDate(labelDate, "MMMM yyyy", locale));
         };
         _this.getQuarterClassNames = function (q) {
-            var _a = _this.props, day = _a.day, startDate = _a.startDate, endDate = _a.endDate, selected = _a.selected, minDate = _a.minDate, maxDate = _a.maxDate, excludeDates = _a.excludeDates, includeDates = _a.includeDates, filterDate = _a.filterDate, preSelection = _a.preSelection, disabledKeyboardNavigation = _a.disabledKeyboardNavigation, disabled = _a.disabled;
+            var _a = _this.props, day = _a.day, startDate = _a.startDate, endDate = _a.endDate, minDate = _a.minDate, maxDate = _a.maxDate, excludeDates = _a.excludeDates, includeDates = _a.includeDates, filterDate = _a.filterDate, preSelection = _a.preSelection, disabledKeyboardNavigation = _a.disabledKeyboardNavigation, disabled = _a.disabled;
             var isDisabled = (minDate ||
                 maxDate ||
                 excludeDates ||
@@ -12072,14 +12221,16 @@ var Month$1 = /** @class */ (function (_super) {
                 filterDate ||
                 disabled) &&
                 isQuarterDisabled(setQuarter(day, q), _this.props);
+            var selection = _this.getSelection();
             return clsx("react-datepicker__quarter-text", "react-datepicker__quarter-".concat(q), {
                 "react-datepicker__quarter-text--disabled": isDisabled,
-                "react-datepicker__quarter-text--selected": selected
-                    ? _this.isSelectedQuarter(day, q, selected)
+                "react-datepicker__quarter-text--selected": selection
+                    ? _this.isSelectQuarterInList(day, q, selection)
                     : undefined,
                 "react-datepicker__quarter-text--keyboard-selected": !disabledKeyboardNavigation &&
                     preSelection &&
                     _this.isSelectedQuarter(day, q, preSelection) &&
+                    !_this.isQuarterSelected() &&
                     !isDisabled,
                 "react-datepicker__quarter-text--in-selecting-range": _this.isInSelectingRangeQuarter(q),
                 "react-datepicker__quarter-text--in-range": startDate && endDate
@@ -12159,14 +12310,20 @@ var Month$1 = /** @class */ (function (_super) {
         var formattedAriaLabelPrefix = ariaLabelPrefix
             ? ariaLabelPrefix.trim() + " "
             : "";
+        // Format aria-label, return empty string if date is invalid
+        var formattedAriaLabel = isValid(day)
+            ? "".concat(formattedAriaLabelPrefix).concat(formatDate(day, "MMMM, yyyy", this.props.locale))
+            : "";
         var shouldUseListboxRole = showMonthYearPicker || showQuarterYearPicker;
         if (shouldUseListboxRole) {
-            return (React__default.createElement("div", { className: this.getClassNames(), onMouseLeave: !this.props.usePointerEvent ? this.handleMouseLeave : undefined, onPointerLeave: this.props.usePointerEvent ? this.handleMouseLeave : undefined, "aria-label": "".concat(formattedAriaLabelPrefix).concat(formatDate(day, "MMMM, yyyy", this.props.locale)), role: "listbox" }, showMonthYearPicker ? this.renderMonths() : this.renderQuarters()));
+            return (React__default.createElement("div", { className: this.getClassNames(), onMouseLeave: !this.props.usePointerEvent ? this.handleMouseLeave : undefined, onPointerLeave: this.props.usePointerEvent ? this.handleMouseLeave : undefined, "aria-label": formattedAriaLabel, role: "listbox" }, showMonthYearPicker ? this.renderMonths() : this.renderQuarters()));
         }
         // For regular calendar view, use table structure
         return (React__default.createElement("div", { role: "table" },
             this.props.dayNamesHeader && (React__default.createElement("div", { role: "rowgroup" }, this.props.dayNamesHeader)),
-            React__default.createElement("div", { className: this.getClassNames(), onMouseLeave: !this.props.usePointerEvent ? this.handleMouseLeave : undefined, onPointerLeave: this.props.usePointerEvent ? this.handleMouseLeave : undefined, "aria-label": "".concat(formattedAriaLabelPrefix).concat(formatDate(day, "MMMM, yyyy", this.props.locale)), role: "rowgroup" }, this.renderWeeks())));
+            this.props.monthHeader && (React__default.createElement("div", { role: "rowgroup" }, this.props.monthHeader)),
+            React__default.createElement("div", { className: this.getClassNames(), onMouseLeave: !this.props.usePointerEvent ? this.handleMouseLeave : undefined, onPointerLeave: this.props.usePointerEvent ? this.handleMouseLeave : undefined, "aria-label": formattedAriaLabel, role: "rowgroup" }, this.renderWeeks()),
+            this.props.monthFooter && (React__default.createElement("div", { role: "rowgroup" }, this.props.monthFooter))));
     };
     return Month;
 }(Component));
@@ -12277,10 +12434,15 @@ var MonthDropdown = /** @class */ (function (_super) {
     return MonthDropdown;
 }(Component));
 
-function generateMonthYears(minDate, maxDate) {
+// Default range: 5 years before and after current date
+var DEFAULT_YEAR_RANGE$1 = 5;
+function generateMonthYears(minDate, maxDate, currentDate) {
     var list = [];
-    var currDate = getStartOfMonth(minDate);
-    var lastDate = getStartOfMonth(maxDate);
+    // Use defaults if minDate/maxDate not provided
+    var effectiveMinDate = minDate !== null && minDate !== void 0 ? minDate : subYears(currentDate, DEFAULT_YEAR_RANGE$1);
+    var effectiveMaxDate = maxDate !== null && maxDate !== void 0 ? maxDate : addYears(currentDate, DEFAULT_YEAR_RANGE$1);
+    var currDate = getStartOfMonth(effectiveMinDate);
+    var lastDate = getStartOfMonth(effectiveMaxDate);
     while (!isAfter(currDate, lastDate)) {
         list.push(newDate(currDate));
         currDate = addMonths(currDate, 1);
@@ -12308,7 +12470,7 @@ var MonthYearDropdownOptions = /** @class */ (function (_super) {
             _this.props.onCancel();
         };
         _this.state = {
-            monthYearsList: generateMonthYears(_this.props.minDate, _this.props.maxDate),
+            monthYearsList: generateMonthYears(_this.props.minDate, _this.props.maxDate, _this.props.date),
         };
         return _this;
     }
@@ -12322,6 +12484,8 @@ var MonthYearDropdownOptions = /** @class */ (function (_super) {
     return MonthYearDropdownOptions;
 }(Component));
 
+// Default range: 5 years before and after current date
+var DEFAULT_YEAR_RANGE = 5;
 var MonthYearDropdown = /** @class */ (function (_super) {
     __extends(MonthYearDropdown, _super);
     function MonthYearDropdown() {
@@ -12330,8 +12494,12 @@ var MonthYearDropdown = /** @class */ (function (_super) {
             dropdownVisible: false,
         };
         _this.renderSelectOptions = function () {
-            var currDate = getStartOfMonth(_this.props.minDate);
-            var lastDate = getStartOfMonth(_this.props.maxDate);
+            var _a, _b;
+            // Use defaults if minDate/maxDate not provided
+            var minDate = (_a = _this.props.minDate) !== null && _a !== void 0 ? _a : subYears(_this.props.date, DEFAULT_YEAR_RANGE);
+            var maxDate = (_b = _this.props.maxDate) !== null && _b !== void 0 ? _b : addYears(_this.props.date, DEFAULT_YEAR_RANGE);
+            var currDate = getStartOfMonth(minDate);
+            var lastDate = getStartOfMonth(maxDate);
             var options = [];
             while (!isAfter(currDate, lastDate)) {
                 var timePoint = getTime(currDate);
@@ -12423,7 +12591,8 @@ var Time = /** @class */ (function (_super) {
             (_b = (_a = _this.props).onChange) === null || _b === void 0 ? void 0 : _b.call(_a, time);
         };
         _this.isSelectedTime = function (time) {
-            return _this.props.selected && isSameMinute(_this.props.selected, time);
+            var selected = safeToDate(_this.props.selected);
+            return selected && isSameMinute(selected, time);
         };
         _this.isDisabledTime = function (time) {
             return ((_this.props.minTime || _this.props.maxTime) &&
@@ -12484,7 +12653,9 @@ var Time = /** @class */ (function (_super) {
             var times = [];
             var format = typeof _this.props.format === "string" ? _this.props.format : "p";
             var intervals = (_a = _this.props.intervals) !== null && _a !== void 0 ? _a : Time.defaultProps.intervals;
-            var activeDate = _this.props.selected || _this.props.openToDate || newDate();
+            var activeDate = safeToDate(_this.props.selected) ||
+                safeToDate(_this.props.openToDate) ||
+                newDate();
             var base = getStartOfDay(activeDate);
             var sortedInjectTimes = _this.props.injectTimes &&
                 _this.props.injectTimes.sort(function (a, b) {
@@ -12564,9 +12735,13 @@ var Time = /** @class */ (function (_super) {
     };
     Time.prototype.updateContainerHeight = function () {
         if (this.props.monthRef && this.header) {
-            this.setState({
-                height: this.props.monthRef.clientHeight - this.header.clientHeight,
-            });
+            var newHeight = this.props.monthRef.clientHeight - this.header.clientHeight;
+            // Only update state if height actually changed to prevent infinite resize loops
+            if (this.state.height !== newHeight) {
+                this.setState({
+                    height: newHeight,
+                });
+            }
         }
     };
     Time.prototype.render = function () {
@@ -13254,7 +13429,13 @@ var Calendar = /** @class */ (function (_super) {
                 return ({
                     date: setMonth(date, Number(month)),
                 });
-            }, function () { return _this.handleMonthChange(_this.state.date); });
+            }, function () {
+                var _a, _b;
+                _this.handleMonthChange(_this.state.date);
+                // Reset monthSelectedIn to 0 so the target month appears in the leftmost position
+                // This ensures consistent behavior when using changeMonth in custom headers
+                (_b = (_a = _this.props).onMonthSelectedInChange) === null || _b === void 0 ? void 0 : _b.call(_a, 0);
+            });
         };
         _this.changeMonthYear = function (monthYear) {
             _this.setState(function (_a) {
@@ -13264,8 +13445,13 @@ var Calendar = /** @class */ (function (_super) {
                 });
             }, function () { return _this.handleMonthYearChange(_this.state.date); });
         };
-        _this.header = function (date) {
+        _this.header = function (date, customDayNameCount) {
             if (date === void 0) { date = _this.state.date; }
+            if (customDayNameCount === void 0) { customDayNameCount = 0; }
+            // Return empty array if date is invalid
+            if (!isValid(date)) {
+                return [];
+            }
             var disabled = _this.props.disabled;
             var startOfWeek = getStartOfWeek(date, _this.props.locale, _this.props.calendarStartDay);
             var dayNames = [];
@@ -13277,11 +13463,24 @@ var Calendar = /** @class */ (function (_super) {
             return dayNames.concat([0, 1, 2, 3, 4, 5, 6].map(function (offset) {
                 var day = addDays(startOfWeek, offset);
                 var weekDayName = _this.formatWeekday(day, _this.props.locale);
+                var fullDayName = formatDate(day, "EEEE", _this.props.locale);
                 var weekDayClassName = _this.props.weekDayClassName
                     ? _this.props.weekDayClassName(day)
                     : undefined;
+                // Use custom render if provided
+                if (_this.props.renderCustomDayName) {
+                    var customContent = _this.props.renderCustomDayName({
+                        day: day,
+                        shortName: weekDayName,
+                        fullName: fullDayName,
+                        locale: _this.props.locale,
+                        customDayNameCount: customDayNameCount,
+                    });
+                    return (React__default.createElement("div", { key: offset, role: "columnheader", className: clsx("react-datepicker__day-name", weekDayClassName, disabled ? "react-datepicker__day-name--disabled" : "") }, customContent));
+                }
+                // Default render
                 return (React__default.createElement("div", { key: offset, role: "columnheader", className: clsx("react-datepicker__day-name", weekDayClassName, disabled ? "react-datepicker__day-name--disabled" : "") },
-                    React__default.createElement("span", { className: "react-datepicker__sr-only" }, formatDate(day, "EEEE", _this.props.locale)),
+                    React__default.createElement("span", { className: "react-datepicker__sr-only" }, fullDayName),
                     React__default.createElement("span", { "aria-hidden": "true" }, weekDayName)));
             }));
         };
@@ -13460,7 +13659,9 @@ var Calendar = /** @class */ (function (_super) {
             if (_this.props.showMonthYearDropdown) {
                 classes.push("react-datepicker__current-month--hasMonthYearDropdown");
             }
-            return (React__default.createElement("h2", { className: classes.join(" ") }, formatDate(date, _this.props.dateFormat, _this.props.locale)));
+            return (React__default.createElement("h2", { className: classes.join(" ") }, isValid(date)
+                ? formatDate(date, _this.props.dateFormat, _this.props.locale)
+                : ""));
         };
         _this.renderYearDropdown = function (overrideHide) {
             if (overrideHide === void 0) { overrideHide = false; }
@@ -13493,17 +13694,31 @@ var Calendar = /** @class */ (function (_super) {
             }
             return (React__default.createElement("div", { className: "react-datepicker__today-button", onClick: _this.handleTodayButtonClick }, _this.props.todayButton));
         };
-        _this.renderDayNamesHeader = function (monthDate) { return (React__default.createElement("div", { className: "react-datepicker__day-names", role: "row" }, _this.header(monthDate))); };
+        _this.renderDayNamesHeader = function (monthDate, customDayNameCount) {
+            if (customDayNameCount === void 0) { customDayNameCount = 0; }
+            return (React__default.createElement("div", { className: "react-datepicker__day-names", role: "row" }, _this.header(monthDate, customDayNameCount)));
+        };
         _this.renderDefaultHeader = function (_a) {
             var monthDate = _a.monthDate, i = _a.i;
-            return (React__default.createElement("div", { className: "react-datepicker__header ".concat(_this.props.showTimeSelect
-                    ? "react-datepicker__header--has-time-select"
-                    : "") },
+            var headerContent = (React__default.createElement("div", { className: clsx("react-datepicker__header", {
+                    "react-datepicker__header--has-time-select": _this.props.showTimeSelect,
+                    "react-datepicker__header--middle": _this.props.monthHeaderPosition === "middle",
+                    "react-datepicker__header--bottom": _this.props.monthHeaderPosition === "bottom",
+                }) },
                 _this.renderCurrentMonth(monthDate),
                 React__default.createElement("div", { className: "react-datepicker__header__dropdown react-datepicker__header__dropdown--".concat(_this.props.dropdownMode), onFocus: _this.handleDropdownFocus },
                     _this.renderMonthDropdown(i !== 0),
                     _this.renderMonthYearDropdown(i !== 0),
                     _this.renderYearDropdown(i !== 0))));
+            // Top position: render header directly in default location
+            if (_this.props.monthHeaderPosition === "top") {
+                return headerContent;
+            }
+            // Middle/bottom positions: wrap with navigation buttons
+            return (React__default.createElement("div", { className: "react-datepicker__header-wrapper" },
+                _this.renderPreviousButton() || null,
+                _this.renderNextButton() || null,
+                headerContent));
         };
         _this.renderCustomHeader = function (headerArgs) {
             var _a, _b;
@@ -13572,8 +13787,13 @@ var Calendar = /** @class */ (function (_super) {
                 monthList.push(React__default.createElement("div", { key: monthKey, ref: function (div) {
                         _this.monthContainer = div !== null && div !== void 0 ? div : undefined;
                     }, className: "react-datepicker__month-container" },
-                    _this.renderHeader({ monthDate: monthDate, i: i }),
-                    React__default.createElement(Month$1, _assign({}, Calendar.defaultProps, _this.props, { containerRef: _this.containerRef, ariaLabelPrefix: _this.props.monthAriaLabelPrefix, day: monthDate, onDayClick: _this.handleDayClick, handleOnKeyDown: _this.props.handleOnDayKeyDown, handleOnMonthKeyDown: _this.props.handleOnKeyDown, onDayMouseEnter: _this.handleDayMouseEnter, onMouseLeave: _this.handleMonthMouseLeave, orderInDisplay: i, selectingDate: _this.state.selectingDate, monthShowsDuplicateDaysEnd: monthShowsDuplicateDaysEnd, monthShowsDuplicateDaysStart: monthShowsDuplicateDaysStart, dayNamesHeader: _this.renderDayNamesHeader(monthDate) }))));
+                    _this.props.monthHeaderPosition === "top" &&
+                        _this.renderHeader({ monthDate: monthDate, i: i }),
+                    React__default.createElement(Month$1, _assign({}, Calendar.defaultProps, _this.props, { containerRef: _this.containerRef, ariaLabelPrefix: _this.props.monthAriaLabelPrefix, day: monthDate, onDayClick: _this.handleDayClick, handleOnKeyDown: _this.props.handleOnDayKeyDown, handleOnMonthKeyDown: _this.props.handleOnKeyDown, onDayMouseEnter: _this.handleDayMouseEnter, onMouseLeave: _this.handleMonthMouseLeave, orderInDisplay: i, selectingDate: _this.state.selectingDate, monthShowsDuplicateDaysEnd: monthShowsDuplicateDaysEnd, monthShowsDuplicateDaysStart: monthShowsDuplicateDaysStart, dayNamesHeader: _this.renderDayNamesHeader(monthDate, i), monthHeader: _this.props.monthHeaderPosition === "middle"
+                            ? _this.renderHeader({ monthDate: monthDate, i: i })
+                            : undefined, monthFooter: _this.props.monthHeaderPosition === "bottom"
+                            ? _this.renderHeader({ monthDate: monthDate, i: i })
+                            : undefined }))));
             }
             return monthList;
         };
@@ -13596,6 +13816,34 @@ var Calendar = /** @class */ (function (_super) {
             return;
         };
         _this.renderInputTimeSection = function () {
+            var _a, _b;
+            if (!_this.props.showTimeInput) {
+                return;
+            }
+            // Handle selectsRange mode - render two time inputs
+            if (_this.props.selectsRange) {
+                var _c = _this.props, startDate = _c.startDate, endDate = _c.endDate;
+                var startTime = startDate ? new Date(startDate) : undefined;
+                var startTimeValid = startTime && isValid(startTime) && Boolean(startDate);
+                var startTimeString = startTimeValid
+                    ? "".concat(addZero(startTime.getHours()), ":").concat(addZero(startTime.getMinutes()))
+                    : "";
+                var endTime = endDate ? new Date(endDate) : undefined;
+                var endTimeValid = endTime && isValid(endTime) && Boolean(endDate);
+                var endTimeString = endTimeValid
+                    ? "".concat(addZero(endTime.getHours()), ":").concat(addZero(endTime.getMinutes()))
+                    : "";
+                return (React__default.createElement(React__default.Fragment, null,
+                    React__default.createElement(InputTime, _assign({}, Calendar.defaultProps, _this.props, { date: startTime, timeString: startTimeString, onChange: function (time) {
+                            var _a, _b;
+                            (_b = (_a = _this.props).onTimeChange) === null || _b === void 0 ? void 0 : _b.call(_a, time, "start");
+                        }, timeInputLabel: ((_a = _this.props.timeInputLabel) !== null && _a !== void 0 ? _a : "Time") + " (Start)" })),
+                    React__default.createElement(InputTime, _assign({}, Calendar.defaultProps, _this.props, { date: endTime, timeString: endTimeString, onChange: function (time) {
+                            var _a, _b;
+                            (_b = (_a = _this.props).onTimeChange) === null || _b === void 0 ? void 0 : _b.call(_a, time, "end");
+                        }, timeInputLabel: ((_b = _this.props.timeInputLabel) !== null && _b !== void 0 ? _b : "Time") + " (End)" }))));
+            }
+            // Single date mode (original behavior)
             var time = _this.props.selected
                 ? new Date(_this.props.selected)
                 : undefined;
@@ -13603,13 +13851,17 @@ var Calendar = /** @class */ (function (_super) {
             var timeString = timeValid
                 ? "".concat(addZero(time.getHours()), ":").concat(addZero(time.getMinutes()))
                 : "";
-            if (_this.props.showTimeInput) {
-                return (React__default.createElement(InputTime, _assign({}, Calendar.defaultProps, _this.props, { date: time, timeString: timeString, onChange: _this.props.onTimeChange })));
-            }
-            return;
+            return (React__default.createElement(InputTime, _assign({}, Calendar.defaultProps, _this.props, { date: time, timeString: timeString, onChange: function (time) {
+                    var _a, _b;
+                    (_b = (_a = _this.props).onTimeChange) === null || _b === void 0 ? void 0 : _b.call(_a, time);
+                } })));
         };
         _this.renderAriaLiveRegion = function () {
             var _a;
+            // Don't render aria-live message if date is invalid
+            if (!isValid(_this.state.date)) {
+                return (React__default.createElement("span", { role: "alert", "aria-live": "polite", className: "react-datepicker__aria-live" }));
+            }
             var _b = getYearsPeriod(_this.state.date, (_a = _this.props.yearItemNumber) !== null && _a !== void 0 ? _a : Calendar.defaultProps.yearItemNumber), startPeriod = _b.startPeriod, endPeriod = _b.endPeriod;
             var ariaLiveMessage;
             if (_this.props.showYearPicker) {
@@ -13651,6 +13903,7 @@ var Calendar = /** @class */ (function (_super) {
                 previousMonthButtonLabel: "Previous Month",
                 nextMonthButtonLabel: "Next Month",
                 yearItemNumber: DEFAULT_YEAR_ITEM_NUMBER,
+                monthHeaderPosition: "top",
             };
         },
         enumerable: false,
@@ -13671,6 +13924,7 @@ var Calendar = /** @class */ (function (_super) {
     Calendar.prototype.componentDidUpdate = function (prevProps) {
         var _this = this;
         if (this.props.preSelection &&
+            isValid(this.props.preSelection) &&
             (!isSameDay(this.props.preSelection, prevProps.preSelection) ||
                 this.props.monthSelectedIn !== prevProps.monthSelectedIn)) {
             var hasMonthChanged_1 = !isSameMonth(this.state.date, this.props.preSelection);
@@ -13691,10 +13945,12 @@ var Calendar = /** @class */ (function (_super) {
             React__default.createElement("div", { style: { display: "contents" }, ref: this.containerRef },
                 React__default.createElement(Container, { className: clsx("react-datepicker", this.props.className, {
                         "react-datepicker--time-only": this.props.showTimeSelectOnly,
-                    }), showTime: this.props.showTimeSelect || this.props.showTimeInput, showTimeSelectOnly: this.props.showTimeSelectOnly },
+                    }), showTime: this.props.showTimeSelect || this.props.showTimeInput, showTimeSelectOnly: this.props.showTimeSelectOnly, inline: this.props.inline },
                     this.renderAriaLiveRegion(),
-                    this.renderPreviousButton(),
-                    this.renderNextButton(),
+                    this.props.monthHeaderPosition === "top" &&
+                        this.renderPreviousButton(),
+                    this.props.monthHeaderPosition === "top" &&
+                        this.renderNextButton(),
                     this.renderMonths(),
                     this.renderYears(),
                     this.renderTodayButton(),
@@ -13885,6 +14141,7 @@ function withFloating(Component) {
         var floatingProps = useFloating(_assign({ open: !hidePopper, whileElementsMounted: autoUpdate, placement: props.popperPlacement, middleware: __spreadArray([
                 flip({ padding: 15 }),
                 offset(10),
+                // eslint-disable-next-line react-hooks/refs -- Floating UI requires refs to be passed during render
                 arrow({ element: arrowRef })
             ], ((_a = props.popperModifiers) !== null && _a !== void 0 ? _a : []), true) }, props.popperProps));
         var componentProps = _assign(_assign({}, props), { hidePopper: hidePopper, popperProps: _assign(_assign({}, floatingProps), { arrowRef: arrowRef }) });
@@ -13895,11 +14152,21 @@ function withFloating(Component) {
 }
 
 // Exported for testing purposes
-var PopperComponent = function (props) {
-    var className = props.className, wrapperClassName = props.wrapperClassName, _a = props.hidePopper, hidePopper = _a === void 0 ? true : _a, popperComponent = props.popperComponent, targetComponent = props.targetComponent, enableTabLoop = props.enableTabLoop, popperOnKeyDown = props.popperOnKeyDown, portalId = props.portalId, portalHost = props.portalHost, popperProps = props.popperProps, showArrow = props.showArrow;
+var PopperComponent$1 = function (props) {
+    var className = props.className, wrapperClassName = props.wrapperClassName, _a = props.hidePopper, hidePopper = _a === void 0 ? true : _a, popperComponent = props.popperComponent, targetComponent = props.targetComponent, enableTabLoop = props.enableTabLoop, popperOnKeyDown = props.popperOnKeyDown, portalId = props.portalId, portalHost = props.portalHost, popperProps = props.popperProps, showArrow = props.showArrow, popperTargetRef = props.popperTargetRef, monthHeaderPosition = props.monthHeaderPosition;
+    // When a custom popperTargetRef is provided, use it as the position reference
+    // This allows the popper to be positioned relative to a specific element
+    // within the custom input, rather than the wrapper div
+    useEffect(function () {
+        if (popperTargetRef === null || popperTargetRef === void 0 ? void 0 : popperTargetRef.current) {
+            popperProps.refs.setPositionReference(popperTargetRef.current);
+        }
+    }, [popperTargetRef, popperProps.refs]);
     var popper = undefined;
     if (!hidePopper) {
-        var classes = clsx("react-datepicker-popper", className);
+        var classes = clsx("react-datepicker-popper", !showArrow && "react-datepicker-popper-offset", monthHeaderPosition === "middle" &&
+            "react-datepicker-popper--header-middle", monthHeaderPosition === "bottom" &&
+            "react-datepicker-popper--header-bottom", className);
         popper = (React__default.createElement(TabLoop, { enableTabLoop: enableTabLoop },
             React__default.createElement("div", { ref: popperProps.refs.setFloating, style: popperProps.floatingStyles, className: classes, "data-placement": popperProps.placement, onKeyDown: popperOnKeyDown },
                 popperComponent,
@@ -13916,7 +14183,7 @@ var PopperComponent = function (props) {
         React__default.createElement("div", { ref: popperProps.refs.setReference, className: wrapperClasses }, targetComponent),
         popper));
 };
-var PopperComponent$1 = withFloating(PopperComponent);
+var PopperComponent = withFloating(PopperComponent$1);
 
 // Compares dates year+month combinations
 function hasPreSelectionChanged(date1, date2) {
@@ -13936,27 +14203,32 @@ var DatePicker = /** @class */ (function (_super) {
         _this.calendar = null;
         _this.input = null;
         _this.getPreSelection = function () {
-            return _this.props.openToDate
+            var timeZone = _this.props.timeZone;
+            var baseDate = _this.props.openToDate
                 ? _this.props.openToDate
                 : _this.props.selectsEnd && _this.props.startDate
                     ? _this.props.startDate
                     : _this.props.selectsStart && _this.props.endDate
                         ? _this.props.endDate
                         : newDate();
+            // Convert to the specified timezone for display
+            return timeZone ? toZonedTime(baseDate, timeZone) : baseDate;
         };
         // Convert the date from string format to standard Date format
+        // Uses parseDate with ISO format to parse as local time, preventing
+        // dates from shifting in timezones west of UTC. See issue #6105.
         _this.modifyHolidays = function () {
             var _a;
             return (_a = _this.props.holidays) === null || _a === void 0 ? void 0 : _a.reduce(function (accumulator, holiday) {
-                var date = new Date(holiday.date);
-                if (!isValid(date)) {
+                var date = parseDate(holiday.date, "yyyy-MM-dd", undefined, false);
+                if (!date) {
                     return accumulator;
                 }
                 return __spreadArray(__spreadArray([], accumulator, true), [_assign(_assign({}, holiday), { date: date })], false);
             }, []);
         };
         _this.calcInitialState = function () {
-            var _a;
+            var timeZone = _this.props.timeZone;
             var defaultPreSelection = _this.getPreSelection();
             var minDate = getEffectiveMinDate(_this.props);
             var maxDate = getEffectiveMaxDate(_this.props);
@@ -13965,13 +14237,18 @@ var DatePicker = /** @class */ (function (_super) {
                 : maxDate && isAfter(defaultPreSelection, getEndOfDay(maxDate))
                     ? maxDate
                     : defaultPreSelection;
+            // Convert selected/startDate to zoned time for display if timezone is specified
+            var initialPreSelection = _this.props.selectsRange
+                ? _this.props.startDate
+                : _this.props.selected;
+            if (initialPreSelection && timeZone) {
+                initialPreSelection = toZonedTime(initialPreSelection, timeZone);
+            }
             return {
                 open: _this.props.startOpen || false,
                 preventFocus: false,
                 inputValue: null,
-                preSelection: (_a = (_this.props.selectsRange
-                    ? _this.props.startDate
-                    : _this.props.selected)) !== null && _a !== void 0 ? _a : boundedPreSelection,
+                preSelection: initialPreSelection !== null && initialPreSelection !== void 0 ? initialPreSelection : boundedPreSelection,
                 // transforming highlighted days (perhaps nested array)
                 // to flat Map for faster access in day.jsx
                 highlightDates: getHighLightDaysMap(_this.props.highlightDates),
@@ -13985,7 +14262,7 @@ var DatePicker = /** @class */ (function (_super) {
         };
         _this.getInputValue = function () {
             var _a;
-            var _b = _this.props, locale = _b.locale, startDate = _b.startDate, endDate = _b.endDate, rangeSeparator = _b.rangeSeparator, selected = _b.selected, selectedDates = _b.selectedDates, selectsMultiple = _b.selectsMultiple, selectsRange = _b.selectsRange, value = _b.value;
+            var _b = _this.props, locale = _b.locale, startDate = _b.startDate, endDate = _b.endDate, rangeSeparator = _b.rangeSeparator, selected = _b.selected, selectedDates = _b.selectedDates, selectsMultiple = _b.selectsMultiple, selectsRange = _b.selectsRange, formatMultipleDates = _b.formatMultipleDates, value = _b.value;
             var dateFormat = (_a = _this.props.dateFormat) !== null && _a !== void 0 ? _a : DatePicker.defaultProps.dateFormat;
             var inputValue = _this.state.inputValue;
             if (typeof value === "string") {
@@ -14002,6 +14279,12 @@ var DatePicker = /** @class */ (function (_super) {
                 });
             }
             else if (selectsMultiple) {
+                if (formatMultipleDates) {
+                    var formatDateFn = function (date) {
+                        return safeDateFormat(date, { dateFormat: dateFormat, locale: locale });
+                    };
+                    return formatMultipleDates(selectedDates !== null && selectedDates !== void 0 ? selectedDates : [], formatDateFn);
+                }
                 return safeMultipleDatesFormat(selectedDates !== null && selectedDates !== void 0 ? selectedDates : [], {
                     dateFormat: dateFormat,
                     locale: locale,
@@ -14119,6 +14402,19 @@ var DatePicker = /** @class */ (function (_super) {
             if (!_this.state.open || _this.props.withPortal || _this.props.showTimeInput) {
                 (_b = (_a = _this.props).onBlur) === null || _b === void 0 ? void 0 : _b.call(_a, event);
             }
+            // If user cleared the input via a mask library (inputValue has no date-like
+            // characters), clear the selection on blur (fixes issue #5814 with mask inputs)
+            var inputValue = _this.state.inputValue;
+            if (typeof inputValue === "string" && inputValue.length > 0) {
+                // Check if input looks like a cleared mask (no alphanumeric characters)
+                // This distinguishes between:
+                // - "__/__/____" (cleared mask) → should clear selection
+                // - "2025-02-45" (invalid date) → should keep previous selection
+                var hasDateCharacters = /[a-zA-Z0-9]/.test(inputValue);
+                if (!hasDateCharacters && _this.props.selected) {
+                    _this.setSelected(null, undefined, true);
+                }
+            }
             _this.resetInputValue();
             if (_this.state.open && _this.props.open === false) {
                 _this.setOpen(false);
@@ -14127,17 +14423,19 @@ var DatePicker = /** @class */ (function (_super) {
         };
         _this.handleCalendarClickOutside = function (event) {
             var _a, _b;
-            if (!_this.props.inline) {
+            // Call user's onClickOutside first, allowing them to call preventDefault()
+            (_b = (_a = _this.props).onClickOutside) === null || _b === void 0 ? void 0 : _b.call(_a, event);
+            // Only close if not prevented and not inline
+            if (!_this.props.inline && !event.defaultPrevented) {
                 _this.setOpen(false);
             }
-            (_b = (_a = _this.props).onClickOutside) === null || _b === void 0 ? void 0 : _b.call(_a, event);
             if (_this.props.withPortal) {
                 event.preventDefault();
             }
         };
         // handleChange is called when user types in the textbox
         _this.handleChange = function () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             var allArgs = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 allArgs[_i] = arguments[_i];
@@ -14155,24 +14453,24 @@ var DatePicker = /** @class */ (function (_super) {
                 inputValue: (event === null || event === void 0 ? void 0 : event.target) instanceof HTMLInputElement ? event.target.value : null,
                 lastPreSelectChange: PRESELECT_CHANGE_VIA_INPUT,
             });
-            var _f = _this.props, selectsRange = _f.selectsRange, startDate = _f.startDate, endDate = _f.endDate;
+            var _j = _this.props, selectsRange = _j.selectsRange, startDate = _j.startDate, endDate = _j.endDate;
             var dateFormat = (_a = _this.props.dateFormat) !== null && _a !== void 0 ? _a : DatePicker.defaultProps.dateFormat;
             var strictParsing = (_b = _this.props.strictParsing) !== null && _b !== void 0 ? _b : DatePicker.defaultProps.strictParsing;
             var value = (event === null || event === void 0 ? void 0 : event.target) instanceof HTMLInputElement ? event.target.value : "";
             if (selectsRange) {
                 var rangeSeparator = _this.props.rangeSeparator;
                 var trimmedRangeSeparator = rangeSeparator.trim();
-                var _g = value
+                var _k = value
                     .split(dateFormat.includes(trimmedRangeSeparator)
                     ? rangeSeparator
                     : trimmedRangeSeparator, 2)
-                    .map(function (val) { return val.trim(); }), valueStart = _g[0], valueEnd = _g[1];
+                    .map(function (val) { return val.trim(); }), valueStart = _k[0], valueEnd = _k[1];
                 var startDateNew = parseDate(valueStart !== null && valueStart !== void 0 ? valueStart : "", dateFormat, _this.props.locale, strictParsing);
                 var endDateNew = startDateNew
                     ? parseDate(valueEnd !== null && valueEnd !== void 0 ? valueEnd : "", dateFormat, _this.props.locale, strictParsing)
                     : null;
-                var startChanged = (startDate === null || startDate === void 0 ? void 0 : startDate.getTime()) !== (startDateNew === null || startDateNew === void 0 ? void 0 : startDateNew.getTime());
-                var endChanged = (endDate === null || endDate === void 0 ? void 0 : endDate.getTime()) !== (endDateNew === null || endDateNew === void 0 ? void 0 : endDateNew.getTime());
+                var startChanged = ((_c = safeToDate(startDate)) === null || _c === void 0 ? void 0 : _c.getTime()) !== (startDateNew === null || startDateNew === void 0 ? void 0 : startDateNew.getTime());
+                var endChanged = ((_d = safeToDate(endDate)) === null || _d === void 0 ? void 0 : _d.getTime()) !== (endDateNew === null || endDateNew === void 0 ? void 0 : endDateNew.getTime());
                 if (!startChanged && !endChanged) {
                     return;
                 }
@@ -14182,15 +14480,31 @@ var DatePicker = /** @class */ (function (_super) {
                 if (endDateNew && isDayDisabled(endDateNew, _this.props)) {
                     return;
                 }
-                (_d = (_c = _this.props).onChange) === null || _d === void 0 ? void 0 : _d.call(_c, [startDateNew, endDateNew], event);
+                // Update preSelection to keep calendar viewport consistent when reopening
+                // Use startDate for preSelection to match calcInitialState behavior
+                if (startDateNew) {
+                    _this.setState({ preSelection: startDateNew });
+                }
+                (_f = (_e = _this.props).onChange) === null || _f === void 0 ? void 0 : _f.call(_e, [startDateNew, endDateNew], event);
             }
             else {
                 // not selectsRange
-                var date = parseDate(value, dateFormat, _this.props.locale, strictParsing, (_e = _this.props.selected) !== null && _e !== void 0 ? _e : undefined);
+                var date = parseDate(value, dateFormat, _this.props.locale, strictParsing, (_g = _this.props.selected) !== null && _g !== void 0 ? _g : undefined);
                 // Update selection if either (1) date was successfully parsed, or (2) input field is empty
                 if (date || !value) {
                     _this.setSelected(date, event, true);
                 }
+                else if (!_this.props.inline) {
+                    // If full date parsing failed but we have partial input,
+                    // try to extract date info for calendar navigation
+                    var navDate = parseDateForNavigation(value, (_h = _this.state.preSelection) !== null && _h !== void 0 ? _h : undefined);
+                    // Only update preSelection if navDate is valid and within min/max bounds
+                    if (navDate &&
+                        (!_this.props.minDate || !isBefore(navDate, _this.props.minDate)) &&
+                        (!_this.props.maxDate || !isAfter(navDate, _this.props.maxDate))) {
+                        _this.setState({ preSelection: navDate });
+                    }
+                }
             }
         };
         _this.handleSelect = function (date, event, monthSelectedIn) {
@@ -14229,7 +14543,13 @@ var DatePicker = /** @class */ (function (_super) {
         // setSelected is called either from handleChange (user typed date into textbox and it was parsed) or handleSelect (user selected date from calendar using mouse or keyboard)
         _this.setSelected = function (date, event, keepInput, monthSelectedIn) {
             var _a, _b;
+            var timeZone = _this.props.timeZone;
+            // If timezone is specified, convert the selected date from zoned time to UTC
+            // This ensures the onChange callback receives a proper UTC Date object
             var changedDate = date;
+            if (changedDate && timeZone) {
+                changedDate = fromZonedTime(changedDate, timeZone);
+            }
             // Early return if selected year/month/day is disabled
             if (_this.props.showYearPicker) {
                 if (changedDate !== null &&
@@ -14286,54 +14606,56 @@ var DatePicker = /** @class */ (function (_super) {
                     }
                 }
                 if (selectsRange) {
+                    var onChangeRange = onChange;
                     var noRanges = !startDate && !endDate;
                     var hasStartRange = startDate && !endDate;
                     var hasOnlyEndRange = !startDate && !!endDate;
                     var isRangeFilled = startDate && endDate;
                     if (noRanges) {
-                        onChange === null || onChange === void 0 ? void 0 : onChange([changedDate, null], event);
+                        onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([changedDate, null], event);
                     }
                     else if (hasStartRange) {
                         if (changedDate === null) {
-                            onChange === null || onChange === void 0 ? void 0 : onChange([null, null], event);
+                            onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([null, null], event);
                         }
                         else if (isDateBefore(changedDate, startDate)) {
                             if (swapRange) {
-                                onChange === null || onChange === void 0 ? void 0 : onChange([changedDate, startDate], event);
+                                onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([changedDate, startDate], event);
                             }
                             else {
-                                onChange === null || onChange === void 0 ? void 0 : onChange([changedDate, null], event);
+                                onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([changedDate, null], event);
                             }
                         }
                         else {
-                            onChange === null || onChange === void 0 ? void 0 : onChange([startDate, changedDate], event);
+                            onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([startDate, changedDate], event);
                         }
                     }
                     else if (hasOnlyEndRange) {
                         if (changedDate && isDateBefore(changedDate, endDate)) {
-                            onChange === null || onChange === void 0 ? void 0 : onChange([changedDate, endDate], event);
+                            onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([changedDate, endDate], event);
                         }
                         else {
-                            onChange === null || onChange === void 0 ? void 0 : onChange([changedDate, null], event);
+                            onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([changedDate, null], event);
                         }
                     }
                     if (isRangeFilled) {
-                        onChange === null || onChange === void 0 ? void 0 : onChange([changedDate, null], event);
+                        onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([changedDate, null], event);
                     }
                 }
                 else if (selectsMultiple) {
+                    var onChangeMultiple = onChange;
                     if (changedDate !== null) {
                         if (!(selectedDates === null || selectedDates === void 0 ? void 0 : selectedDates.length)) {
-                            onChange === null || onChange === void 0 ? void 0 : onChange([changedDate], event);
+                            onChangeMultiple === null || onChangeMultiple === void 0 ? void 0 : onChangeMultiple([changedDate], event);
                         }
                         else {
                             var isChangedDateAlreadySelected = selectedDates.some(function (selectedDate) { return isSameDay(selectedDate, changedDate); });
                             if (isChangedDateAlreadySelected) {
                                 var nextDates = selectedDates.filter(function (selectedDate) { return !isSameDay(selectedDate, changedDate); });
-                                onChange === null || onChange === void 0 ? void 0 : onChange(nextDates, event);
+                                onChangeMultiple === null || onChangeMultiple === void 0 ? void 0 : onChangeMultiple(nextDates, event);
                             }
                             else {
-                                onChange === null || onChange === void 0 ? void 0 : onChange(__spreadArray(__spreadArray([], selectedDates, true), [changedDate], false), event);
+                                onChangeMultiple === null || onChangeMultiple === void 0 ? void 0 : onChangeMultiple(__spreadArray(__spreadArray([], selectedDates, true), [changedDate], false), event);
                             }
                         }
                     }
@@ -14382,24 +14704,135 @@ var DatePicker = /** @class */ (function (_super) {
         _this.toggleCalendar = function () {
             _this.setOpen(!_this.state.open);
         };
-        _this.handleTimeChange = function (time) {
+        _this.handleTimeChange = function (time, modifyDateType) {
             var _a, _b;
-            if (_this.props.selectsRange || _this.props.selectsMultiple) {
+            if (_this.props.selectsMultiple) {
                 return;
             }
-            var selected = _this.props.selected
-                ? _this.props.selected
-                : _this.getPreSelection();
-            var changedDate = _this.props.selected
-                ? time
-                : setTime(selected, {
-                    hour: getHours(time),
-                    minute: getMinutes(time),
+            var _c = _this.props, selectsRange = _c.selectsRange, startDate = _c.startDate, endDate = _c.endDate, onChange = _c.onChange, timeZone = _c.timeZone;
+            if (selectsRange) {
+                var onChangeRange = onChange;
+                // In range mode, apply time to the appropriate date
+                // If modifyDateType is specified, use that to determine which date to modify
+                // Otherwise, use the legacy behavior:
+                // - If we have a startDate but no endDate, apply time to startDate
+                // - If we have both, apply time to endDate
+                if (modifyDateType === "start") {
+                    // Explicitly modify start date
+                    if (startDate) {
+                        var changedStartDate = setTime(startDate, {
+                            hour: getHours(time),
+                            minute: getMinutes(time),
+                        });
+                        _this.setState({
+                            preSelection: changedStartDate,
+                        });
+                        // Convert from zoned time to UTC if timezone is specified
+                        if (timeZone) {
+                            changedStartDate = fromZonedTime(changedStartDate, timeZone);
+                        }
+                        onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([
+                            changedStartDate,
+                            endDate
+                                ? timeZone
+                                    ? fromZonedTime(endDate, timeZone)
+                                    : endDate
+                                : null,
+                        ], undefined);
+                    }
+                }
+                else if (modifyDateType === "end") {
+                    // Explicitly modify end date
+                    if (endDate) {
+                        var changedEndDate = setTime(endDate, {
+                            hour: getHours(time),
+                            minute: getMinutes(time),
+                        });
+                        _this.setState({
+                            preSelection: changedEndDate,
+                        });
+                        // Convert from zoned time to UTC if timezone is specified
+                        if (timeZone) {
+                            changedEndDate = fromZonedTime(changedEndDate, timeZone);
+                        }
+                        onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([
+                            startDate
+                                ? timeZone
+                                    ? fromZonedTime(startDate, timeZone)
+                                    : startDate
+                                : null,
+                            changedEndDate,
+                        ], undefined);
+                    }
+                }
+                else {
+                    // Legacy behavior for showTimeSelect (single time picker)
+                    var hasStartRange = startDate && !endDate;
+                    if (hasStartRange) {
+                        // Apply time to startDate
+                        var changedStartDate = setTime(startDate, {
+                            hour: getHours(time),
+                            minute: getMinutes(time),
+                        });
+                        _this.setState({
+                            preSelection: changedStartDate,
+                        });
+                        // Convert from zoned time to UTC if timezone is specified
+                        if (timeZone) {
+                            changedStartDate = fromZonedTime(changedStartDate, timeZone);
+                        }
+                        onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([changedStartDate, null], undefined);
+                    }
+                    else if (startDate && endDate) {
+                        // Apply time to endDate
+                        var changedEndDate = setTime(endDate, {
+                            hour: getHours(time),
+                            minute: getMinutes(time),
+                        });
+                        _this.setState({
+                            preSelection: changedEndDate,
+                        });
+                        // Convert from zoned time to UTC if timezone is specified
+                        if (timeZone) {
+                            changedEndDate = fromZonedTime(changedEndDate, timeZone);
+                        }
+                        onChangeRange === null || onChangeRange === void 0 ? void 0 : onChangeRange([
+                            timeZone ? fromZonedTime(startDate, timeZone) : startDate,
+                            changedEndDate,
+                        ], undefined);
+                    }
+                    else {
+                        // No dates selected yet, just update preSelection
+                        var changedDate = setTime(_this.getPreSelection(), {
+                            hour: getHours(time),
+                            minute: getMinutes(time),
+                        });
+                        _this.setState({
+                            preSelection: changedDate,
+                        });
+                    }
+                }
+            }
+            else {
+                // Single date mode (original behavior)
+                var selected = _this.props.selected
+                    ? _this.props.selected
+                    : _this.getPreSelection();
+                var changedDate = _this.props.selected
+                    ? time
+                    : setTime(selected, {
+                        hour: getHours(time),
+                        minute: getMinutes(time),
+                    });
+                _this.setState({
+                    preSelection: changedDate,
                 });
-            _this.setState({
-                preSelection: changedDate,
-            });
-            (_b = (_a = _this.props).onChange) === null || _b === void 0 ? void 0 : _b.call(_a, changedDate);
+                // Convert from zoned time to UTC if timezone is specified
+                if (changedDate && timeZone) {
+                    changedDate = fromZonedTime(changedDate, timeZone);
+                }
+                (_b = (_a = _this.props).onChange) === null || _b === void 0 ? void 0 : _b.call(_a, changedDate);
+            }
             if (_this.props.shouldCloseOnSelect && !_this.props.showTimeInput) {
                 _this.sendFocusBackToInput();
                 _this.setOpen(false);
@@ -14419,6 +14852,117 @@ var DatePicker = /** @class */ (function (_super) {
             }
             (_b = (_a = _this.props).onInputClick) === null || _b === void 0 ? void 0 : _b.call(_a);
         };
+        _this.handleTimeOnlyArrowKey = function (eventKey) {
+            var _a, _b, _c, _d;
+            var currentTime = safeToDate(_this.props.selected) || _this.state.preSelection || newDate();
+            var timeIntervals = (_a = _this.props.timeIntervals) !== null && _a !== void 0 ? _a : 30;
+            var dateFormat = (_b = _this.props.dateFormat) !== null && _b !== void 0 ? _b : DatePicker.defaultProps.dateFormat;
+            var formatStr = Array.isArray(dateFormat) ? dateFormat[0] : dateFormat;
+            var baseDate = getStartOfDay(currentTime);
+            var currentMinutes = getHours(currentTime) * 60 + getMinutes(currentTime);
+            var maxMinutes = 23 * 60 + 60 - timeIntervals; // Cap at last valid interval of the day
+            var newTime;
+            if (eventKey === KeyType.ArrowUp) {
+                var newMinutes = Math.max(0, currentMinutes - timeIntervals);
+                newTime = addMinutes(baseDate, newMinutes);
+            }
+            else {
+                var newMinutes = Math.min(maxMinutes, currentMinutes + timeIntervals);
+                newTime = addMinutes(baseDate, newMinutes);
+            }
+            var formattedTime = formatDate(newTime, formatStr || DatePicker.defaultProps.dateFormat, _this.props.locale);
+            _this.setState({
+                preSelection: newTime,
+                inputValue: formattedTime,
+            });
+            if (_this.props.selectsRange || _this.props.selectsMultiple) {
+                return;
+            }
+            var selected = _this.props.selected
+                ? _this.props.selected
+                : _this.getPreSelection();
+            var changedDate = _this.props.selected
+                ? newTime
+                : setTime(selected, {
+                    hour: getHours(newTime),
+                    minute: getMinutes(newTime),
+                });
+            (_d = (_c = _this.props).onChange) === null || _d === void 0 ? void 0 : _d.call(_c, changedDate);
+            if (_this.props.showTimeSelectOnly || _this.props.showTimeSelect) {
+                _this.setState({ isRenderAriaLiveMessage: true });
+            }
+            requestAnimationFrame(function () {
+                _this.scrollToTimeOption(newTime);
+            });
+        };
+        _this.handleTimeOnlyEnterKey = function (event) {
+            var _a, _b, _c, _d;
+            var inputElement = event.target;
+            var inputValue = inputElement.value;
+            var dateFormat = (_a = _this.props.dateFormat) !== null && _a !== void 0 ? _a : DatePicker.defaultProps.dateFormat;
+            var timeFormat = _this.props.timeFormat || "p";
+            var defaultTime = _this.state.preSelection || safeToDate(_this.props.selected) || newDate();
+            var parsedDate = parseDate(inputValue, dateFormat, _this.props.locale, (_b = _this.props.strictParsing) !== null && _b !== void 0 ? _b : false, defaultTime);
+            var timeToCommit = defaultTime;
+            if (parsedDate && isValid(parsedDate)) {
+                timeToCommit = parsedDate;
+            }
+            else {
+                var highlightedItem = ((_c = _this.calendar) === null || _c === void 0 ? void 0 : _c.containerRef.current) instanceof Element &&
+                    _this.calendar.containerRef.current.querySelector(".react-datepicker__time-list-item[tabindex='0']");
+                if (highlightedItem instanceof HTMLElement) {
+                    var itemText = (_d = highlightedItem.textContent) === null || _d === void 0 ? void 0 : _d.trim();
+                    if (itemText) {
+                        var itemTime = parseDate(itemText, timeFormat, _this.props.locale, false, defaultTime);
+                        if (itemTime && isValid(itemTime)) {
+                            timeToCommit = itemTime;
+                        }
+                    }
+                }
+            }
+            _this.handleTimeChange(timeToCommit);
+            _this.setOpen(false);
+            _this.sendFocusBackToInput();
+        };
+        _this.scrollToTimeOption = function (time) {
+            var _a, _b;
+            if (!((_a = _this.calendar) === null || _a === void 0 ? void 0 : _a.containerRef.current)) {
+                return;
+            }
+            var container = _this.calendar.containerRef.current;
+            var timeListItems = Array.from(container.querySelectorAll(".react-datepicker__time-list-item"));
+            var targetItem = null;
+            var closestTimeDiff = Infinity;
+            var timeFormat = _this.props.timeFormat || "p";
+            for (var _i = 0, timeListItems_1 = timeListItems; _i < timeListItems_1.length; _i++) {
+                var item = timeListItems_1[_i];
+                var itemText = (_b = item.textContent) === null || _b === void 0 ? void 0 : _b.trim();
+                if (itemText) {
+                    var itemTime = parseDate(itemText, timeFormat, _this.props.locale, false, time);
+                    if (itemTime && isValid(itemTime)) {
+                        if (isSameMinute(itemTime, time)) {
+                            targetItem = item;
+                            break;
+                        }
+                        var timeDiff = Math.abs(itemTime.getTime() - time.getTime());
+                        if (timeDiff < closestTimeDiff) {
+                            closestTimeDiff = timeDiff;
+                            targetItem = item;
+                        }
+                    }
+                }
+            }
+            if (targetItem) {
+                timeListItems.forEach(function (item) {
+                    item.setAttribute("tabindex", "-1");
+                });
+                targetItem.setAttribute("tabindex", "0");
+                targetItem.scrollIntoView({
+                    behavior: "smooth",
+                    block: "center",
+                });
+            }
+        };
         _this.onInputKeyDown = function (event) {
             var _a, _b, _c, _d, _e, _f;
             (_b = (_a = _this.props).onKeyDown) === null || _b === void 0 ? void 0 : _b.call(_a, event);
@@ -14433,6 +14977,18 @@ var DatePicker = /** @class */ (function (_super) {
                 }
                 return;
             }
+            if (_this.state.open && _this.props.showTimeSelectOnly) {
+                if (eventKey === KeyType.ArrowDown || eventKey === KeyType.ArrowUp) {
+                    event.preventDefault();
+                    _this.handleTimeOnlyArrowKey(eventKey);
+                    return;
+                }
+                if (eventKey === KeyType.Enter) {
+                    event.preventDefault();
+                    _this.handleTimeOnlyEnterKey(event);
+                    return;
+                }
+            }
             // if calendar is open, these keys will focus the selected item
             if (_this.state.open) {
                 if (eventKey === KeyType.ArrowDown || eventKey === KeyType.ArrowUp) {
@@ -14623,20 +15179,12 @@ var DatePicker = /** @class */ (function (_super) {
                 _this.setSelected(newSelection);
             }
             _this.setPreSelection(newSelection);
-            // need to figure out whether month has changed to focus day in inline version
+            // In inline mode, always set shouldFocusDayInline to true when navigating via keyboard.
+            // This ensures focus is properly transferred to the new day element regardless of
+            // whether the month changed. The user initiated this navigation from a focused day,
+            // so we should always focus the destination day.
             if (inline) {
-                var prevMonth = getMonth(copy);
-                var newMonth = getMonth(newSelection);
-                var prevYear = getYear(copy);
-                var newYear = getYear(newSelection);
-                if (prevMonth !== newMonth || prevYear !== newYear) {
-                    // month has changed
-                    _this.setState({ shouldFocusDayInline: true });
-                }
-                else {
-                    // month hasn't changed
-                    _this.setState({ shouldFocusDayInline: false });
-                }
+                _this.setState({ shouldFocusDayInline: true });
             }
         };
         // handle generic key down events in the popper that do not adjust or select dates
@@ -14683,6 +15231,9 @@ var DatePicker = /** @class */ (function (_super) {
                 }
             }
         };
+        _this.handleMonthSelectedInChange = function (monthSelectedIn) {
+            _this.setState({ monthSelectedIn: monthSelectedIn });
+        };
         _this.renderCalendar = function () {
             var _a, _b;
             if (!_this.props.inline && !_this.isCalendarOpen()) {
@@ -14690,7 +15241,7 @@ var DatePicker = /** @class */ (function (_super) {
             }
             return (React__default.createElement(Calendar, _assign({ showMonthYearDropdown: undefined, ref: function (elem) {
                     _this.calendar = elem;
-                } }, _this.props, _this.state, { setOpen: _this.setOpen, dateFormat: (_a = _this.props.dateFormatCalendar) !== null && _a !== void 0 ? _a : DatePicker.defaultProps.dateFormatCalendar, onSelect: _this.handleSelect, onClickOutside: _this.handleCalendarClickOutside, holidays: getHolidaysMap(_this.modifyHolidays()), outsideClickIgnoreClass: _this.props.outsideClickIgnoreClass, onDropdownFocus: _this.handleDropdownFocus, onTimeChange: _this.handleTimeChange, className: _this.props.calendarClassName, container: _this.props.calendarContainer, handleOnKeyDown: _this.props.onKeyDown, handleOnDayKeyDown: _this.onDayKeyDown, setPreSelection: _this.setPreSelection, dropdownMode: (_b = _this.props.dropdownMode) !== null && _b !== void 0 ? _b : DatePicker.defaultProps.dropdownMode }), _this.props.children));
+                } }, _this.props, _this.state, { setOpen: _this.setOpen, dateFormat: (_a = _this.props.dateFormatCalendar) !== null && _a !== void 0 ? _a : DatePicker.defaultProps.dateFormatCalendar, onSelect: _this.handleSelect, onClickOutside: _this.handleCalendarClickOutside, holidays: getHolidaysMap(_this.modifyHolidays()), outsideClickIgnoreClass: _this.props.outsideClickIgnoreClass, onDropdownFocus: _this.handleDropdownFocus, onTimeChange: _this.handleTimeChange, className: _this.props.calendarClassName, container: _this.props.calendarContainer, handleOnKeyDown: _this.props.onKeyDown, handleOnDayKeyDown: _this.onDayKeyDown, setPreSelection: _this.setPreSelection, dropdownMode: (_b = _this.props.dropdownMode) !== null && _b !== void 0 ? _b : DatePicker.defaultProps.dropdownMode, onMonthSelectedInChange: _this.handleMonthSelectedInChange }), _this.props.children));
         };
         _this.renderAriaLiveRegion = function () {
             var _a;
@@ -14738,39 +15289,34 @@ var DatePicker = /** @class */ (function (_super) {
         };
         _this.renderDateInput = function () {
             var _a, _b;
+            var _c, _d, _e, _f, _g;
             var className = clsx(_this.props.className, (_a = {},
                 _a[_this.props.outsideClickIgnoreClass ||
                     DatePicker.defaultProps.outsideClickIgnoreClass] = _this.state.open,
                 _a));
             var customInput = _this.props.customInput || React__default.createElement("input", { type: "text" });
             var customInputRef = _this.props.customInputRef || "ref";
-            return cloneElement(customInput, (_b = {},
-                _b[customInputRef] = function (input) {
-                    _this.input = input;
-                },
-                _b.value = _this.getInputValue(),
-                _b.onBlur = _this.handleBlur,
-                _b.onChange = _this.handleChange,
-                _b.onClick = _this.onInputClick,
-                _b.onFocus = _this.handleFocus,
-                _b.onKeyDown = _this.onInputKeyDown,
-                _b.id = _this.props.id,
-                _b.name = _this.props.name,
-                _b.form = _this.props.form,
-                _b.autoFocus = _this.props.autoFocus,
-                _b.placeholder = _this.props.placeholderText,
-                _b.disabled = _this.props.disabled,
-                _b.autoComplete = _this.props.autoComplete,
-                _b.className = clsx(customInput.props.className, className),
-                _b.title = _this.props.title,
-                _b.readOnly = _this.props.readOnly,
-                _b.required = _this.props.required,
-                _b.tabIndex = _this.props.tabIndex,
-                _b["aria-describedby"] = _this.props.ariaDescribedBy,
-                _b["aria-invalid"] = _this.props.ariaInvalid,
-                _b["aria-labelledby"] = _this.props.ariaLabelledBy,
-                _b["aria-required"] = _this.props.ariaRequired,
-                _b));
+            // Build aria props object, only including defined values to avoid
+            // overwriting aria attributes that may be set on the custom input
+            var ariaProps = {};
+            var ariaDescribedBy = (_c = _this.props["aria-describedby"]) !== null && _c !== void 0 ? _c : _this.props.ariaDescribedBy;
+            var ariaInvalid = (_d = _this.props["aria-invalid"]) !== null && _d !== void 0 ? _d : _this.props.ariaInvalid;
+            var ariaLabel = (_e = _this.props["aria-label"]) !== null && _e !== void 0 ? _e : _this.props.ariaLabel;
+            var ariaLabelledBy = (_f = _this.props["aria-labelledby"]) !== null && _f !== void 0 ? _f : _this.props.ariaLabelledBy;
+            var ariaRequired = (_g = _this.props["aria-required"]) !== null && _g !== void 0 ? _g : _this.props.ariaRequired;
+            if (ariaDescribedBy != null)
+                ariaProps["aria-describedby"] = ariaDescribedBy;
+            if (ariaInvalid != null)
+                ariaProps["aria-invalid"] = ariaInvalid;
+            if (ariaLabel != null)
+                ariaProps["aria-label"] = ariaLabel;
+            if (ariaLabelledBy != null)
+                ariaProps["aria-labelledby"] = ariaLabelledBy;
+            if (ariaRequired != null)
+                ariaProps["aria-required"] = ariaRequired;
+            return cloneElement(customInput, _assign((_b = {}, _b[customInputRef] = function (input) {
+                _this.input = input;
+            }, _b.value = _this.getInputValue(), _b.onBlur = _this.handleBlur, _b.onChange = _this.handleChange, _b.onClick = _this.onInputClick, _b.onFocus = _this.handleFocus, _b.onKeyDown = _this.onInputKeyDown, _b.id = _this.props.id, _b.name = _this.props.name, _b.form = _this.props.form, _b.autoFocus = _this.props.autoFocus, _b.placeholder = _this.props.placeholderText, _b.disabled = _this.props.disabled, _b.autoComplete = _this.props.autoComplete, _b.className = clsx(customInput.props.className, className), _b.title = _this.props.title, _b.readOnly = _this.props.readOnly, _b.required = _this.props.required, _b.tabIndex = _this.props.tabIndex, _b), ariaProps));
         };
         _this.renderClearButton = function () {
             var _a = _this.props, isClearable = _a.isClearable, disabled = _a.disabled, selected = _a.selected, startDate = _a.startDate, endDate = _a.endDate, clearButtonTitle = _a.clearButtonTitle, _b = _a.clearButtonClassName, clearButtonClassName = _b === void 0 ? "" : _b, _c = _a.ariaLabelClose, ariaLabelClose = _c === void 0 ? "Close" : _c, selectedDates = _a.selectedDates, readOnly = _a.readOnly;
@@ -14850,14 +15396,30 @@ var DatePicker = /** @class */ (function (_super) {
     };
     DatePicker.prototype.componentDidUpdate = function (prevProps, prevState) {
         var _a, _b, _c, _d;
-        if (prevProps.inline &&
-            hasPreSelectionChanged(prevProps.selected, this.props.selected)) {
+        // Update preSelection when selected/startDate prop changes to a different month/year.
+        // This ensures the calendar view updates when dates are programmatically set
+        // (e.g., via "Today" or "This Week" buttons). (Fix for #3367)
+        if (this.props.selectsRange &&
+            hasPreSelectionChanged(prevProps.startDate, this.props.startDate)) {
+            this.setPreSelection(this.props.startDate);
+        }
+        else if (hasPreSelectionChanged(prevProps.selected, this.props.selected)) {
             this.setPreSelection(this.props.selected);
         }
         if (this.state.monthSelectedIn !== undefined &&
             prevProps.monthsShown !== this.props.monthsShown) {
             this.setState({ monthSelectedIn: 0 });
         }
+        // Reset monthSelectedIn when calendar opens for range selection
+        // This ensures startDate is displayed as the first month when reopening
+        // (Fix for #5939), but we don't reset during active selection to avoid
+        // the view jumping when clicking dates in the second calendar (Fix for #5275)
+        if (this.props.selectsRange &&
+            prevState.open === false &&
+            this.state.open === true &&
+            this.state.monthSelectedIn !== 0) {
+            this.setState({ monthSelectedIn: 0 });
+        }
         if (prevProps.highlightDates !== this.props.highlightDates) {
             this.setState({
                 highlightDates: getHighLightDaysMap(this.props.highlightDates),
@@ -14907,11 +15469,11 @@ var DatePicker = /** @class */ (function (_super) {
             if (this.state.open && this.props.portalId) {
                 portalContainer = (React__default.createElement(Portal, _assign({ portalId: this.props.portalId }, this.props), portalContainer));
             }
-            return (React__default.createElement("div", null,
+            return (React__default.createElement(React__default.Fragment, null,
                 this.renderInputContainer(),
                 portalContainer));
         }
-        return (React__default.createElement(PopperComponent$1, _assign({}, this.props, { className: this.props.popperClassName, hidePopper: !this.isCalendarOpen(), targetComponent: this.renderInputContainer(), popperComponent: calendar, popperOnKeyDown: this.onPopperKeyDown, showArrow: this.props.showPopperArrow })));
+        return (React__default.createElement(PopperComponent, _assign({}, this.props, { className: this.props.popperClassName, hidePopper: !this.isCalendarOpen(), targetComponent: this.renderInputContainer(), popperComponent: calendar, popperOnKeyDown: this.onPopperKeyDown, showArrow: this.props.showPopperArrow, monthHeaderPosition: this.props.monthHeaderPosition })));
     };
     return DatePicker;
 }(Component));
@@ -15316,4 +15878,4 @@ var InlineDatePicker = function (props) {
 };
 
 export { DatePickerGroup as D, HelperText as H, InlineDatePicker as I, ValidationText as V };
-//# sourceMappingURL=InlineDatePicker-RlV9iC8j.js.map
+//# sourceMappingURL=InlineDatePicker-XiMGS9jI.js.map