@ic-reactor/react 1.12.1 → 1.13.0

package/dist/helpers/actorHooks.js

@@ -114,24 +114,31 @@ const actorHooks = (actorManager) => {
         }, [functionName]);
     };
     const useSharedCall = (_a) => {
-        var { args = [], functionName, throwOnError = false, onError, onLoading, onSuccess } = _a, options = __rest(_a, ["args", "functionName", "throwOnError", "onError", "onLoading", "onSuccess"]);
+        var { args = [], functionName, throwOnError = false, onError, onLoading, onSuccess, onSuccessResult } = _a, options = __rest(_a, ["args", "functionName", "throwOnError", "onError", "onLoading", "onSuccess", "onSuccessResult"]);
         const requestKey = React.useMemo(() => (0, utils_1.generateRequestHash)(args), [args]);
         const [sharedState, setSharedState] = useMethodState(functionName, requestKey);
-        const reset = React.useCallback(() => updateMethodState(functionName, requestKey, DEFAULT_STATE), [functionName, requestKey]);
+        const latestDataRef = React.useRef();
+        const reset = React.useCallback(() => {
+            updateMethodState(functionName, requestKey, DEFAULT_STATE);
+            latestDataRef.current = undefined;
+        }, [functionName, requestKey]);
         const call = React.useCallback((eventOrReplaceArgs) => __awaiter(void 0, void 0, void 0, function* () {
             setSharedState({ error: undefined, loading: true });
             onLoading === null || onLoading === void 0 ? void 0 : onLoading(true);
             try {
                 const replaceArgs = eventOrReplaceArgs instanceof Array ? eventOrReplaceArgs : args;
                 const data = yield callMethodWithOptions(options)(functionName, ...(replaceArgs !== null && replaceArgs !== void 0 ? replaceArgs : args));
+                latestDataRef.current = data;
                 setSharedState({ data, error: undefined, loading: false });
-                onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess((0, utils_1.createCompiledResult)(data));
+                onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(data);
+                onSuccessResult === null || onSuccessResult === void 0 ? void 0 : onSuccessResult((0, utils_1.createCompiledResult)(data));
                 onLoading === null || onLoading === void 0 ? void 0 : onLoading(false);
                 return data;
             }
             catch (error) {
                 // eslint-disable-next-line no-console
                 console.error(`Error calling method ${functionName}:`, error);
+                latestDataRef.current = undefined;
                 setSharedState({
                     error: error,
                     loading: false,
@@ -141,16 +148,30 @@ const actorHooks = (actorManager) => {
                 if (throwOnError)
                     throw error;
             }
-        }), [args, functionName, options, onError, onLoading, onSuccess, throwOnError]);
-        const compileResult = React.useCallback(() => (0, utils_1.createCompiledResult)(sharedState === null || sharedState === void 0 ? void 0 : sharedState.data), [sharedState === null || sharedState === void 0 ? void 0 : sharedState.data]);
-        return Object.assign({ call, reset, compileResult, requestKey }, sharedState);
+        }), [
+            args,
+            functionName,
+            options,
+            onError,
+            onLoading,
+            onSuccess,
+            onSuccessResult,
+            throwOnError,
+        ]);
+        const compileResult = () => {
+            return (0, utils_1.createCompiledResult)(latestDataRef.current || (sharedState === null || sharedState === void 0 ? void 0 : sharedState.data));
+        };
+        return Object.assign({ call,
+            reset,
+            compileResult,
+            requestKey }, sharedState);
     };
     const useQueryCall = (_a) => {
         var { refetchOnMount = true, refetchInterval = false } = _a, rest = __rest(_a, ["refetchOnMount", "refetchInterval"]);
         const _b = useSharedCall(rest), { call, requestKey } = _b, state = __rest(_b, ["call", "requestKey"]);
         const intervalId = React.useRef();
         React.useEffect(() => {
-            var _a;
+            var _a, _b;
             if (refetchInterval) {
                 intervalId.current = setInterval(call, refetchInterval);
             }
@@ -158,7 +179,8 @@ const actorHooks = (actorManager) => {
                 call();
             }
             else if (refetchOnMount && state.data !== undefined) {
-                (_a = rest.onSuccess) === null || _a === void 0 ? void 0 : _a.call(rest, (0, utils_1.createCompiledResult)(state.data));
+                (_a = rest.onSuccess) === null || _a === void 0 ? void 0 : _a.call(rest, state.data);
+                (_b = rest.onSuccessResult) === null || _b === void 0 ? void 0 : _b.call(rest, (0, utils_1.createCompiledResult)(state.data));
             }
             return () => clearInterval(intervalId.current);
         }, [refetchInterval, refetchOnMount, requestKey]);

package/dist/helpers/types.d.ts

@@ -52,7 +52,8 @@ export interface UseSharedCallParameters<A, M extends FunctionName<A>> extends C
     args?: ActorMethodParameters<A[M]>;
     onLoading?: (loading: boolean) => void;
     onError?: (error: Error | undefined) => void;
-    onSuccess?: (data: CompiledResult<ActorMethodReturnType<A[M]>>) => void;
+    onSuccess?: (data: ActorMethodReturnType<A[M]>) => void;
+    onSuccessResult?: (result: CompiledResult<ActorMethodReturnType<A[M]>>) => void;
     throwOnError?: boolean;
     compileResult?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/react",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "description": "A React library for interacting with Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -47,5 +47,5 @@
     "react": ">=16.8",
     "zustand": "4.5"
   },
-  "gitHead": "9118e38b6596835b6aef84e8e653d05454d031b7"
+  "gitHead": "2336c03931dda3c24bdb3c13946ec63a9b8b0e99"
 }