@proyecto-viviana/solidaria 0.2.8 → 0.3.0

package/src/datepicker/createDatePicker.ts

@@ -5,17 +5,15 @@
  * Based on @react-aria/datepicker useDatePicker
  */
 
-import { createMemo } from 'solid-js';
-import { createId } from '../ssr';
-import { createLabel } from '../label/createLabel';
-import { access, type MaybeAccessor } from '../utils/reactivity';
-import { mergeProps } from '../utils/mergeProps';
-import { useLocale } from '../i18n';
-import type { DateFieldState, CalendarState } from '@proyecto-viviana/solid-stately';
-
-// ============================================
-// TYPES
-// ============================================
+import { createMemo } from "solid-js";
+import { createId } from "../ssr";
+import { createLabel } from "../label/createLabel";
+import { access, type MaybeAccessor } from "../utils/reactivity";
+import { mergeProps } from "../utils/mergeProps";
+import { useLocale } from "../i18n";
+import { createPress } from "../interactions/createPress";
+import { DateFormatter, getLocalTimeZone } from "@internationalized/date";
+import type { DateFieldState, CalendarState } from "@proyecto-viviana/solid-stately";
 
 export interface AriaDatePickerProps {
   /** An ID for the date picker. */
@@ -23,11 +21,11 @@ export interface AriaDatePickerProps {
   /** A visible label for the date picker. */
   label?: string;
   /** An accessible label for the date picker. */
-  'aria-label'?: string;
+  "aria-label"?: string;
   /** The ID of an element that labels the date picker. */
-  'aria-labelledby'?: string;
+  "aria-labelledby"?: string;
   /** The ID of an element that describes the date picker. */
-  'aria-describedby'?: string;
+  "aria-describedby"?: string;
   /** Whether the date picker is disabled. */
   isDisabled?: boolean;
   /** Whether the date picker is read-only. */
@@ -46,6 +44,38 @@ export interface AriaDatePickerProps {
   dialogAriaLabel?: string;
   /** Accessible label for the calendar grid region. */
   calendarAriaLabel?: string;
+  /** The minimum allowed date. */
+  minValue?: Date;
+  /** The maximum allowed date. */
+  maxValue?: Date;
+  /** Whether a date is unavailable. */
+  isDateUnavailable?: (date: unknown) => boolean;
+  /** The first day of the week. */
+  firstDayOfWeek?: number;
+  /** Page behavior for calendar. */
+  pageBehavior?: "single" | "visible";
+  /** Whether to force leading zeros. */
+  shouldForceLeadingZeros?: boolean;
+  /** Callback when focus changes. */
+  onFocusChange?: (isFocused: boolean) => void;
+  /** Callback when focused. */
+  onFocus?: (e: FocusEvent) => void;
+  /** Callback when blurred. */
+  onBlur?: (e: FocusEvent) => void;
+  /** The name attribute for form submission. */
+  name?: string;
+  /** The form attribute. */
+  form?: string;
+  /** Auto focus the field. */
+  autoFocus?: boolean;
+  /** The placeholder value. */
+  placeholderValue?: unknown;
+  /** Whether to hide the time zone. */
+  hideTimeZone?: boolean;
+  /** The hour cycle. */
+  hourCycle?: 12 | 24;
+  /** The granularity. */
+  granularity?: "day" | "hour" | "minute" | "second";
 }
 
 export interface DatePickerState {
@@ -76,12 +106,22 @@ export interface DatePickerAria {
   descriptionProps: Record<string, unknown>;
   /** Props for the error message element. */
   errorMessageProps: Record<string, unknown>;
+  /** Whether the picker is invalid. */
+  isInvalid: boolean;
+  /** Validation errors. */
+  validationErrors: string[];
+  /** Validation details. */
+  validationDetails: Record<string, unknown>;
+  /** Focus manager for programmatic segment focus. */
+  focusManager: {
+    focusFirst: () => void;
+    focusLast: () => void;
+  } & {
+    /** @internal Wires the actual focus implementations from the component layer */
+    _register?: (first: () => void, last: () => void) => void;
+  };
 }
 
-// ============================================
-// IMPLEMENTATION
-// ============================================
-
 /**
  * Provides the behavior and accessibility implementation for a date picker component.
  */
@@ -89,7 +129,7 @@ export function createDatePicker<T extends DateFieldState, C extends CalendarSta
   props: MaybeAccessor<AriaDatePickerProps>,
   state: T,
   overlayState: DatePickerState,
-  _calendarState?: C
+  _calendarState?: C,
 ): DatePickerAria {
   const locale = useLocale();
   const getProps = () => access(props);
@@ -97,108 +137,243 @@ export function createDatePicker<T extends DateFieldState, C extends CalendarSta
   const descriptionId = createId();
   const errorMessageId = createId();
   const dialogId = createId();
+  const buttonId = createId();
+  const fieldId = createId();
 
   // Create label handling
   const { labelProps, fieldProps: labelFieldProps } = createLabel({
-    get label() { return getProps().label; },
-    get 'aria-label'() { return getProps()['aria-label']; },
-    get 'aria-labelledby'() { return getProps()['aria-labelledby']; },
-    labelElementType: 'span',
+    get label() {
+      return getProps().label;
+    },
+    get "aria-label"() {
+      return getProps()["aria-label"];
+    },
+    get "aria-labelledby"() {
+      return getProps()["aria-labelledby"];
+    },
+    labelElementType: "span",
   });
 
   // Build aria-describedby
   const getAriaDescribedBy = () => {
     const p = getProps();
     const ids: string[] = [];
-    if (p['aria-describedby']) {
-      ids.push(p['aria-describedby']);
+    if (p["aria-describedby"]) {
+      ids.push(p["aria-describedby"]);
+    }
+    if (valueDescription()) {
+      ids.push(valueDescriptionId);
     }
     if (p.description) {
       ids.push(descriptionId);
     }
-    if (p.isInvalid && p.errorMessage) {
+    if ((p.isInvalid || state.isInvalid()) && p.errorMessage) {
       ids.push(errorMessageId);
     }
-    return ids.length > 0 ? ids.join(' ') : undefined;
+    return ids.length > 0 ? ids.join(" ") : undefined;
   };
 
+  // Selected date description for screen readers
+  const valueDescriptionId = createId();
+  const valueDescription = createMemo(() => {
+    const v = state.value?.();
+    if (!v) return "";
+    const formatter = new DateFormatter(locale().locale, {
+      year: "numeric",
+      month: "long",
+      day: "numeric",
+    });
+    return formatter.format(v.toDate(getLocalTimeZone()));
+  });
+
   // Group props
   const groupProps = createMemo(() => {
     const p = getProps();
     const isInvalid = p.isInvalid || state.isInvalid();
+    const describedBy = getAriaDescribedBy();
+    const labelField = labelFieldProps as Record<string, unknown>;
 
-    return mergeProps(labelFieldProps as Record<string, unknown>, {
+    return {
       id,
-      role: 'group',
-      'aria-disabled': p.isDisabled || state.isDisabled() || undefined,
-      'aria-readonly': p.isReadOnly || state.isReadOnly() || undefined,
-      'aria-required': p.isRequired || state.isRequired() || undefined,
-      'aria-invalid': isInvalid || undefined,
-      'aria-describedby': getAriaDescribedBy(),
-    });
+      role: "group",
+      "aria-label": labelField["aria-label"] || undefined,
+      "aria-labelledby": labelField["aria-labelledby"] || undefined,
+      "aria-disabled": p.isDisabled || state.isDisabled() || undefined,
+      "aria-readonly": p.isReadOnly || state.isReadOnly() || undefined,
+      "aria-required": p.isRequired || state.isRequired() || undefined,
+      "aria-invalid": isInvalid || undefined,
+      "aria-describedby": describedBy,
+    };
+  });
+
+  // Field props - applied to DateInput container
+  const fieldProps = createMemo(() => {
+    const p = getProps();
+    const describedBy = getAriaDescribedBy();
+
+    return {
+      id: fieldId,
+      "aria-describedby": describedBy,
+      value: state.value?.(),
+      defaultValue: state.defaultValue,
+      onChange: (value: unknown) => {
+        state.setValue?.(value as T extends DateFieldState<infer V> ? V | null : null);
+      },
+      placeholderValue: p.placeholderValue,
+      hideTimeZone: p.hideTimeZone,
+      hourCycle: p.hourCycle,
+      shouldForceLeadingZeros: p.shouldForceLeadingZeros,
+      granularity: p.granularity,
+      isDisabled: p.isDisabled || state.isDisabled(),
+      isReadOnly: p.isReadOnly || state.isReadOnly(),
+      isRequired: p.isRequired || state.isRequired(),
+      autoFocus: p.autoFocus,
+      name: p.name,
+      form: p.form,
+    };
   });
 
-  // Field props are applied to DateInput (a non-popup container), so avoid
-  // popup trigger attributes like aria-expanded/aria-haspopup here.
-  const fieldProps = createMemo(() => ({}));
+  // Button props with createPress for keyboard/mouse/touch activation
+  const buttonPress = createPress({
+    get isDisabled() {
+      const p = getProps();
+      return p.isDisabled || state.isDisabled();
+    },
+    onPress: () => {
+      overlayState.open();
+    },
+  });
 
-  // Button props
   const buttonProps = createMemo(() => {
     const p = getProps();
     const isDisabled = p.isDisabled || state.isDisabled();
     const defaults = getDatePickerLabelDefaults(locale().locale);
+    const labelId = (labelProps as Record<string, unknown>)["id"] as string | undefined;
+    const labelledBy = labelId ? `${buttonId} ${labelId}` : buttonId;
+    const describedBy = getAriaDescribedBy();
 
-    return {
-      'aria-label': p.buttonAriaLabel ?? defaults.button,
-      'aria-haspopup': 'dialog' as const,
-      'aria-expanded': overlayState.isOpen,
-      'aria-controls': overlayState.isOpen ? dialogId : undefined,
-      disabled: isDisabled,
-      tabIndex: -1,
-      onClick: () => {
-        if (!isDisabled) {
-          overlayState.toggle();
-        }
-      },
-    };
+    return mergeProps(buttonPress.pressProps as Record<string, unknown>, {
+      id: buttonId,
+      type: "button" as const,
+      "aria-label": p.buttonAriaLabel ?? defaults.button,
+      "aria-labelledby": labelledBy,
+      "aria-haspopup": "dialog" as const,
+      "aria-expanded": overlayState.isOpen,
+      "aria-controls": overlayState.isOpen ? dialogId : undefined,
+      "aria-describedby": describedBy,
+      "aria-disabled": isDisabled || undefined,
+      tabIndex: 0,
+    });
   });
 
   // Dialog props
   const dialogProps = createMemo(() => {
+    const p = getProps();
     const defaults = getDatePickerLabelDefaults(locale().locale);
+    const labelId = (labelProps as Record<string, unknown>)["id"] as string | undefined;
+    const labelledBy = labelId ? `${buttonId} ${labelId}` : buttonId;
+
     return {
       id: dialogId,
-      role: 'dialog',
-      'aria-modal': true,
-      'aria-label': getProps().dialogAriaLabel ?? defaults.dialog,
+      role: "dialog",
+      "aria-modal": true,
+      "aria-labelledby": labelledBy,
+      "aria-label": p.dialogAriaLabel ?? defaults.dialog,
     };
   });
 
   // Calendar props
   const calendarProps = createMemo(() => {
+    const p = getProps();
     const defaults = getDatePickerLabelDefaults(locale().locale);
+    const currentValue = state.value?.();
+
     return {
-      'aria-label': getProps().calendarAriaLabel ?? getProps().dialogAriaLabel ?? defaults.calendar,
+      autoFocus: true,
+      value: currentValue,
+      onChange: (value: unknown) => {
+        if (state.setValue) {
+          state.setValue(value as Parameters<typeof state.setValue>[0]);
+        }
+      },
+      minValue: p.minValue,
+      maxValue: p.maxValue,
+      isDisabled: p.isDisabled || state.isDisabled(),
+      isReadOnly: p.isReadOnly || state.isReadOnly(),
+      isDateUnavailable: p.isDateUnavailable,
+      defaultFocusedValue: currentValue ? undefined : p.placeholderValue,
+      isInvalid: p.isInvalid || state.isInvalid(),
+      errorMessage:
+        typeof p.errorMessage === "string"
+          ? p.errorMessage
+          : state.isInvalid()
+            ? "Invalid date"
+            : undefined,
+      firstDayOfWeek: p.firstDayOfWeek,
+      pageBehavior: p.pageBehavior,
+      "aria-label": p.calendarAriaLabel ?? p.dialogAriaLabel ?? defaults.calendar,
     };
   });
 
-  // Description props
+  // Description props for the description element
   const descriptionProps = createMemo(() => ({
     id: descriptionId,
   }));
 
+  // Value description element props
+  const valueDescriptionProps = createMemo(() => ({
+    id: valueDescriptionId,
+    "aria-hidden": true,
+  }));
+
   // Error message props
   const errorMessageProps = createMemo(() => ({
     id: errorMessageId,
-    role: 'alert',
+    role: "alert",
   }));
 
+  // Label click focuses first segment — component layer wires the actual ref
+  let focusFirstSegment: (() => void) | undefined;
+  let focusLastSegment: (() => void) | undefined;
+
+  const enhancedLabelProps = createMemo(() => {
+    return {
+      ...labelProps,
+      onClick: () => {
+        focusFirstSegment?.();
+      },
+    };
+  });
+
+  const isInvalid = createMemo(() => {
+    const p = getProps();
+    return p.isInvalid || state.isInvalid();
+  });
+
+  const validationErrors = createMemo(() => {
+    const p = getProps();
+    if (p.isInvalid && typeof p.errorMessage === "string") {
+      return [p.errorMessage];
+    }
+    return [];
+  });
+
+  const validationDetails = createMemo(() => {
+    const p = getProps();
+    return {
+      minValue: p.minValue,
+      maxValue: p.maxValue,
+      isDateUnavailable: p.isDateUnavailable,
+      isInvalid: isInvalid(),
+    };
+  });
+
   return {
     get groupProps() {
       return groupProps();
     },
     get labelProps() {
-      return labelProps as Record<string, unknown>;
+      return enhancedLabelProps() as Record<string, unknown>;
     },
     get fieldProps() {
       return fieldProps();
@@ -218,6 +393,24 @@ export function createDatePicker<T extends DateFieldState, C extends CalendarSta
     get errorMessageProps() {
       return errorMessageProps();
     },
+    get isInvalid() {
+      return isInvalid();
+    },
+    get validationErrors() {
+      return validationErrors();
+    },
+    get validationDetails() {
+      return validationDetails();
+    },
+    focusManager: {
+      focusFirst: () => focusFirstSegment?.(),
+      focusLast: () => focusLastSegment?.(),
+      /** @internal Wires the actual focus implementations from the component layer */
+      _register: (first: () => void, last: () => void) => {
+        focusFirstSegment = first;
+        focusLastSegment = last;
+      },
+    },
   };
 }
 
@@ -226,19 +419,19 @@ function getDatePickerLabelDefaults(locale: string): {
   dialog: string;
   calendar: string;
 } {
-  const language = locale.toLowerCase().split('-')[0] ?? 'en';
+  const language = locale.toLowerCase().split("-")[0] ?? "en";
 
-  if (language === 'es') {
+  if (language === "es") {
     return {
-      button: 'Abrir calendario',
-      dialog: 'Calendario',
-      calendar: 'Calendario',
+      button: "Abrir calendario",
+      dialog: "Calendario",
+      calendar: "Calendario",
     };
   }
 
   return {
-    button: 'Open calendar',
-    dialog: 'Calendar',
-    calendar: 'Calendar',
+    button: "Open calendar",
+    dialog: "Calendar",
+    calendar: "Calendar",
   };
 }

package/src/datepicker/createDatePickerGroup.ts

@@ -0,0 +1,149 @@
+/**
+ * createDatePickerGroup hook for Solidaria
+ *
+ * Provides keyboard and pointer behavior for the date picker field group.
+ * Based on @react-aria/datepicker useDatePickerGroup
+ */
+
+import { createMemo } from "solid-js";
+import { type MaybeAccessor, access } from "../utils/reactivity";
+import { mergeProps } from "../utils/mergeProps";
+import { useLocale } from "../i18n";
+import { createPress } from "../interactions/createPress";
+import { nodeContains, getEventTarget } from "../utils";
+import { focusSafely } from "../utils/focus";
+
+export interface AriaDatePickerGroupProps {
+  isDisabled?: boolean;
+}
+
+export interface DatePickerGroupAria {
+  groupProps: Record<string, unknown>;
+}
+
+export function createDatePickerGroup(
+  props: MaybeAccessor<AriaDatePickerGroupProps>,
+  state: { setOpen: (isOpen: boolean) => void; isOpen: boolean; isDisabled: () => boolean },
+  ref: () => HTMLElement | null,
+  disableArrowNavigation?: boolean,
+): DatePickerGroupAria {
+  const locale = useLocale();
+  const resolvedProps = createMemo(() => access(props));
+
+  const onKeyDown = (e: KeyboardEvent) => {
+    if (!nodeContains(e.currentTarget as Node | null, getEventTarget(e) as Node | null)) {
+      return;
+    }
+
+    // Open the popover on alt + arrow down/up
+    if (e.altKey && (e.key === "ArrowDown" || e.key === "ArrowUp")) {
+      e.preventDefault();
+      e.stopPropagation();
+      state.setOpen(true);
+      return;
+    }
+
+    if (disableArrowNavigation) return;
+
+    const root = ref();
+    if (!root) return;
+
+    const segments = Array.from(root.querySelectorAll('[role="spinbutton"]')) as HTMLElement[];
+    if (segments.length === 0) return;
+
+    const activeElement = root.ownerDocument.activeElement;
+    let currentIndex = -1;
+    if (activeElement) {
+      currentIndex = segments.indexOf(activeElement as HTMLElement);
+    }
+
+    const direction = locale().direction;
+
+    switch (e.key) {
+      case "ArrowLeft": {
+        e.preventDefault();
+        e.stopPropagation();
+        if (direction === "rtl") {
+          // geometric fallback: in RTL, left arrow moves toward the end (next)
+          const nextIndex = currentIndex >= 0 ? currentIndex + 1 : 0;
+          if (nextIndex < segments.length) {
+            focusSafely(segments[nextIndex]);
+          }
+        } else {
+          const prevIndex = currentIndex >= 0 ? currentIndex - 1 : segments.length - 1;
+          if (prevIndex >= 0) {
+            focusSafely(segments[prevIndex]);
+          }
+        }
+        break;
+      }
+      case "ArrowRight": {
+        e.preventDefault();
+        e.stopPropagation();
+        if (direction === "rtl") {
+          // geometric fallback: in RTL, right arrow moves toward the start (previous)
+          const prevIndex = currentIndex >= 0 ? currentIndex - 1 : segments.length - 1;
+          if (prevIndex >= 0) {
+            focusSafely(segments[prevIndex]);
+          }
+        } else {
+          const nextIndex = currentIndex >= 0 ? currentIndex + 1 : 0;
+          if (nextIndex < segments.length) {
+            focusSafely(segments[nextIndex]);
+          }
+        }
+        break;
+      }
+    }
+  };
+
+  const focusLast = (event?: Event) => {
+    const root = ref();
+    if (!root) return;
+
+    const target = event ? getEventTarget(event) : null;
+
+    const segments = Array.from(root.querySelectorAll('[role="spinbutton"]')) as HTMLElement[];
+    if (segments.length === 0) return;
+
+    let startIndex = segments.length - 1;
+    if (target) {
+      const targetIndex = segments.indexOf(target as HTMLElement);
+      if (targetIndex >= 0) {
+        startIndex = targetIndex;
+      }
+    }
+
+    for (let i = startIndex; i >= 0; i--) {
+      const segment = segments[i];
+      if (segment.getAttribute("data-placeholder") !== "true") {
+        focusSafely(segment);
+        return;
+      }
+    }
+  };
+
+  const { pressProps } = createPress({
+    isDisabled: () => resolvedProps().isDisabled || state.isDisabled(),
+    preventFocusOnPress: true,
+    allowTextSelectionOnPress: true,
+    onPressStart(e) {
+      if (e.pointerType === "mouse") {
+        focusLast(e as unknown as Event);
+      }
+    },
+    onPress(e) {
+      if (e.pointerType === "touch" || e.pointerType === "pen") {
+        focusLast(e as unknown as Event);
+      }
+    },
+  });
+
+  return {
+    get groupProps() {
+      return mergeProps(pressProps, {
+        onKeyDown,
+      });
+    },
+  };
+}