feat: Implement useDateField with @internationalized/date

.changeset/gentle-cups-destroy.md

@@ -0,0 +1,5 @@
+---
+'@formwerk/core': minor
+---
+
+feat: implement useDateTimeField

packages/core/package.json

@@ -41,6 +41,7 @@
     "dist/*.d.ts"
   ],
   "dependencies": {
+    "@internationalized/date": "^3.7.0",
     "@standard-schema/spec": "1.0.0",
     "@standard-schema/utils": "^0.3.0",
     "klona": "^2.0.6",

packages/core/src/constants/index.ts

@@ -18,6 +18,9 @@ export const FieldTypePrefixes = {
   CustomField: 'cf',
   ComboBox: 'cbx',
   ListBox: 'lb',
+  DateTimeField: 'dtf',
+  DateTimeSegment: 'dts',
+  Calendar: 'cal',
 } as const;
 
 export const NOOP = () => {};

packages/core/src/helpers/useControlButtonProps/index.ts

@@ -0,0 +1 @@
+export * from './useControlButtonProps';

packages/core/src/helpers/useControlButtonProps/useControlButtonProps.ts

@@ -0,0 +1,29 @@
+import { computed, shallowRef } from 'vue';
+import { isButtonElement, withRefCapture } from '../../utils/common';
+
+interface ControlButtonProps {
+  [key: string]: unknown;
+  disabled?: boolean;
+}
+
+export function useControlButtonProps(props: () => ControlButtonProps) {
+  const buttonEl = shallowRef<HTMLElement>();
+
+  const buttonProps = computed(() => {
+    const isBtn = isButtonElement(buttonEl.value);
+    const { disabled, ...rest } = props();
+
+    return withRefCapture(
+      {
+        type: isBtn ? ('button' as const) : undefined,
+        role: isBtn ? undefined : 'button',
+        [isBtn ? 'disabled' : 'aria-disabled']: disabled || undefined,
+        tabindex: '-1',
+        ...rest,
+      },
+      buttonEl,
+    );
+  });
+
+  return buttonProps;
+}

packages/core/src/i18n/getCalendar.ts

@@ -0,0 +1,11 @@
+export function getCalendar(locale: Intl.Locale): string {
+  if (locale.calendar) {
+    return locale.calendar as string;
+  }
+
+  if ('calendars' in locale) {
+    return (locale.calendars as string[])[0] as string;
+  }
+
+  return 'gregory';
+}

packages/core/src/i18n/getDirection.spec.ts

@@ -2,8 +2,8 @@ import { configure } from '../config';
 import { getDirection } from './getDirection';
 
 test('gets the direction of a locale', () => {
-  expect(getDirection('ar-EG')).toBe('rtl');
-  expect(getDirection('en-US')).toBe('ltr');
+  expect(getDirection(new Intl.Locale('ar-EG'))).toBe('rtl');
+  expect(getDirection(new Intl.Locale('en-US'))).toBe('ltr');
 });
 
 test('warns if the direction was not recognized', () => {
@@ -15,6 +15,6 @@ test('warns if the direction was not recognized', () => {
 
 test('returns ltr if detectDirection is false', () => {
   configure({ detectDirection: false });
-  expect(getDirection('ar-EG')).toBe('ltr');
+  expect(getDirection(new Intl.Locale('ar-EG'))).toBe('ltr');
   configure({ detectDirection: true });
 });

packages/core/src/i18n/getDirection.ts

@@ -2,19 +2,18 @@ import { Direction } from '../types';
 import { isCallable, warn } from '../utils/common';
 import { getConfig } from '../config';
 
-export function getDirection(locale: string): Direction {
+export function getDirection(locale: Intl.Locale): Direction {
   if (!getConfig().detectDirection) {
     return 'ltr';
   }
 
   try {
-    const instance = new Intl.Locale(locale);
-    if ('textInfo' in instance) {
-      return ((instance.textInfo as { direction: Direction }).direction as Direction) || 'ltr';
+    if ('textInfo' in locale) {
+      return ((locale.textInfo as { direction: Direction }).direction as Direction) || 'ltr';
     }
 
-    if ('getTextInfo' in instance && isCallable(instance.getTextInfo)) {
-      return (instance.getTextInfo().direction as Direction) || 'ltr';
+    if ('getTextInfo' in locale && isCallable(locale.getTextInfo)) {
+      return (locale.getTextInfo().direction as Direction) || 'ltr';
     }
 
     throw new Error(`Cannot determine direction for locale ${locale}`);

packages/core/src/i18n/getTimezone.ts

@@ -0,0 +1,3 @@
+export function getTimeZone(locale: Intl.Locale) {
+  return new Intl.DateTimeFormat(locale).resolvedOptions().timeZone;
+}

packages/core/src/i18n/getWeekInfo.ts

@@ -0,0 +1,26 @@
+import { isCallable, warn } from '../utils/common';
+
+export interface WeekInfo {
+  firstDay: number;
+  weekend: number[];
+}
+
+export function getWeekInfo(locale: Intl.Locale): WeekInfo {
+  const fallbackInfo: WeekInfo = { firstDay: 7, weekend: [6, 7] };
+
+  try {
+    if ('weekInfo' in locale) {
+      return (locale.weekInfo as WeekInfo) || fallbackInfo;
+    }
+
+    if ('getWeekInfo' in locale && isCallable(locale.getWeekInfo)) {
+      return (locale.getWeekInfo() as WeekInfo) || fallbackInfo;
+    }
+
+    throw new Error(`Cannot determine week info for locale ${locale}`);
+  } catch {
+    warn(`Cannot determine week info for locale ${locale}`);
+
+    return fallbackInfo;
+  }
+}

packages/core/src/i18n/index.ts

@@ -4,3 +4,4 @@ export * from './getSiteLocale';
 export * from './useLocale';
 export * from './useNumberParser';
 export * from './checkLocaleMismatch';
+export * from './useDateFormatter';

packages/core/src/i18n/useDateFormatter.ts

@@ -0,0 +1,40 @@
+import { MaybeRefOrGetter, shallowRef, toValue, watch } from 'vue';
+import { DateFormatter } from '@internationalized/date';
+import { getUserLocale } from './getUserLocale';
+import { isEqual } from '../utils/common';
+
+// TODO: May memory leak in SSR
+const dateFormatterCache = new Map<string, DateFormatter>();
+
+function getFormatter(locale: string, options: Intl.DateTimeFormatOptions = {}) {
+  const cacheKey = locale + JSON.stringify(options);
+  let formatter = dateFormatterCache.get(cacheKey);
+  if (!formatter) {
+    formatter = new DateFormatter(locale, options);
+    dateFormatterCache.set(cacheKey, formatter);
+  }
+
+  return formatter;
+}
+
+export function useDateFormatter(
+  locale: MaybeRefOrGetter<string | undefined>,
+  opts?: MaybeRefOrGetter<Intl.DateTimeFormatOptions | undefined>,
+) {
+  const resolvedLocale = getUserLocale();
+  const formatter = shallowRef(getFormatter(toValue(locale) || resolvedLocale, toValue(opts)));
+
+  watch(
+    () => ({
+      locale: toValue(locale) || resolvedLocale,
+      opts: toValue(opts),
+    }),
+    (config, oldConfig) => {
+      if (!isEqual(config, oldConfig)) {
+        formatter.value = getFormatter(config.locale, config.opts);
+      }
+    },
+  );
+
+  return formatter;
+}

packages/core/src/i18n/useLocale.ts

@@ -1,13 +1,57 @@
-import { computed } from 'vue';
+import { computed, MaybeRefOrGetter, toValue } from 'vue';
 import { getConfig } from '../config';
 import { getDirection } from './getDirection';
+import { getWeekInfo } from './getWeekInfo';
+import { Maybe, Reactivify } from '../types';
+import { Calendar, GregorianCalendar } from '@internationalized/date';
+import { getTimeZone } from './getTimezone';
+
+export type NumberLocaleExtension = `nu-${string}`;
+
+export interface LocaleExtension {
+  number: Maybe<NumberLocaleExtension>;
+  calendar: Maybe<Calendar>;
+  timeZone: Maybe<string>;
+}
 
 /**
  * Composable that resolves the currently configured locale and direction.
  */
-export function useLocale() {
-  const locale = computed(() => getConfig().locale);
-  const direction = computed(() => getDirection(locale.value));
+export function useLocale(
+  localeCode?: MaybeRefOrGetter<Maybe<string>>,
+  extensions: Partial<Reactivify<LocaleExtension>> = {},
+) {
+  const localeString = computed(() => {
+    let code = toValue(localeCode) || getConfig().locale;
+    const calExt = toValue(extensions.calendar);
+    const numExt = toValue(extensions.number);
+
+    // Add the base locale extension if it's not already present
+    if (!code.includes('-u-') && (numExt || calExt)) {
+      code += '-u-';
+    }
+
+    // Add the number locale extension if it's not already present
+    if (!code.includes('-nu-') && numExt) {
+      code += `-nu-${numExt}`;
+    }
+
+    // Add the calendar locale extension if it's not already present
+    if (!code.includes('-ca-') && calExt?.identifier) {
+      code += `-ca-${calExt.identifier}`;
+    }
+
+    code = code.replaceAll('--', '-');
+
+    return code;
+  });
+
+  const localeInstance = computed(() => new Intl.Locale(localeString.value));
+  const direction = computed(() => getDirection(localeInstance.value));
+  const weekInfo = computed(() => getWeekInfo(localeInstance.value));
+  const calendar = computed(() => toValue(extensions.calendar) ?? (new GregorianCalendar() as Calendar));
+  const timeZone = computed(() => toValue(extensions.timeZone) ?? getTimeZone(localeInstance.value));
+  const locale = computed(() => localeInstance.value.toString());
 
-  return { locale, direction };
+  return { locale, direction, weekInfo, calendar, timeZone };
 }

packages/core/src/i18n/useNumberParser/index.spec.ts → packages/core/src/i18n/useNumberParser.spec.ts

@@ -1,4 +1,4 @@
-import { useNumberParser } from '.';
+import { useNumberParser } from './useNumberParser';
 
 const enNumber = 1234567890.12;
 

packages/core/src/i18n/useNumberParser/index.ts → packages/core/src/i18n/useNumberParser.ts

@@ -1,5 +1,5 @@
-import { MaybeRefOrGetter, toValue } from 'vue';
-import { getUserLocale } from '../getUserLocale';
+import { MaybeRefOrGetter, toValue, watch } from 'vue';
+import { getUserLocale } from './getUserLocale';
 
 /**
  * Stuff that are considered "literals" that's not part of the number itself and should be stripped out when parsing/validating.
@@ -57,7 +57,7 @@ interface NumberSymbols {
   resolveNumber: (number: string) => string;
 }
 
-interface NumberParser {
+export interface NumberParser {
   formatter: Intl.NumberFormat;
   options: Intl.ResolvedNumberFormatOptions;
   locale: string;
@@ -67,6 +67,7 @@ interface NumberParser {
   isValidNumberPart(value: string): boolean;
 }
 
+// TODO: May memory leak in SSR
 const numberParserCache = new Map<string, NumberParser>();
 
 function getParser(locale: string, options: Intl.NumberFormatOptions) {
@@ -206,6 +207,8 @@ export function defineNumberParser(locale: string, options: Intl.NumberFormatOpt
   };
 }
 
+export type NumberParserContext = Pick<NumberParser, 'parse' | 'isValidNumberPart'>;
+
 export function useNumberParser(
   locale: MaybeRefOrGetter<string | undefined>,
   opts?: MaybeRefOrGetter<Intl.NumberFormatOptions | undefined>,
@@ -273,12 +276,18 @@ export function useNumberParser(
     return resolveParser(value).isValidNumberPart(value);
   }
 
-  function format(value: number): string {
-    const defaultParser = getParser(toValue(locale) ?? toValue(resolvedLocale), toValue(opts) || {});
+  function getDefaultParser() {
+    return getParser(toValue(locale) ?? toValue(resolvedLocale), toValue(opts) || {});
+  }
 
-    return (lastResolvedParser ?? defaultParser).format(value);
+  function format(value: number): string {
+    return (lastResolvedParser ?? getDefaultParser()).format(value);
   }
 
+  watch([() => toValue(locale), () => toValue(opts)], () => {
+    lastResolvedParser = getDefaultParser();
+  });
+
   return {
     parse,
     format,

packages/core/src/index.ts

@@ -13,6 +13,9 @@ export * from './useSelect';
 export * from './useComboBox';
 export * from './useHiddenField';
 export * from './useCustomField';
+export * from './useDateTimeField';
+export * from './useCalendar';
+export * from './usePicker';
 export * from './types';
 export * from './config';
 export * from './useForm';

packages/core/src/useCalendar/constants.ts

@@ -0,0 +1,10 @@
+import { InjectionKey } from 'vue';
+import { CalendarContext } from './types';
+
+export const CalendarContextKey: InjectionKey<CalendarContext> = Symbol('CalendarContext');
+
+export const YEAR_CELLS_COUNT = 9;
+
+export const MONTHS_COLUMNS_COUNT = 3;
+
+export const YEARS_COLUMNS_COUNT = 3;

packages/core/src/useCalendar/index.ts

@@ -0,0 +1,4 @@
+export * from './useCalendar';
+export * from './types';
+export * from './useCalendarCell';
+export * from './useCalendarView';

packages/core/src/useCalendar/types.ts

@@ -0,0 +1,53 @@
+import { WeekInfo } from '../i18n/getWeekInfo';
+import { Ref } from 'vue';
+import { Maybe } from '../types';
+import type { ZonedDateTime, Calendar } from '@internationalized/date';
+
+export interface CalendarDayCell {
+  type: 'day';
+  value: ZonedDateTime;
+  dayOfMonth: number;
+  label: string;
+  isToday: boolean;
+  isOutsideMonth: boolean;
+  selected: boolean;
+  disabled: boolean;
+  focused: boolean;
+}
+
+export interface CalendarMonthCell {
+  type: 'month';
+  label: string;
+  value: ZonedDateTime;
+  monthOfYear: number;
+  selected: boolean;
+  disabled: boolean;
+  focused: boolean;
+}
+
+export interface CalendarYearCell {
+  type: 'year';
+  label: string;
+  value: ZonedDateTime;
+  year: number;
+  selected: boolean;
+  disabled: boolean;
+  focused: boolean;
+}
+
+export type CalendarCellProps = CalendarDayCell | CalendarMonthCell | CalendarYearCell;
+
+export type CalendarViewType = 'weeks' | 'months' | 'years';
+
+export interface CalendarContext {
+  locale: Ref<string>;
+  weekInfo: Ref<WeekInfo>;
+  calendar: Ref<Calendar>;
+  timeZone: Ref<string>;
+  getSelectedDate: () => ZonedDateTime;
+  getMinDate: () => Maybe<ZonedDateTime>;
+  getMaxDate: () => Maybe<ZonedDateTime>;
+  getFocusedDate: () => ZonedDateTime;
+  setFocusedDate: (date: ZonedDateTime) => void;
+  setDate: (date: ZonedDateTime, view?: CalendarViewType) => void;
+}