build(rhf): update to 7.48.2 and fix error types

BedrockStreaming · Nov 13, 2023 · a1c91bf · a1c91bf
1 parent 6a55eac
commit a1c91bf
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 133 deletions.
diff --git a/libs/form-builder/package.json b/libs/form-builder/package.json
@@ -2,7 +2,7 @@
   "name": "@bedrockstreaming/form-builder",
   "version": "0.8.4",
   "dependencies": {
-    "react-hook-form": "7.27.0"
+    "react-hook-form": "7.48.2"
   },
   "peerDependencies": {
     "react": "17.0.2"

diff --git a/libs/form-builder/src/lib/components/formField.component.tsx b/libs/form-builder/src/lib/components/formField.component.tsx
@@ -8,7 +8,7 @@ export interface FormFieldProps {
   dictionary: Dictionary;
   validation?: Validations;
   errors?: ErrorOption;
-  setFieldValue?: SetFieldValue<string | number>;
+  setFieldValue?: SetFieldValue<FieldValues>;
   triggerValidationField?: (value: Path<FieldValues>) => void;
   propRef?: Ref;
   disabled?: boolean;

diff --git a/libs/form-builder/src/lib/utils/conditionalFields.utils.ts b/libs/form-builder/src/lib/utils/conditionalFields.utils.ts
@@ -1,4 +1,4 @@
-import { UseFormGetValues, FieldValues, FieldErrors } from 'react-hook-form';
+import { UseFormGetValues, FieldValues, FieldErrors, FieldError } from 'react-hook-form';
 import { ExtraValidation, FormField, FormFields } from '../types';
 
 export interface ShouldDisplayField {
@@ -24,7 +24,7 @@ export const shouldDisplayField = ({ dependsOn, getValues, extraValidation, erro
     // When the validate option is disabled
     // Check for specific validation error
     if (!dependRule.validate) {
-      const validationError = fieldError && fieldError[dependRule.key];
+      const validationError = fieldError && fieldError[dependRule.key as keyof FieldError];
       return dependsOnConditions.push(!!fieldValue && !validationError);
     }
 

diff --git a/libs/form-builder/src/lib/utils/validation.utils.ts b/libs/form-builder/src/lib/utils/validation.utils.ts
@@ -18,7 +18,7 @@ export interface GetFieldRulesArgs {
   extraValidation?: ExtraValidation;
 }
 
-export interface FieldRules extends RegisterOptions {
+export type FieldRules = RegisterOptions & {
   validate?: { [key: string]: (value?: any) => Promise<boolean> | boolean };
 }
 

diff --git a/libs/form-context/package.json b/libs/form-context/package.json
@@ -4,7 +4,7 @@
   "peerDependencies": {
     "react": "17.0.2",
     "@bedrockstreaming/form-builder": "0.8.1",
-    "react-hook-form": "7.27.0"
+    "react-hook-form": "7.48.2"
   },
   "devDependencies": {
     "deep-freeze": "0.0.1"

diff --git a/libs/form-editor/package.json b/libs/form-editor/package.json
@@ -11,7 +11,7 @@
     "@mui/material": "5.2.2",
     "@mui/styles": "5.2.2",
     "react": "17.0.2",
-    "react-hook-form": "7.27.0",
+    "react-hook-form": "7.48.2",
     "react-redux": "7.2.6"
   }
 }
diff --git a/libs/form-redux/package.json b/libs/form-redux/package.json
@@ -5,7 +5,7 @@
     "@bedrockstreaming/form-builder": "0.8.1",
     "@hookform/devtools": "4.0.2",
     "react": "17.0.2",
-    "react-hook-form": "7.27.0"
+    "react-hook-form": "7.48.2"
   },
   "devDependencies": {
     "deep-freeze": "0.0.1"

diff --git a/libs/form-validation-rule-list/package.json b/libs/form-validation-rule-list/package.json
@@ -5,6 +5,6 @@
   "peerDependencies": {
     "react": "17.0.2",
     "@bedrockstreaming/form-builder": "0.8.1",
-    "react-hook-form": "7.27.0"
+    "react-hook-form": "7.48.2"
   }
 }
diff --git a/libs/form-validation-rule-list/src/lib/getValidationRulesHints.ts b/libs/form-validation-rule-list/src/lib/getValidationRulesHints.ts
@@ -18,6 +18,7 @@ const identity = (value: string) => value;
 
 export const getValidationRulesHints = ({ t = identity, errors, validation, config }: GetValidationRulesHintsArgs) => {
   return Object.values(validation).reduce((acc, { message, key }) => {
+    // @ts-ignore
     return DEFAULT_RULES_NAMES[key] ? acc : [...acc, rule(t(message, config), () => !errors?.types[key])];
   }, [] as Array<RuleObject>);
 };
diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     "prism-react-renderer": "1.2.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-hook-form": "7.27.0",
+    "react-hook-form": "7.48.2",
     "react-redux": "7.2.6",
     "react-router-dom": "5.2.0",
     "redux": "4.1.2",