Merge pull request #482 from lyytioy/next

Version 2.2.1
lyytioy · May 23, 2023 · 30347c3 · 30347c3
2 parents 4934438 + e57822f
commit 30347c3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@lyyti/design-system",
   "description": "Lyyti Design System",
   "homepage": "https://lyytioy.github.io/lyyti-design-system",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "engines": {
     "node": "^18",
     "npm": "^8"

diff --git a/src/components/DatePicker.tsx b/src/components/DatePicker.tsx
@@ -3,7 +3,6 @@ import {
   DatePickerProps as MuiDatepickerProps,
 } from '@mui/x-date-pickers/DatePicker';
 import { DesktopDatePicker as MuiDesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker';
-import { MobileDatePicker as MuiMobileDatePicker } from '@mui/x-date-pickers/MobileDatePicker';
 import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 import type { FormHelperTextProps, InputLabelProps, InputAdornmentProps as MuiInputAdornmentProps } from '@mui/material';
 
@@ -18,7 +17,7 @@ export interface DatePickerProps<TDate = unknown> extends Omit<MuiDatepickerProp
   InputAdornmentProps?: Partial<MuiInputAdornmentProps>;
   InputLabelProps?: Partial<InputLabelProps>
   'data-testid'?: string;
-  variant: 'desktop' | 'mobile' | 'responsive';
+  variant?: 'desktop' | 'responsive';
 }
 
 export { AdapterDayjs }
@@ -41,7 +40,7 @@ const DatePicker = <TDate = unknown>(
     ...props
   }: DatePickerProps<TDate>,
 ): JSX.Element => {
-  const MuiDatePicker = variant === 'responsive' ? MuiResponsiveDatePicker : variant === 'desktop' ? MuiDesktopDatePicker : MuiMobileDatePicker;
+  const MuiDatePicker = variant === 'desktop' ? MuiDesktopDatePicker : MuiResponsiveDatePicker;
   return (
     <MuiDatePicker
       slots={{ openPickerIcon: (iconProps) => Calendar({ fontSize: 'small', ...iconProps }) }}

diff --git a/src/components/TimePicker.tsx b/src/components/TimePicker.tsx
@@ -1,7 +1,8 @@
 import {
-  TimePicker as MuiTimePicker,
+  TimePicker as MuiResponsiveTimePicker,
   TimePickerProps as MuiTimePickerProps,
 } from '@mui/x-date-pickers/TimePicker';
+import { DesktopTimePicker as MuiDesktopTimePicker } from '@mui/x-date-pickers/DesktopTimePicker';
 import type { FormHelperTextProps, InputLabelProps, InputAdornmentProps as MuiInputAdornmentProps } from '@mui/material';
 import { TextInputProps } from './TextField';
 
@@ -13,9 +14,21 @@ export interface TimePickerProps<TDate = unknown> extends Omit<MuiTimePickerProp
   InputLabelProps?: Partial<InputLabelProps>;
   OpenPickerButtonProps?: Record<string, unknown>;
   'data-testid'?: string;
+  variant?: 'desktop' | 'responsive';
 }
 
-const TimePicker = <TDate = unknown>({ ampm = false, InputProps = {}, InputAdornmentProps = {}, OpenPickerButtonProps = {}, helperText, FormHelperTextProps, InputLabelProps, ...props }: TimePickerProps<TDate>): JSX.Element => {
+const TimePicker = <TDate = unknown>({ 
+  ampm = false, 
+  InputProps = {}, 
+  InputAdornmentProps = {}, 
+  OpenPickerButtonProps = {}, 
+  helperText, 
+  FormHelperTextProps, 
+  InputLabelProps,
+  variant = 'responsive', 
+  ...props 
+}: TimePickerProps<TDate>): JSX.Element => {
+  const MuiTimePicker = variant === 'desktop' ? MuiDesktopTimePicker : MuiResponsiveTimePicker;
   return (
     <MuiTimePicker
       ampm={ampm}