@ic-reactor/react 1.1.2 → 1.1.3

package/dist/context/actor.js

@@ -83,13 +83,17 @@ function createActorContext(config = {}) {
     const { canisterId: defaultCanisterId } = config, defaultConfig = __rest(config, ["canisterId"]);
     const ActorContext = react_1.default.createContext(null);
     const ActorProvider = (_a) => {
-        var { children, canisterId = defaultCanisterId, loadingComponent = react_1.default.createElement("div", null, "Fetching canister...") } = _a, restConfig = __rest(_a, ["children", "canisterId", "loadingComponent"]);
+        var { children, canisterId = defaultCanisterId, loadingComponent = react_1.default.createElement("div", null, "Fetching canister..."), authenticatingComponent = react_1.default.createElement("div", null, "Authenticating...") } = _a, restConfig = __rest(_a, ["children", "canisterId", "loadingComponent", "authenticatingComponent"]);
         if (!canisterId) {
             throw new Error("canisterId is required");
         }
         const config = react_1.default.useMemo(() => (Object.assign(Object.assign({}, defaultConfig), restConfig)), [defaultConfig, restConfig]);
-        const { fetchError, fetching, hooks } = (0, useActor_1.useActor)(Object.assign({ canisterId }, config));
-        return (react_1.default.createElement(ActorContext.Provider, { value: hooks }, fetching || hooks === null ? fetchError !== null && fetchError !== void 0 ? fetchError : loadingComponent : children));
+        const { fetchError, authenticating, hooks } = (0, useActor_1.useActor)(Object.assign({ canisterId, fetchOnMount: false }, config));
+        return (react_1.default.createElement(ActorContext.Provider, { value: hooks }, hooks === null
+            ? (fetchError !== null && fetchError !== void 0 ? fetchError : authenticating)
+                ? authenticatingComponent
+                : loadingComponent
+            : children));
     };
     ActorProvider.displayName = "ActorProvider";
     return Object.assign({ ActorProvider }, (0, extractActorContext_1.extractActorContext)(ActorContext));

package/dist/context/agent.js

@@ -93,11 +93,15 @@ const extractAgentContext_1 = require("../helpers/extractAgentContext");
  * with the Internet Computer blockchain.
  */
 const createAgentContext = (config = {}) => {
+    const { disableAuthenticateOnMount: defaultDisable } = config, contextOptions = __rest(config, ["disableAuthenticateOnMount"]);
     const AgentContext = react_1.default.createContext(null);
     const AgentProvider = (_a) => {
-        var { children, agentManager: mybeAgentManager } = _a, options = __rest(_a, ["children", "agentManager"]);
+        var { children, agentManager: mybeAgentManager, disableAuthenticateOnMount = defaultDisable !== null && defaultDisable !== void 0 ? defaultDisable : false } = _a, options = __rest(_a, ["children", "agentManager", "disableAuthenticateOnMount"]);
         const hooks = react_1.default.useMemo(() => {
-            const agentManager = mybeAgentManager !== null && mybeAgentManager !== void 0 ? mybeAgentManager : (0, core_1.createAgentManager)(Object.assign(Object.assign({}, options), config));
+            const agentManager = mybeAgentManager !== null && mybeAgentManager !== void 0 ? mybeAgentManager : (0, core_1.createAgentManager)(Object.assign(Object.assign({}, options), contextOptions));
+            if (!disableAuthenticateOnMount) {
+                agentManager.authenticate();
+            }
             return Object.assign(Object.assign(Object.assign({}, (0, agentHooks_1.agentHooks)(agentManager)), (0, authHooks_1.authHooks)(agentManager)), { agentManager });
         }, [options]);
         return (react_1.default.createElement(AgentContext.Provider, { value: hooks }, children));

package/dist/context/types.d.ts

@@ -4,12 +4,13 @@ export interface AgentContext extends AgentHooksReturnType, AuthHooksReturnType
     agentManager: AgentManager;
 }
 export interface CreateAgentCotextParameters extends AgentManagerParameters {
+    disableAuthenticateOnMount?: boolean;
 }
 export interface CreateAgentContextReturnType extends AgentHooksReturnType, AuthHooksReturnType {
     useAgentManager: (agentContext?: React.Context<AgentContext | null>) => AgentManager;
     AgentProvider: React.FC<AgentProviderProps>;
 }
-export interface AgentProviderProps extends PropsWithChildren, AgentManagerParameters {
+export interface AgentProviderProps extends PropsWithChildren, CreateAgentCotextParameters {
     agentManager?: AgentManager;
 }
 export interface CreateActorContextReturnType<A = BaseActor> extends ActorHooksReturnType<A> {
@@ -18,6 +19,7 @@ export interface CreateActorContextReturnType<A = BaseActor> extends ActorHooksR
 export interface ActorProviderProps extends CreateActorContextParameters {
     children?: React.ReactNode | undefined;
     loadingComponent?: React.ReactNode;
+    authenticatingComponent?: React.ReactNode;
 }
 export interface CreateActorContextParameters extends Omit<ActorManagerParameters, "idlFactory" | "agentManager" | "canisterId"> {
     didjsId?: string;

package/dist/helpers/extractAgentContext.js

@@ -51,7 +51,7 @@ const extractAgentContext = (agentContext) => {
         useAgent,
         useAuthState,
         useAgentState,
-        useAuth: useAuth,
+        useAuth,
         useAgentManager,
         useUserPrincipal,
     };

package/dist/hooks/types.d.ts

@@ -6,10 +6,12 @@ export interface UseActorParameters extends Omit<ActorManagerParameters, "idlFac
     canisterId: string;
     idlFactory?: IDL.InterfaceFactory;
     agentContext?: React.Context<AgentContext | null>;
+    fetchOnMount?: boolean;
     didjsCanisterId?: string;
 }
 export interface UseActorReturn<A = BaseActor> {
     hooks: ActorHooksReturnType<A> | null;
     fetching: boolean;
     fetchError: string | null;
+    authenticating: boolean;
 }

package/dist/hooks/useActor.js

@@ -25,6 +25,7 @@ const core_1 = require("@ic-reactor/core");
 const react_1 = require("react");
 const useAgentManager_1 = require("./agent/useAgentManager");
 const helpers_1 = require("../helpers");
+const agent_1 = require("./agent");
 /**
  * A comprehensive hook that manages both the fetching of Candid interfaces
  * and the initialization of actor stores for Internet Computer (IC) canisters.
@@ -88,7 +89,7 @@ const helpers_1 = require("../helpers");
  * ```
  */
 const useActor = (config) => {
-    const { canisterId, idlFactory: maybeIdlFactory, agentContext, didjsCanisterId } = config, actorConfig = __rest(config, ["canisterId", "idlFactory", "agentContext", "didjsCanisterId"]);
+    const { canisterId, idlFactory: maybeIdlFactory, agentContext, fetchOnMount = true, didjsCanisterId } = config, actorConfig = __rest(config, ["canisterId", "idlFactory", "agentContext", "fetchOnMount", "didjsCanisterId"]);
     const [{ idlFactory, fetching, fetchError }, setState] = (0, react_1.useState)({
         idlFactory: maybeIdlFactory,
         fetching: false,
@@ -126,16 +127,29 @@ const useActor = (config) => {
             });
         }
     }), [canisterId, didjsCanisterId]);
-    // Automatically fetch Candid if not already fetched or provided.
-    (0, react_1.useEffect)(() => agentManager.subscribeAgent(fetchCandid, !maybeIdlFactory), [fetchCandid, agentManager]);
+    (0, react_1.useEffect)(() => {
+        if (maybeIdlFactory) {
+            setState(() => ({
+                idlFactory: maybeIdlFactory,
+                fetching: false,
+                fetchError: null,
+            }));
+            return;
+        }
+        const unsubscribe = agentManager.subscribeAgent(fetchCandid, fetchOnMount);
+        return unsubscribe;
+    }, [agentManager, fetchOnMount]);
+    const authenticating = (0, agent_1.useAuthState)().authenticating;
     const hooks = (0, react_1.useMemo)(() => {
         if (!idlFactory)
             return null;
+        if (authenticating)
+            return null;
         const actorManager = (0, core_1.createActorManager)(Object.assign({ agentManager,
             idlFactory,
             canisterId }, actorConfig));
         return (0, helpers_1.actorHooks)(actorManager);
-    }, [canisterId, idlFactory]);
-    return { hooks, fetching, fetchError };
+    }, [canisterId, authenticating, idlFactory]);
+    return { hooks, authenticating, fetching, fetchError };
 };
 exports.useActor = useActor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/react",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "A React library for interacting with Internet Computer canisters",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,7 +26,7 @@
   },
   "homepage": "https://b3pay.github.io/ic-reactor/modules/react.html",
   "scripts": {
-    "test": "npx jest",
+    "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
     "start": "tsc watch",
     "build": "npx tsc",
     "clean": "npx rimraf dist && npx rimraf umd"
@@ -47,5 +47,5 @@
     "react": ">=16.8",
     "zustand": "4.5"
   },
-  "gitHead": "036b4b03b8cc9b1e40ece8f8b16d9ce084634192"
+  "gitHead": "5420fba37e2721dd9c4a41ba885151eb420c5332"
 }