@availity/mui-controlled-form 0.2.4 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -2,6 +2,13 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ ## [0.2.5](https://github.com/Availity/element/compare/@availity/mui-controlled-form@0.2.4...@availity/mui-controlled-form@0.2.5) (2025-02-05)
6
+
7
+
8
+ ### Bug Fixes
9
+
10
+ * **mui-controlled-form:** support required prop object ([6a2282c](https://github.com/Availity/element/commit/6a2282ca0328c7e1ed3d1ace974209123c38f673))
11
+
5
12
  ## [0.2.4](https://github.com/Availity/element/compare/@availity/mui-controlled-form@0.2.3...@availity/mui-controlled-form@0.2.4) (2025-02-05)
6
13
 
7
14
 
package/dist/index.d.mts CHANGED
@@ -39,7 +39,7 @@ type ControlledFormProps = {
39
39
  declare const ControlledForm: ({ onSubmit, values, schema, validationResolver, ...rest }: ControlledFormProps) => react_jsx_runtime.JSX.Element;
40
40
 
41
41
  type ControlledDatepickerProps = DatepickerProps & Omit<RegisterOptions<FieldValues, string>, 'disabled' | 'valueAsNumber' | 'valueAsDate' | 'setValueAs'> & Pick<ControllerProps, 'defaultValue' | 'shouldUnregister' | 'name'>;
42
- declare const ControlledDatepicker: ({ name, defaultValue, deps, max, maxLength, min, minLength, onBlur, onChange, pattern, required, shouldUnregister, validate, value, ...rest }: ControlledDatepickerProps) => react_jsx_runtime.JSX.Element;
42
+ declare const ControlledDatepicker: ({ name, defaultValue, deps, max, maxLength, min, minLength, onBlur, onChange, pattern, required, shouldUnregister, validate, value, FieldProps, ...rest }: ControlledDatepickerProps) => react_jsx_runtime.JSX.Element;
43
43
 
44
44
  type ControlledInputProps = Omit<InputProps, 'error' | 'name' | 'required'> & {
45
45
  name: string;
package/dist/index.d.ts CHANGED
@@ -39,7 +39,7 @@ type ControlledFormProps = {
39
39
  declare const ControlledForm: ({ onSubmit, values, schema, validationResolver, ...rest }: ControlledFormProps) => react_jsx_runtime.JSX.Element;
40
40
 
41
41
  type ControlledDatepickerProps = DatepickerProps & Omit<RegisterOptions<FieldValues, string>, 'disabled' | 'valueAsNumber' | 'valueAsDate' | 'setValueAs'> & Pick<ControllerProps, 'defaultValue' | 'shouldUnregister' | 'name'>;
42
- declare const ControlledDatepicker: ({ name, defaultValue, deps, max, maxLength, min, minLength, onBlur, onChange, pattern, required, shouldUnregister, validate, value, ...rest }: ControlledDatepickerProps) => react_jsx_runtime.JSX.Element;
42
+ declare const ControlledDatepicker: ({ name, defaultValue, deps, max, maxLength, min, minLength, onBlur, onChange, pattern, required, shouldUnregister, validate, value, FieldProps, ...rest }: ControlledDatepickerProps) => react_jsx_runtime.JSX.Element;
43
43
 
44
44
  type ControlledInputProps = Omit<InputProps, 'error' | 'name' | 'required'> & {
45
45
  name: string;
package/dist/index.js CHANGED
@@ -128,6 +128,7 @@ var ControlledAsyncAutocomplete = (_a) => {
128
128
  import_mui_autocomplete.AsyncAutocomplete,
129
129
  __spreadProps(__spreadValues({}, rest), {
130
130
  FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
131
+ required: typeof required === "object" ? required.value : !!required,
131
132
  error: !!errorMessage,
132
133
  helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
133
134
  errorMessage,
@@ -215,6 +216,7 @@ var ControlledAutocomplete = (_a) => {
215
216
  import_mui_autocomplete2.Autocomplete,
216
217
  __spreadProps(__spreadValues({}, rest), {
217
218
  FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
219
+ required: typeof required === "object" ? required.value : !!required,
218
220
  error: !!errorMessage,
219
221
  helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_jsx_runtime2.Fragment, { children: [
220
222
  errorMessage,
@@ -335,6 +337,7 @@ var ControlledCodesAutocomplete = (_a) => {
335
337
  import_mui_autocomplete3.CodesAutocomplete,
336
338
  __spreadProps(__spreadValues({}, rest), {
337
339
  FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
340
+ required: typeof required === "object" ? required.value : !!required,
338
341
  error: !!errorMessage,
339
342
  helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_jsx_runtime4.Fragment, { children: [
340
343
  errorMessage,
@@ -388,7 +391,8 @@ var ControlledDatepicker = (_a) => {
388
391
  required,
389
392
  shouldUnregister,
390
393
  validate,
391
- value
394
+ value,
395
+ FieldProps
392
396
  } = _b, rest = __objRest(_b, [
393
397
  "name",
394
398
  "defaultValue",
@@ -403,7 +407,8 @@ var ControlledDatepicker = (_a) => {
403
407
  "required",
404
408
  "shouldUnregister",
405
409
  "validate",
406
- "value"
410
+ "value",
411
+ "FieldProps"
407
412
  ]);
408
413
  const { control } = (0, import_react_hook_form6.useFormContext)();
409
414
  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
@@ -427,7 +432,22 @@ var ControlledDatepicker = (_a) => {
427
432
  value
428
433
  },
429
434
  shouldUnregister,
430
- render: ({ field: { onChange: onChange2, value: value2 } }) => /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_mui_datepicker.Datepicker, __spreadProps(__spreadValues({}, rest), { onChange: onChange2, value: value2 || null }))
435
+ render: ({ field: { onChange: onChange2, value: value2 }, fieldState: { error } }) => /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
436
+ import_mui_datepicker.Datepicker,
437
+ __spreadProps(__spreadValues({}, rest), {
438
+ FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
439
+ required: typeof required === "object" ? required.value : !!required,
440
+ error: !!error,
441
+ helperText: (error == null ? void 0 : error.message) ? /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, { children: [
442
+ error == null ? void 0 : error.message,
443
+ /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("br", {}),
444
+ FieldProps == null ? void 0 : FieldProps.helperText
445
+ ] }) : FieldProps == null ? void 0 : FieldProps.helperText
446
+ }),
447
+ onChange: onChange2,
448
+ value: value2 || null
449
+ })
450
+ )
431
451
  }
432
452
  );
433
453
  };
@@ -475,7 +495,7 @@ var ControlledInput = (_a) => {
475
495
  import_mui_form_utils.Input,
476
496
  __spreadValues(__spreadProps(__spreadValues({}, rest), {
477
497
  error: !!getFieldState(name).error,
478
- required: !!required
498
+ required: typeof required === "object" ? required.value : !!required
479
499
  }), register(name, {
480
500
  required,
481
501
  maxLength,
@@ -549,6 +569,7 @@ var ControlledOrganizationAutocomplete = (_a) => {
549
569
  import_mui_autocomplete4.OrganizationAutocomplete,
550
570
  __spreadProps(__spreadValues({}, rest), {
551
571
  FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
572
+ required: typeof required === "object" ? required.value : !!required,
552
573
  error: !!errorMessage,
553
574
  helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_jsx_runtime8.Fragment, { children: [
554
575
  errorMessage,
@@ -636,6 +657,7 @@ var ControlledProviderAutocomplete = (_a) => {
636
657
  import_mui_autocomplete5.ProviderAutocomplete,
637
658
  __spreadProps(__spreadValues({}, rest), {
638
659
  FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
660
+ required: typeof required === "object" ? required.value : !!required,
639
661
  error: !!errorMessage,
640
662
  helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_jsx_runtime9.Fragment, { children: [
641
663
  errorMessage,
@@ -698,7 +720,7 @@ var ControlledRadioGroup = (_a) => {
698
720
  rules: { deps, onBlur, onChange, required, shouldUnregister, value },
699
721
  shouldUnregister,
700
722
  render: ({ field }) => /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_mui_form_utils3.FormControl, { error: !!errorMessage, children: [
701
- /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_mui_form_utils3.FormLabel, { children: label }),
723
+ /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_mui_form_utils3.FormLabel, { required: typeof required === "object" ? required.value : !!required, children: label }),
702
724
  /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_mui_form_utils2.RadioGroup, __spreadValues(__spreadValues({}, field), rest)),
703
725
  /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_mui_form_utils3.FormHelperText, { children: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_jsx_runtime10.Fragment, { children: [
704
726
  errorMessage,
@@ -753,7 +775,7 @@ var ControlledSelect = (_a) => {
753
775
  import_mui_form_utils4.Select,
754
776
  __spreadValues(__spreadProps(__spreadValues({}, rest), {
755
777
  error: !!getFieldState(name).error,
756
- required: !!required
778
+ required: typeof required === "object" ? required.value : !!required
757
779
  }), register(name, {
758
780
  required,
759
781
  maxLength,
@@ -819,7 +841,7 @@ var ControlledTextField = (_a) => {
819
841
  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
820
842
  import_mui_textfield.TextField,
821
843
  __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, rest), {
822
- required: !!required
844
+ required: typeof required === "object" ? required.value : !!required
823
845
  }), register(name, {
824
846
  required,
825
847
  maxLength,
package/dist/index.mjs CHANGED
@@ -94,6 +94,7 @@ var ControlledAsyncAutocomplete = (_a) => {
94
94
  AsyncAutocomplete,
95
95
  __spreadProps(__spreadValues({}, rest), {
96
96
  FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
97
+ required: typeof required === "object" ? required.value : !!required,
97
98
  error: !!errorMessage,
98
99
  helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ jsxs(Fragment, { children: [
99
100
  errorMessage,
@@ -181,6 +182,7 @@ var ControlledAutocomplete = (_a) => {
181
182
  Autocomplete,
182
183
  __spreadProps(__spreadValues({}, rest), {
183
184
  FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
185
+ required: typeof required === "object" ? required.value : !!required,
184
186
  error: !!errorMessage,
185
187
  helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ jsxs2(Fragment2, { children: [
186
188
  errorMessage,
@@ -301,6 +303,7 @@ var ControlledCodesAutocomplete = (_a) => {
301
303
  CodesAutocomplete,
302
304
  __spreadProps(__spreadValues({}, rest), {
303
305
  FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
306
+ required: typeof required === "object" ? required.value : !!required,
304
307
  error: !!errorMessage,
305
308
  helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ jsxs3(Fragment3, { children: [
306
309
  errorMessage,
@@ -338,7 +341,7 @@ var ControlledForm = (_a) => {
338
341
  // src/lib/Datepicker.tsx
339
342
  import { Datepicker } from "@availity/mui-datepicker";
340
343
  import { useFormContext as useFormContext5, Controller as Controller4 } from "react-hook-form";
341
- import { jsx as jsx6 } from "react/jsx-runtime";
344
+ import { Fragment as Fragment4, jsx as jsx6, jsxs as jsxs4 } from "react/jsx-runtime";
342
345
  var ControlledDatepicker = (_a) => {
343
346
  var _b = _a, {
344
347
  name,
@@ -354,7 +357,8 @@ var ControlledDatepicker = (_a) => {
354
357
  required,
355
358
  shouldUnregister,
356
359
  validate,
357
- value
360
+ value,
361
+ FieldProps
358
362
  } = _b, rest = __objRest(_b, [
359
363
  "name",
360
364
  "defaultValue",
@@ -369,7 +373,8 @@ var ControlledDatepicker = (_a) => {
369
373
  "required",
370
374
  "shouldUnregister",
371
375
  "validate",
372
- "value"
376
+ "value",
377
+ "FieldProps"
373
378
  ]);
374
379
  const { control } = useFormContext5();
375
380
  return /* @__PURE__ */ jsx6(
@@ -393,7 +398,22 @@ var ControlledDatepicker = (_a) => {
393
398
  value
394
399
  },
395
400
  shouldUnregister,
396
- render: ({ field: { onChange: onChange2, value: value2 } }) => /* @__PURE__ */ jsx6(Datepicker, __spreadProps(__spreadValues({}, rest), { onChange: onChange2, value: value2 || null }))
401
+ render: ({ field: { onChange: onChange2, value: value2 }, fieldState: { error } }) => /* @__PURE__ */ jsx6(
402
+ Datepicker,
403
+ __spreadProps(__spreadValues({}, rest), {
404
+ FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
405
+ required: typeof required === "object" ? required.value : !!required,
406
+ error: !!error,
407
+ helperText: (error == null ? void 0 : error.message) ? /* @__PURE__ */ jsxs4(Fragment4, { children: [
408
+ error == null ? void 0 : error.message,
409
+ /* @__PURE__ */ jsx6("br", {}),
410
+ FieldProps == null ? void 0 : FieldProps.helperText
411
+ ] }) : FieldProps == null ? void 0 : FieldProps.helperText
412
+ }),
413
+ onChange: onChange2,
414
+ value: value2 || null
415
+ })
416
+ )
397
417
  }
398
418
  );
399
419
  };
@@ -441,7 +461,7 @@ var ControlledInput = (_a) => {
441
461
  Input,
442
462
  __spreadValues(__spreadProps(__spreadValues({}, rest), {
443
463
  error: !!getFieldState(name).error,
444
- required: !!required
464
+ required: typeof required === "object" ? required.value : !!required
445
465
  }), register(name, {
446
466
  required,
447
467
  maxLength,
@@ -464,7 +484,7 @@ var ControlledInput = (_a) => {
464
484
  // src/lib/OrganizationAutocomplete.tsx
465
485
  import { OrganizationAutocomplete } from "@availity/mui-autocomplete";
466
486
  import { useFormContext as useFormContext7, Controller as Controller5 } from "react-hook-form";
467
- import { Fragment as Fragment4, jsx as jsx8, jsxs as jsxs4 } from "react/jsx-runtime";
487
+ import { Fragment as Fragment5, jsx as jsx8, jsxs as jsxs5 } from "react/jsx-runtime";
468
488
  var ControlledOrganizationAutocomplete = (_a) => {
469
489
  var _b = _a, {
470
490
  name,
@@ -515,8 +535,9 @@ var ControlledOrganizationAutocomplete = (_a) => {
515
535
  OrganizationAutocomplete,
516
536
  __spreadProps(__spreadValues({}, rest), {
517
537
  FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
538
+ required: typeof required === "object" ? required.value : !!required,
518
539
  error: !!errorMessage,
519
- helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ jsxs4(Fragment4, { children: [
540
+ helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ jsxs5(Fragment5, { children: [
520
541
  errorMessage,
521
542
  /* @__PURE__ */ jsx8("br", {}),
522
543
  FieldProps == null ? void 0 : FieldProps.helperText
@@ -539,7 +560,7 @@ var ControlledOrganizationAutocomplete = (_a) => {
539
560
  // src/lib/ProviderAutocomplete.tsx
540
561
  import { ProviderAutocomplete } from "@availity/mui-autocomplete";
541
562
  import { useFormContext as useFormContext8, Controller as Controller6 } from "react-hook-form";
542
- import { Fragment as Fragment5, jsx as jsx9, jsxs as jsxs5 } from "react/jsx-runtime";
563
+ import { Fragment as Fragment6, jsx as jsx9, jsxs as jsxs6 } from "react/jsx-runtime";
543
564
  var ControlledProviderAutocomplete = (_a) => {
544
565
  var _b = _a, {
545
566
  name,
@@ -602,8 +623,9 @@ var ControlledProviderAutocomplete = (_a) => {
602
623
  ProviderAutocomplete,
603
624
  __spreadProps(__spreadValues({}, rest), {
604
625
  FieldProps: __spreadProps(__spreadValues({}, FieldProps), {
626
+ required: typeof required === "object" ? required.value : !!required,
605
627
  error: !!errorMessage,
606
- helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ jsxs5(Fragment5, { children: [
628
+ helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ jsxs6(Fragment6, { children: [
607
629
  errorMessage,
608
630
  /* @__PURE__ */ jsx9("br", {}),
609
631
  FieldProps == null ? void 0 : FieldProps.helperText
@@ -627,7 +649,7 @@ var ControlledProviderAutocomplete = (_a) => {
627
649
  import { RadioGroup } from "@availity/mui-form-utils";
628
650
  import { useFormContext as useFormContext9, Controller as Controller7 } from "react-hook-form";
629
651
  import { FormControl, FormLabel, FormHelperText } from "@availity/mui-form-utils";
630
- import { Fragment as Fragment6, jsx as jsx10, jsxs as jsxs6 } from "react/jsx-runtime";
652
+ import { Fragment as Fragment7, jsx as jsx10, jsxs as jsxs7 } from "react/jsx-runtime";
631
653
  var ControlledRadioGroup = (_a) => {
632
654
  var _b = _a, {
633
655
  name,
@@ -663,10 +685,10 @@ var ControlledRadioGroup = (_a) => {
663
685
  defaultValue,
664
686
  rules: { deps, onBlur, onChange, required, shouldUnregister, value },
665
687
  shouldUnregister,
666
- render: ({ field }) => /* @__PURE__ */ jsxs6(FormControl, { error: !!errorMessage, children: [
667
- /* @__PURE__ */ jsx10(FormLabel, { children: label }),
688
+ render: ({ field }) => /* @__PURE__ */ jsxs7(FormControl, { error: !!errorMessage, children: [
689
+ /* @__PURE__ */ jsx10(FormLabel, { required: typeof required === "object" ? required.value : !!required, children: label }),
668
690
  /* @__PURE__ */ jsx10(RadioGroup, __spreadValues(__spreadValues({}, field), rest)),
669
- /* @__PURE__ */ jsx10(FormHelperText, { children: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ jsxs6(Fragment6, { children: [
691
+ /* @__PURE__ */ jsx10(FormHelperText, { children: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ jsxs7(Fragment7, { children: [
670
692
  errorMessage,
671
693
  /* @__PURE__ */ jsx10("br", {}),
672
694
  helperText
@@ -719,7 +741,7 @@ var ControlledSelect = (_a) => {
719
741
  Select,
720
742
  __spreadValues(__spreadProps(__spreadValues({}, rest), {
721
743
  error: !!getFieldState(name).error,
722
- required: !!required
744
+ required: typeof required === "object" ? required.value : !!required
723
745
  }), register(name, {
724
746
  required,
725
747
  maxLength,
@@ -742,7 +764,7 @@ var ControlledSelect = (_a) => {
742
764
  // src/lib/TextField.tsx
743
765
  import { TextField } from "@availity/mui-textfield";
744
766
  import { useFormContext as useFormContext11 } from "react-hook-form";
745
- import { Fragment as Fragment7, jsx as jsx12, jsxs as jsxs7 } from "react/jsx-runtime";
767
+ import { Fragment as Fragment8, jsx as jsx12, jsxs as jsxs8 } from "react/jsx-runtime";
746
768
  var ControlledTextField = (_a) => {
747
769
  var _b = _a, {
748
770
  name,
@@ -785,7 +807,7 @@ var ControlledTextField = (_a) => {
785
807
  return /* @__PURE__ */ jsx12(
786
808
  TextField,
787
809
  __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, rest), {
788
- required: !!required
810
+ required: typeof required === "object" ? required.value : !!required
789
811
  }), register(name, {
790
812
  required,
791
813
  maxLength,
@@ -803,7 +825,7 @@ var ControlledTextField = (_a) => {
803
825
  deps
804
826
  })), {
805
827
  error: !!getFieldState(name).error,
806
- helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ jsxs7(Fragment7, { children: [
828
+ helperText: errorMessage && typeof errorMessage === "string" ? /* @__PURE__ */ jsxs8(Fragment8, { children: [
807
829
  errorMessage,
808
830
  /* @__PURE__ */ jsx12("br", {}),
809
831
  helperText
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@availity/mui-controlled-form",
3
- "version": "0.2.4",
3
+ "version": "0.2.5",
4
4
  "description": "Availity MUI ControlledForm Component - part of the @availity/element design system",
5
5
  "keywords": [
6
6
  "react",
@@ -62,6 +62,7 @@ export const ControlledAsyncAutocomplete = <
62
62
  {...rest}
63
63
  FieldProps={{
64
64
  ...FieldProps,
65
+ required: typeof required === 'object' ? required.value : !!required,
65
66
  error: !!errorMessage,
66
67
  helperText:
67
68
  errorMessage && typeof errorMessage === 'string' ? (
@@ -66,6 +66,7 @@ export const ControlledAutocomplete = <
66
66
  {...rest}
67
67
  FieldProps={{
68
68
  ...FieldProps,
69
+ required: typeof required === 'object' ? required.value : !!required,
69
70
  error: !!errorMessage,
70
71
  helperText:
71
72
  errorMessage && typeof errorMessage === 'string' ? (
@@ -46,6 +46,7 @@ export const ControlledCodesAutocomplete = ({
46
46
  {...rest}
47
47
  FieldProps={{
48
48
  ...FieldProps,
49
+ required: typeof required === 'object' ? required.value : !!required,
49
50
  error: !!errorMessage,
50
51
  helperText:
51
52
  errorMessage && typeof errorMessage === 'string' ? (
@@ -20,6 +20,7 @@ export const ControlledDatepicker = ({
20
20
  shouldUnregister,
21
21
  validate,
22
22
  value,
23
+ FieldProps,
23
24
  ...rest
24
25
  }: ControlledDatepickerProps) => {
25
26
  const { control } = useFormContext();
@@ -43,7 +44,27 @@ export const ControlledDatepicker = ({
43
44
  value,
44
45
  }}
45
46
  shouldUnregister={shouldUnregister}
46
- render={({ field: { onChange, value } }) => <Datepicker {...rest} onChange={onChange} value={value || null} />}
47
+ render={({ field: { onChange, value }, fieldState: { error } }) => (
48
+ <Datepicker
49
+ {...rest}
50
+ FieldProps={{
51
+ ...FieldProps,
52
+ required: typeof required === 'object' ? required.value : !!required,
53
+ error: !!error,
54
+ helperText: error?.message ? (
55
+ <>
56
+ {error?.message}
57
+ <br />
58
+ {FieldProps?.helperText}
59
+ </>
60
+ ) : (
61
+ FieldProps?.helperText
62
+ ),
63
+ }}
64
+ onChange={onChange}
65
+ value={value || null}
66
+ />
67
+ )}
47
68
  />
48
69
  );
49
70
  };
package/src/lib/Input.tsx CHANGED
@@ -29,7 +29,7 @@ export const ControlledInput = ({
29
29
  <Input
30
30
  {...rest}
31
31
  error={!!getFieldState(name).error}
32
- required={!!required}
32
+ required={typeof required === 'object' ? required.value : !!required}
33
33
  {...register(name, {
34
34
  required,
35
35
  maxLength,
@@ -45,6 +45,7 @@ export const ControlledOrganizationAutocomplete = ({
45
45
  {...rest}
46
46
  FieldProps={{
47
47
  ...FieldProps,
48
+ required: typeof required === 'object' ? required.value : !!required,
48
49
  error: !!errorMessage,
49
50
  helperText:
50
51
  errorMessage && typeof errorMessage === 'string' ? (
@@ -50,6 +50,7 @@ export const ControlledProviderAutocomplete = ({
50
50
  {...rest}
51
51
  FieldProps={{
52
52
  ...FieldProps,
53
+ required: typeof required === 'object' ? required.value : !!required,
53
54
  error: !!errorMessage,
54
55
  helperText:
55
56
  errorMessage && typeof errorMessage === 'string' ? (
@@ -45,7 +45,7 @@ export const ControlledRadioGroup = ({
45
45
  shouldUnregister={shouldUnregister}
46
46
  render={({ field }) => (
47
47
  <FormControl error={!!errorMessage}>
48
- <FormLabel>{label}</FormLabel>
48
+ <FormLabel required={typeof required === 'object' ? required.value : !!required}>{label}</FormLabel>
49
49
  <RadioGroup {...field} {...rest} />
50
50
  <FormHelperText>
51
51
  {errorMessage && typeof errorMessage === 'string' ? (
@@ -30,7 +30,7 @@ export const ControlledSelect = ({
30
30
  <Select
31
31
  {...rest}
32
32
  error={!!getFieldState(name).error}
33
- required={!!required}
33
+ required={typeof required === 'object' ? required.value : !!required}
34
34
  {...register(name, {
35
35
  required,
36
36
  maxLength,
@@ -31,7 +31,7 @@ export const ControlledTextField = ({
31
31
  return (
32
32
  <TextField
33
33
  {...rest}
34
- required={!!required}
34
+ required={typeof required === 'object' ? required.value : !!required}
35
35
  {...register(name, {
36
36
  required,
37
37
  maxLength,