mobx-react-use-autorun 3.0.0 → 3.0.1

package/dist/lib/useMobxState.js

@@ -2,15 +2,16 @@ import { extendObservable, remove, isObservable } from 'mobx';
 import { useLocalObservable } from 'mobx-react-lite';
 export function useMobxState(state, props) {
     var _a, _b;
-    var mobxState = useLocalObservable(function () { return state; });
-    for (var key in props) {
-        if (isObservable(props[key])) {
-            mobxState[key] = props[key];
+    var mobxState = useLocalObservable(typeof state === "function" ? state : function () { return state; });
+    var propsResult = typeof props === "function" ? props() : props;
+    for (var key in propsResult) {
+        if (isObservable(propsResult[key])) {
+            mobxState[key] = propsResult[key];
         }
         else {
-            if (props[key] !== mobxState[key]) {
+            if (propsResult[key] !== mobxState[key]) {
                 remove(mobxState, key);
-                extendObservable(mobxState, (_a = {}, _a[key] = props[key], _a), (_b = {}, _b[key] = false, _b));
+                extendObservable(mobxState, (_a = {}, _a[key] = propsResult[key], _a), (_b = {}, _b[key] = false, _b));
             }
         }
     }

package/dist/lib/useMobxState.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMobxState.js","sourceRoot":"","sources":["../../lib/lib/useMobxState.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,UAAU,YAAY,CAAyD,KAAQ,EAAE,KAAS;;IAEpG,IAAM,SAAS,GAAG,kBAAkB,CAAC,cAAM,OAAA,KAAK,EAAL,CAAK,CAAC,CAAC;IAElD,KAAK,IAAM,GAAG,IAAI,KAAK,EAAE;QACrB,IAAI,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE;YAC1B,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;SAC/B;aAAM;YACH,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,GAAG,CAAC,EAAE;gBAC/B,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBACvB,gBAAgB,CAAC,SAAS,YAAI,GAAC,GAAG,IAAG,KAAK,CAAC,GAAG,CAAC,iBAAM,GAAC,GAAG,IAAG,KAAK,MAAG,CAAA;aACvE;SACJ;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC"}
+{"version":3,"file":"useMobxState.js","sourceRoot":"","sources":["../../lib/lib/useMobxState.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,UAAU,YAAY,CAAyD,KAAQ,EAAE,KAAS;;IAEpG,IAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAE,KAAa,CAAC,CAAC,CAAC,cAAM,OAAA,KAAK,EAAL,CAAK,CAAC,CAAC;IAEjG,IAAM,WAAW,GAAG,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAElE,KAAK,IAAM,GAAG,IAAI,WAAW,EAAE;QAC3B,IAAI,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE;YAChC,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;SACrC;aAAM;YACH,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,GAAG,CAAC,EAAE;gBACrC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBACvB,gBAAgB,CAAC,SAAS,YAAI,GAAC,GAAG,IAAG,WAAW,CAAC,GAAG,CAAC,iBAAM,GAAC,GAAG,IAAG,KAAK,MAAG,CAAA;aAC7E;SACJ;KACJ;IAED,OAAO,SAAgB,CAAC;AAC5B,CAAC"}

package/lib/index.d.ts

@@ -1,2 +1,6 @@
-declare const useMobxState: (fn: () => any) => void;
+declare function useMobxState<T extends Record<any, any>, P extends Record<any, any>>(state: T, props?: P): T & P;
+declare function useMobxState<T extends Record<any, any>, P extends Record<any, any>>(statefn: () => T, propsfn: () => P): T & P;
+declare function useMobxState<T extends Record<any, any>, P extends Record<any, any>>(statefn: () => T, props?: P): T & P;
+declare function useMobxState<T extends Record<any, any>, P extends Record<any, any>>(state: T, propsfn: () => P): T & P;
+
 export { useMobxState };

package/lib/lib/useMobxState.tsx

@@ -3,18 +3,20 @@ import { useLocalObservable } from 'mobx-react-lite';
 
 export function useMobxState<T extends Record<any, any>, P extends Record<any, any>>(state: T, props?: P): T & P {
 
-    const mobxState = useLocalObservable(() => state);
+    const mobxState = useLocalObservable(typeof state === "function" ? (state as any) : () => state);
 
-    for (const key in props) {
-        if (isObservable(props[key])) {
-            mobxState[key] = props[key];
+    const propsResult = typeof props === "function" ? props() : props;
+
+    for (const key in propsResult) {
+        if (isObservable(propsResult[key])) {
+            mobxState[key] = propsResult[key];
         } else {
-            if (props[key] !== mobxState[key]) {
+            if (propsResult[key] !== mobxState[key]) {
                 remove(mobxState, key);
-                extendObservable(mobxState, { [key]: props[key] }, { [key]: false })
+                extendObservable(mobxState, { [key]: propsResult[key] }, { [key]: false })
             }
         }
     }
 
-    return mobxState;
+    return mobxState as any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-react-use-autorun",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "React Hook for mobx",
   "scripts": {
     "build": "npm install -g typescript@4.6.3 @types/node@17.0.23 ts-node@10.7.0 cross-env@7.0.3 && cross-env TS_NODE_SKIP_PROJECT=true ts-node bin/mobx_react_build.ts",