@ic-reactor/react 1.3.0 → 1.3.2

package/dist/helpers/actorHooks.js

@@ -123,7 +123,7 @@ const actorHooks = (actorManager) => {
                         throw new Error("Args required");
                     }
                     attributes.validate((args.args || []));
-                    formRequired = false;
+                    formRequired = args.refetchOnMount === false ? true : false;
                 }
                 catch (error) {
                     refetchOnMount = false;

package/dist/hooks/agent/useCandidAdapter.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="react" />
+import { CandidAdapter } from "@ic-reactor/core/dist/classes";
+import { AgentContext } from "../../types";
+export interface UseCandidAdapterParams {
+    agentContext?: React.Context<AgentContext | null>;
+    didjsCanisterId?: string;
+}
+/**
+ * Accesses the `AgentManager` instance for managing agent configurations and state.
+ *
+ * @example
+ *```jsx
+ *  function AgentManagerComponent() {
+ *    const agentManager = useAgentManager();
+ *
+ *    // Use agentManager for managing agent configurations, etc.
+ *    return <div>Agent Manager ready.</div>;
+ *  }
+ *```
+ */
+export declare const useCandidAdapter: (config: UseCandidAdapterParams) => CandidAdapter | undefined;

package/dist/hooks/agent/useCandidAdapter.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useCandidAdapter = void 0;
+const useAgentManager_1 = require("./useAgentManager");
+const react_1 = require("react");
+const core_1 = require("@ic-reactor/core");
+/**
+ * Accesses the `AgentManager` instance for managing agent configurations and state.
+ *
+ * @example
+ *```jsx
+ *  function AgentManagerComponent() {
+ *    const agentManager = useAgentManager();
+ *
+ *    // Use agentManager for managing agent configurations, etc.
+ *    return <div>Agent Manager ready.</div>;
+ *  }
+ *```
+ */
+const useCandidAdapter = (config) => {
+    const [candidAdapter, setCandidAdapter] = (0, react_1.useState)();
+    const agentManager = (0, useAgentManager_1.useAgentManager)(config.agentContext);
+    (0, react_1.useEffect)(() => {
+        const agent = agentManager.getAgent();
+        try {
+            const candidManager = (0, core_1.createCandidAdapter)({
+                agent,
+                didjsCanisterId: config.didjsCanisterId,
+            });
+            setCandidAdapter(candidManager);
+        }
+        catch (error) {
+            // eslint-disable-next-line no-console
+            console.error("Error creating CandidAdapter", error);
+        }
+    }, [agentManager, config.didjsCanisterId]);
+    return candidAdapter;
+};
+exports.useCandidAdapter = useCandidAdapter;

package/dist/hooks/useActor.d.ts

@@ -1,4 +1,4 @@
-import { type BaseActor } from "../types";
+import type { BaseActor } from "../types";
 import type { UseActorParameters, UseActorReturn } from "./types";
 /**
  * A comprehensive hook that manages both the fetching of Candid interfaces

package/dist/hooks/useActor.js

@@ -26,6 +26,7 @@ const react_1 = require("react");
 const useAgentManager_1 = require("./agent/useAgentManager");
 const helpers_1 = require("../helpers");
 const agent_1 = require("./agent");
+const useCandidAdapter_1 = require("./agent/useCandidAdapter");
 /**
  * A comprehensive hook that manages both the fetching of Candid interfaces
  * and the initialization of actor stores for Internet Computer (IC) canisters.
@@ -93,27 +94,31 @@ const useActor = (config) => {
     if (!canisterId) {
         throw new Error("canisterId is required");
     }
-    const [actorManager, setActorManager] = (0, react_1.useState)();
+    const [actorManager, setActorManager] = (0, react_1.useState)(null);
+    (0, react_1.useEffect)(() => {
+        if ((actorManager === null || actorManager === void 0 ? void 0 : actorManager.canisterId) !== canisterId) {
+            setActorManager(null);
+        }
+        return actorManager === null || actorManager === void 0 ? void 0 : actorManager.cleanup();
+    }, [canisterId, actorManager]);
     const [{ fetching, fetchError }, setState] = (0, react_1.useState)({
         fetching: false,
         fetchError: null,
     });
-    const agentManager = (0, useAgentManager_1.useAgentManager)(agentContext);
+    const candidAdapter = (0, useCandidAdapter_1.useCandidAdapter)({
+        agentContext,
+        didjsCanisterId,
+    });
     const authenticating = (0, agent_1.useAuthState)().authenticating;
     const fetchCandid = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
-        if (fetching || authenticating)
+        if (fetching || authenticating || !candidAdapter)
             return;
         setState({
             fetching: true,
             fetchError: null,
         });
-        const agent = agentManager.getAgent();
         try {
-            const candidManager = (0, core_1.createCandidAdapter)({
-                agent,
-                didjsCanisterId,
-            });
-            const { idlFactory } = yield candidManager.getCandidDefinition(canisterId);
+            const { idlFactory } = yield candidAdapter.getCandidDefinition(canisterId);
             setState({
                 fetching: false,
                 fetchError: null,
@@ -128,32 +133,33 @@ const useActor = (config) => {
                 fetching: false,
             });
         }
-    }), [canisterId, authenticating, didjsCanisterId]);
+    }), [canisterId, candidAdapter, authenticating, didjsCanisterId]);
+    const agentManager = (0, useAgentManager_1.useAgentManager)(agentContext);
+    const initialActorManager = (0, react_1.useCallback)((idlFactory) => {
+        if (authenticating)
+            return;
+        const actorManager = (0, core_1.createActorManager)(Object.assign({ agentManager,
+            idlFactory,
+            canisterId }, actorConfig));
+        setActorManager(actorManager);
+    }, [canisterId, agentManager, authenticating]);
     (0, react_1.useEffect)(() => {
         if (maybeIdlFactory) {
-            const actorManager = (0, core_1.createActorManager)(Object.assign({ agentManager, idlFactory: maybeIdlFactory, canisterId }, actorConfig));
-            setActorManager(() => actorManager);
+            initialActorManager(maybeIdlFactory);
         }
         else {
-            setActorManager(undefined);
             fetchCandid().then((idlFactory) => {
                 if (!idlFactory)
                     return;
-                const actorManager = (0, core_1.createActorManager)(Object.assign({ agentManager,
-                    idlFactory,
-                    canisterId }, actorConfig));
-                setActorManager(() => actorManager);
+                initialActorManager(idlFactory);
             });
         }
-        return actorManager === null || actorManager === void 0 ? void 0 : actorManager.cleanup();
-    }, [fetchCandid, maybeIdlFactory, canisterId, agentManager]);
+    }, [fetchCandid, maybeIdlFactory, initialActorManager]);
     const hooks = (0, react_1.useMemo)(() => {
-        if (fetching)
-            return null;
         if (!actorManager)
             return null;
         return (0, helpers_1.actorHooks)(actorManager);
-    }, [canisterId, authenticating, actorManager, fetching]);
+    }, [actorManager]);
     return { hooks, authenticating, fetching, fetchError };
 };
 exports.useActor = useActor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/react",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "A React library for interacting with Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -35,7 +35,7 @@
     "node": ">=10"
   },
   "dependencies": {
-    "@ic-reactor/core": "^1.3.0",
+    "@ic-reactor/core": "^1.3.1",
     "zustand-utils": "^1.3"
   },
   "peerDependencies": {
@@ -47,5 +47,5 @@
     "react": ">=16.8",
     "zustand": "4.5"
   },
-  "gitHead": "25043c2d1a78b97e327995abaf13835ac511e5d6"
+  "gitHead": "02ebf0dfbd01792ded00b91a69b4196aab018285"
 }