expose helper.formContext

MakerXStudio · Mar 30, 2023 · 8c66570 · 8c66570
1 parent b917a7c
commit 8c66570
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.changeset/polite-ears-carry.md b/.changeset/polite-ears-carry.md
@@ -0,0 +1,5 @@
+---
+'@makerx/forms-core': minor
+---
+
+Expose helper.formContext
diff --git a/packages/core/src/components/ValidatedFormFactory.tsx b/packages/core/src/components/ValidatedFormFactory.tsx
@@ -39,7 +39,7 @@ export const ValidatedFormFactory =
     TSchema extends Record<string, unknown>,
     K extends FormFieldHelperBase<TSchema>
   >(
-    formFieldHelperFactory: new () => K
+    formFieldHelperFactory: new (formContext: UseFormReturn<TSchema>) => K
   ) =>
   ({
     className,
@@ -65,7 +65,7 @@ export const ValidatedFormFactory =
             onSubmit={onSubmit && formContext.handleSubmit(onSubmit)}
           >
             {typeof children === 'function'
-              ? children(new formFieldHelperFactory())
+              ? children(new formFieldHelperFactory(formContext))
               : children}
           </form>
         </FormProvider>

diff --git a/packages/core/src/util/FormFieldHelperBase.tsx b/packages/core/src/util/FormFieldHelperBase.tsx
@@ -1,6 +1,11 @@
+import { UseFormReturn } from 'react-hook-form';
+
 export class FormFieldHelperBase<TSchema extends Record<string, any>> {
   private readonly fieldPrefix: string;
-  constructor({ fieldPrefix }: { fieldPrefix?: string } = {}) {
+  constructor(
+    public formContext: UseFormReturn<TSchema>,
+    { fieldPrefix }: { fieldPrefix?: string } = {}
+  ) {
     this.fieldPrefix = fieldPrefix ? `${fieldPrefix}.` : '';
   }