@proyecto-viviana/solidaria 0.2.8 → 0.3.0

package/src/datepicker/createDateRangePicker.ts

@@ -5,21 +5,21 @@
  * Compatibility target: @react-aria/datepicker useDateRangePicker.
  */
 
-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 { RangeCalendarState } from '@proyecto-viviana/solid-stately';
-import type { DatePickerState } from './createDatePicker';
+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 { RangeCalendarState } from "@proyecto-viviana/solid-stately";
+import type { DatePickerState } from "./createDatePicker";
 
 export interface AriaDateRangePickerProps {
   id?: string;
   label?: string;
-  'aria-label'?: string;
-  'aria-labelledby'?: string;
-  'aria-describedby'?: string;
+  "aria-label"?: string;
+  "aria-labelledby"?: string;
+  "aria-describedby"?: string;
   isDisabled?: boolean;
   isReadOnly?: boolean;
   isRequired?: boolean;
@@ -38,6 +38,8 @@ export interface DateRangePickerAria {
   labelProps: Record<string, unknown>;
   startFieldProps: Record<string, unknown>;
   endFieldProps: Record<string, unknown>;
+  startInputProps: Record<string, unknown>;
+  endInputProps: Record<string, unknown>;
   buttonProps: Record<string, unknown>;
   dialogProps: Record<string, unknown>;
   calendarProps: Record<string, unknown>;
@@ -48,7 +50,7 @@ export interface DateRangePickerAria {
 export function createDateRangePicker<T extends RangeCalendarState>(
   props: MaybeAccessor<AriaDateRangePickerProps>,
   state: T,
-  overlayState: DatePickerState
+  overlayState: DatePickerState,
 ): DateRangePickerAria {
   const locale = useLocale();
   const getProps = () => access(props);
@@ -60,19 +62,25 @@ export function createDateRangePicker<T extends RangeCalendarState>(
   const dialogId = createId();
 
   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",
   });
 
   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 (p.description) ids.push(descriptionId);
     if (p.isInvalid && p.errorMessage) ids.push(errorMessageId);
-    return ids.length > 0 ? ids.join(' ') : undefined;
+    return ids.length > 0 ? ids.join(" ") : undefined;
   };
 
   const groupProps = createMemo(() => {
@@ -80,12 +88,12 @@ export function createDateRangePicker<T extends RangeCalendarState>(
     const isInvalid = p.isInvalid;
     return mergeProps(labelFieldProps as Record<string, unknown>, {
       id,
-      role: 'group',
-      'aria-disabled': p.isDisabled || state.isDisabled() || undefined,
-      'aria-readonly': p.isReadOnly || state.isReadOnly() || undefined,
-      'aria-required': p.isRequired || undefined,
-      'aria-invalid': isInvalid || undefined,
-      'aria-describedby': getAriaDescribedBy(),
+      role: "group",
+      "aria-disabled": p.isDisabled || state.isDisabled() || undefined,
+      "aria-readonly": p.isReadOnly || state.isReadOnly() || undefined,
+      "aria-required": p.isRequired || undefined,
+      "aria-invalid": isInvalid || undefined,
+      "aria-describedby": getAriaDescribedBy(),
     });
   });
 
@@ -98,11 +106,11 @@ export function createDateRangePicker<T extends RangeCalendarState>(
 
     return {
       id: startFieldId,
-      'aria-label': p.startFieldAriaLabel ?? defaults.startField,
-      'aria-describedby': getAriaDescribedBy(),
-      'aria-disabled': isDisabled || undefined,
-      'aria-readonly': isReadOnly || undefined,
-      'aria-invalid': isInvalid || undefined,
+      "aria-label": p.startFieldAriaLabel ?? defaults.startField,
+      "aria-describedby": getAriaDescribedBy(),
+      "aria-disabled": isDisabled || undefined,
+      "aria-readonly": isReadOnly || undefined,
+      "aria-invalid": isInvalid || undefined,
       tabIndex: isDisabled ? -1 : 0,
       onClick: () => {
         if (!isDisabled) {
@@ -111,7 +119,7 @@ export function createDateRangePicker<T extends RangeCalendarState>(
       },
       onKeyDown: (event: KeyboardEvent) => {
         if (isDisabled) return;
-        if (event.key === 'Enter' || event.key === ' ' || event.key === 'ArrowDown') {
+        if (event.key === "Enter" || event.key === " " || event.key === "ArrowDown") {
           event.preventDefault();
           overlayState.open();
         }
@@ -128,11 +136,11 @@ export function createDateRangePicker<T extends RangeCalendarState>(
 
     return {
       id: endFieldId,
-      'aria-label': p.endFieldAriaLabel ?? defaults.endField,
-      'aria-describedby': getAriaDescribedBy(),
-      'aria-disabled': isDisabled || undefined,
-      'aria-readonly': isReadOnly || undefined,
-      'aria-invalid': isInvalid || undefined,
+      "aria-label": p.endFieldAriaLabel ?? defaults.endField,
+      "aria-describedby": getAriaDescribedBy(),
+      "aria-disabled": isDisabled || undefined,
+      "aria-readonly": isReadOnly || undefined,
+      "aria-invalid": isInvalid || undefined,
       tabIndex: isDisabled ? -1 : 0,
       onClick: () => {
         if (!isDisabled) {
@@ -141,7 +149,7 @@ export function createDateRangePicker<T extends RangeCalendarState>(
       },
       onKeyDown: (event: KeyboardEvent) => {
         if (isDisabled) return;
-        if (event.key === 'Enter' || event.key === ' ' || event.key === 'ArrowDown') {
+        if (event.key === "Enter" || event.key === " " || event.key === "ArrowDown") {
           event.preventDefault();
           overlayState.open();
         }
@@ -149,15 +157,49 @@ export function createDateRangePicker<T extends RangeCalendarState>(
     };
   });
 
+  const startInputProps = createMemo(() => {
+    const p = getProps();
+    const defaults = getDateRangePickerLabelDefaults(locale().locale);
+    const isDisabled = p.isDisabled || state.isDisabled();
+    const isReadOnly = p.isReadOnly || state.isReadOnly();
+    const isInvalid = p.isInvalid;
+
+    return {
+      id: startFieldId,
+      "aria-label": p.startFieldAriaLabel ?? defaults.startField,
+      "aria-describedby": getAriaDescribedBy(),
+      "aria-disabled": isDisabled || undefined,
+      "aria-readonly": isReadOnly || undefined,
+      "aria-invalid": isInvalid || undefined,
+    };
+  });
+
+  const endInputProps = createMemo(() => {
+    const p = getProps();
+    const defaults = getDateRangePickerLabelDefaults(locale().locale);
+    const isDisabled = p.isDisabled || state.isDisabled();
+    const isReadOnly = p.isReadOnly || state.isReadOnly();
+    const isInvalid = p.isInvalid;
+
+    return {
+      id: endFieldId,
+      "aria-label": p.endFieldAriaLabel ?? defaults.endField,
+      "aria-describedby": getAriaDescribedBy(),
+      "aria-disabled": isDisabled || undefined,
+      "aria-readonly": isReadOnly || undefined,
+      "aria-invalid": isInvalid || undefined,
+    };
+  });
+
   const buttonProps = createMemo(() => {
     const p = getProps();
     const defaults = getDateRangePickerLabelDefaults(locale().locale);
     const isDisabled = p.isDisabled || state.isDisabled();
     return {
-      'aria-label': p.buttonAriaLabel ?? defaults.button,
-      'aria-haspopup': 'dialog' as const,
-      'aria-expanded': overlayState.isOpen,
-      'aria-controls': overlayState.isOpen ? dialogId : undefined,
+      "aria-label": p.buttonAriaLabel ?? defaults.button,
+      "aria-haspopup": "dialog" as const,
+      "aria-expanded": overlayState.isOpen,
+      "aria-controls": overlayState.isOpen ? dialogId : undefined,
       disabled: isDisabled,
       tabIndex: 0,
       onClick: () => {
@@ -170,21 +212,21 @@ export function createDateRangePicker<T extends RangeCalendarState>(
     const defaults = getDateRangePickerLabelDefaults(locale().locale);
     return {
       id: dialogId,
-      role: 'dialog',
-      'aria-modal': true,
-      'aria-label': getProps().dialogAriaLabel ?? defaults.dialog,
+      role: "dialog",
+      "aria-modal": true,
+      "aria-label": getProps().dialogAriaLabel ?? defaults.dialog,
     };
   });
 
   const calendarProps = createMemo(() => {
     const defaults = getDateRangePickerLabelDefaults(locale().locale);
     return {
-      'aria-label': getProps().calendarAriaLabel ?? getProps().dialogAriaLabel ?? defaults.calendar,
+      "aria-label": getProps().calendarAriaLabel ?? getProps().dialogAriaLabel ?? defaults.calendar,
     };
   });
 
   const descriptionProps = createMemo(() => ({ id: descriptionId }));
-  const errorMessageProps = createMemo(() => ({ id: errorMessageId, role: 'alert' }));
+  const errorMessageProps = createMemo(() => ({ id: errorMessageId, role: "alert" }));
 
   return {
     get groupProps() {
@@ -199,6 +241,12 @@ export function createDateRangePicker<T extends RangeCalendarState>(
     get endFieldProps() {
       return endFieldProps();
     },
+    get startInputProps() {
+      return startInputProps();
+    },
+    get endInputProps() {
+      return endInputProps();
+    },
     get buttonProps() {
       return buttonProps();
     },
@@ -224,23 +272,23 @@ function getDateRangePickerLabelDefaults(locale: string): {
   startField: string;
   endField: 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 de rango',
-      dialog: 'Calendario de rango',
-      calendar: 'Calendario de rango',
-      startField: 'Fecha de inicio',
-      endField: 'Fecha de fin',
+      button: "Abrir calendario de rango",
+      dialog: "Calendario de rango",
+      calendar: "Calendario de rango",
+      startField: "Fecha de inicio",
+      endField: "Fecha de fin",
     };
   }
 
   return {
-    button: 'Open range calendar',
-    dialog: 'Range calendar',
-    calendar: 'Range calendar',
-    startField: 'Start date',
-    endField: 'End date',
+    button: "Open range calendar",
+    dialog: "Range calendar",
+    calendar: "Range calendar",
+    startField: "Start date",
+    endField: "End date",
   };
 }