diff --git a/packages/date-picker/src/DateInput/DateInputBox/DateInputBox.spec.tsx b/packages/date-picker/src/DateInput/DateInputBox/DateInputBox.spec.tsx index d59d114676..8efb04fee2 100644 --- a/packages/date-picker/src/DateInput/DateInputBox/DateInputBox.spec.tsx +++ b/packages/date-picker/src/DateInput/DateInputBox/DateInputBox.spec.tsx @@ -6,16 +6,28 @@ import { DatePickerProvider, DatePickerProviderProps, } from '../../DatePickerContext'; +import { defaultDatePickerContext } from '../../DatePickerContext/DatePickerContext.utils'; +import { SegmentRefs } from './DateInputBox.types'; import { DateInputBox, type DateInputBoxProps } from '.'; const renderDateInputBox = ( - props?: DateInputBoxProps, - context?: DatePickerProviderProps, + props?: Omit, + context?: Partial, ) => { + const segmentRefsMock: SegmentRefs = { + day: React.createRef(), + month: React.createRef(), + year: React.createRef(), + }; + const result = render( - - + + , ); diff --git a/packages/date-picker/src/DateInput/DateInputBox/DateInputBox.types.ts b/packages/date-picker/src/DateInput/DateInputBox/DateInputBox.types.ts index 6224f7baec..ab9ae9bfa7 100644 --- a/packages/date-picker/src/DateInput/DateInputBox/DateInputBox.types.ts +++ b/packages/date-picker/src/DateInput/DateInputBox/DateInputBox.types.ts @@ -4,6 +4,11 @@ import { HTMLElementProps } from '@leafygreen-ui/lib'; import { DateType } from '../../types'; import { DateSegment } from '../DateInput.types'; +export type SegmentRefs = Record< + DateSegment, + ReturnType> +>; + export interface DateInputBoxProps extends Omit, 'onChange'> { /** @@ -23,8 +28,5 @@ export interface DateInputBoxProps labelledBy?: string; /** Refs */ - segmentRefs: Record< - DateSegment, - ReturnType> - >; + segmentRefs: SegmentRefs; } diff --git a/packages/date-picker/src/DatePicker/DatePicker.types.ts b/packages/date-picker/src/DatePicker/DatePicker.types.ts index b3987dfcd8..f82404d473 100644 --- a/packages/date-picker/src/DatePicker/DatePicker.types.ts +++ b/packages/date-picker/src/DatePicker/DatePicker.types.ts @@ -1,13 +1,5 @@ -import { DynamicRefGetter } from '@leafygreen-ui/hooks/src/useDynamicRefs'; - -import { DateSegment } from '../DateInput/DateInput.types'; import { BaseDatePickerProps, DateType } from '../types'; -export type SegmentRefs = Record< - DateSegment, - ReturnType> ->; - export interface DatePickerProps extends BaseDatePickerProps { /** * The selected date, given in UTC time diff --git a/packages/date-picker/src/DatePicker/DatePickerContents/DatePickerContents.tsx b/packages/date-picker/src/DatePicker/DatePickerContents/DatePickerContents.tsx index 52b7ca56ab..7ce31fa774 100644 --- a/packages/date-picker/src/DatePicker/DatePickerContents/DatePickerContents.tsx +++ b/packages/date-picker/src/DatePicker/DatePickerContents/DatePickerContents.tsx @@ -7,8 +7,8 @@ import { useForwardedRef, } from '@leafygreen-ui/hooks'; +import { SegmentRefs } from '../../DateInput/DateInputBox/DateInputBox.types'; import { useDatePickerContext } from '../../DatePickerContext'; -import { SegmentRefs } from '../DatePicker.types'; import { DatePickerInput, DatePickerInputProps } from '../DatePickerInput'; import { DatePickerMenu, DatePickerMenuProps } from '../DatePickerMenu'; import { focusRelevantSegment } from '../utils/focusRelevantSegment'; diff --git a/packages/date-picker/src/DatePicker/utils/focusRelevantSegment.ts b/packages/date-picker/src/DatePicker/utils/focusRelevantSegment.ts index fa0a7984d2..b006b8916b 100644 --- a/packages/date-picker/src/DatePicker/utils/focusRelevantSegment.ts +++ b/packages/date-picker/src/DatePicker/utils/focusRelevantSegment.ts @@ -2,8 +2,8 @@ import isUndefined from 'lodash/isUndefined'; import last from 'lodash/last'; import { isDateSegment } from '../../DateInput/DateInput.types'; +import { SegmentRefs } from '../../DateInput/DateInputBox/DateInputBox.types'; import { DatePickerContextProps } from '../../DatePickerContext'; -import { SegmentRefs } from '../DatePicker.types'; interface FocusRelevantSegmentArgs { target: EventTarget;