mobx-react-use-autorun 4.0.30 → 4.0.32
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.
|
@@ -4,23 +4,53 @@ exports.useMobxEffect = void 0;
|
|
|
4
4
|
var useMount_1 = require("./useMount");
|
|
5
5
|
var rxjs_1 = require("rxjs");
|
|
6
6
|
var mobx_1 = require("mobx");
|
|
7
|
-
var useMobxState_1 = require("./useMobxState");
|
|
8
7
|
var react_1 = require("react");
|
|
8
|
+
var mobx_2 = require("mobx");
|
|
9
9
|
var useMobxEffect = function (callback, dependencyList) {
|
|
10
|
-
var
|
|
11
|
-
var
|
|
10
|
+
var callbackRef = (0, react_1.useRef)({ callback: callback });
|
|
11
|
+
var subjectRef = (0, react_1.useRef)(new rxjs_1.ReplaySubject(1));
|
|
12
|
+
var dependencyListRef = (0, react_1.useRef)(dependencyList);
|
|
13
|
+
callbackRef.current.callback = callback;
|
|
14
|
+
dependencyListRef.current = dependencyList;
|
|
12
15
|
(0, react_1.useEffect)(function () {
|
|
13
|
-
if (
|
|
14
|
-
|
|
16
|
+
if (dependencyList) {
|
|
17
|
+
return;
|
|
15
18
|
}
|
|
19
|
+
callback();
|
|
16
20
|
});
|
|
21
|
+
(0, react_1.useEffect)(function () {
|
|
22
|
+
if (!dependencyList) {
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
subjectRef.current.next();
|
|
26
|
+
}, dependencyList);
|
|
17
27
|
(0, useMount_1.useMount)(function (subscription) {
|
|
18
|
-
if (dependencyList) {
|
|
19
|
-
|
|
20
|
-
subscription.add(new rxjs_1.Subscription(function () {
|
|
21
|
-
disposer_1();
|
|
22
|
-
}));
|
|
28
|
+
if (!dependencyList) {
|
|
29
|
+
return;
|
|
23
30
|
}
|
|
31
|
+
var mobxData = (0, mobx_1.observable)(Object.assign({}, dependencyListRef.current));
|
|
32
|
+
subscription.add(subjectRef.current.pipe((0, rxjs_1.tap)(function () {
|
|
33
|
+
(0, mobx_2.runInAction)(function () {
|
|
34
|
+
var _a, _b;
|
|
35
|
+
var _c;
|
|
36
|
+
var props = Object.assign({}, dependencyListRef.current);
|
|
37
|
+
for (var key in props) {
|
|
38
|
+
if ((0, mobx_2.isObservable)(props[key]) || ((_c = Object.getOwnPropertyDescriptor(props, key)) === null || _c === void 0 ? void 0 : _c.get)) {
|
|
39
|
+
Object.defineProperty(mobxData, key, Object.getOwnPropertyDescriptor(props, key));
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
if (props[key] !== mobxData[key]) {
|
|
43
|
+
(0, mobx_2.remove)(mobxData, key);
|
|
44
|
+
(0, mobx_2.extendObservable)(mobxData, (_a = {}, _a[key] = props[key], _a), (_b = {}, _b[key] = false, _b));
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
})).subscribe());
|
|
50
|
+
var disposer = (0, mobx_1.reaction)(function () { return [(0, mobx_1.toJS)(mobxData)]; }, function () { return callbackRef.current.callback(); }, { fireImmediately: true, delay: 1 });
|
|
51
|
+
subscription.add(new rxjs_1.Subscription(function () {
|
|
52
|
+
disposer();
|
|
53
|
+
}));
|
|
24
54
|
});
|
|
25
55
|
};
|
|
26
56
|
exports.useMobxEffect = useMobxEffect;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMobxEffect.js","sourceRoot":"","sources":["../../../lib/js/useMobxEffect.tsx"],"names":[],"mappings":";;;AAAA,uCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"useMobxEffect.js","sourceRoot":"","sources":["../../../lib/js/useMobxEffect.tsx"],"names":[],"mappings":";;;AAAA,uCAAsC;AACtC,6BAAwD;AACxD,6BAAiD;AACjD,+BAA0C;AAC1C,6BAA2E;AAEpE,IAAM,aAAa,GAAG,UAAC,QAAoB,EAAE,cAAsB;IAExE,IAAM,WAAW,GAAG,IAAA,cAAM,EAA2B,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE7E,IAAM,UAAU,GAAG,IAAA,cAAM,EAAC,IAAI,oBAAa,CAAO,CAAC,CAAC,CAAC,CAAC;IAEtD,IAAM,iBAAiB,GAAG,IAAA,cAAM,EAAC,cAAc,CAAC,CAAC;IAEjD,WAAW,CAAC,OAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAEzC,iBAAiB,CAAC,OAAO,GAAG,cAAc,CAAC;IAE3C,IAAA,iBAAS,EAAC;QACR,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QACD,QAAQ,EAAE,CAAC;IACb,CAAC,CAAC,CAAA;IAEF,IAAA,iBAAS,EAAC;QACR,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC,EAAE,cAAc,CAAC,CAAA;IAElB,IAAA,mBAAQ,EAAC,UAAC,YAAY;QACpB,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAM,QAAQ,GAAG,IAAA,iBAAU,EAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1E,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CACtC,IAAA,UAAG,EAAC;YACF,IAAA,kBAAW,EAAC;;;gBACV,IAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBAC3D,KAAK,IAAM,GAAG,IAAI,KAAK,EAAE,CAAC;oBACxB,IAAI,IAAA,mBAAY,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAI,MAAA,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAC,0CAAE,GAAG,CAAA,EAAE,CAAC;wBACjF,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAQ,CAAC,CAAA;oBAC1F,CAAC;yBAAM,CAAC;wBACN,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;4BACjC,IAAA,aAAM,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;4BACtB,IAAA,uBAAgB,EAAC,QAAQ,YAAI,GAAC,GAAG,IAAG,KAAK,CAAC,GAAG,CAAC,iBAAM,GAAC,GAAG,IAAG,KAAK,MAAG,CAAA;wBACrE,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CACH,CAAC,SAAS,EAAE,CAAC,CAAC;QAEf,IAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,cAAM,OAAA,CAAC,IAAA,WAAI,EAAC,QAAQ,CAAC,CAAC,EAAhB,CAAgB,EAAE,cAAM,OAAA,WAAW,CAAC,OAAQ,CAAC,QAAQ,EAAE,EAA/B,CAA+B,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAE9H,YAAY,CAAC,GAAG,CAAC,IAAI,mBAAY,CAAC;YAChC,QAAQ,EAAE,CAAC;QACb,CAAC,CAAC,CAAC,CAAC;IAEN,CAAC,CAAC,CAAA;AAEJ,CAAC,CAAA;AAzDY,QAAA,aAAa,iBAyDzB"}
|
|
@@ -1,23 +1,53 @@
|
|
|
1
1
|
import { useMount } from './useMount';
|
|
2
|
-
import { Subscription } from 'rxjs';
|
|
3
|
-
import { reaction, toJS } from 'mobx';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
2
|
+
import { ReplaySubject, Subscription, tap } from 'rxjs';
|
|
3
|
+
import { observable, reaction, toJS } from 'mobx';
|
|
4
|
+
import { useEffect, useRef } from 'react';
|
|
5
|
+
import { extendObservable, remove, isObservable, runInAction } from 'mobx';
|
|
6
6
|
export var useMobxEffect = function (callback, dependencyList) {
|
|
7
|
-
var
|
|
8
|
-
var
|
|
7
|
+
var callbackRef = useRef({ callback: callback });
|
|
8
|
+
var subjectRef = useRef(new ReplaySubject(1));
|
|
9
|
+
var dependencyListRef = useRef(dependencyList);
|
|
10
|
+
callbackRef.current.callback = callback;
|
|
11
|
+
dependencyListRef.current = dependencyList;
|
|
9
12
|
useEffect(function () {
|
|
10
|
-
if (
|
|
11
|
-
|
|
13
|
+
if (dependencyList) {
|
|
14
|
+
return;
|
|
12
15
|
}
|
|
16
|
+
callback();
|
|
13
17
|
});
|
|
18
|
+
useEffect(function () {
|
|
19
|
+
if (!dependencyList) {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
subjectRef.current.next();
|
|
23
|
+
}, dependencyList);
|
|
14
24
|
useMount(function (subscription) {
|
|
15
|
-
if (dependencyList) {
|
|
16
|
-
|
|
17
|
-
subscription.add(new Subscription(function () {
|
|
18
|
-
disposer_1();
|
|
19
|
-
}));
|
|
25
|
+
if (!dependencyList) {
|
|
26
|
+
return;
|
|
20
27
|
}
|
|
28
|
+
var mobxData = observable(Object.assign({}, dependencyListRef.current));
|
|
29
|
+
subscription.add(subjectRef.current.pipe(tap(function () {
|
|
30
|
+
runInAction(function () {
|
|
31
|
+
var _a, _b;
|
|
32
|
+
var _c;
|
|
33
|
+
var props = Object.assign({}, dependencyListRef.current);
|
|
34
|
+
for (var key in props) {
|
|
35
|
+
if (isObservable(props[key]) || ((_c = Object.getOwnPropertyDescriptor(props, key)) === null || _c === void 0 ? void 0 : _c.get)) {
|
|
36
|
+
Object.defineProperty(mobxData, key, Object.getOwnPropertyDescriptor(props, key));
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
if (props[key] !== mobxData[key]) {
|
|
40
|
+
remove(mobxData, key);
|
|
41
|
+
extendObservable(mobxData, (_a = {}, _a[key] = props[key], _a), (_b = {}, _b[key] = false, _b));
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
})).subscribe());
|
|
47
|
+
var disposer = reaction(function () { return [toJS(mobxData)]; }, function () { return callbackRef.current.callback(); }, { fireImmediately: true, delay: 1 });
|
|
48
|
+
subscription.add(new Subscription(function () {
|
|
49
|
+
disposer();
|
|
50
|
+
}));
|
|
21
51
|
});
|
|
22
52
|
};
|
|
23
53
|
//# sourceMappingURL=useMobxEffect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMobxEffect.js","sourceRoot":"","sources":["../../../lib/js/useMobxEffect.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"useMobxEffect.js","sourceRoot":"","sources":["../../../lib/js/useMobxEffect.tsx"],"names":[],"mappings":"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"}
|
package/lib/js/useMobxEffect.tsx
CHANGED
|
@@ -1,30 +1,64 @@
|
|
|
1
1
|
import { useMount } from './useMount';
|
|
2
|
-
import { Subscription } from 'rxjs';
|
|
3
|
-
import { reaction, toJS } from 'mobx'
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
2
|
+
import { ReplaySubject, Subscription, tap } from 'rxjs';
|
|
3
|
+
import { observable, reaction, toJS } from 'mobx'
|
|
4
|
+
import { useEffect, useRef } from 'react';
|
|
5
|
+
import { extendObservable, remove, isObservable, runInAction } from 'mobx';
|
|
6
6
|
|
|
7
7
|
export const useMobxEffect = (callback: () => void, dependencyList?: any[]): void => {
|
|
8
8
|
|
|
9
|
-
const
|
|
10
|
-
}, { callback })
|
|
9
|
+
const callbackRef = useRef<{ callback: () => void }>({ callback: callback });
|
|
11
10
|
|
|
12
|
-
const
|
|
11
|
+
const subjectRef = useRef(new ReplaySubject<void>(1));
|
|
12
|
+
|
|
13
|
+
const dependencyListRef = useRef(dependencyList);
|
|
14
|
+
|
|
15
|
+
callbackRef.current!.callback = callback;
|
|
16
|
+
|
|
17
|
+
dependencyListRef.current = dependencyList;
|
|
13
18
|
|
|
14
19
|
useEffect(() => {
|
|
15
|
-
if (
|
|
16
|
-
|
|
20
|
+
if (dependencyList) {
|
|
21
|
+
return;
|
|
17
22
|
}
|
|
23
|
+
callback();
|
|
18
24
|
})
|
|
19
25
|
|
|
20
|
-
|
|
21
|
-
if (dependencyList) {
|
|
22
|
-
|
|
26
|
+
useEffect(() => {
|
|
27
|
+
if (!dependencyList) {
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
subjectRef.current.next();
|
|
31
|
+
}, dependencyList)
|
|
23
32
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
33
|
+
useMount((subscription) => {
|
|
34
|
+
if (!dependencyList) {
|
|
35
|
+
return;
|
|
27
36
|
}
|
|
37
|
+
const mobxData = observable(Object.assign({}, dependencyListRef.current));
|
|
38
|
+
subscription.add(subjectRef.current.pipe(
|
|
39
|
+
tap(() => {
|
|
40
|
+
runInAction(() => {
|
|
41
|
+
const props = Object.assign({}, dependencyListRef.current);
|
|
42
|
+
for (const key in props) {
|
|
43
|
+
if (isObservable(props[key]) || Object.getOwnPropertyDescriptor(props, key)?.get) {
|
|
44
|
+
Object.defineProperty(mobxData, key, Object.getOwnPropertyDescriptor(props, key) as any)
|
|
45
|
+
} else {
|
|
46
|
+
if (props[key] !== mobxData[key]) {
|
|
47
|
+
remove(mobxData, key);
|
|
48
|
+
extendObservable(mobxData, { [key]: props[key] }, { [key]: false })
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
})
|
|
53
|
+
})
|
|
54
|
+
).subscribe());
|
|
55
|
+
|
|
56
|
+
const disposer = reaction(() => [toJS(mobxData)], () => callbackRef.current!.callback(), { fireImmediately: true, delay: 1 });
|
|
57
|
+
|
|
58
|
+
subscription.add(new Subscription(() => {
|
|
59
|
+
disposer();
|
|
60
|
+
}));
|
|
61
|
+
|
|
28
62
|
})
|
|
29
63
|
|
|
30
64
|
}
|
package/package.json
CHANGED