@proyecto-viviana/solidaria 0.4.2 → 0.6.0-rc.0

package/dist/_chunk/calendar.jsx

@@ -1,12 +1,95 @@
-import { i as mergeProps$1 } from "./env.jsx";
+/*
+* Copyright 2020 Adobe. All rights reserved.
+* This file is licensed to you under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License. You may obtain a copy
+* of the License at http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software distributed under
+* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+* OF ANY KIND, either express or implied. See the License for the specific language
+* governing permissions and limitations under the License.
+*/
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/calendar/useCalendar.ts
+/*
+* Copyright 2020 Adobe. All rights reserved.
+* This file is licensed to you under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License. You may obtain a copy
+* of the License at http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software distributed under
+* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+* OF ANY KIND, either express or implied. See the License for the specific language
+* governing permissions and limitations under the License.
+*/
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/calendar/useCalendarCell.ts
+/*
+* Copyright 2020 Adobe. All rights reserved.
+* This file is licensed to you under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License. You may obtain a copy
+* of the License at http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software distributed under
+* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+* OF ANY KIND, either express or implied. See the License for the specific language
+* governing permissions and limitations under the License.
+*/
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/calendar/useCalendarGrid.ts
+/*
+* Copyright 2026 Adobe. All rights reserved.
+* This file is licensed to you under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License. You may obtain a copy
+* of the License at http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software distributed under
+* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+* OF ANY KIND, either express or implied. See the License for the specific language
+* governing permissions and limitations under the License.
+*/
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/calendar/useCalendarMonthPicker.ts
+/*
+* Copyright 2026 Adobe. All rights reserved.
+* This file is licensed to you under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License. You may obtain a copy
+* of the License at http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software distributed under
+* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+* OF ANY KIND, either express or implied. See the License for the specific language
+* governing permissions and limitations under the License.
+*/
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/calendar/useCalendarYearPicker.ts
+/*
+* Copyright 2020 Adobe. All rights reserved.
+* This file is licensed to you under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License. You may obtain a copy
+* of the License at http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software distributed under
+* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+* OF ANY KIND, either express or implied. See the License for the specific language
+* governing permissions and limitations under the License.
+*/
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/calendar/useRangeCalendar.ts
+/*
+* Copyright 2020 Adobe. All rights reserved.
+* This file is licensed to you under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License. You may obtain a copy
+* of the License at http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software distributed under
+* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+* OF ANY KIND, either express or implied. See the License for the specific language
+* governing permissions and limitations under the License.
+*/
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/calendar/utils.ts
+import { t as mergeProps } from "./mergeProps.jsx";
+import { _ as scrollIntoViewport, i as createDescription } from "./utils.jsx";
 import { t as access } from "./reactivity.jsx";
-import { S as scrollIntoViewport, i as createDescription } from "./utils.jsx";
-import { l as getScrollParent, t as focusSafely } from "./focus.jsx";
-import { o as getInteractionModality } from "./createInteractionModality.jsx";
+import { N as getInteractionModality, c as getScrollParent, d as isFocusWithin, r as getEventTarget, v as nodeContains, w as focusSafely } from "./dom.jsx";
 import { t as createFocusRing } from "./createFocusRing.jsx";
 import { i as useLocale } from "./locale.jsx";
 import { createId } from "../ssr/index.jsx";
-import { createEffect, createMemo, createSignal } from "solid-js";
+import { createMemo, createSignal, createTrackedEffect } from "solid-js";
 import { LocalizedStringDictionary, LocalizedStringFormatter } from "@internationalized/string";
 import { DateFormatter, endOfMonth, getLocalTimeZone, isSameDay, isSameYear, isToday, startOfMonth, startOfWeek, toCalendarDate, today } from "@internationalized/date";
 //#region src/calendar/intl/index.ts
@@ -341,21 +424,27 @@ function createCalendar(props, state) {
 		ariaLabelledBy: initialProps["aria-labelledby"]
 	});
 	const prevButtonProps = createMemo(() => {
-		const isDisabled = getProps().isDisabled || state.isDisabled();
+		const isDisabled = getProps().isDisabled || state.isDisabled() || state.isPreviousVisibleRangeInvalid();
 		return {
 			"aria-label": formatCalendarLabel(state.locale(), "previous"),
 			onClick: () => {
-				if (!isDisabled) state.focusPreviousPage();
+				if (!isDisabled) {
+					state.setFocused(false);
+					state.focusPreviousPage();
+				}
 			},
 			disabled: isDisabled
 		};
 	});
 	const nextButtonProps = createMemo(() => {
-		const isDisabled = getProps().isDisabled || state.isDisabled();
+		const isDisabled = getProps().isDisabled || state.isDisabled() || state.isNextVisibleRangeInvalid();
 		return {
 			"aria-label": formatCalendarLabel(state.locale(), "next"),
 			onClick: () => {
-				if (!isDisabled) state.focusNextPage();
+				if (!isDisabled) {
+					state.setFocused(false);
+					state.focusNextPage();
+				}
 			},
 			disabled: isDisabled
 		};
@@ -367,7 +456,7 @@ function createCalendar(props, state) {
 	const errorMessageProps = createMemo(() => ({ id: errorMessageId }));
 	const calendarProps = createMemo(() => {
 		const p = getProps();
-		return mergeProps$1({
+		return mergeProps({
 			id,
 			role: "application",
 			"aria-labelledby": p["aria-labelledby"],
@@ -539,7 +628,7 @@ function createCalendarYearPicker(props, state) {
 /**
 * Provides the behavior and accessibility implementation for a calendar grid.
 */
-function createCalendarGrid(props, state, ref) {
+function createCalendarGrid(props, state, _ref) {
 	const weekDays = createMemo(() => {
 		const gridProps = access(props);
 		const formatter = new DateFormatter(state.locale(), {
@@ -549,11 +638,8 @@ function createCalendarGrid(props, state, ref) {
 		const weekStart = startOfWeek(today(state.timeZone), state.locale(), state.firstDayOfWeek());
 		return Array.from({ length: 7 }, (_, index) => formatter.format(weekStart.add({ days: index }).toDate(state.timeZone)));
 	});
-	const isRTL = () => {
-		const scopedDirection = (ref?.())?.closest("[dir]")?.getAttribute("dir");
-		const documentDirection = typeof document !== "undefined" ? document.dir : "";
-		return (scopedDirection ?? documentDirection) === "rtl";
-	};
+	const locale = useLocale();
+	const isRTL = () => locale().direction === "rtl";
 	const handleKeyDown = (e) => {
 		if (state.isDisabled()) return;
 		switch (e.key) {
@@ -602,18 +688,20 @@ function createCalendarGrid(props, state, ref) {
 				state.focusPageEnd();
 				break;
 			case "Enter":
-			case " ":
+			case " ": {
 				e.preventDefault();
+				const rangeState = state;
+				const hadAnchor = rangeState.anchorDate?.() != null;
 				state.selectFocusedDate();
+				if (!hadAnchor) rangeState.focusNearestAvailableDate?.(state.focusedDate());
 				break;
-			case "Escape":
-				if ("anchorDate" in state && typeof state.anchorDate === "function" && state.anchorDate() && "setAnchorDate" in state && typeof state.setAnchorDate === "function") {
-					e.preventDefault();
-					e.stopPropagation();
-					state.setAnchorDate(null);
-					if ("setDragging" in state && typeof state.setDragging === "function") state.setDragging(false);
-				}
-				break;
+			}
+			case "Escape": if ("anchorDate" in state && typeof state.anchorDate === "function" && state.anchorDate() && "setAnchorDate" in state && typeof state.setAnchorDate === "function") {
+				e.preventDefault();
+				e.stopPropagation();
+				state.setAnchorDate(null);
+				if ("setDragging" in state && typeof state.setDragging === "function") state.setDragging(false);
+			}
 		}
 	};
 	const isMultiSelectable = () => {
@@ -630,15 +718,15 @@ function createCalendarGrid(props, state, ref) {
 			role: "grid",
 			"aria-label": [data?.ariaLabel, visibleRangeDescription()].filter(Boolean).join(", ") || void 0,
 			"aria-labelledby": data?.ariaLabelledBy,
-			"aria-readonly": state.isReadOnly() || void 0,
-			"aria-disabled": state.isDisabled() || void 0,
-			"aria-multiselectable": isMultiSelectable() || void 0,
+			"aria-readonly": state.isReadOnly() ? "true" : void 0,
+			"aria-disabled": state.isDisabled() ? "true" : void 0,
+			"aria-multiselectable": isMultiSelectable() ? "true" : void 0,
 			onFocus: () => state.setFocused(true),
 			onBlur: () => state.setFocused(false),
 			onKeyDown: handleKeyDown
 		};
 	});
-	const headerProps = createMemo(() => ({ "aria-hidden": true }));
+	const headerProps = createMemo(() => ({ "aria-hidden": "true" }));
 	return {
 		get gridProps() {
 			return gridProps();
@@ -671,17 +759,42 @@ function createCalendarCell(props, state, ref) {
 	const stateWithLocale = state;
 	const locale = () => stateWithLocale.locale?.() ?? inheritedLocale().locale;
 	let ignoreNextClick = false;
+	let cellReceivedPointer = false;
+	const startedUnfocused = !state.isFocused();
 	const date = createMemo(() => getProps().date);
 	const isSelected = createMemo(() => state.isSelected(date()));
 	const isInvalid = createMemo(() => state.isValueInvalid() && isSelected());
 	const isDisabled = createMemo(() => {
-		return getProps().isDisabled || state.isCellDisabled(date());
+		return getProps().isDisabled || state.isCellDisabled(date()) || !!getProps().isOutsideMonth;
 	});
 	const isUnavailable = createMemo(() => state.isCellUnavailable(date()));
 	const isOutsideMonth = createMemo(() => getProps().isOutsideMonth ?? state.isOutsideVisibleRange(date()));
 	const isFocused = createMemo(() => state.isCellFocused(date()) && !isOutsideMonth());
 	const isToday$2 = createMemo(() => isToday(date(), timeZone));
-	const isCellFocusVisible = createMemo(() => isFocused() && isRingFocusVisible() && getInteractionModality() !== null);
+	const isCellFocusVisible = createMemo(() => isRingFocusVisible() && isFocused());
+	const [isOverlayAutoFocusVisible, setIsOverlayAutoFocusVisible] = createSignal(false);
+	createTrackedEffect(() => {
+		const _s2Cleanups = [];
+		if (!startedUnfocused) return;
+		if (!isFocused() || cellReceivedPointer) {
+			setIsOverlayAutoFocusVisible(false);
+			return;
+		}
+		let second = 0;
+		const first = requestAnimationFrame(() => {
+			second = requestAnimationFrame(() => {
+				if (isFocused() && !cellReceivedPointer) setIsOverlayAutoFocusVisible(true);
+			});
+		});
+		_s2Cleanups.push(() => {
+			cancelAnimationFrame(first);
+			cancelAnimationFrame(second);
+		});
+		return () => {
+			for (const c of _s2Cleanups) c();
+		};
+	});
+	const isFocusVisible = createMemo(() => startedUnfocused ? isOverlayAutoFocusVisible() : isCellFocusVisible());
 	const formattedDate = createMemo(() => {
 		const d = date();
 		return new DateFormatter(locale(), {
@@ -691,11 +804,15 @@ function createCalendarCell(props, state, ref) {
 		}).formatToParts(d.toDate(timeZone)).find((part) => part.type === "day")?.value ?? d.day.toString();
 	});
 	const handlePointerDown = (e) => {
+		cellReceivedPointer = true;
 		if (!isDisabled() && !isUnavailable()) {
 			setIsPressed(true);
+			state.setFocusedDate(date());
+			state.setFocused(true);
 			state.selectDate(date());
 			ignoreNextClick = true;
-			e.preventDefault();
+			const element = ref?.();
+			if (element) focusSafely(element);
 		}
 	};
 	const handleClick = () => {
@@ -703,17 +820,32 @@ function createCalendarCell(props, state, ref) {
 			ignoreNextClick = false;
 			return;
 		}
-		if (!isDisabled() && !isUnavailable()) state.selectDate(date());
+		if (!isDisabled() && !isUnavailable()) {
+			state.setFocusedDate(date());
+			state.setFocused(true);
+			state.selectDate(date());
+			const element = ref?.();
+			if (element) focusSafely(element);
+		}
 	};
 	const handlePointerUp = () => {
 		setIsPressed(false);
 	};
-	createEffect(() => {
+	createTrackedEffect(() => {
+		const _s2Cleanups = [];
 		const element = ref?.();
-		if (element && isFocused()) {
+		if (!element || !isFocused()) return;
+		const frame = requestAnimationFrame(() => {
+			if (!isFocused() || ref?.() !== element) return;
+			const navLabel = document.activeElement?.getAttribute("aria-label");
+			if (navLabel === "Next" || navLabel === "Previous") return;
 			focusSafely(element);
 			if (getInteractionModality() !== "pointer" && document.activeElement === element) scrollIntoViewport(element, { containingElement: getScrollParent(element) });
-		}
+		});
+		_s2Cleanups.push(() => cancelAnimationFrame(frame));
+		return () => {
+			for (const c of _s2Cleanups) c();
+		};
 	});
 	const cellProps = createMemo(() => ({
 		role: "gridcell",
@@ -732,8 +864,12 @@ function createCalendarCell(props, state, ref) {
 		}).format(d.toDate(timeZone));
 		if (isToday$2()) label = formatCalendarLabel(locale(), isSelected() ? "todayDateSelected" : "todayDate", { date: label });
 		else if (isSelected()) label = formatCalendarLabel(locale(), "dateSelected", { date: label });
+		const minValue = state.minValue();
+		const maxValue = state.maxValue();
+		if (minValue && isSameDay(d, minValue)) label += `, ${formatCalendarLabel(locale(), "minimumDate")}`;
+		else if (maxValue && isSameDay(d, maxValue)) label += `, ${formatCalendarLabel(locale(), "maximumDate")}`;
 		const errorMessageId = getCalendarHookData(state)?.errorMessageId;
-		return mergeProps$1(focusProps, {
+		return mergeProps(focusProps, {
 			role: "button",
 			tabIndex: isDisabled() ? void 0 : isSameDay(date(), state.focusedDate()) ? 0 : -1,
 			"aria-label": label,
@@ -741,7 +877,7 @@ function createCalendarCell(props, state, ref) {
 			"aria-invalid": isInvalid() || void 0,
 			"aria-describedby": isInvalid() ? errorMessageId : void 0,
 			"aria-pressed": isPressed() || void 0,
-			"data-focus-visible": isCellFocusVisible() || void 0,
+			"data-focus-visible": isFocusVisible() || void 0,
 			disabled: isDisabled() || isUnavailable(),
 			onClick: handleClick,
 			onPointerDown: handlePointerDown,
@@ -767,7 +903,7 @@ function createCalendarCell(props, state, ref) {
 			return isFocused();
 		},
 		get isFocusVisible() {
-			return isCellFocusVisible();
+			return isFocusVisible();
 		},
 		get isDisabled() {
 			return isDisabled();
@@ -803,7 +939,7 @@ function createCalendarCell(props, state, ref) {
 /**
 * Provides the behavior and accessibility implementation for a range calendar component.
 */
-function createRangeCalendar(props, state) {
+function createRangeCalendar(props, state, ref) {
 	const getProps = () => access(props);
 	const id = createId(getProps().id);
 	const titleId = createId();
@@ -831,7 +967,10 @@ function createRangeCalendar(props, state) {
 		return {
 			"aria-label": formatCalendarLabel(state.locale(), "previous"),
 			onClick: () => {
-				if (!isDisabled) state.focusPreviousPage();
+				if (!isDisabled) {
+					state.setFocused(false);
+					state.focusPreviousPage();
+				}
 			},
 			disabled: isDisabled
 		};
@@ -841,7 +980,10 @@ function createRangeCalendar(props, state) {
 		return {
 			"aria-label": formatCalendarLabel(state.locale(), "next"),
 			onClick: () => {
-				if (!isDisabled) state.focusNextPage();
+				if (!isDisabled) {
+					state.setFocused(false);
+					state.focusNextPage();
+				}
 			},
 			disabled: isDisabled
 		};
@@ -853,7 +995,7 @@ function createRangeCalendar(props, state) {
 	const errorMessageProps = createMemo(() => ({ id: errorMessageId }));
 	const calendarProps = createMemo(() => {
 		const p = getProps();
-		return mergeProps$1({
+		return mergeProps({
 			id,
 			role: "application",
 			"aria-labelledby": p["aria-labelledby"],
@@ -862,6 +1004,69 @@ function createRangeCalendar(props, state) {
 			"aria-details": p["aria-details"]
 		});
 	});
+	createTrackedEffect(() => {
+		const _s2Cleanups = [];
+		const element = ref?.();
+		if (!element) return;
+		const commitBehavior = getProps().commitBehavior ?? "select";
+		const commitBehaviorMapping = {
+			clear: () => {
+				state.setAnchorDate(null);
+				state.setValue(null);
+			},
+			reset: () => state.setAnchorDate(null),
+			select: () => state.selectDate(state.focusedDate())
+		};
+		let isVirtualClick = false;
+		const onPointerDown = (e) => {
+			isVirtualClick = e.width === 0 && e.height === 0;
+		};
+		const endDragging = (e) => {
+			if (isVirtualClick) {
+				isVirtualClick = false;
+				return;
+			}
+			state.setDragging(false);
+			if (!state.anchorDate()) return;
+			const target = getEventTarget(e);
+			if (isFocusWithin(element) && (!nodeContains(element, target) || !target.closest("button, [role='button']"))) commitBehaviorMapping[commitBehavior]();
+		};
+		let blurPending = false;
+		const onFocus = () => {
+			blurPending = false;
+		};
+		const onBlur = (e) => {
+			const focusEvent = e;
+			if (focusEvent.relatedTarget && nodeContains(element, focusEvent.relatedTarget)) return;
+			blurPending = true;
+			queueMicrotask(() => {
+				if (!blurPending || !element) return;
+				if (!isFocusWithin(element) && state.anchorDate()) commitBehaviorMapping[commitBehavior]();
+			});
+		};
+		const onTouchMove = (e) => {
+			if (state.isDragging()) e.preventDefault();
+		};
+		window.addEventListener("pointerdown", onPointerDown);
+		window.addEventListener("pointerup", endDragging);
+		element.addEventListener("focus", onFocus, true);
+		element.addEventListener("blur", onBlur, true);
+		element.addEventListener("touchmove", onTouchMove, {
+			passive: false,
+			capture: true
+		});
+		_s2Cleanups.push(() => {
+			blurPending = false;
+			window.removeEventListener("pointerdown", onPointerDown);
+			window.removeEventListener("pointerup", endDragging);
+			element.removeEventListener("focus", onFocus, true);
+			element.removeEventListener("blur", onBlur, true);
+			element.removeEventListener("touchmove", onTouchMove, true);
+		});
+		return () => {
+			for (const c of _s2Cleanups) c();
+		};
+	});
 	return {
 		get calendarProps() {
 			return calendarProps();
@@ -897,7 +1102,11 @@ function createRangeCalendar(props, state) {
 function createRangeCalendarCell(props, state, ref) {
 	const getProps = () => access(props);
 	const [isPressed, setIsPressed] = createSignal(false);
+	const { focusProps, isFocusVisible: isRingFocusVisible } = createFocusRing();
 	const timeZone = getLocalTimeZone();
+	let cellReceivedPointer = false;
+	let ignoreNextClick = false;
+	const startedUnfocused = !state.isFocused();
 	const date = createMemo(() => getProps().date);
 	const isSelected = createMemo(() => state.isSelected(date()));
 	const isSelectionStart = createMemo(() => state.isSelectionStart(date()));
@@ -908,7 +1117,7 @@ function createRangeCalendarCell(props, state, ref) {
 		return state.isValueInvalid() && !state.anchorDate() && !!range && d.compare(range.start) >= 0 && d.compare(range.end) <= 0;
 	});
 	const isDisabled = createMemo(() => {
-		return getProps().isDisabled || state.isCellDisabled(date());
+		return getProps().isDisabled || state.isCellDisabled(date()) || !!getProps().isOutsideMonth;
 	});
 	const isUnavailable = createMemo(() => state.isCellUnavailable(date()));
 	const isSelectable = createMemo(() => !isDisabled() && !isUnavailable());
@@ -917,32 +1126,100 @@ function createRangeCalendarCell(props, state, ref) {
 	});
 	const isFocused = createMemo(() => state.isCellFocused(date()) && !isOutsideMonth());
 	const isToday$1 = createMemo(() => isToday(date(), timeZone));
-	const descriptionProps = createDescription(createMemo(() => {
+	const isCellFocusVisible = createMemo(() => isRingFocusVisible() && isFocused());
+	const [isOverlayAutoFocusVisible, setIsOverlayAutoFocusVisible] = createSignal(false);
+	createTrackedEffect(() => {
+		const _s2Cleanups = [];
+		if (!startedUnfocused) return;
+		if (!isFocused() || cellReceivedPointer) {
+			setIsOverlayAutoFocusVisible(false);
+			return;
+		}
+		let second = 0;
+		const first = requestAnimationFrame(() => {
+			second = requestAnimationFrame(() => {
+				if (isFocused() && !cellReceivedPointer) setIsOverlayAutoFocusVisible(true);
+			});
+		});
+		_s2Cleanups.push(() => {
+			cancelAnimationFrame(first);
+			cancelAnimationFrame(second);
+		});
+		return () => {
+			for (const c of _s2Cleanups) c();
+		};
+	});
+	const isFocusVisible = createMemo(() => startedUnfocused ? isOverlayAutoFocusVisible() : isCellFocusVisible());
+	const rangeSelectionPrompt = createMemo(() => {
 		if (!isFocused() || state.isReadOnly() || !isSelectable()) return;
 		return formatCalendarPrompt(state.locale(), state.anchorDate() ? "finishRangeSelectionPrompt" : "startRangeSelectionPrompt");
-	}));
+	});
+	const descriptionProps = createDescription(rangeSelectionPrompt);
 	const formattedDate = createMemo(() => {
 		return date().day.toString();
 	});
 	const handlePointerDown = (e) => {
+		cellReceivedPointer = true;
+		const target = e.currentTarget || e.target;
+		if (target && "releasePointerCapture" in target) {
+			if ("hasPointerCapture" in target ? target.hasPointerCapture(e.pointerId) : true) try {
+				target.releasePointerCapture(e.pointerId);
+			} catch {}
+		}
 		if (isSelectable()) {
 			setIsPressed(true);
+			state.setFocusedDate(date());
+			state.setFocused(true);
 			state.selectDate(date());
-			e.preventDefault();
+			ignoreNextClick = true;
+			const element = ref?.();
+			if (element) focusSafely(element);
 		}
 	};
 	const handleClick = () => {
-		if (isSelectable()) state.selectDate(date());
+		if (ignoreNextClick) {
+			ignoreNextClick = false;
+			return;
+		}
+		if (!isSelectable()) return;
+		const hadAnchor = state.anchorDate() != null;
+		state.setFocusedDate(date());
+		state.setFocused(true);
+		state.selectDate(date());
+		const element = ref?.();
+		if (element) focusSafely(element);
+		if (!hadAnchor) state.focusNearestAvailableDate(date());
 	};
-	const handlePointerUp = () => {
+	const handlePointerUp = (e) => {
 		setIsPressed(false);
+		if (isSelectable() && (!e || e.button === 0) && state.isDragging() && state.anchorDate() && !isSameDay(date(), state.anchorDate())) {
+			state.selectDate(date());
+			state.setFocusedDate(date());
+			state.setFocused(true);
+			const element = ref?.();
+			if (element) focusSafely(element);
+		}
 	};
-	const handlePointerEnter = () => {
-		if (state.isDragging() && isSelectable()) state.setFocusedDate(date());
+	const handlePointerLeave = () => {
+		setIsPressed(false);
 	};
-	createEffect(() => {
+	const handlePointerEnter = (e) => {
+		if (isSelectable() && (state.isDragging() || state.anchorDate() && e?.pointerType !== "touch")) state.setFocusedDate(date());
+	};
+	createTrackedEffect(() => {
+		const _s2Cleanups = [];
 		const element = ref?.();
-		if (element && isFocused()) focusSafely(element);
+		if (!element || !isFocused()) return;
+		const frame = requestAnimationFrame(() => {
+			if (!isFocused() || ref?.() !== element) return;
+			const navLabel = document.activeElement?.getAttribute("aria-label");
+			if (navLabel === "Next" || navLabel === "Previous") return;
+			focusSafely(element);
+		});
+		_s2Cleanups.push(() => cancelAnimationFrame(frame));
+		return () => {
+			for (const c of _s2Cleanups) c();
+		};
 	});
 	const cellProps = createMemo(() => ({
 		role: "gridcell",
@@ -967,9 +1244,13 @@ function createRangeCalendarCell(props, state, ref) {
 		label += formatter.format(d.toDate(timeZone));
 		if (isToday$1()) label = formatCalendarLabel(state.locale(), isSelected() ? "todayDateSelected" : "todayDate", { date: label });
 		else if (isSelected()) label = formatCalendarLabel(state.locale(), "dateSelected", { date: label });
+		const minValue = state.minValue();
+		const maxValue = state.maxValue();
+		if (minValue && isSameDay(d, minValue)) label += `, ${formatCalendarLabel(state.locale(), "minimumDate")}`;
+		else if (maxValue && isSameDay(d, maxValue)) label += `, ${formatCalendarLabel(state.locale(), "maximumDate")}`;
 		const errorMessageId = hookData?.errorMessageId;
 		const describedByIds = [isInvalid() ? errorMessageId : void 0, descriptionProps["aria-describedby"]].filter(Boolean);
-		return {
+		return mergeProps(focusProps, {
 			role: "button",
 			tabIndex: isDisabled() ? void 0 : isSameDay(d, state.focusedDate()) ? 0 : -1,
 			"aria-label": label,
@@ -977,17 +1258,18 @@ function createRangeCalendarCell(props, state, ref) {
 			"aria-invalid": isInvalid() || void 0,
 			"aria-describedby": describedByIds.length ? describedByIds.join(" ") : void 0,
 			"aria-pressed": isPressed() || void 0,
+			"data-focus-visible": isFocusVisible() || void 0,
 			disabled: isDisabled() || isUnavailable(),
 			onClick: handleClick,
 			onPointerDown: handlePointerDown,
 			onPointerUp: handlePointerUp,
-			onPointerLeave: handlePointerUp,
+			onPointerLeave: handlePointerLeave,
 			onPointerEnter: handlePointerEnter,
 			onFocus: () => {
 				if (!state.isCellFocused(d)) state.setFocusedDate(d);
 				state.setFocused(true);
 			}
-		};
+		});
 	});
 	return {
 		get cellProps() {
@@ -1008,6 +1290,9 @@ function createRangeCalendarCell(props, state, ref) {
 		get isFocused() {
 			return isFocused();
 		},
+		get isFocusVisible() {
+			return isFocusVisible();
+		},
 		get isDisabled() {
 			return isDisabled();
 		},