[pickers] Move the adapters interfaces to our repository

mui · Mar 28, 2023 · a7931fb · a7931fb
1 parent 78f82bf
commit a7931fb
Show file tree

Hide file tree

Showing 31 changed files with 639 additions and 67 deletions.
diff --git a/packages/x-date-pickers-pro/src/DateRangeCalendar/useDragRange.ts b/packages/x-date-pickers-pro/src/DateRangeCalendar/useDragRange.ts
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import useEventCallback from '@mui/utils/useEventCallback';
-import { MuiPickersAdapter } from '@mui/x-date-pickers/internals';
+import { MuiPickersAdapter } from '@mui/x-date-pickers/models';
 import { DateRangePosition } from './DateRangeCalendar.types';
 import { DateRange } from '../internal/models';
 import { isEndOfRange, isStartOfRange } from '../internal/utils/date-utils';

diff --git a/packages/x-date-pickers-pro/src/internal/utils/date-range-manager.ts b/packages/x-date-pickers-pro/src/internal/utils/date-range-manager.ts
@@ -1,4 +1,4 @@
-import { MuiPickersAdapter } from '@mui/x-date-pickers/internals';
+import { MuiPickersAdapter } from '@mui/x-date-pickers/models';
 import { DateRange, RangePosition } from '../models/range';
 
 interface CalculateRangeChangeOptions<TDate> {

diff --git a/packages/x-date-pickers-pro/src/internal/utils/date-utils.ts b/packages/x-date-pickers-pro/src/internal/utils/date-utils.ts
@@ -1,4 +1,4 @@
-import { MuiPickersAdapter } from '@mui/x-date-pickers/internals';
+import { MuiPickersAdapter } from '@mui/x-date-pickers/models';
 import { DateRange, NonEmptyDateRange } from '../models/range';
 
 export const isRangeValid = <TDate>(

diff --git a/packages/x-date-pickers/src/AdapterDateFns/index.ts b/packages/x-date-pickers/src/AdapterDateFns/index.ts
@@ -3,7 +3,7 @@ import defaultLocale from 'date-fns/locale/en-US';
 // @ts-ignore
 import longFormatters from 'date-fns/_lib/format/longFormatters';
 import getWeek from 'date-fns/getWeek';
-import { FieldFormatTokenMap, MuiPickersAdapter } from '../internals/models';
+import { FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 
 const formatTokenMap: FieldFormatTokenMap = {
   // Year

diff --git a/packages/x-date-pickers/src/AdapterDateFnsJalali/index.ts b/packages/x-date-pickers/src/AdapterDateFnsJalali/index.ts
@@ -3,7 +3,7 @@ import defaultLocale from 'date-fns-jalali/locale/fa-IR';
 import getWeek from 'date-fns-jalali/getWeek';
 // @ts-ignore
 import longFormatters from 'date-fns-jalali/_lib/format/longFormatters';
-import { FieldFormatTokenMap, MuiPickersAdapter } from '../internals/models';
+import { FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 
 const formatTokenMap: FieldFormatTokenMap = {
   // Year

diff --git a/packages/x-date-pickers/src/AdapterDayjs/index.ts b/packages/x-date-pickers/src/AdapterDayjs/index.ts
@@ -2,8 +2,7 @@
 import defaultDayjs, { Dayjs } from 'dayjs';
 import weekOfYear from 'dayjs/plugin/weekOfYear';
 import BaseAdapterDayjs from '@date-io/dayjs';
-import { DateIOFormats } from '@date-io/core/IUtils';
-import { FieldFormatTokenMap, MuiPickersAdapter } from '../internals/models';
+import { FieldFormatTokenMap, MuiPickersAdapter, AdapterFormats } from '../models';
 import { buildWarning } from '../internals/utils/warning';
 
 const localeNotFoundWarning = buildWarning([
@@ -58,7 +57,7 @@ interface Opts {
   locale?: string;
   /** Make sure that your dayjs instance extends customParseFormat and advancedFormat */
   instance?: typeof defaultDayjs;
-  formats?: Partial<DateIOFormats>;
+  formats?: Partial<AdapterFormats>;
 }
 
 export class AdapterDayjs extends BaseAdapterDayjs implements MuiPickersAdapter<Dayjs> {

diff --git a/packages/x-date-pickers/src/AdapterLuxon/index.ts b/packages/x-date-pickers/src/AdapterLuxon/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 import { DateTime } from 'luxon';
 import BaseAdapterLuxon from '@date-io/luxon';
-import { FieldFormatTokenMap, MuiPickersAdapter } from '../internals/models';
+import { FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 
 const formatTokenMap: FieldFormatTokenMap = {
   // Year
@@ -64,7 +64,7 @@ export class AdapterLuxon extends BaseAdapterLuxon implements MuiPickersAdapter<
         'Your luxon version does not support `expandFormat`. Consider upgrading it to v3.0.2',
       );
     }
-    // Extract escaped section to avoid entending them
+    // Extract escaped section to avoid extending them
     const longFormatRegexp = /''|'(''|[^'])+('|$)|[^']*/g;
     return (
       format

diff --git a/packages/x-date-pickers/src/AdapterMoment/index.ts b/packages/x-date-pickers/src/AdapterMoment/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 import defaultMoment, { LongDateFormatKey } from 'moment';
 import BaseAdapterMoment from '@date-io/moment';
-import { FieldFormatTokenMap, MuiPickersAdapter } from '../internals/models';
+import { FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 
 // From https://momentjs.com/docs/#/displaying/format/
 const formatTokenMap: FieldFormatTokenMap = {

diff --git a/packages/x-date-pickers/src/AdapterMomentHijri/index.ts b/packages/x-date-pickers/src/AdapterMomentHijri/index.ts
@@ -2,7 +2,7 @@
 import BaseAdapterMomentHijri from '@date-io/hijri';
 // @ts-ignore
 import defaultMoment, { LongDateFormatKey } from 'moment-hijri';
-import { FieldFormatTokenMap, MuiPickersAdapter } from '../internals/models';
+import { FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 
 // From https://momentjs.com/docs/#/displaying/format/
 const formatTokenMap: FieldFormatTokenMap = {

diff --git a/packages/x-date-pickers/src/AdapterMomentJalaali/index.ts b/packages/x-date-pickers/src/AdapterMomentJalaali/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 import BaseAdapterMomentJalaali from '@date-io/jalaali';
 import defaultMoment, { LongDateFormatKey } from 'moment-jalaali';
-import { FieldFormatTokenMap, MuiPickersAdapter } from '../internals/models';
+import { FieldFormatTokenMap, MuiPickersAdapter } from '../models';
 
 type Moment = defaultMoment.Moment;
 

diff --git a/packages/x-date-pickers/src/DateCalendar/useCalendarState.tsx b/packages/x-date-pickers/src/DateCalendar/useCalendarState.tsx
@@ -3,7 +3,7 @@ import useEventCallback from '@mui/utils/useEventCallback';
 import { SlideDirection } from './PickersSlideTransition';
 import { useIsDateDisabled } from '../internals/hooks/validation/useDateValidation';
 import { useUtils, useNow } from '../internals/hooks/useUtils';
-import { MuiPickersAdapter } from '../internals/models';
+import { MuiPickersAdapter } from '../models';
 import { clamp } from '../internals/utils/date-utils';
 import { DateCalendarDefaultizedProps } from './DateCalendar.types';
 

diff --git a/packages/x-date-pickers/src/DatePicker/shared.tsx b/packages/x-date-pickers/src/DatePicker/shared.tsx
@@ -12,10 +12,10 @@ import {
   isYearAndMonthViews,
   isYearOnlyView,
 } from '../internals/utils/views';
-import { DateValidationError, DateView } from '../models';
+import { DateValidationError, DateView, MuiPickersAdapter } from '../models';
 import { BasePickerInputProps } from '../internals/models/props/basePickerProps';
 import { applyDefaultDate } from '../internals/utils/date-utils';
-import { BaseDateValidationProps, MuiPickersAdapter, UncapitalizeObjectKeys } from '../internals';
+import { BaseDateValidationProps, UncapitalizeObjectKeys } from '../internals';
 import { LocalizedComponent, PickersInputLocaleText } from '../locales/utils/pickersLocaleTextApi';
 import {
   DatePickerToolbar,

diff --git a/packages/x-date-pickers/src/LocalizationProvider/LocalizationProvider.tsx b/packages/x-date-pickers/src/LocalizationProvider/LocalizationProvider.tsx
@@ -1,8 +1,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { DateIOFormats } from '@date-io/core/IUtils';
 import { useThemeProps } from '@mui/material/styles';
-import { MuiPickersAdapter } from '../internals/models';
+import { AdapterFormats, MuiPickersAdapter } from '../models';
 import { PickersInputLocaleText } from '../locales';
 
 export interface MuiPickersAdapterContextValue<TDate> {
@@ -34,7 +33,7 @@ export interface LocalizationProviderProps<TDate> {
    */
   dateAdapter?: new (...args: any) => MuiPickersAdapter<TDate>;
   /** Formats that are used for any child pickers */
-  dateFormats?: Partial<DateIOFormats>;
+  dateFormats?: Partial<AdapterFormats>;
   /**
    * Date library instance you are using, if it has some global overrides
    * ```jsx

diff --git a/packages/x-date-pickers/src/TimeClock/ClockNumbers.tsx b/packages/x-date-pickers/src/TimeClock/ClockNumbers.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ClockNumber } from './ClockNumber';
-import { MuiPickersAdapter } from '../internals/models';
+import { MuiPickersAdapter } from '../models';
 import type { PickerSelectionState } from '../internals/hooks/usePicker';
 
 interface GetHourNumbersOptions<TDate> {

diff --git a/packages/x-date-pickers/src/internals/hooks/useDesktopPicker/useDesktopPicker.types.ts b/packages/x-date-pickers/src/internals/hooks/useDesktopPicker/useDesktopPicker.types.ts
@@ -3,7 +3,6 @@ import IconButton, { IconButtonProps } from '@mui/material/IconButton';
 import { InputAdornmentProps } from '@mui/material/InputAdornment';
 import TextField, { TextFieldProps } from '@mui/material/TextField';
 import { SlotComponentProps } from '@mui/base/utils';
-import { MuiPickersAdapter } from '../../models';
 import {
   BaseNonStaticPickerProps,
   BasePickerProps,
@@ -14,7 +13,12 @@ import {
   PickersPopperSlotsComponentsProps,
 } from '../../components/PickersPopper';
 import { UsePickerParams, UsePickerProps } from '../usePicker';
-import { BaseSingleInputFieldProps, FieldSection, DateOrTimeView } from '../../../models';
+import {
+  BaseSingleInputFieldProps,
+  FieldSection,
+  DateOrTimeView,
+  MuiPickersAdapter,
+} from '../../../models';
 import {
   ExportedPickersLayoutSlotsComponent,
   ExportedPickersLayoutSlotsComponentsProps,

diff --git a/packages/x-date-pickers/src/internals/hooks/useField/useField.types.ts b/packages/x-date-pickers/src/internals/hooks/useField/useField.types.ts
@@ -1,6 +1,10 @@
 import * as React from 'react';
-import { MuiPickersAdapter } from '../../models';
-import { FieldSectionType, FieldSection, FieldSelectedSections } from '../../../models';
+import {
+  FieldSectionType,
+  FieldSection,
+  FieldSelectedSections,
+  MuiPickersAdapter,
+} from '../../../models';
 import type { PickerValueManager } from '../usePicker';
 import { InferError, Validator } from '../validation/useValidation';
 

diff --git a/packages/x-date-pickers/src/internals/hooks/useField/useField.utils.ts b/packages/x-date-pickers/src/internals/hooks/useField/useField.utils.ts
@@ -7,8 +7,7 @@ import {
   FieldSectionWithoutPosition,
   FieldSectionValueBoundaries,
 } from './useField.types';
-import { MuiPickersAdapter } from '../../models';
-import { FieldSectionType, FieldSection } from '../../../models';
+import { FieldSectionType, FieldSection, MuiPickersAdapter } from '../../../models';
 import { PickersLocaleText } from '../../../locales/utils/pickersLocaleTextApi';
 
 export const getDateSectionConfigFromFormatToken = <TDate>(

diff --git a/packages/x-date-pickers/src/internals/hooks/useMobilePicker/useMobilePicker.types.ts b/packages/x-date-pickers/src/internals/hooks/useMobilePicker/useMobilePicker.types.ts
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import TextField, { TextFieldProps } from '@mui/material/TextField';
 import { SlotComponentProps } from '@mui/base/utils';
-import { MuiPickersAdapter } from '../../models';
 import {
   BaseNonStaticPickerProps,
   BasePickerProps,
@@ -12,7 +11,12 @@ import {
   PickersModalDialogSlotsComponentsProps,
 } from '../../components/PickersModalDialog';
 import { UsePickerParams, UsePickerProps } from '../usePicker';
-import { BaseSingleInputFieldProps, FieldSection, DateOrTimeView } from '../../../models';
+import {
+  BaseSingleInputFieldProps,
+  FieldSection,
+  DateOrTimeView,
+  MuiPickersAdapter,
+} from '../../../models';
 import {
   ExportedPickersLayoutSlotsComponent,
   ExportedPickersLayoutSlotsComponentsProps,

diff --git a/packages/x-date-pickers/src/internals/hooks/usePicker/usePickerValue.ts b/packages/x-date-pickers/src/internals/hooks/usePicker/usePickerValue.ts
@@ -7,8 +7,7 @@ import { FieldChangeHandlerContext, UseFieldInternalProps } from '../useField';
 import { InferError, useValidation, Validator } from '../validation/useValidation';
 import { UseFieldValidationProps } from '../useField/useField.types';
 import { WrapperVariant } from '../../models/common';
-import { MuiPickersAdapter } from '../../models/muiPickersAdapter';
-import { FieldSection, FieldSelectedSections } from '../../../models';
+import { FieldSection, FieldSelectedSections, MuiPickersAdapter } from '../../../models';
 
 export interface PickerValueManager<TValue, TDate, TError> {
   /**

diff --git a/packages/x-date-pickers/src/internals/index.ts b/packages/x-date-pickers/src/internals/index.ts
@@ -120,7 +120,6 @@ export type {
   BaseNonStaticPickerProps,
 } from './models/props/basePickerProps';
 export type { BaseToolbarProps, ExportedBaseToolbarProps } from './models/props/toolbar';
-export type { MuiPickersAdapter } from './models/muiPickersAdapter';
 export type { DefaultizedProps, MakeOptional } from './models/helpers';
 export type { WrapperVariant } from './models/common';
 

diff --git a/packages/x-date-pickers/src/internals/models/index.ts b/packages/x-date-pickers/src/internals/models/index.ts
@@ -1,2 +1 @@
 export * from './fields';
-export * from './muiPickersAdapter';
diff --git a/packages/x-date-pickers/src/internals/models/muiPickersAdapter.d.ts b/packages/x-date-pickers/src/internals/models/muiPickersAdapter.d.ts
diff --git a/packages/x-date-pickers/src/internals/utils/date-utils.ts b/packages/x-date-pickers/src/internals/utils/date-utils.ts
@@ -1,4 +1,4 @@
-import { MuiPickersAdapter } from '../models';
+import { MuiPickersAdapter } from '../../models';
 
 interface FindClosestDateParams<TDate> {
   date: TDate;

diff --git a/packages/x-date-pickers/src/internals/utils/time-utils.ts b/packages/x-date-pickers/src/internals/utils/time-utils.ts
@@ -1,5 +1,4 @@
-import { MuiPickersAdapter } from '../models';
-import { DateOrTimeView } from '../../models';
+import { DateOrTimeView, MuiPickersAdapter } from '../../models';
 
 export const isTimeView = (view: DateOrTimeView) => ['hours', 'minutes', 'seconds'].includes(view);
 

diff --git a/packages/x-date-pickers/src/locales/utils/pickersLocaleTextApi.ts b/packages/x-date-pickers/src/locales/utils/pickersLocaleTextApi.ts
@@ -1,5 +1,4 @@
-import { MuiPickersAdapter } from '../../internals/models';
-import { DateView, TimeView } from '../../models';
+import { DateView, TimeView, MuiPickersAdapter } from '../../models';
 
 export interface PickersComponentSpecificLocaleText {
   /**