Work

mui · Apr 12, 2022 · 4c61557 · 4c61557
1 parent c3e9b76
commit 4c61557
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/x-date-pickers-pro/src/DateRangePicker/DateRangePicker.tsx b/packages/x-date-pickers-pro/src/DateRangePicker/DateRangePicker.tsx
@@ -56,7 +56,14 @@ export const DateRangePicker = React.forwardRef(function DateRangePicker<TDate>(
   const isDesktop = useMediaQuery(desktopModeMediaQuery);
 
   if (isDesktop) {
-    return <DesktopDateRangePicker ref={ref} PopperProps={PopperProps} {...other} />;
+    return (
+      <DesktopDateRangePicker
+        ref={ref}
+        PopperProps={PopperProps}
+        TransitionComponent={TransitionComponent}
+        {...other}
+      />
+    );
   }
 
   return (

diff --git a/packages/x-date-pickers/src/DateTimePicker/shared.ts b/packages/x-date-pickers/src/DateTimePicker/shared.ts
@@ -102,10 +102,10 @@ export function useDateTimePickerDefaultizedProps<
     orientation: 'portrait',
     openTo: 'day',
     views: ['year', 'day', 'hours', 'minutes'],
-    minDate: themeProps.minDateTime ?? defaultDates.minDate,
-    maxDate: themeProps.maxDateTime ?? defaultDates.maxDate,
-    minTime: themeProps.minDateTime,
-    maxTime: themeProps.maxDateTime,
+    minDate: themeProps.minDateTime ?? themeProps.minDate ?? defaultDates.minDate,
+    maxDate: themeProps.maxDateTime ?? themeProps.maxDate ?? defaultDates.maxDate,
+    minTime: themeProps.minDateTime ?? themeProps.minTime,
+    maxTime: themeProps.maxDateTime ?? themeProps.maxTime,
     ampmInClock: true,
     showToolbar: false,
     allowSameDateSelection: true,