mobx-react-hook-form 1.0.13 → 2.0.1

package/mobx-form/mobx-form.d.ts

@@ -1,17 +1,18 @@
 import type { Disposable } from 'disposer-util';
-import { FormState, UseFormProps, UseFormReturn } from 'react-hook-form';
+import { FormState, SubmitErrorHandler, SubmitHandler, UseFormProps, UseFormReturn } from 'react-hook-form';
 import type { AnyObject, Maybe } from 'yammies/utils/types';
 import { ConnectedMobxForm, MobxFormParams } from './mobx-form.types';
-export declare class MobxForm<TFieldValues extends AnyObject, TContext = any> implements Disposable {
+export declare class MobxForm<TFieldValues extends AnyObject, TContext = any, TFieldOutputValues extends AnyObject = TFieldValues> implements Disposable {
+    private config;
     protected abortController: AbortController;
     /**
      * Real react-hook-form params
      * Needed to connect real react-hook-form to this mobx wrapper
      */
     params: UseFormProps<TFieldValues, TContext>;
-    protected submitHandler?: MobxFormParams<TFieldValues, TContext>['onSubmit'];
-    protected submitErrorHandler?: MobxFormParams<TFieldValues, TContext>['onSubmitFailed'];
-    protected resetHandler?: MobxFormParams<TFieldValues, TContext>['onReset'];
+    protected handleSubmit(...args: Parameters<SubmitHandler<TFieldOutputValues>>): void | Promise<void>;
+    protected handleSubmitFailed(...args: Parameters<SubmitErrorHandler<TFieldValues>>): void | Promise<void>;
+    protected handleReset(): void;
     /**
      * Original react-hook-form form
      */
@@ -25,7 +26,7 @@ export declare class MobxForm<TFieldValues extends AnyObject, TContext = any> im
      */
     data: Maybe<TFieldValues>;
     protected isConnected: boolean;
-    constructor({ disposer, abortSignal, onSubmit, onSubmitFailed, onReset, getParams, ...params }: MobxFormParams<TFieldValues, TContext>);
+    constructor(config: MobxFormParams<TFieldValues, TContext, TFieldOutputValues>);
     /**
      * Allows to modify real react-hook-form useForm() payload
      */

package/mobx-form/mobx-form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mobx-form.d.ts","sourceRoot":"","sources":["../../src/mobx-form/mobx-form.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAUhD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEtE,qBAAa,QAAQ,CAAC,YAAY,SAAS,SAAS,EAAE,QAAQ,GAAG,GAAG,CAClE,YAAW,UAAU;IAErB,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAE3C;;;OAGG;IACH,MAAM,EAAE,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAE7C,SAAS,CAAC,aAAa,CAAC,EAAE,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC;IAC7E,SAAS,CAAC,kBAAkB,CAAC,EAAE,cAAc,CAC3C,YAAY,EACZ,QAAQ,CACT,CAAC,gBAAgB,CAAC,CAAC;IACpB,SAAS,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC;IAE3E;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEnD;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAE/B;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAE1B,SAAS,CAAC,WAAW,UAAS;gBAElB,EAEV,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,cAAc,EACd,OAAO,EACP,SAAS,EACT,GAAG,MAAM,EACV,EAAE,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC;IAsDzC;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC;IAItD;;OAEG;IACH,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAIlE;;;;OAIG;IACH,SAAS,CAAC,OAAO,CACf,UAAU,EAAE,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,GAChD,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC;IAkD5C,OAAO,IAAI,IAAI;CAGhB"}
+{"version":3,"file":"mobx-form.d.ts","sourceRoot":"","sources":["../../src/mobx-form/mobx-form.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAShD,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,aAAa,EACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEtE,qBAAa,QAAQ,CACnB,YAAY,SAAS,SAAS,EAC9B,QAAQ,GAAG,GAAG,EACd,kBAAkB,SAAS,SAAS,GAAG,YAAY,CACnD,YAAW,UAAU;IAiDnB,OAAO,CAAC,MAAM;IA/ChB,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAE3C;;;OAGG;IACH,MAAM,EAAE,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAE7C,SAAS,CAAC,YAAY,CAEpB,GAAG,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,GACrD,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvB,SAAS,CAAC,kBAAkB,CAE1B,GAAG,IAAI,EAAE,UAAU,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC,GACpD,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvB,SAAS,CAAC,WAAW;IAKrB;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEnD;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAE/B;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAE1B,SAAS,CAAC,WAAW,UAAS;gBAGpB,MAAM,EAAE,cAAc,CAAC,YAAY,EAAE,QAAQ,EAAE,kBAAkB,CAAC;IAuD5E;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC;IAItD;;OAEG;IACH,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAIlE;;;;OAIG;IACH,SAAS,CAAC,OAAO,CACf,UAAU,EAAE,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,GAChD,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC;IAuD5C,OAAO,IAAI,IAAI;CAGhB"}

package/mobx-form/mobx-form.js

@@ -1,16 +1,29 @@
 import { LinkedAbortController } from 'linked-abort-controller';
-import noop from 'lodash-es/noop';
 import { action, makeObservable, observable, reaction, runInAction, } from 'mobx';
 export class MobxForm {
+    config;
     abortController;
     /**
      * Real react-hook-form params
      * Needed to connect real react-hook-form to this mobx wrapper
      */
     params;
-    submitHandler;
-    submitErrorHandler;
-    resetHandler;
+    handleSubmit(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    ...args) {
+        this.config.onSubmit?.(...args);
+        // used to override
+    }
+    handleSubmitFailed(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    ...args) {
+        this.config.onSubmitFailed?.(...args);
+        // used to override
+    }
+    handleReset() {
+        this.config.onReset?.();
+        // used to override
+    }
     /**
      * Original react-hook-form form
      */
@@ -24,12 +37,13 @@ export class MobxForm {
      */
     data;
     isConnected = false;
-    constructor({ 
-    // eslint-disable-next-line sonarjs/deprecation
-    disposer, abortSignal, onSubmit, onSubmitFailed, onReset, getParams, ...params }) {
-        this.abortController = new LinkedAbortController(abortSignal);
-        if (disposer) {
-            disposer.add(() => this.dispose());
+    constructor(config) {
+        this.config = config;
+        this.abortController = new LinkedAbortController(config.abortSignal);
+        // eslint-disable-next-line sonarjs/deprecation
+        if (config.disposer) {
+            // eslint-disable-next-line sonarjs/deprecation
+            config.disposer.add(() => this.dispose());
         }
         this.abortController.signal.addEventListener('abort', () => {
             this.form = null;
@@ -51,10 +65,7 @@ export class MobxForm {
             dirtyFields: {},
             validatingFields: {},
         };
-        this.submitHandler = onSubmit;
-        this.submitErrorHandler = onSubmitFailed;
-        this.resetHandler = onReset;
-        this.params = params;
+        this.params = config;
         makeObservable(this, {
             state: observable.deep,
             data: observable.deep,
@@ -62,8 +73,8 @@ export class MobxForm {
             setParams: action.bound,
             updateParams: action.bound,
         });
-        if (getParams) {
-            reaction(getParams, (params) => {
+        if (config.getParams) {
+            reaction(config.getParams, (params) => {
                 this.updateParams(params);
             }, {
                 signal: this.abortController.signal,
@@ -106,19 +117,15 @@ export class MobxForm {
         }
         return {
             ...formResult,
-            onReset: this.resetHandler ?? noop,
-            onSubmit: formResult.handleSubmit(this.submitHandler ?? noop, this.submitErrorHandler),
+            onReset: () => this.handleReset(),
+            onSubmit: formResult.handleSubmit((...args) => this.handleSubmit(...args), (...args) => this.handleSubmitFailed(...args)),
             handleSubmit: (onValid, onInvalid) => {
-                return formResult.handleSubmit((...args) => {
-                    if (this.submitHandler) {
-                        this.submitHandler(...args);
-                    }
-                    onValid(...args);
-                }, (...args) => {
-                    if (this.submitErrorHandler) {
-                        this.submitErrorHandler(...args);
-                    }
-                    onInvalid?.(...args);
+                return formResult.handleSubmit(async (...args) => {
+                    await this.handleSubmit(...args);
+                    await onValid(...args);
+                }, async (...args) => {
+                    await this.handleSubmitFailed(...args);
+                    await onInvalid?.(...args);
                 });
             },
         };

package/mobx-form/mobx-form.types.d.ts

@@ -4,7 +4,7 @@ import type { AnyObject } from 'yammies/utils/types';
 /**
  * Additional options for {@link MobxForm} constructor
  */
-export interface MobxFormParams<TFieldValues extends AnyObject, TContext = any> extends UseFormProps<TFieldValues, TContext> {
+export interface MobxFormParams<TFieldValues extends AnyObject, TContext = any, TFieldOutputValues extends AnyObject = TFieldValues> extends UseFormProps<TFieldValues, TContext> {
     /**
      * Disposer for mobx form
      * @deprecated use {abortSignal} instead
@@ -17,7 +17,7 @@ export interface MobxFormParams<TFieldValues extends AnyObject, TContext = any>
     /**
      * Form submit handler
      */
-    onSubmit?: SubmitHandler<TFieldValues>;
+    onSubmit?: SubmitHandler<TFieldOutputValues>;
     /**
      * Form submit failed handler
      */

package/mobx-form/mobx-form.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mobx-form.types.d.ts","sourceRoot":"","sources":["../../src/mobx-form/mobx-form.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,aAAa,EACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,cAAc,CAAC,YAAY,SAAS,SAAS,EAAE,QAAQ,GAAG,GAAG,CAC5E,SAAQ,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC;IAC5C;;;OAGG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;;OAEG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACvC;;OAEG;IACH,cAAc,CAAC,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAClD;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;CACjE;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB,CAChC,YAAY,SAAS,SAAS,EAC9B,QAAQ,GAAG,GAAG,CACd,SAAQ,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC;IAC7C;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,YAAY,CAAC;CACxB"}
+{"version":3,"file":"mobx-form.types.d.ts","sourceRoot":"","sources":["../../src/mobx-form/mobx-form.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,aAAa,EACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,cAAc,CAC7B,YAAY,SAAS,SAAS,EAC9B,QAAQ,GAAG,GAAG,EACd,kBAAkB,SAAS,SAAS,GAAG,YAAY,CACnD,SAAQ,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC;IAC5C;;;OAGG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;;OAEG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC,kBAAkB,CAAC,CAAC;IAC7C;;OAEG;IACH,cAAc,CAAC,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAClD;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;CACjE;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB,CAChC,YAAY,SAAS,SAAS,EAC9B,QAAQ,GAAG,GAAG,CACd,SAAQ,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC;IAC7C;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,YAAY,CAAC;CACxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-react-hook-form",
-  "version": "1.0.13",
+  "version": "2.0.1",
   "description": "",
   "keywords": [],
   "author": "js2me",