@codecademy/gamut
72.5.072.5.1-alpha.7ca70c.0
+
Added (2 files)
~
Modified (8 files)
Index: package/dist/DatePicker/DatePickerCalendar/Calendar/CalendarBody.js
===================================================================
--- package/dist/DatePicker/DatePickerCalendar/Calendar/CalendarBody.js
+++ package/dist/DatePicker/DatePickerCalendar/Calendar/CalendarBody.js
@@ -125,8 +125,9 @@
children: [/*#__PURE__*/_jsx("thead", {
children: /*#__PURE__*/_jsx("tr", {
children: weekdayLabels.map((label, i) => /*#__PURE__*/_jsx(TableHeader, {
abbr: weekdayFullNames[i],
+ "aria-label": weekdayFullNames[i],
scope: "col",
children: label
}, label))
})Index: package/dist/DatePicker/DatePicker.js
===================================================================
--- package/dist/DatePicker/DatePicker.js
+++ package/dist/DatePicker/DatePicker.js
@@ -24,8 +24,9 @@
const [isCalendarOpen, setIsCalendarOpen] = useState(false);
const [focusGridSignal, setFocusGridSignal] = useState(false);
const [gridFocusRequested, setGridFocusRequested] = useState(false);
const [activeRangePart, setActiveRangePart] = useState(null);
+ const [hasError, setHasError] = useState(false);
const inputRef = useRef(null);
const dialogId = useId();
const calendarDialogId = `datepicker-dialog-${dialogId.replace(/:/g, '')}`;
const isRtl = useElementDir() === 'rtl';
@@ -75,9 +76,11 @@
closeCalendar,
locale: resolvedLocale,
disableDate,
translations,
- quickActions: quickActions === null ? [] : resolvedQuickActions
+ quickActions: quickActions === null ? [] : resolvedQuickActions,
+ hasError,
+ setHasError
};
return mode === 'range' ? {
...base,
mode: 'range',
@@ -94,9 +97,9 @@
mode: 'single',
selectedDate: props.selectedDate,
onSelection: props.onSelected
};
- }, [translationsProp, quickActions, mode, resolvedLocale, isCalendarOpen, openCalendar, focusCalendar, focusGridSignal, gridFocusRequested, clearGridFocusRequest, closeCalendar, disableDate, props, activeRangePart]);
+ }, [translationsProp, quickActions, mode, resolvedLocale, isCalendarOpen, openCalendar, focusCalendar, focusGridSignal, gridFocusRequested, clearGridFocusRequest, closeCalendar, disableDate, props, activeRangePart, hasError, setHasError]);
const content = children !== undefined ? children : /*#__PURE__*/_jsxs(_Fragment, {
children: [/*#__PURE__*/_jsx(FlexBox, {
gap: inputSize === 'small' ? 4 : 8,
ref: inputRef,
@@ -129,9 +132,9 @@
invertAxis: "x",
isOpen: isCalendarOpen,
targetRef: inputRef,
x: -20,
- y: -16,
+ y: isCalendarOpen && hasError ? 0 : -16,
onRequestClose: closeCalendar,
children: /*#__PURE__*/_jsx("div", {
"aria-label": contextValue.translations.calendarDialogAriaLabel,
id: calendarDialogId,Index: package/dist/DatePicker/DatePickerInput/index.js
===================================================================
--- package/dist/DatePicker/DatePickerInput/index.js
+++ package/dist/DatePicker/DatePickerInput/index.js
@@ -1,7 +1,11 @@
+import _styled from "@emotion/styled/base";
import { MiniCalendarIcon } from '@codecademy/gamut-icons';
+import { css } from '@codecademy/gamut-styles';
import { forwardRef, useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
import { FlexBox } from '../../Box';
+import { IconButton } from '../../Button';
+import { FormError } from '../../Form/elements/FormError';
import { FormGroup } from '../../Form/elements/FormGroup';
import { isSameDay } from '../DatePickerCalendar/Calendar/utils/dateGrid';
import { handleDateSelectRange } from '../DatePickerCalendar/utils/dateSelect';
import { useDatePicker } from '../DatePickerContext';
@@ -9,12 +13,27 @@
import { DatePickerInputSegment } from './Segment';
import { SegmentLiteral } from './Segment/elements';
import { getDateSegmentsFromDate, normalizeSegmentValues, parseSegmentsToDate } from './Segment/utils';
import { formatDateISO8601DateOnly, getDateFieldOrder, getDateFormatLayout } from './utils';
+import { validateDateRange, validateSegments } from './utils/validation';
+
+/* FormError's `absolute` variant takes the message out of layout flow (anchored
+ to FormGroup's position: relative container), so the input never changes height:
+ the range-mode arrow stays aligned and no space is reserved when there's no error. */
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const AbsoluteFormError = /*#__PURE__*/_styled(FormError, {
+ target: "ev4y6f30",
+ label: "AbsoluteFormError"
+})(css({
+ // max-content keeps the message on one line rather than wrapping into the
+ // narrow input width.
+ width: 'max-content',
+ // The `absolute` variant anchors at top: calc(100% - 8px), which overlaps the
+ // bottom of the input. Nudge it down below the input with a small gap.
+ mt: 12
+}), process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../src/DatePicker/DatePickerInput/index.tsx"],"names":[],"mappings":"AA0C0B","file":"../../../src/DatePicker/DatePickerInput/index.tsx","sourcesContent":["import { MiniCalendarIcon } from '@codecademy/gamut-icons';\nimport { css } from '@codecademy/gamut-styles';\nimport styled from '@emotion/styled';\nimport {\n  type FocusEvent,\n  forwardRef,\n  useCallback,\n  useEffect,\n  useId,\n  useMemo,\n  useRef,\n  useState,\n} from 'react';\n\nimport { FlexBox } from '../../Box';\nimport { IconButton } from '../../Button';\nimport { FormError } from '../../Form/elements/FormError';\nimport { FormGroup } from '../../Form/elements/FormGroup';\nimport type { InputWrapperProps } from '../../Form/inputs/Input';\nimport { isSameDay } from '../DatePickerCalendar/Calendar/utils/dateGrid';\nimport { handleDateSelectRange } from '../DatePickerCalendar/utils/dateSelect';\nimport { useDatePicker } from '../DatePickerContext';\nimport { SegmentedShell } from './elements';\nimport { DatePickerInputSegment } from './Segment';\nimport { SegmentLiteral } from './Segment/elements';\nimport {\n  type SegmentValues,\n  getDateSegmentsFromDate,\n  normalizeSegmentValues,\n  parseSegmentsToDate,\n} from './Segment/utils';\nimport {\n  type DatePartKind,\n  formatDateISO8601DateOnly,\n  getDateFieldOrder,\n  getDateFormatLayout,\n} from './utils';\nimport { validateDateRange, validateSegments } from './utils/validation';\n\n/* FormError's `absolute` variant takes the message out of layout flow (anchored\n   to FormGroup's position: relative container), so the input never changes height:\n   the range-mode arrow stays aligned and no space is reserved when there's no error. */\nconst AbsoluteFormError = styled(FormError)(\n  css({\n    // max-content keeps the message on one line rather than wrapping into the\n    // narrow input width.\n    width: 'max-content',\n    // The `absolute` variant anchors at top: calc(100% - 8px), which overlaps the\n    // bottom of the input. Nudge it down below the input with a small gap.\n    mt: 12,\n  })\n);\n\nexport type DatePickerInputProps = Omit<\n  InputWrapperProps,\n  'className' | 'type' | 'icon' | 'value' | 'onChange' | 'color' | 'error'\n> & {\n  /** In range mode: which part of the range this input edits. Omit for single-date or combined display. */\n  rangePart?: 'start' | 'end';\n};\n\nexport const DatePickerInput = forwardRef<HTMLDivElement, DatePickerInputProps>(\n  ({ disabled, form, label, name, rangePart, size = 'base', ...rest }, ref) => {\n    const context = useDatePicker();\n\n    if (context === null) {\n      throw new Error(\n        'DatePickerInput must be used inside a DatePicker (it reads shared state from context).'\n      );\n    }\n\n    const {\n      mode,\n      openCalendar,\n      focusCalendar,\n      locale,\n      isCalendarOpen,\n      translations,\n      disableDate,\n      setHasError,\n    } = context;\n\n    const isRange = mode === 'range';\n    const endDate = isRange ? context.endDate : null;\n    const date = isRange ? context.startDate : context.selectedDate;\n\n    const inputID = useId();\n    const inputId = `datepicker-input-${inputID.replace(/:/g, '')}`;\n\n    const { layout, fieldOrder } = useMemo(() => {\n      const layout = getDateFormatLayout(locale);\n      return { layout, fieldOrder: getDateFieldOrder(layout) };\n    }, [locale]);\n\n    const defaultLabel = !isRange\n      ? translations.dateLabel\n      : rangePart === 'end'\n      ? translations.endDateLabel\n      : translations.startDateLabel;\n\n    const boundDate = isRange && rangePart === 'end' ? endDate : date;\n    const segmentsFromBound = useMemo(\n      () => getDateSegmentsFromDate(boundDate),\n      [boundDate]\n    );\n    const [segments, setSegments] = useState<SegmentValues>(segmentsFromBound);\n    const [inputError, setInputError] = useState<string>('');\n\n    const parsedForHidden = parseSegmentsToDate(segments);\n    const hiddenValue = parsedForHidden\n      ? formatDateISO8601DateOnly(parsedForHidden)\n      : '';\n\n    const isInputFocusedRef = useRef(false);\n    const containerRef = useRef<HTMLDivElement | null>(null);\n    const buttonRef = useRef<HTMLButtonElement>(null);\n    const segmentElRefs = useRef<\n      Partial<Record<DatePartKind, HTMLSpanElement | null>>\n    >({});\n\n    const assignSegmentRef = useCallback(\n      (field: DatePartKind, el: HTMLSpanElement | null) => {\n        segmentElRefs.current[field] = el;\n      },\n      [segmentElRefs]\n    );\n\n    const onSiblingSegmentFocus = useCallback(\n      (field: DatePartKind) => {\n        segmentElRefs.current[field]?.focus();\n      },\n      [segmentElRefs]\n    );\n\n    const shellRef = useCallback(\n      (el: HTMLDivElement | null) => {\n        containerRef.current = el;\n        if (typeof ref === 'function') ref(el);\n        else if (ref !== null) ref.current = el;\n      },\n      [ref]\n    );\n\n    useEffect(() => {\n      if (!isInputFocusedRef.current) {\n        setSegments(segmentsFromBound);\n      }\n    }, [segmentsFromBound]);\n\n    const commitParsedDate = useCallback(\n      (parsed: Date) => {\n        if (!isRange) {\n          context.onSelection(parsed);\n        }\n        if (isRange && rangePart) {\n          handleDateSelectRange({\n            date: parsed,\n            activeRangePart: rangePart,\n            startDate: date,\n            endDate,\n            onRangeSelection: context.onRangeSelection,\n            disableDate,\n          });\n        }\n      },\n      [isRange, rangePart, context, endDate, date, disableDate]\n    );\n\n    // Returns the range-level error message for the range that *would* be\n    // committed if `parsed` were applied to this input, or null. Mirrors the\n    // endpoint conditions in handleDateSelectRange so we only flag spans that\n    // would actually become a committed start+end range (both set, in order).\n    const getRangeError = useCallback(\n      (parsed: Date): string | null => {\n        if (!isRange || !rangePart) return null;\n        const rangeStart =\n          rangePart === 'start'\n            ? parsed\n            : date && parsed.getTime() >= date.getTime()\n            ? date\n            : null;\n        const rangeEnd =\n          rangePart === 'end'\n            ? parsed\n            : endDate && parsed.getTime() <= endDate.getTime()\n            ? endDate\n            : null;\n        const rangeResult = validateDateRange(\n          rangeStart,\n          rangeEnd,\n          translations,\n          disableDate\n        );\n        return rangeResult && !rangeResult.isValid\n          ? rangeResult.errorMessage\n          : null;\n      },\n      [isRange, rangePart, date, endDate, translations, disableDate]\n    );\n\n    const clearSelection = useCallback(() => {\n      if (!isRange) {\n        context.onSelection(null);\n      }\n      if (isRange && rangePart) {\n        if (rangePart === 'start') context.onRangeSelection(null, endDate);\n        else context.onRangeSelection(date, null);\n      }\n    }, [isRange, rangePart, context, endDate, date]);\n\n    const onSegmentChange = useCallback(\n      (next: SegmentValues) => {\n        const validationResult = validateSegments(\n          next,\n          translations,\n          disableDate\n        );\n        if (validationResult.isValid) {\n          const rangeError = getRangeError(validationResult.date);\n          if (rangeError) {\n            setInputError(rangeError);\n            setHasError(true);\n          } else {\n            setInputError('');\n            setHasError(false);\n            commitParsedDate(validationResult.date);\n          }\n        } else if (!next.month && !next.day && !next.year) {\n          setInputError('');\n          setHasError(false);\n          clearSelection();\n        } else if (validationResult.errorMessage) {\n          setInputError(validationResult.errorMessage);\n          setHasError(true);\n        }\n      },\n      [\n        clearSelection,\n        commitParsedDate,\n        getRangeError,\n        translations,\n        disableDate,\n        setHasError,\n      ]\n    );\n\n    const onContainerBlur = useCallback(\n      (e: FocusEvent<HTMLDivElement>) => {\n        if (containerRef.current?.contains(e.relatedTarget as Node)) return;\n        isInputFocusedRef.current = false;\n        setSegments((prev) => {\n          // Check if all segments are empty\n          if (!prev.month && !prev.day && !prev.year) {\n            setInputError('');\n            setHasError(false);\n            queueMicrotask(() => {\n              clearSelection();\n            });\n            return getDateSegmentsFromDate(null);\n          }\n\n          // Validate raw input (without normalizing/clamping)\n          const validationResult = validateSegments(\n            prev,\n            translations,\n            disableDate\n          );\n\n          if (validationResult.isValid) {\n            // Valid individual date, but the resulting range may span a\n            // disabled date - keep the raw input visible and surface the error.\n            const rangeError = getRangeError(validationResult.date);\n            if (rangeError) {\n              setInputError(rangeError);\n              setHasError(true);\n              return prev;\n            }\n            // Valid complete date - normalize and commit\n            setInputError('');\n            setHasError(false);\n            const normalized = normalizeSegmentValues(prev);\n            const sameAsBound = isSameDay(validationResult.date, boundDate);\n            if (isCalendarOpen && !sameAsBound) {\n              queueMicrotask(() => {\n                commitParsedDate(validationResult.date);\n              });\n            }\n            return normalized;\n          }\n\n          // Incomplete entry on blur - show the incomplete-date error\n          if (!validationResult.errorMessage) {\n            setInputError(translations.invalidDateIncomplete);\n            setHasError(true);\n            return prev; // Keep incomplete input visible so user can correct it\n          }\n\n          // Invalid complete entry - show error and keep invalid input visible\n          setInputError(validationResult.errorMessage);\n          setHasError(true);\n          return prev;\n        });\n      },\n      [\n        containerRef,\n        boundDate,\n        clearSelection,\n        commitParsedDate,\n        getRangeError,\n        isCalendarOpen,\n        translations,\n        disableDate,\n        setHasError,\n      ]\n    );\n\n    const setActiveRangePartForField = useCallback(() => {\n      if (isRange && rangePart) context.setActiveRangePart(rangePart);\n    }, [isRange, rangePart, context]);\n\n    const onSegmentFocus = useCallback(() => {\n      isInputFocusedRef.current = true;\n      setActiveRangePartForField();\n    }, [isInputFocusedRef, setActiveRangePartForField]);\n\n    const onShellFocus = useCallback(() => {\n      setActiveRangePartForField();\n    }, [setActiveRangePartForField]);\n\n    const onShellClick = useCallback(() => {\n      if (disabled) return;\n      setActiveRangePartForField();\n      openCalendar();\n    }, [disabled, setActiveRangePartForField, openCalendar]);\n\n    const onSegmentAltArrowDown = useCallback(() => {\n      if (!isCalendarOpen) openCalendar();\n      focusCalendar();\n    }, [isCalendarOpen, openCalendar, focusCalendar]);\n\n    return (\n      <FormGroup\n        id={inputId}\n        isSoloField\n        label={label ?? defaultLabel}\n        mb={0}\n        pb={0}\n        spacing=\"tight\"\n        width=\"fit-content\"\n      >\n        <SegmentedShell\n          aria-labelledby={inputId}\n          inputSize={size}\n          ref={shellRef}\n          role=\"group\"\n          variant={inputError ? 'error' : 'default'}\n          width=\"113px\"\n          onBlur={onContainerBlur}\n          onClick={onShellClick}\n          onFocus={onShellFocus}\n          {...rest}\n        >\n          <FlexBox alignItems=\"center\" justifyContent=\"center\">\n            {layout.map((item, index) => {\n              if (item.kind === 'literal') {\n                return (\n                  <SegmentLiteral\n                    aria-hidden\n                    // eslint-disable-next-line react/no-array-index-key\n                    key={`literal-${item.text}-${index}`}\n                  >\n                    {`${item.text}`}\n                  </SegmentLiteral>\n                );\n              }\n              const idx = fieldOrder.indexOf(item.field);\n              const prevField = idx > 0 ? fieldOrder[idx - 1] : null;\n              const nextField =\n                idx < fieldOrder.length - 1 ? fieldOrder[idx + 1] : null;\n\n              return (\n                <DatePickerInputSegment\n                  applySegments={onSegmentChange}\n                  assignSegmentRef={assignSegmentRef}\n                  disabled={!!disabled}\n                  error={!!inputError}\n                  field={item.field}\n                  key={item.field}\n                  nextField={nextField}\n                  prevField={prevField}\n                  segments={segments}\n                  setSegments={setSegments}\n                  onAltArrowDown={onSegmentAltArrowDown}\n                  onFocus={onSegmentFocus}\n                  onSiblingFocus={onSiblingSegmentFocus}\n                />\n              );\n            })}\n          </FlexBox>\n          <input\n            aria-hidden\n            form={form}\n            name={name ?? 'datePickerInput'}\n            tabIndex={-1}\n            type=\"hidden\"\n            value={hiddenValue}\n          />\n          <IconButton\n            icon={MiniCalendarIcon}\n            mx={4}\n            ref={buttonRef}\n            size=\"small\"\n            tip={translations.openCalendarLabel}\n            onClick={() => buttonRef.current?.blur()}\n          />\n        </SegmentedShell>\n        {inputError && (\n          <AbsoluteFormError aria-live=\"polite\" role=\"alert\" variant=\"absolute\">\n            {inputError}\n          </AbsoluteFormError>\n        )}\n      </FormGroup>\n    );\n  }\n);\n"]} */");
export const DatePickerInput = /*#__PURE__*/forwardRef(({
disabled,
- error,
form,
label,
name,
rangePart,
@@ -31,9 +50,10 @@
focusCalendar,
locale,
isCalendarOpen,
translations,
- disableDate
+ disableDate,
+ setHasError
} = context;
const isRange = mode === 'range';
const endDate = isRange ? context.endDate : null;
const date = isRange ? context.startDate : context.selectedDate;
@@ -52,12 +72,14 @@
const defaultLabel = !isRange ? translations.dateLabel : rangePart === 'end' ? translations.endDateLabel : translations.startDateLabel;
const boundDate = isRange && rangePart === 'end' ? endDate : date;
const segmentsFromBound = useMemo(() => getDateSegmentsFromDate(boundDate), [boundDate]);
const [segments, setSegments] = useState(segmentsFromBound);
+ const [inputError, setInputError] = useState('');
const parsedForHidden = parseSegmentsToDate(segments);
const hiddenValue = parsedForHidden ? formatDateISO8601DateOnly(parsedForHidden) : '';
const isInputFocusedRef = useRef(false);
const containerRef = useRef(null);
+ const buttonRef = useRef(null);
const segmentElRefs = useRef({});
const assignSegmentRef = useCallback((field, el) => {
segmentElRefs.current[field] = el;
}, [segmentElRefs]);
@@ -87,8 +109,20 @@
disableDate
});
}
}, [isRange, rangePart, context, endDate, date, disableDate]);
+
+ // Returns the range-level error message for the range that *would* be
+ // committed if `parsed` were applied to this input, or null. Mirrors the
+ // endpoint conditions in handleDateSelectRange so we only flag spans that
+ // would actually become a committed start+end range (both set, in order).
+ const getRangeError = useCallback(parsed => {
+ if (!isRange || !rangePart) return null;
+ const rangeStart = rangePart === 'start' ? parsed : date && parsed.getTime() >= date.getTime() ? date : null;
+ const rangeEnd = rangePart === 'end' ? parsed : endDate && parsed.getTime() <= endDate.getTime() ? endDate : null;
+ const rangeResult = validateDateRange(rangeStart, rangeEnd, translations, disableDate);
+ return rangeResult && !rangeResult.isValid ? rangeResult.errorMessage : null;
+ }, [isRange, rangePart, date, endDate, translations, disableDate]);
const clearSelection = useCallback(() => {
if (!isRange) {
context.onSelection(null);
}
@@ -96,35 +130,79 @@
if (rangePart === 'start') context.onRangeSelection(null, endDate);else context.onRangeSelection(date, null);
}
}, [isRange, rangePart, context, endDate, date]);
const onSegmentChange = useCallback(next => {
- const parsed = parseSegmentsToDate(next);
- if (parsed) commitParsedDate(parsed);else if (!next.month && !next.day && !next.year) clearSelection();
- }, [clearSelection, commitParsedDate]);
+ const validationResult = validateSegments(next, translations, disableDate);
+ if (validationResult.isValid) {
+ const rangeError = getRangeError(validationResult.date);
+ if (rangeError) {
+ setInputError(rangeError);
+ setHasError(true);
+ } else {
+ setInputError('');
+ setHasError(false);
+ commitParsedDate(validationResult.date);
+ }
+ } else if (!next.month && !next.day && !next.year) {
+ setInputError('');
+ setHasError(false);
+ clearSelection();
+ } else if (validationResult.errorMessage) {
+ setInputError(validationResult.errorMessage);
+ setHasError(true);
+ }
+ }, [clearSelection, commitParsedDate, getRangeError, translations, disableDate, setHasError]);
const onContainerBlur = useCallback(e => {
if (containerRef.current?.contains(e.relatedTarget)) return;
isInputFocusedRef.current = false;
setSegments(prev => {
- const normalized = normalizeSegmentValues(prev);
- const parsed = parseSegmentsToDate(normalized);
- if (parsed) {
- const sameAsBound = isSameDay(parsed, boundDate);
+ // Check if all segments are empty
+ if (!prev.month && !prev.day && !prev.year) {
+ setInputError('');
+ setHasError(false);
+ queueMicrotask(() => {
+ clearSelection();
+ });
+ return getDateSegmentsFromDate(null);
+ }
+
+ // Validate raw input (without normalizing/clamping)
+ const validationResult = validateSegments(prev, translations, disableDate);
+ if (validationResult.isValid) {
+ // Valid individual date, but the resulting range may span a
+ // disabled date - keep the raw input visible and surface the error.
+ const rangeError = getRangeError(validationResult.date);
+ if (rangeError) {
+ setInputError(rangeError);
+ setHasError(true);
+ return prev;
+ }
+ // Valid complete date - normalize and commit
+ setInputError('');
+ setHasError(false);
+ const normalized = normalizeSegmentValues(prev);
+ const sameAsBound = isSameDay(validationResult.date, boundDate);
if (isCalendarOpen && !sameAsBound) {
queueMicrotask(() => {
- commitParsedDate(parsed);
+ commitParsedDate(validationResult.date);
});
}
return normalized;
}
- if (!normalized.month && !normalized.day && !normalized.year) {
- queueMicrotask(() => {
- clearSelection();
- });
- return getDateSegmentsFromDate(null);
+
+ // Incomplete entry on blur - show the incomplete-date error
+ if (!validationResult.errorMessage) {
+ setInputError(translations.invalidDateIncomplete);
+ setHasError(true);
+ return prev; // Keep incomplete input visible so user can correct it
}
- return segmentsFromBound;
+
+ // Invalid complete entry - show error and keep invalid input visible
+ setInputError(validationResult.errorMessage);
+ setHasError(true);
+ return prev;
});
- }, [containerRef, boundDate, segmentsFromBound, clearSelection, commitParsedDate, isCalendarOpen]);
+ }, [containerRef, boundDate, clearSelection, commitParsedDate, getRangeError, isCalendarOpen, translations, disableDate, setHasError]);
const setActiveRangePartForField = useCallback(() => {
if (isRange && rangePart) context.setActiveRangePart(rangePart);
}, [isRange, rangePart, context]);
const onSegmentFocus = useCallback(() => {
@@ -142,22 +220,22 @@
const onSegmentAltArrowDown = useCallback(() => {
if (!isCalendarOpen) openCalendar();
focusCalendar();
}, [isCalendarOpen, openCalendar, focusCalendar]);
- return /*#__PURE__*/_jsx(FormGroup, {
- htmlFor: inputId,
+ return /*#__PURE__*/_jsxs(FormGroup, {
+ id: inputId,
isSoloField: true,
label: label ?? defaultLabel,
mb: 0,
pb: 0,
spacing: "tight",
width: "fit-content",
- children: /*#__PURE__*/_jsxs(SegmentedShell, {
- id: inputId,
+ children: [/*#__PURE__*/_jsxs(SegmentedShell, {
+ "aria-labelledby": inputId,
inputSize: size,
ref: shellRef,
role: "group",
- variant: error ? 'error' : 'default',
+ variant: inputError ? 'error' : 'default',
width: "113px",
onBlur: onContainerBlur,
onClick: onShellClick,
onFocus: onShellFocus,
@@ -180,9 +258,9 @@
return /*#__PURE__*/_jsx(DatePickerInputSegment, {
applySegments: onSegmentChange,
assignSegmentRef: assignSegmentRef,
disabled: !!disabled,
- error: !!error,
+ error: !!inputError,
field: item.field,
nextField: nextField,
prevField: prevField,
segments: segments,
@@ -198,18 +276,20 @@
name: name ?? 'datePickerInput',
tabIndex: -1,
type: "hidden",
value: hiddenValue
- }), /*#__PURE__*/_jsx(FlexBox, {
- alignItems: "center",
- justifyContent: "center",
- pl: 16,
- pr: 8,
- role: "presentation",
- children: /*#__PURE__*/_jsx(MiniCalendarIcon, {
- "aria-hidden": true,
- size: 16
- })
+ }), /*#__PURE__*/_jsx(IconButton, {
+ icon: MiniCalendarIcon,
+ mx: 4,
+ ref: buttonRef,
+ size: "small",
+ tip: translations.openCalendarLabel,
+ onClick: () => buttonRef.current?.blur()
})]
- })
+ }), inputError && /*#__PURE__*/_jsx(AbsoluteFormError, {
+ "aria-live": "polite",
+ role: "alert",
+ variant: "absolute",
+ children: inputError
+ })]
});
});
\ No newline at end of fileIndex: package/dist/DatePicker/utils/translations.js
===================================================================
--- package/dist/DatePicker/utils/translations.js
+++ package/dist/DatePicker/utils/translations.js
@@ -3,8 +3,15 @@
dateLabel: 'Date',
startDateLabel: 'Start date',
endDateLabel: 'End date',
calendarDialogAriaLabel: 'Choose date',
+ openCalendarLabel: 'Open calendar',
last7DaysDisplayText: 'Last 7 days',
last30DaysDisplayText: 'Last 30 days',
- last90DaysDisplayText: 'Last 90 days'
+ last90DaysDisplayText: 'Last 90 days',
+ invalidDateIncomplete: 'Incomplete date',
+ invalidDateInvalidMonth: 'Month must be between 1 and 12',
+ invalidDateInvalidDay: '{{month}} does not have {{day}} days',
+ invalidDateRollover: '{{month}} does not have {{day}} days',
+ invalidDateNotAvailable: 'This date is not available',
+ invalidDateRangeContainsDisabledDate: 'This date range contains unavailable dates'
};
\ No newline at end of fileIndex: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,16 +1,16 @@
{
"name": "@codecademy/gamut",
"description": "Styleguide & Component library for Codecademy",
- "version": "72.5.0",
+ "version": "72.5.1-alpha.7ca70c.0",
"author": "Codecademy Engineering <[email protected]>",
"bin": "./bin/gamut.mjs",
"dependencies": {
- "@codecademy/gamut-icons": "9.57.11",
- "@codecademy/gamut-illustrations": "0.58.16",
- "@codecademy/gamut-patterns": "0.10.35",
- "@codecademy/gamut-styles": "20.1.0",
- "@codecademy/variance": "0.26.1",
+ "@codecademy/gamut-icons": "9.57.12-alpha.7ca70c.0",
+ "@codecademy/gamut-illustrations": "0.58.17-alpha.7ca70c.0",
+ "@codecademy/gamut-patterns": "0.10.36-alpha.7ca70c.0",
+ "@codecademy/gamut-styles": "20.1.1-alpha.7ca70c.0",
+ "@codecademy/variance": "0.26.2-alpha.7ca70c.0",
"@formatjs/intl-locale": "5.3.1",
"@react-aria/interactions": "3.25.0",
"@types/marked": "^4.0.8",
"@vidstack/react": "^1.12.12",Index: package/dist/DatePicker/DatePickerInput/index.d.ts
===================================================================
--- package/dist/DatePicker/DatePickerInput/index.d.ts
+++ package/dist/DatePicker/DatePickerInput/index.d.ts
@@ -1,9 +1,9 @@
import type { InputWrapperProps } from '../../Form/inputs/Input';
-export type DatePickerInputProps = Omit<InputWrapperProps, 'className' | 'type' | 'icon' | 'value' | 'onChange' | 'color'> & {
+export type DatePickerInputProps = Omit<InputWrapperProps, 'className' | 'type' | 'icon' | 'value' | 'onChange' | 'color' | 'error'> & {
/** In range mode: which part of the range this input edits. Omit for single-date or combined display. */
rangePart?: 'start' | 'end';
};
-export declare const DatePickerInput: import("react").ForwardRefExoticComponent<Omit<InputWrapperProps, "color" | "className" | "onChange" | "type" | "icon" | "value"> & {
+export declare const DatePickerInput: import("react").ForwardRefExoticComponent<Omit<InputWrapperProps, "color" | "error" | "className" | "onChange" | "type" | "icon" | "value"> & {
/** In range mode: which part of the range this input edits. Omit for single-date or combined display. */
rangePart?: "start" | "end";
} & import("react").RefAttributes<HTMLDivElement>>;Index: package/dist/DatePicker/utils/translations.d.ts
===================================================================
--- package/dist/DatePicker/utils/translations.d.ts
+++ package/dist/DatePicker/utils/translations.d.ts
@@ -8,12 +8,26 @@
/** Label for the end date input in range mode (default: "End date"). */
endDateLabel?: string;
/** aria-label for the calendar dialog (default: "Choose date"). */
calendarDialogAriaLabel?: string;
+ /** aria-label for the calendar icon trigger (default: "Open calendar"). */
+ openCalendarLabel?: string;
/** Label for the last 7 days quick action (default: "Last 7 days"). */
last7DaysDisplayText?: string;
/** Label for the last 30 days quick action (default: "Last 30 days"). */
last30DaysDisplayText?: string;
/** Label for the last 90 days quick action (default: "Last 90 days"). */
last90DaysDisplayText?: string;
+ /** Error message for incomplete date entry (default: "Incomplete date"). */
+ invalidDateIncomplete?: string;
+ /** Error message for invalid month (default: "Month must be between 1 and 12"). */
+ invalidDateInvalidMonth?: string;
+ /** Error message for invalid day (default: "{{month}} does not have {{day}} days"). Supports {{month}} and {{day}} template variables. */
+ invalidDateInvalidDay?: string;
+ /** Error message for date rollover (default: "{{month}} does not have {{day}} days"). Supports {{month}} and {{day}} template variables. */
+ invalidDateRollover?: string;
+ /** Error message for disabled/unavailable date (default: "This date is not available"). */
+ invalidDateNotAvailable?: string;
+ /** Error message for date range containing disabled dates (default: "This date range contains unavailable dates"). */
+ invalidDateRangeContainsDisabledDate?: string;
}
export declare const DEFAULT_DATE_PICKER_TRANSLATIONS: Required<DatePickerTranslations>;Index: package/dist/DatePicker/DatePickerContext/types.d.ts
===================================================================
--- package/dist/DatePicker/DatePickerContext/types.d.ts
+++ package/dist/DatePicker/DatePickerContext/types.d.ts
@@ -5,8 +5,17 @@
* Discriminator: same meaning as the `mode` prop on `DatePicker` (`"single"` or `"range"`).
*/
mode: Mode;
/**
+ * Whether there is an error in any input. Used by DatePicker to adjust popover position
+ * when calendar is open. Only tracks IF error exists, not the message.
+ */
+ hasError: boolean;
+ /**
+ * Callback to set whether error exists. Called by DatePickerInput when validation errors occur.
+ */
+ setHasError: (hasError: boolean) => void;
+ /**
* Resolved `Intl.Locale` for the `locale` prop (or the runtime default). The same object is
* passed to formatters and to APIs such as `getWeekInfo` where available.
*/
locale: Intl.Locale;