mobx-react-use-autorun 4.0.35 → 4.0.37-beta
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/dist/cjs/js/useMobxEffect.js.map +1 -1
- package/dist/cjs/js/useMobxState.js +20 -10
- package/dist/cjs/js/useMobxState.js.map +1 -1
- package/dist/esm/js/useMobxEffect.js.map +1 -1
- package/dist/esm/js/useMobxState.js +21 -11
- package/dist/esm/js/useMobxState.js.map +1 -1
- package/lib/js/useMobxEffect.tsx +2 -2
- package/lib/js/useMobxState.tsx +12 -4
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,CAAC;oBAC3F,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,CAAC;wBACtE,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"}
|
|
@@ -5,25 +5,35 @@ var mobx_1 = require("mobx");
|
|
|
5
5
|
var react_1 = require("react");
|
|
6
6
|
function useMobxState(state, props) {
|
|
7
7
|
var initStateFunction = typeof state === "function" ? state : function () { return state; };
|
|
8
|
-
var mobxState = (0, react_1.useState)(function () { return (0, mobx_1.
|
|
8
|
+
var mobxState = (0, react_1.useState)(function () { return (0, mobx_1.makeAutoObservable)(initStateFunction()); })[0];
|
|
9
9
|
var keyListOfState = (0, react_1.useRef)([]);
|
|
10
10
|
(0, mobx_1.runInAction)(function () {
|
|
11
|
-
var _a;
|
|
11
|
+
var _a, _b;
|
|
12
|
+
var _c;
|
|
12
13
|
if (props) {
|
|
13
|
-
for (var _i = 0,
|
|
14
|
-
var key =
|
|
14
|
+
for (var _i = 0, _d = keyListOfState.current; _i < _d.length; _i++) {
|
|
15
|
+
var key = _d[_i];
|
|
15
16
|
if (!Object.keys(props).includes(key)) {
|
|
16
17
|
(0, mobx_1.remove)(mobxState, key);
|
|
17
18
|
}
|
|
18
19
|
}
|
|
19
|
-
for (var _c = 0, _d = Object.keys(props); _c < _d.length; _c++) {
|
|
20
|
-
var key = _d[_c];
|
|
21
|
-
(0, mobx_1.remove)(mobxState, key);
|
|
22
|
-
Object.assign(mobxState, (_a = {}, _a[key] = props[key], _a));
|
|
23
|
-
}
|
|
24
|
-
keyListOfState.current.splice(0, keyListOfState.current.length);
|
|
25
20
|
for (var _e = 0, _f = Object.keys(props); _e < _f.length; _e++) {
|
|
26
21
|
var key = _f[_e];
|
|
22
|
+
for (var key_1 in props) {
|
|
23
|
+
if ((0, mobx_1.isObservable)(props[key_1]) || ((_c = Object.getOwnPropertyDescriptor(props, key_1)) === null || _c === void 0 ? void 0 : _c.get)) {
|
|
24
|
+
Object.defineProperty(mobxState, key_1, Object.getOwnPropertyDescriptor(props, key_1));
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
if (props[key_1] !== mobxState[key_1]) {
|
|
28
|
+
(0, mobx_1.remove)(mobxState, key_1);
|
|
29
|
+
(0, mobx_1.extendObservable)(mobxState, (_a = {}, _a[key_1] = props[key_1], _a), (_b = {}, _b[key_1] = false, _b));
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
keyListOfState.current.splice(0, keyListOfState.current.length);
|
|
35
|
+
for (var _g = 0, _h = Object.keys(props); _g < _h.length; _g++) {
|
|
36
|
+
var key = _h[_g];
|
|
27
37
|
keyListOfState.current.push(key);
|
|
28
38
|
}
|
|
29
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMobxState.js","sourceRoot":"","sources":["../../../lib/js/useMobxState.tsx"],"names":[],"mappings":";;AAMA,
|
|
1
|
+
{"version":3,"file":"useMobxState.js","sourceRoot":"","sources":["../../../lib/js/useMobxState.tsx"],"names":[],"mappings":";;AAMA,oCAqCC;AA3CD,6BAA+F;AAC/F,+BAAyC;AAKzC,SAAgB,YAAY,CAAyD,KAAoB,EAAE,KAAS;IAClH,IAAM,iBAAiB,GAAG,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAE,KAAa,CAAC,CAAC,CAAC,cAAM,OAAA,KAAK,EAAL,CAAK,CAAC;IACrF,IAAM,SAAS,GAAG,IAAA,gBAAQ,EAAC,cAAM,OAAA,IAAA,yBAAkB,EAAC,iBAAiB,EAAE,CAAC,EAAvC,CAAuC,CAAC,CAAC,CAAC,CAAwB,CAAC;IAEpG,IAAM,cAAc,GAAG,IAAA,cAAM,EAAW,EAAE,CAAC,CAAC;IAE5C,IAAA,kBAAW,EAAC;;;QAEV,IAAI,KAAK,EAAE,CAAC;YAEV,KAAkB,UAAsB,EAAtB,KAAA,cAAc,CAAC,OAAO,EAAtB,cAAsB,EAAtB,IAAsB,EAAE,CAAC;gBAAtC,IAAM,GAAG,SAAA;gBACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtC,IAAA,aAAM,EAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;YAED,KAAkB,UAAkB,EAAlB,KAAA,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAlB,cAAkB,EAAlB,IAAkB,EAAE,CAAC;gBAAlC,IAAM,GAAG,SAAA;gBACZ,KAAK,IAAM,KAAG,IAAI,KAAK,EAAE,CAAC;oBACxB,IAAI,IAAA,mBAAY,EAAC,KAAK,CAAC,KAAG,CAAC,CAAC,KAAI,MAAA,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,KAAG,CAAC,0CAAE,GAAG,CAAA,EAAE,CAAC;wBACjF,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,KAAG,EAAE,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,KAAG,CAAQ,CAAC,CAAC;oBAC5F,CAAC;yBAAM,CAAC;wBACN,IAAI,KAAK,CAAC,KAAG,CAAC,KAAK,SAAS,CAAC,KAAG,CAAC,EAAE,CAAC;4BAClC,IAAA,aAAM,EAAC,SAAS,EAAE,KAAG,CAAC,CAAC;4BACvB,IAAA,uBAAgB,EAAC,SAAS,YAAI,GAAC,KAAG,IAAG,KAAK,CAAC,KAAG,CAAC,iBAAM,GAAC,KAAG,IAAG,KAAK,MAAG,CAAC;wBACvE,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAED,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAChE,KAAkB,UAAkB,EAAlB,KAAA,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAlB,cAAkB,EAAlB,IAAkB,EAAE,CAAC;gBAAlC,IAAM,GAAG,SAAA;gBACZ,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,SAAgB,CAAC;AAC1B,CAAC"}
|
|
@@ -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,aAAa,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAE3E,MAAM,CAAC,IAAM,aAAa,GAAG,UAAC,QAAoB,EAAE,cAAsB;IAExE,IAAM,WAAW,GAAG,MAAM,CAA2B,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE7E,IAAM,UAAU,GAAG,MAAM,CAAC,IAAI,aAAa,CAAO,CAAC,CAAC,CAAC,CAAC;IAEtD,IAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;IAEjD,WAAW,CAAC,OAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAEzC,iBAAiB,CAAC,OAAO,GAAG,cAAc,CAAC;IAE3C,SAAS,CAAC;QACR,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QACD,QAAQ,EAAE,CAAC;IACb,CAAC,CAAC,CAAA;IAEF,SAAS,CAAC;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,QAAQ,CAAC,UAAC,YAAY;QACpB,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1E,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CACtC,GAAG,CAAC;YACF,WAAW,CAAC;;;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,YAAY,CAAC,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,
|
|
1
|
+
{"version":3,"file":"useMobxEffect.js","sourceRoot":"","sources":["../../../lib/js/useMobxEffect.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,36 @@
|
|
|
1
|
-
import { remove, runInAction,
|
|
1
|
+
import { remove, runInAction, makeAutoObservable, extendObservable, isObservable } from 'mobx';
|
|
2
2
|
import { useRef, useState } from 'react';
|
|
3
3
|
export function useMobxState(state, props) {
|
|
4
4
|
var initStateFunction = typeof state === "function" ? state : function () { return state; };
|
|
5
|
-
var mobxState = useState(function () { return
|
|
5
|
+
var mobxState = useState(function () { return makeAutoObservable(initStateFunction()); })[0];
|
|
6
6
|
var keyListOfState = useRef([]);
|
|
7
7
|
runInAction(function () {
|
|
8
|
-
var _a;
|
|
8
|
+
var _a, _b;
|
|
9
|
+
var _c;
|
|
9
10
|
if (props) {
|
|
10
|
-
for (var _i = 0,
|
|
11
|
-
var key =
|
|
11
|
+
for (var _i = 0, _d = keyListOfState.current; _i < _d.length; _i++) {
|
|
12
|
+
var key = _d[_i];
|
|
12
13
|
if (!Object.keys(props).includes(key)) {
|
|
13
14
|
remove(mobxState, key);
|
|
14
15
|
}
|
|
15
16
|
}
|
|
16
|
-
for (var _c = 0, _d = Object.keys(props); _c < _d.length; _c++) {
|
|
17
|
-
var key = _d[_c];
|
|
18
|
-
remove(mobxState, key);
|
|
19
|
-
Object.assign(mobxState, (_a = {}, _a[key] = props[key], _a));
|
|
20
|
-
}
|
|
21
|
-
keyListOfState.current.splice(0, keyListOfState.current.length);
|
|
22
17
|
for (var _e = 0, _f = Object.keys(props); _e < _f.length; _e++) {
|
|
23
18
|
var key = _f[_e];
|
|
19
|
+
for (var key_1 in props) {
|
|
20
|
+
if (isObservable(props[key_1]) || ((_c = Object.getOwnPropertyDescriptor(props, key_1)) === null || _c === void 0 ? void 0 : _c.get)) {
|
|
21
|
+
Object.defineProperty(mobxState, key_1, Object.getOwnPropertyDescriptor(props, key_1));
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
if (props[key_1] !== mobxState[key_1]) {
|
|
25
|
+
remove(mobxState, key_1);
|
|
26
|
+
extendObservable(mobxState, (_a = {}, _a[key_1] = props[key_1], _a), (_b = {}, _b[key_1] = false, _b));
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
keyListOfState.current.splice(0, keyListOfState.current.length);
|
|
32
|
+
for (var _g = 0, _h = Object.keys(props); _g < _h.length; _g++) {
|
|
33
|
+
var key = _h[_g];
|
|
24
34
|
keyListOfState.current.push(key);
|
|
25
35
|
}
|
|
26
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMobxState.js","sourceRoot":"","sources":["../../../lib/js/useMobxState.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"useMobxState.js","sourceRoot":"","sources":["../../../lib/js/useMobxState.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAC/F,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAKzC,MAAM,UAAU,YAAY,CAAyD,KAAoB,EAAE,KAAS;IAClH,IAAM,iBAAiB,GAAG,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAE,KAAa,CAAC,CAAC,CAAC,cAAM,OAAA,KAAK,EAAL,CAAK,CAAC;IACrF,IAAM,SAAS,GAAG,QAAQ,CAAC,cAAM,OAAA,kBAAkB,CAAC,iBAAiB,EAAE,CAAC,EAAvC,CAAuC,CAAC,CAAC,CAAC,CAAwB,CAAC;IAEpG,IAAM,cAAc,GAAG,MAAM,CAAW,EAAE,CAAC,CAAC;IAE5C,WAAW,CAAC;;;QAEV,IAAI,KAAK,EAAE,CAAC;YAEV,KAAkB,UAAsB,EAAtB,KAAA,cAAc,CAAC,OAAO,EAAtB,cAAsB,EAAtB,IAAsB,EAAE,CAAC;gBAAtC,IAAM,GAAG,SAAA;gBACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;YAED,KAAkB,UAAkB,EAAlB,KAAA,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAlB,cAAkB,EAAlB,IAAkB,EAAE,CAAC;gBAAlC,IAAM,GAAG,SAAA;gBACZ,KAAK,IAAM,KAAG,IAAI,KAAK,EAAE,CAAC;oBACxB,IAAI,YAAY,CAAC,KAAK,CAAC,KAAG,CAAC,CAAC,KAAI,MAAA,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,KAAG,CAAC,0CAAE,GAAG,CAAA,EAAE,CAAC;wBACjF,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,KAAG,EAAE,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,KAAG,CAAQ,CAAC,CAAC;oBAC5F,CAAC;yBAAM,CAAC;wBACN,IAAI,KAAK,CAAC,KAAG,CAAC,KAAK,SAAS,CAAC,KAAG,CAAC,EAAE,CAAC;4BAClC,MAAM,CAAC,SAAS,EAAE,KAAG,CAAC,CAAC;4BACvB,gBAAgB,CAAC,SAAS,YAAI,GAAC,KAAG,IAAG,KAAK,CAAC,KAAG,CAAC,iBAAM,GAAC,KAAG,IAAG,KAAK,MAAG,CAAC;wBACvE,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAED,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAChE,KAAkB,UAAkB,EAAlB,KAAA,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAlB,cAAkB,EAAlB,IAAkB,EAAE,CAAC;gBAAlC,IAAM,GAAG,SAAA;gBACZ,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,SAAgB,CAAC;AAC1B,CAAC"}
|
package/lib/js/useMobxEffect.tsx
CHANGED
|
@@ -41,11 +41,11 @@ export const useMobxEffect = (callback: () => void, dependencyList?: any[]): voi
|
|
|
41
41
|
const props = Object.assign({}, dependencyListRef.current);
|
|
42
42
|
for (const key in props) {
|
|
43
43
|
if (isObservable(props[key]) || Object.getOwnPropertyDescriptor(props, key)?.get) {
|
|
44
|
-
Object.defineProperty(mobxData, key, Object.getOwnPropertyDescriptor(props, key) as any)
|
|
44
|
+
Object.defineProperty(mobxData, key, Object.getOwnPropertyDescriptor(props, key) as any);
|
|
45
45
|
} else {
|
|
46
46
|
if (props[key] !== mobxData[key]) {
|
|
47
47
|
remove(mobxData, key);
|
|
48
|
-
extendObservable(mobxData, { [key]: props[key] }, { [key]: false })
|
|
48
|
+
extendObservable(mobxData, { [key]: props[key] }, { [key]: false });
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
}
|
package/lib/js/useMobxState.tsx
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { remove, runInAction,
|
|
1
|
+
import { remove, runInAction, makeAutoObservable, extendObservable, isObservable } from 'mobx';
|
|
2
2
|
import { useRef, useState } from 'react';
|
|
3
3
|
|
|
4
4
|
export function useMobxState<T extends Record<any, any>>(state: T | (() => T)): T;
|
|
@@ -6,7 +6,7 @@ export function useMobxState<T extends Record<any, any>, P extends Record<any, a
|
|
|
6
6
|
|
|
7
7
|
export function useMobxState<T extends Record<any, any>, P extends Record<any, any>>(state: T | (() => T), props?: P): T & P {
|
|
8
8
|
const initStateFunction = typeof state === "function" ? (state as any) : () => state;
|
|
9
|
-
const mobxState = useState(() =>
|
|
9
|
+
const mobxState = useState(() => makeAutoObservable(initStateFunction()))[0] as Record<string, any>;
|
|
10
10
|
|
|
11
11
|
const keyListOfState = useRef<string[]>([]);
|
|
12
12
|
|
|
@@ -21,8 +21,16 @@ export function useMobxState<T extends Record<any, any>, P extends Record<any, a
|
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
for (const key of Object.keys(props)) {
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
for (const key in props) {
|
|
25
|
+
if (isObservable(props[key]) || Object.getOwnPropertyDescriptor(props, key)?.get) {
|
|
26
|
+
Object.defineProperty(mobxState, key, Object.getOwnPropertyDescriptor(props, key) as any);
|
|
27
|
+
} else {
|
|
28
|
+
if (props[key] !== mobxState[key]) {
|
|
29
|
+
remove(mobxState, key);
|
|
30
|
+
extendObservable(mobxState, { [key]: props[key] }, { [key]: false });
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
26
34
|
}
|
|
27
35
|
|
|
28
36
|
keyListOfState.current.splice(0, keyListOfState.current.length);
|
package/package.json
CHANGED