Merge pull request #69 from Eureka-Shoulders/develop

Develop
Eureka-Shoulders · May 3, 2022 · af4ade5 · af4ade5
2 parents 8b53742 + 4faf35e
commit af4ade5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 46 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@euk-labs/componentz",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",

diff --git a/src/components/Inputs/DatePicker/DatePicker.stories.tsx b/src/components/Inputs/DatePicker/DatePicker.stories.tsx
@@ -13,8 +13,8 @@ const Template: ComponentStory<typeof DatePicker> = (args) => {
   return (
     <DatePicker
       {...args}
-      onDatePickerChange={(newDate) => setDate(newDate as Date)}
-      datePickerValue={date}
+      onChange={(newDate) => setDate(newDate as Date)}
+      value={date}
     />
   );
 };

diff --git a/src/components/Inputs/DatePicker/index.tsx b/src/components/Inputs/DatePicker/index.tsx
@@ -1,48 +1,33 @@
 import {
   DatePicker as MuiDatePicker,
   DatePickerProps as MuiDatePickerProps,
-  LocalizationProvider,
-  LocalizationProviderProps,
 } from '@mui/lab';
-import AdapterDateFns from '@mui/lab/AdapterDateFns';
 import { TextField, TextFieldProps } from '@mui/material';
 
 export type DatePickerProps = {
   label?: string;
   textFieldProps?: TextFieldProps;
-  localizationProviderProps?: Omit<LocalizationProviderProps, 'dateAdapter'>;
-  dateAdapter?: LocalizationProviderProps['dateAdapter'];
-  onDatePickerChange: (
-    date: unknown,
-    keyboardInputValue: string | undefined
-  ) => void;
-  datePickerValue: Date | string | undefined;
+  onChange: (date: unknown, keyboardInputValue: string | undefined) => void;
+  value: Date | string | undefined;
 } & Omit<MuiDatePickerProps, 'renderInput' | 'onChange' | 'value'>;
 
 function DatePicker({
   label,
+  onChange,
+  value,
   textFieldProps,
-  dateAdapter,
-  localizationProviderProps,
-  onDatePickerChange,
-  datePickerValue,
   ...props
 }: DatePickerProps) {
   return (
-    <LocalizationProvider
-      {...localizationProviderProps}
-      dateAdapter={dateAdapter || AdapterDateFns}
-    >
-      <MuiDatePicker
-        {...props}
-        value={datePickerValue}
-        onChange={onDatePickerChange}
-        label={label}
-        renderInput={(params) => (
-          <TextField {...params} fullWidth {...textFieldProps} />
-        )}
-      />
-    </LocalizationProvider>
+    <MuiDatePicker
+      {...props}
+      value={value}
+      onChange={onChange}
+      label={label}
+      renderInput={(params) => (
+        <TextField {...params} fullWidth {...textFieldProps} />
+      )}
+    />
   );
 }
 

diff --git a/src/components/Inputs/DateRangePicker/DateRangePicker.tsx b/src/components/Inputs/DateRangePicker/DateRangePicker.tsx
@@ -1,9 +1,4 @@
-import {
-  DesktopDatePickerProps,
-  LocalizationProvider,
-  LocalizationProviderProps,
-} from '@mui/lab';
-import AdapterDateFns from '@mui/lab/AdapterDateFns';
+import { DesktopDatePickerProps } from '@mui/lab';
 import { Popover } from '@mui/material';
 import { observer } from 'mobx-react-lite';
 import { useRef, useState } from 'react';
@@ -18,16 +13,12 @@ export type DateRangePickerProps = Omit<
 > & {
   renderInput?: DesktopDatePickerProps['renderInput'];
   onChange: (value: DateRange) => void;
-  localizationProviderProps?: Omit<LocalizationProviderProps, 'dateAdapter'>;
-  dateAdapter?: LocalizationProviderProps['dateAdapter'];
   label?: string;
   value: DateRange;
 };
 
 function DateRangePicker({
   value,
-  localizationProviderProps,
-  dateAdapter,
   label,
   onChange,
   ...props
@@ -36,10 +27,7 @@ function DateRangePicker({
   const anchorRef = useRef(null);
 
   return (
-    <LocalizationProvider
-      {...localizationProviderProps}
-      dateAdapter={dateAdapter || AdapterDateFns}
-    >
+    <>
       <DateRangeMaskedInput
         label={label}
         store={store}
@@ -59,7 +47,7 @@ function DateRangePicker({
           store={store}
         />
       </Popover>
-    </LocalizationProvider>
+    </>
   );
 }