Use dedicated interface for *Picker components

mui · Mar 11, 2021 · dd958dd · dd958dd
1 parent 9843b4b
commit dd958dd
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 60 deletions.
diff --git a/packages/material-ui-lab/src/DatePicker/DatePicker.tsx b/packages/material-ui-lab/src/DatePicker/DatePicker.tsx
@@ -147,6 +147,11 @@ function DatePickerWrapper(props: DatePickerWrapperProps) {
   );
 }
 
+export interface DatePickerProps<TDate = unknown>
+  extends BaseDatePickerProps<unknown>,
+    PublicWrapperProps<typeof ResponsiveWrapper>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate> {}
+
 /**
  *
  * Demos:
@@ -158,9 +163,7 @@ function DatePickerWrapper(props: DatePickerWrapperProps) {
  * - [DatePicker API](https://material-ui.com/api/date-picker/)
  */
 const DatePicker = React.forwardRef(function DatePicker<TDate>(
-  __props: BaseDatePickerProps<unknown> &
-    PublicWrapperProps<typeof ResponsiveWrapper> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+  __props: DatePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -542,6 +545,4 @@ DatePicker.propTypes /* remove-proptypes */ = {
   views: PropTypes.arrayOf(PropTypes.oneOf(['date', 'month', 'year']).isRequired),
 } as any;
 
-export type DatePickerProps = React.ComponentProps<typeof DatePicker>;
-
 export default DatePicker;
diff --git a/packages/material-ui-lab/src/DateTimePicker/DateTimePicker.tsx b/packages/material-ui-lab/src/DateTimePicker/DateTimePicker.tsx
@@ -209,6 +209,11 @@ function DateTimePickerWrapper(props: DateTimePickerWrapperProps) {
   );
 }
 
+export interface DateTimePickerProps<TDate = unknown>
+  extends BaseDateTimePickerProps<unknown>,
+    PublicWrapperProps<typeof ResponsiveWrapper>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate> {}
+
 /**
  *
  * Demos:
@@ -220,9 +225,7 @@ function DateTimePickerWrapper(props: DateTimePickerWrapperProps) {
  * - [DateTimePicker API](https://material-ui.com/api/date-time-picker/)
  */
 const DateTimePicker = React.forwardRef(function DateTimePicker<TDate>(
-  __props: BaseDateTimePickerProps<unknown> &
-    PublicWrapperProps<typeof ResponsiveWrapper> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+  __props: DateTimePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -692,6 +695,4 @@ DateTimePicker.propTypes /* remove-proptypes */ = {
   ),
 } as any;
 
-export type DateTimePickerProps = React.ComponentProps<typeof DateTimePicker>;
-
 export default DateTimePicker;
diff --git a/packages/material-ui-lab/src/DesktopDatePicker/DesktopDatePicker.tsx b/packages/material-ui-lab/src/DesktopDatePicker/DesktopDatePicker.tsx
@@ -91,16 +91,20 @@ function DesktopDatePickerWrapper(props: DesktopDatePickerWrapperProps) {
     />
   );
 }
+
+export interface DesktopDatePickerProps<TDate = unknown>
+  extends BaseDatePickerProps<unknown>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+    PublicWrapperProps<typeof DesktopWrapper> {}
+
 /**
  *
  * API:
  *
  * - [DesktopDatePicker API](https://material-ui.com/api/desktop-date-picker/)
  */
 const DesktopDatePicker = React.forwardRef(function DesktopDatePicker<TDate>(
-  __props: BaseDatePickerProps<unknown> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate> &
-    PublicWrapperProps<typeof DesktopWrapper>,
+  __props: DesktopDatePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -443,6 +447,4 @@ DesktopDatePicker.propTypes /* remove-proptypes */ = {
   views: PropTypes.arrayOf(PropTypes.oneOf(['date', 'month', 'year']).isRequired),
 } as any;
 
-export type DesktopDatePickerProps = React.ComponentProps<typeof DesktopDatePicker>;
-
 export default DesktopDatePicker;
diff --git a/packages/material-ui-lab/src/DesktopDateTimePicker/DesktopDateTimePicker.tsx b/packages/material-ui-lab/src/DesktopDateTimePicker/DesktopDateTimePicker.tsx
@@ -92,6 +92,10 @@ function DesktopDateTimePickerWrapper(props: DesktopDateTimePickerWrapperProps)
     />
   );
 }
+export interface DesktopDateTimePickerProps<TDate = unknown>
+  extends BaseDateTimePickerProps<unknown>,
+    PublicWrapperProps<typeof DesktopWrapper>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate> {}
 
 /**
  *
@@ -104,9 +108,7 @@ function DesktopDateTimePickerWrapper(props: DesktopDateTimePickerWrapperProps)
  * - [DesktopDateTimePicker API](https://material-ui.com/api/desktop-date-time-picker/)
  */
 const DesktopDateTimePicker = React.forwardRef(function DesktopDateTimePicker<TDate>(
-  __props: BaseDateTimePickerProps<unknown> &
-    PublicWrapperProps<typeof DesktopWrapper> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+  __props: DesktopDateTimePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -536,6 +538,4 @@ DesktopDateTimePicker.propTypes /* remove-proptypes */ = {
   ),
 } as any;
 
-export type DesktopDateTimePickerProps = React.ComponentProps<typeof DesktopDateTimePicker>;
-
 export default DesktopDateTimePicker;
diff --git a/packages/material-ui-lab/src/DesktopTimePicker/DesktopTimePicker.tsx b/packages/material-ui-lab/src/DesktopTimePicker/DesktopTimePicker.tsx
@@ -92,16 +92,19 @@ function DesktopTimePickerWrapper(props: DesktopTimePickerWrapperProps) {
   );
 }
 
+export interface DesktopTimePickerProps<TDate = unknown>
+  extends BaseTimePickerProps,
+    PublicWrapperProps<typeof DesktopWrapper>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate> {}
+
 /**
  *
  * API:
  *
  * - [DesktopTimePicker API](https://material-ui.com/api/desktop-time-picker/)
  */
 const DesktopTimePicker = React.forwardRef(function DesktopTimePicker<TDate>(
-  __props: BaseTimePickerProps &
-    PublicWrapperProps<typeof DesktopWrapper> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+  __props: DesktopTimePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -380,6 +383,4 @@ DesktopTimePicker.propTypes /* remove-proptypes */ = {
   views: PropTypes.arrayOf(PropTypes.oneOf(['hours', 'minutes', 'seconds']).isRequired),
 } as any;
 
-export type DesktopTimePickerProps = React.ComponentProps<typeof DesktopTimePicker>;
-
 export default DesktopTimePicker;
diff --git a/packages/material-ui-lab/src/MobileDatePicker/MobileDatePicker.tsx b/packages/material-ui-lab/src/MobileDatePicker/MobileDatePicker.tsx
@@ -92,16 +92,19 @@ function MobileDatePickerWrapper(props: MobileDatePickerWrapperProps) {
   );
 }
 
+export interface MobileDatePickerProps<TDate = unknown>
+  extends BaseDatePickerProps<unknown>,
+    PublicWrapperProps<typeof MobileWrapper>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate> {}
+
 /**
  *
  * API:
  *
  * - [MobileDatePicker API](https://material-ui.com/api/mobile-date-picker/)
  */
 const MobileDatePicker = React.forwardRef(function MobileDatePicker<TDate>(
-  __props: BaseDatePickerProps<unknown> &
-    PublicWrapperProps<typeof MobileWrapper> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+  __props: MobileDatePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -470,6 +473,4 @@ MobileDatePicker.propTypes /* remove-proptypes */ = {
   views: PropTypes.arrayOf(PropTypes.oneOf(['date', 'month', 'year']).isRequired),
 } as any;
 
-export type MobileDatePickerProps = React.ComponentProps<typeof MobileDatePicker>;
-
 export default MobileDatePicker;
diff --git a/packages/material-ui-lab/src/MobileDateTimePicker/MobileDateTimePicker.tsx b/packages/material-ui-lab/src/MobileDateTimePicker/MobileDateTimePicker.tsx
@@ -92,6 +92,11 @@ function MobileDateTimePickerWrapper(props: MobileDateTimeWrapperProps) {
   );
 }
 
+export interface MobileDateTimePickerProps<TDate = unknown>
+  extends BaseDateTimePickerProps<unknown>,
+    PublicWrapperProps<typeof MobileWrapper>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate> {}
+
 /**
  *
  * Demos:
@@ -103,9 +108,7 @@ function MobileDateTimePickerWrapper(props: MobileDateTimeWrapperProps) {
  * - [MobileDateTimePicker API](https://material-ui.com/api/mobile-date-time-picker/)
  */
 const MobileDateTimePicker = React.forwardRef(function MobileDateTimePicker<TDate>(
-  __props: BaseDateTimePickerProps<unknown> &
-    PublicWrapperProps<typeof MobileWrapper> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+  __props: MobileDateTimePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -561,6 +564,4 @@ MobileDateTimePicker.propTypes /* remove-proptypes */ = {
   ),
 } as any;
 
-export type MobileDateTimePickerProps = React.ComponentProps<typeof MobileDateTimePicker>;
-
 export default MobileDateTimePicker;
diff --git a/packages/material-ui-lab/src/MobileTimePicker/MobileTimePicker.tsx b/packages/material-ui-lab/src/MobileTimePicker/MobileTimePicker.tsx
@@ -92,16 +92,19 @@ function MobileTimePickerWrapper(props: MobileTimePickerWrapperProps) {
   );
 }
 
+export interface MobileTimePickerProps<TDate = unknown>
+  extends BaseTimePickerProps,
+    PublicWrapperProps<typeof MobileWrapper>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate> {}
+
 /**
  *
  * API:
  *
  * - [MobileTimePicker API](https://material-ui.com/api/mobile-time-picker/)
  */
 const MobileTimePicker = React.forwardRef(function MobileTimePicker<TDate>(
-  __props: BaseTimePickerProps &
-    PublicWrapperProps<typeof MobileWrapper> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+  __props: MobileTimePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -406,6 +409,4 @@ MobileTimePicker.propTypes /* remove-proptypes */ = {
   views: PropTypes.arrayOf(PropTypes.oneOf(['hours', 'minutes', 'seconds']).isRequired),
 } as any;
 
-export type MobileTimePickerProps = React.ComponentProps<typeof MobileTimePicker>;
-
 export default MobileTimePicker;
diff --git a/packages/material-ui-lab/src/StaticDatePicker/StaticDatePicker.tsx b/packages/material-ui-lab/src/StaticDatePicker/StaticDatePicker.tsx
@@ -92,16 +92,19 @@ function StaticDatePickerWrapper(props: StaticDatePickerWrapperProps) {
   );
 }
 
+export interface StaticDatePickerProps<TDate = unknown>
+  extends BaseDatePickerProps<unknown>,
+    PublicWrapperProps<typeof StaticWrapper>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate> {}
+
 /**
  *
  * API:
  *
  * - [StaticDatePicker API](https://material-ui.com/api/static-date-picker/)
  */
 const StaticDatePicker = React.forwardRef(function PickerWithState<TDate>(
-  __props: BaseDatePickerProps<unknown> &
-    PublicWrapperProps<typeof StaticWrapper> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+  __props: StaticDatePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -441,6 +444,4 @@ StaticDatePicker.propTypes /* remove-proptypes */ = {
   views: PropTypes.arrayOf(PropTypes.oneOf(['date', 'month', 'year']).isRequired),
 } as any;
 
-export type StaticDatePickerProps = React.ComponentProps<typeof StaticDatePicker>;
-
 export default StaticDatePicker;
diff --git a/packages/material-ui-lab/src/StaticDateTimePicker/StaticDateTimePicker.tsx b/packages/material-ui-lab/src/StaticDateTimePicker/StaticDateTimePicker.tsx
@@ -92,6 +92,11 @@ function StaticDateTimePickerWrapper(props: StaticDateTimePickerWrapperProps) {
   );
 }
 
+export interface StaticDateTimePickerProps<TDate = unknown>
+  extends BaseDateTimePickerProps<unknown>,
+    PublicWrapperProps<typeof StaticWrapper>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate> {}
+
 /**
  *
  * Demos:
@@ -103,9 +108,7 @@ function StaticDateTimePickerWrapper(props: StaticDateTimePickerWrapperProps) {
  * - [StaticDateTimePicker API](https://material-ui.com/api/static-date-time-picker/)
  */
 const StaticDateTimePicker = React.forwardRef(function StaticDateTimePicker<TDate>(
-  __props: BaseDateTimePickerProps<unknown> &
-    PublicWrapperProps<typeof StaticWrapper> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+  __props: StaticDateTimePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -532,6 +535,4 @@ StaticDateTimePicker.propTypes /* remove-proptypes */ = {
   ),
 } as any;
 
-export type StaticDateTimePickerProps = React.ComponentProps<typeof StaticDateTimePicker>;
-
 export default StaticDateTimePicker;
diff --git a/packages/material-ui-lab/src/StaticTimePicker/StaticTimePicker.tsx b/packages/material-ui-lab/src/StaticTimePicker/StaticTimePicker.tsx
@@ -92,16 +92,19 @@ function StaticTimePickerWrapper(props: StaticTimePickerWrapperProps) {
   );
 }
 
+export interface StaticTimePickerProps<TDate = unknown>
+  extends BaseTimePickerProps,
+    PublicWrapperProps<typeof StaticWrapper>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate> {}
+
 /**
  *
  * API:
  *
  * - [StaticTimePicker API](https://material-ui.com/api/static-time-picker/)
  */
 const StaticTimePicker = React.forwardRef(function StaticTimePicker<TDate>(
-  __props: BaseTimePickerProps &
-    PublicWrapperProps<typeof StaticWrapper> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+  __props: StaticTimePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -377,6 +380,4 @@ StaticTimePicker.propTypes /* remove-proptypes */ = {
   views: PropTypes.arrayOf(PropTypes.oneOf(['hours', 'minutes', 'seconds']).isRequired),
 } as any;
 
-export type StaticTimePickerProps = React.ComponentProps<typeof StaticTimePicker>;
-
 export default StaticTimePicker;
diff --git a/packages/material-ui-lab/src/TimePicker/TimePicker.tsx b/packages/material-ui-lab/src/TimePicker/TimePicker.tsx
@@ -158,6 +158,11 @@ function TimePickerWrapper(props: TimePickerWrapperProps) {
   );
 }
 
+export interface TimePickerProps<TDate = unknown>
+  extends BaseTimePickerProps,
+    PublicWrapperProps<typeof ResponsiveWrapper>,
+    AllSharedPickerProps<ParsableDate<TDate>, TDate> {}
+
 /**
  *
  * Demos:
@@ -169,9 +174,7 @@ function TimePickerWrapper(props: TimePickerWrapperProps) {
  * - [TimePicker API](https://material-ui.com/api/time-picker/)
  */
 const TimePicker = React.forwardRef(function TimePicker<TDate>(
-  __props: BaseTimePickerProps &
-    PublicWrapperProps<typeof ResponsiveWrapper> &
-    AllSharedPickerProps<ParsableDate<TDate>, TDate>,
+  __props: TimePickerProps<TDate>,
   ref: React.Ref<HTMLInputElement>,
 ) {
   const allProps = useInterceptProps(__props) as AllPickerProps<
@@ -486,6 +489,4 @@ TimePicker.propTypes /* remove-proptypes */ = {
   views: PropTypes.arrayOf(PropTypes.oneOf(['hours', 'minutes', 'seconds']).isRequired),
 } as any;
 
-export type TimePickerProps = React.ComponentProps<typeof TimePicker>;
-
 export default TimePicker;