mobx-react-hook-form 1.0.10 → 1.0.11
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/hooks/use-mobx-form.d.ts +1 -1
- package/hooks/use-mobx-form.d.ts.map +1 -1
- package/mobx-form/mobx-form.d.ts +5 -5
- package/mobx-form/mobx-form.d.ts.map +1 -1
- package/mobx-form/mobx-form.js +20 -11
- package/mobx-form/mobx-form.types.d.ts +7 -2
- package/mobx-form/mobx-form.types.d.ts.map +1 -1
- package/package.json +2 -1
package/hooks/use-mobx-form.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AnyObject } from 'yammies/utils/types';
|
|
1
|
+
import type { AnyObject } from 'yammies/utils/types';
|
|
2
2
|
import { ConnectedMobxForm, MobxForm } from '../mobx-form';
|
|
3
3
|
export declare const useMobxForm: <TFieldValues extends AnyObject, TContext>(mobxForm: MobxForm<TFieldValues, TContext>) => ConnectedMobxForm<TFieldValues, TContext>;
|
|
4
4
|
//# sourceMappingURL=use-mobx-form.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-mobx-form.d.ts","sourceRoot":"","sources":["../../src/hooks/use-mobx-form.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"use-mobx-form.d.ts","sourceRoot":"","sources":["../../src/hooks/use-mobx-form.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE3D,eAAO,MAAM,WAAW,GAAI,YAAY,SAAS,SAAS,EAAE,QAAQ,YACxD,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,KACzC,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAEC,CAAC"}
|
package/mobx-form/mobx-form.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Disposable
|
|
1
|
+
import type { Disposable } from 'disposer-util';
|
|
2
2
|
import { FormState, UseFormProps, UseFormReturn } from 'react-hook-form';
|
|
3
|
-
import {
|
|
3
|
+
import { WithAbortController } from 'with-abort-controller';
|
|
4
|
+
import type { AnyObject, Maybe } from 'yammies/utils/types';
|
|
4
5
|
import { ConnectedMobxForm, MobxFormParams } from './mobx-form.types';
|
|
5
|
-
export declare class MobxForm<TFieldValues extends AnyObject, TContext = any> implements Disposable {
|
|
6
|
-
protected disposer: IDisposer;
|
|
6
|
+
export declare class MobxForm<TFieldValues extends AnyObject, TContext = any> extends WithAbortController implements Disposable {
|
|
7
7
|
/**
|
|
8
8
|
* Readl react-hook-form params
|
|
9
9
|
* Needed to connect real react-hook-form to this mobx wrapper
|
|
@@ -25,7 +25,7 @@ export declare class MobxForm<TFieldValues extends AnyObject, TContext = any> im
|
|
|
25
25
|
*/
|
|
26
26
|
data: Maybe<TFieldValues>;
|
|
27
27
|
protected isConnected: boolean;
|
|
28
|
-
constructor({ disposer, onSubmit, onSubmitFailed, onReset, getParams, ...params }: MobxFormParams<TFieldValues, TContext>);
|
|
28
|
+
constructor({ disposer, abortSignal, onSubmit, onSubmitFailed, onReset, getParams, ...params }: MobxFormParams<TFieldValues, TContext>);
|
|
29
29
|
/**
|
|
30
30
|
* Allows to modify real react-hook-form useForm() payload
|
|
31
31
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mobx-form.d.ts","sourceRoot":"","sources":["../../src/mobx-form/mobx-form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,
|
|
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;AAShD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,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,SAAQ,mBACR,YAAW,UAAU;IAErB;;;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;IAgDzC;;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;IAkC5C,OAAO,IAAI,IAAI;CAGhB"}
|
package/mobx-form/mobx-form.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { Disposer } from 'disposer-util';
|
|
2
1
|
import noop from 'lodash-es/noop';
|
|
3
2
|
import { action, makeObservable, observable, reaction, runInAction, } from 'mobx';
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
import { WithAbortController } from 'with-abort-controller';
|
|
4
|
+
export class MobxForm extends WithAbortController {
|
|
6
5
|
/**
|
|
7
6
|
* Readl react-hook-form params
|
|
8
7
|
* Needed to connect real react-hook-form to this mobx wrapper
|
|
@@ -24,8 +23,17 @@ export class MobxForm {
|
|
|
24
23
|
*/
|
|
25
24
|
data;
|
|
26
25
|
isConnected = false;
|
|
27
|
-
constructor({
|
|
28
|
-
|
|
26
|
+
constructor({
|
|
27
|
+
// eslint-disable-next-line sonarjs/deprecation
|
|
28
|
+
disposer, abortSignal, onSubmit, onSubmitFailed, onReset, getParams, ...params }) {
|
|
29
|
+
super(abortSignal);
|
|
30
|
+
if (disposer) {
|
|
31
|
+
disposer.add(() => this.dispose());
|
|
32
|
+
}
|
|
33
|
+
this.abortSignal.addEventListener('abort', () => {
|
|
34
|
+
this.form = null;
|
|
35
|
+
this.data = null;
|
|
36
|
+
});
|
|
29
37
|
this.state = {
|
|
30
38
|
disabled: false,
|
|
31
39
|
errors: {},
|
|
@@ -54,7 +62,9 @@ export class MobxForm {
|
|
|
54
62
|
updateParams: action.bound,
|
|
55
63
|
});
|
|
56
64
|
if (getParams) {
|
|
57
|
-
|
|
65
|
+
reaction(getParams, (params) => this.updateParams(params), {
|
|
66
|
+
signal: this.abortSignal,
|
|
67
|
+
});
|
|
58
68
|
}
|
|
59
69
|
}
|
|
60
70
|
/**
|
|
@@ -82,13 +92,14 @@ export class MobxForm {
|
|
|
82
92
|
this.state = formResult.formState;
|
|
83
93
|
this.data = formResult.getValues();
|
|
84
94
|
});
|
|
85
|
-
|
|
95
|
+
const formWatchSubscription = formResult.watch(() => {
|
|
86
96
|
runInAction(() => {
|
|
87
97
|
this.form = formResult;
|
|
88
98
|
this.state = formResult.formState;
|
|
89
99
|
this.data = formResult.getValues();
|
|
90
100
|
});
|
|
91
|
-
})
|
|
101
|
+
});
|
|
102
|
+
this.abortSignal.addEventListener('abort', formWatchSubscription.unsubscribe);
|
|
92
103
|
}
|
|
93
104
|
return {
|
|
94
105
|
...formResult,
|
|
@@ -97,8 +108,6 @@ export class MobxForm {
|
|
|
97
108
|
};
|
|
98
109
|
}
|
|
99
110
|
dispose() {
|
|
100
|
-
this.
|
|
101
|
-
this.form = null;
|
|
102
|
-
this.data = null;
|
|
111
|
+
this.abortController.abort();
|
|
103
112
|
}
|
|
104
113
|
}
|
|
@@ -1,14 +1,19 @@
|
|
|
1
|
-
import { IDisposer } from 'disposer-util';
|
|
1
|
+
import type { IDisposer } from 'disposer-util';
|
|
2
2
|
import { SubmitErrorHandler, SubmitHandler, UseFormProps, UseFormReturn } from 'react-hook-form';
|
|
3
|
-
import { AnyObject } from 'yammies/utils/types';
|
|
3
|
+
import type { AnyObject } from 'yammies/utils/types';
|
|
4
4
|
/**
|
|
5
5
|
* Additional options for {@link MobxForm} constructor
|
|
6
6
|
*/
|
|
7
7
|
export interface MobxFormParams<TFieldValues extends AnyObject, TContext = any> extends UseFormProps<TFieldValues, TContext> {
|
|
8
8
|
/**
|
|
9
9
|
* Disposer for mobx form
|
|
10
|
+
* @deprecated use {abortSignal} instead
|
|
10
11
|
*/
|
|
11
12
|
disposer?: IDisposer;
|
|
13
|
+
/**
|
|
14
|
+
* Abort signal for mobx form
|
|
15
|
+
*/
|
|
16
|
+
abortSignal?: AbortSignal;
|
|
12
17
|
/**
|
|
13
18
|
* Form submit handler
|
|
14
19
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mobx-form.types.d.ts","sourceRoot":"","sources":["../../src/mobx-form/mobx-form.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;
|
|
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,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,cAAc,CAAC;IACnE;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,YAAY,CAAC;CACxB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mobx-react-hook-form",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.11",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "js2me",
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"disposer-util": "^1.0.11",
|
|
16
|
+
"with-abort-controller": "1.0.0",
|
|
16
17
|
"lodash-es": "^4.17.21",
|
|
17
18
|
"yammies": "^2.0.8"
|
|
18
19
|
},
|