Merge pull request #83 from Eureka-Shoulders/fix/updating_date_pickers

fix: updating date pickers
Eureka-Shoulders · Aug 2, 2022 · 4fbaf50 · 4fbaf50
2 parents 1943547 + f3e5abc
commit 4fbaf50
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 121 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@euk-labs/componentz",
-  "version": "0.5.13",
+  "version": "0.5.14",
   "types": "./lib/types/index.d.ts",
   "main": "./lib/cjs/index.js",
   "exports": {
@@ -48,9 +48,9 @@
     "@euk-labs/componentz": "^0.5.12",
     "@euk-labs/formix": "^0.4.5",
     "@mui/icons-material": "^5.8.4",
-    "@mui/lab": "^5.0.0-alpha.88",
-    "@mui/material": "^5.8.6",
-    "@mui/x-date-pickers": "^5.0.0-alpha.7",
+    "@mui/lab": "^5.0.0-alpha.93",
+    "@mui/material": "^5.9.3",
+    "@mui/x-date-pickers": "^5.0.0-beta.3",
     "@storybook/addon-actions": "^6.4.17",
     "@storybook/addon-essentials": "^6.4.17",
     "@storybook/addon-interactions": "^6.4.17",

diff --git a/src/components/Inputs/DatePicker/index.tsx b/src/components/Inputs/DatePicker/index.tsx
@@ -1,8 +1,8 @@
+import { TextField, TextFieldProps } from '@mui/material';
 import {
   DatePicker as MuiDatePicker,
   DatePickerProps as MuiDatePickerProps,
 } from '@mui/x-date-pickers';
-import { TextField, TextFieldProps } from '@mui/material';
 
 export type DatePickerProps = {
   label?: string;
@@ -28,7 +28,17 @@ function DatePicker({
       onChange={onChange}
       label={label}
       renderInput={(params) => (
-        <TextField {...params} fullWidth {...textFieldProps} />
+        <TextField
+          {...params}
+          {...textFieldProps}
+          fullWidth
+          onBlur={(e) => {
+            textFieldProps?.onBlur && textFieldProps?.onBlur(e);
+            params.onBlur && params.onBlur(e);
+          }}
+          error={params.error || textFieldProps?.error}
+          helperText={params.helperText || textFieldProps?.helperText}
+        />
       )}
     />
   );

diff --git a/src/components/Inputs/DateTimePicker/index.tsx b/src/components/Inputs/DateTimePicker/index.tsx
@@ -28,7 +28,17 @@ function DateTimePicker({
       onChange={onChange}
       label={label}
       renderInput={(params) => (
-        <TextField {...params} fullWidth {...textFieldProps} />
+        <TextField
+          {...params}
+          {...textFieldProps}
+          fullWidth
+          onBlur={(e) => {
+            textFieldProps?.onBlur && textFieldProps?.onBlur(e);
+            params.onBlur && params.onBlur(e);
+          }}
+          error={params.error || textFieldProps?.error}
+          helperText={params.helperText || textFieldProps?.helperText}
+        />
       )}
     />
   );