@xyo-network/react-payload 2.26.11 → 2.26.14

package/dist/esm/hooks/ResolvePayloadArgs.d.ts

@@ -0,0 +1,4 @@
+import { XyoApiError } from '@xyo-network/api';
+import { XyoPayload } from '@xyo-network/payload';
+export declare type UsePayload = [XyoPayload?, boolean?, XyoApiError?];
+export declare type UseHuriOrHash = [...UsePayload, boolean?];

package/dist/esm/hooks/ResolvePayloadArgs.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ResolvePayloadArgs.js.map

package/dist/esm/hooks/ResolvePayloadArgs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResolvePayloadArgs.js","sourceRoot":"","sources":["../../../src/hooks/ResolvePayloadArgs.ts"],"names":[],"mappings":""}

package/dist/esm/hooks/index.d.ts

@@ -1,4 +1,5 @@
 export * from './lib';
+export * from './ResolvePayloadArgs';
 export * from './useGetSchema';
 export * from './useHuriHash';
 export * from './usePayload';

package/dist/esm/hooks/index.js

@@ -1,4 +1,5 @@
 export * from './lib';
+export * from './ResolvePayloadArgs';
 export * from './useGetSchema';
 export * from './useHuriHash';
 export * from './usePayload';

package/dist/esm/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,sBAAsB,CAAA;AACpC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA"}

package/dist/esm/hooks/useHuriHash.d.ts

@@ -1,8 +1,7 @@
-import { XyoApiError } from '@xyo-network/api';
-import { Huri, XyoPayload } from '@xyo-network/payload';
+import { Huri } from '@xyo-network/payload';
 import { FetchHuriHashOptions } from './lib';
 /**
  * Resolve a hash or a huri regardless of network
  */
-declare const useHuriHash: (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined];
+declare const useHuriHash: (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions) => [(import("@xyo-network/payload").XyoPayload<object> | undefined)?, (boolean | undefined)?, (import("@xyo-network/api").XyoApiError<any, any> | undefined)?, (boolean | undefined)?];
 export { useHuriHash };

package/dist/esm/hooks/useHuriHash.js

@@ -16,11 +16,13 @@ const useHuriHash = (huriOrHash, huriUri, options) => {
             }
         }
     }, []);
-    const foundHash = hash(huriOrHash);
+    const providedHash = hash(huriOrHash);
     // Optimistically try to grab the has from the current network and archive
-    const [payload, notFound, apiError] = usePayload(foundHash);
+    const [payload, notFound, apiError] = usePayload(providedHash);
+    // if a huriUri was passed, we can safely override the notFound from the hash only query
+    const notFoundOverride = huriUri ? true : notFound;
     // If payload isn't found, fallback to the huriUri
-    const [huriPayload, huriPayloadNotFound, huriApiError, networkNotFound] = useResolveHuri(huriUri, notFound, options);
+    const [huriPayload, huriPayloadNotFound, huriApiError, networkNotFound] = useResolveHuri(huriUri, notFoundOverride, options);
     return [payload ?? huriPayload, huriPayloadNotFound, apiError ?? huriApiError, networkNotFound];
 };
 export { useHuriHash };

package/dist/esm/hooks/useHuriHash.js.map

@@ -1 +1 @@
-{"version":3,"file":"useHuriHash.js","sourceRoot":"","sources":["../../../src/hooks/useHuriHash.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD;;GAEG;AACH,MAAM,WAAW,GAAG,CAClB,UAA0B,EAC1B,OAAgB,EAChB,OAA8B,EAC+D,EAAE;IAC/F,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,UAA0B,EAAE,EAAE;QACtD,IAAI,UAAU,EAAE;YACd,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,UAAU,CAAA;aAClB;YACD,IAAI,UAAU,YAAY,IAAI,EAAE;gBAC9B,OAAO,UAAU,CAAC,IAAI,CAAA;aACvB;SACF;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,CAAA;IAElC,0EAA0E;IAC1E,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IAE3D,kDAAkD;IAClD,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAEpH,OAAO,CAAC,OAAO,IAAI,WAAW,EAAE,mBAAmB,EAAE,QAAQ,IAAI,YAAY,EAAE,eAAe,CAAC,CAAA;AACjG,CAAC,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"useHuriHash.js","sourceRoot":"","sources":["../../../src/hooks/useHuriHash.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAa,MAAM,OAAO,CAAA;AAI9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD;;GAEG;AACH,MAAM,WAAW,GAAG,CAAC,UAA0B,EAAE,OAAgB,EAAE,OAA8B,EAAiB,EAAE;IAClH,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,UAA0B,EAAE,EAAE;QACtD,IAAI,UAAU,EAAE;YACd,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,UAAU,CAAA;aAClB;YACD,IAAI,UAAU,YAAY,IAAI,EAAE;gBAC9B,OAAO,UAAU,CAAC,IAAI,CAAA;aACvB;SACF;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,CAAA;IAErC,0EAA0E;IAC1E,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,YAAY,CAAC,CAAA;IAE9D,wFAAwF;IACxF,MAAM,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAA;IAElD,kDAAkD;IAClD,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAA;IAE5H,OAAO,CAAC,OAAO,IAAI,WAAW,EAAE,mBAAmB,EAAE,QAAQ,IAAI,YAAY,EAAE,eAAe,CAAC,CAAA;AACjG,CAAC,CAAA;AAED,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/dist/esm/hooks/usePayload.d.ts

@@ -1,3 +1,2 @@
-import { XyoApiError } from '@xyo-network/api';
-import { XyoPayload } from '@xyo-network/payload';
-export declare const usePayload: (hash?: string) => [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined];
+import { UsePayload } from './ResolvePayloadArgs';
+export declare const usePayload: (hash?: string) => UsePayload;

package/dist/esm/hooks/usePayload.js

@@ -1,10 +1,11 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
 import { useArchive } from '@xyo-network/react-archive';
 import { useArchivistApi } from '@xyo-network/react-archivist-api';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 export const usePayload = (hash) => {
     const { api } = useArchivistApi();
     const { archive } = useArchive();
+    const [localHash, setLocalHash] = useState();
     const [notFound, setNotFound] = useState();
     const [apiError, setApiError] = useState();
     const [payload, setPayload] = useState();
@@ -13,18 +14,26 @@ export const usePayload = (hash) => {
         setApiError(undefined);
         setNotFound(undefined);
     };
+    // allow for hash changes to retrigger the api call
+    useEffect(() => {
+        if (hash !== localHash) {
+            setLocalHash(hash);
+            reset();
+        }
+    }, [hash, localHash]);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-        if (api && hash && hash.length > 0) {
+        if (api && localHash && localHash.length > 0 && notFound === undefined) {
+            reset();
             try {
-                reset();
-                const result = await api?.archive(archive).payload.hash(hash).get();
+                const result = await api?.archive(archive).payload.hash(localHash).get();
                 if (mounted()) {
                     if (result?.length) {
                         setPayload(result[0]);
+                        setNotFound(false);
                     }
-                    else if (result) {
+                    else if (result?.length === 0) {
                         setNotFound(true);
                         setPayload(undefined);
                     }
@@ -32,11 +41,12 @@ export const usePayload = (hash) => {
             }
             catch (e) {
                 reset();
+                setNotFound(false);
                 setApiError(e);
                 console.error(e);
             }
         }
-    }, [hash, api, archive]);
+    }, [hash, api, archive, payload, notFound, localHash]);
     return [payload, notFound, apiError];
 };
 //# sourceMappingURL=usePayload.js.map

package/dist/esm/hooks/usePayload.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePayload.js","sourceRoot":"","sources":["../../../src/hooks/usePayload.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAa,EAA0E,EAAE;IAClH,MAAM,EAAE,GAAG,EAAE,GAAG,eAAe,EAAE,CAAA;IACjC,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAChC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAW,CAAA;IACnD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAe,CAAA;IACvD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAc,CAAA;IAEpD,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,UAAU,CAAC,SAAS,CAAC,CAAA;QACrB,WAAW,CAAC,SAAS,CAAC,CAAA;QACtB,WAAW,CAAC,SAAS,CAAC,CAAA;IACxB,CAAC,CAAA;IAED,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,IAAI;gBACF,KAAK,EAAE,CAAA;gBACP,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAA;gBACnE,IAAI,OAAO,EAAE,EAAE;oBACb,IAAI,MAAM,EAAE,MAAM,EAAE;wBAClB,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;qBACtB;yBAAM,IAAI,MAAM,EAAE;wBACjB,WAAW,CAAC,IAAI,CAAC,CAAA;wBACjB,UAAU,CAAC,SAAS,CAAC,CAAA;qBACtB;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,KAAK,EAAE,CAAA;gBACP,WAAW,CAAC,CAAgB,CAAC,CAAA;gBAC7B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACjB;SACF;IACH,CAAC,EACD,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CACrB,CAAA;IACD,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACtC,CAAC,CAAA"}
+{"version":3,"file":"usePayload.js","sourceRoot":"","sources":["../../../src/hooks/usePayload.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAI3C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAa,EAAc,EAAE;IACtD,MAAM,EAAE,GAAG,EAAE,GAAG,eAAe,EAAE,CAAA;IACjC,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAChC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,EAAU,CAAA;IACpD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAW,CAAA;IACnD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAe,CAAA;IACvD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAc,CAAA;IAEpD,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,UAAU,CAAC,SAAS,CAAC,CAAA;QACrB,WAAW,CAAC,SAAS,CAAC,CAAA;QACtB,WAAW,CAAC,SAAS,CAAC,CAAA;IACxB,CAAC,CAAA;IAED,mDAAmD;IACnD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,YAAY,CAAC,IAAI,CAAC,CAAA;YAClB,KAAK,EAAE,CAAA;SACR;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAA;IAErB,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,GAAG,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,KAAK,SAAS,EAAE;YACtE,KAAK,EAAE,CAAA;YACP,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,CAAA;gBACxE,IAAI,OAAO,EAAE,EAAE;oBACb,IAAI,MAAM,EAAE,MAAM,EAAE;wBAClB,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;wBACrB,WAAW,CAAC,KAAK,CAAC,CAAA;qBACnB;yBAAM,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC,EAAE;wBAC/B,WAAW,CAAC,IAAI,CAAC,CAAA;wBACjB,UAAU,CAAC,SAAS,CAAC,CAAA;qBACtB;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,KAAK,EAAE,CAAA;gBACP,WAAW,CAAC,KAAK,CAAC,CAAA;gBAClB,WAAW,CAAC,CAAgB,CAAC,CAAA;gBAC7B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aACjB;SACF;IACH,CAAC,EACD,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CACnD,CAAA;IACD,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACtC,CAAC,CAAA"}

package/dist/esm/hooks/useResolveHuri.d.ts

@@ -1,5 +1,5 @@
 import { XyoApiError } from '@xyo-network/api';
 import { XyoPayload } from '@xyo-network/payload';
 import { FetchHuriHashOptions } from './lib';
-declare const useResolveHuri: (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions) => [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined];
+declare const useResolveHuri: (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions) => [(XyoPayload<object> | undefined)?, (boolean | undefined)?, (XyoApiError<any, any> | undefined)?, (boolean | undefined)?];
 export { useResolveHuri };

package/dist/esm/hooks/useResolveHuri.js

@@ -10,6 +10,11 @@ const useResolveHuri = (huriUri, dependentNotFound, options) => {
     const [huriNetworkNotFound, setHuriNetworkNotFound] = useState();
     const [huriApiError, setHuriApiError] = useState();
     const { changeActiveNetwork } = options ?? {};
+    const reset = () => {
+        setHuriPayload(undefined);
+        setHuriPayloadNotFound(undefined);
+        setHuriApiError(undefined);
+    };
     useEffect(() => {
         // Initially, sync local not found with dependent's status
         setHuriPayloadNotFound(dependentNotFound);
@@ -18,7 +23,8 @@ const useResolveHuri = (huriUri, dependentNotFound, options) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
         // if dependent value is resolved, don't do anything, if not resolved, try to resolve huriUri
-        if ((dependentNotFound === undefined || dependentNotFound) && huriUri) {
+        if (dependentNotFound && huriUri) {
+            reset();
             const huriInstance = new Huri(huriUri);
             const foundHuriNetwork = findHuriNetwork(huriInstance, networks);
             if (foundHuriNetwork && mounted()) {
@@ -40,6 +46,8 @@ const useResolveHuri = (huriUri, dependentNotFound, options) => {
                 }
                 catch (e) {
                     if (mounted()) {
+                        setHuriPayloadNotFound(false);
+                        setHuriPayload(undefined);
                         setHuriApiError(e);
                     }
                 }

package/dist/esm/hooks/useResolveHuri.js.map

@@ -1 +1 @@
-{"version":3,"file":"useResolveHuri.js","sourceRoot":"","sources":["../../../src/hooks/useResolveHuri.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAwB,eAAe,EAAE,MAAM,OAAO,CAAA;AAE7D,MAAM,cAAc,GAAG,CACrB,OAAgB,EAChB,iBAA2B,EAC3B,OAA8B,EAC+D,EAAE;IAC/F,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAc,CAAA;IAC5D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAW,CAAA;IACzE,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAW,CAAA;IACzE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAe,CAAA;IAE/D,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAE7C,SAAS,CAAC,GAAG,EAAE;QACb,0DAA0D;QAC1D,sBAAsB,CAAC,iBAAiB,CAAC,CAAA;IAC3C,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAEvB,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,6FAA6F;QAC7F,IAAI,CAAC,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,OAAO,EAAE;YACrE,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtC,MAAM,gBAAgB,GAAG,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAEhE,IAAI,gBAAgB,IAAI,OAAO,EAAE,EAAE;gBACjC,IAAI,OAAO,KAAK,gBAAgB,IAAI,mBAAmB,EAAE;oBACvD,UAAU,EAAE,CAAC,gBAAgB,CAAC,CAAA;oBAC9B,OAAM;iBACP;gBAED,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;oBAC9C,IAAI,OAAO,EAAE,EAAE;wBACb,IAAI,WAAW,EAAE;4BACf,cAAc,CAAC,WAAW,CAAC,CAAA;4BAC3B,sBAAsB,CAAC,KAAK,CAAC,CAAA;yBAC9B;6BAAM;4BACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;yBAC7B;qBACF;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,OAAO,EAAE,EAAE;wBACb,eAAe,CAAC,CAAgB,CAAC,CAAA;qBAClC;iBACF;aACF;iBAAM;gBACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;aAC7B;SACF;IACH,CAAC,EACD,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CACjF,CAAA;IAED,OAAO,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAA;AAC9E,CAAC,CAAA;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}
+{"version":3,"file":"useResolveHuri.js","sourceRoot":"","sources":["../../../src/hooks/useResolveHuri.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAwB,eAAe,EAAE,MAAM,OAAO,CAAA;AAG7D,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAE,iBAA2B,EAAE,OAA8B,EAAiB,EAAE;IACtH,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAc,CAAA;IAC5D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAW,CAAA;IACzE,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,EAAW,CAAA;IACzE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAe,CAAA;IAE/D,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAE7C,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,cAAc,CAAC,SAAS,CAAC,CAAA;QACzB,sBAAsB,CAAC,SAAS,CAAC,CAAA;QACjC,eAAe,CAAC,SAAS,CAAC,CAAA;IAC5B,CAAC,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,0DAA0D;QAC1D,sBAAsB,CAAC,iBAAiB,CAAC,CAAA;IAC3C,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAEvB,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,6FAA6F;QAC7F,IAAI,iBAAiB,IAAI,OAAO,EAAE;YAChC,KAAK,EAAE,CAAA;YACP,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtC,MAAM,gBAAgB,GAAG,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAEhE,IAAI,gBAAgB,IAAI,OAAO,EAAE,EAAE;gBACjC,IAAI,OAAO,KAAK,gBAAgB,IAAI,mBAAmB,EAAE;oBACvD,UAAU,EAAE,CAAC,gBAAgB,CAAC,CAAA;oBAC9B,OAAM;iBACP;gBAED,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,CAAA;oBAC9C,IAAI,OAAO,EAAE,EAAE;wBACb,IAAI,WAAW,EAAE;4BACf,cAAc,CAAC,WAAW,CAAC,CAAA;4BAC3B,sBAAsB,CAAC,KAAK,CAAC,CAAA;yBAC9B;6BAAM;4BACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;yBAC7B;qBACF;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,OAAO,EAAE,EAAE;wBACb,sBAAsB,CAAC,KAAK,CAAC,CAAA;wBAC7B,cAAc,CAAC,SAAS,CAAC,CAAA;wBACzB,eAAe,CAAC,CAAgB,CAAC,CAAA;qBAClC;iBACF;aACF;iBAAM;gBACL,sBAAsB,CAAC,IAAI,CAAC,CAAA;aAC7B;SACF;IACH,CAAC,EACD,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CACjF,CAAA;IAED,OAAO,CAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAA;AAC9E,CAAC,CAAA;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/package.json

@@ -13,23 +13,23 @@
     "@emotion/react": "^11.9.3",
     "@emotion/styled": "^11.9.3",
     "@mui/icons-material": "^5.8.4",
-    "@mui/material": "^5.8.7",
-    "@xylabs/react-button": "^2.14.5",
-    "@xylabs/react-flexbox": "^2.14.5",
-    "@xylabs/react-quick-tip-button": "^2.14.5",
-    "@xylabs/react-shared": "^2.14.5",
-    "@xyo-network/api": "^2.21.14",
-    "@xyo-network/network": "^2.21.14",
-    "@xyo-network/payload": "^2.21.14",
-    "@xyo-network/react-archive": "^2.26.11",
-    "@xyo-network/react-archivist-api": "^2.26.11",
-    "@xyo-network/react-auth-service": "^2.26.11",
-    "@xyo-network/react-network": "^2.26.11",
-    "@xyo-network/react-property": "^2.26.11",
-    "@xyo-network/react-schema": "^2.26.11",
-    "@xyo-network/react-shared": "^2.26.11",
-    "@xyo-network/utils": "^2.21.14",
-    "luxon": "^2.4.0",
+    "@mui/material": "^5.9.0",
+    "@xylabs/react-button": "^2.14.6",
+    "@xylabs/react-flexbox": "^2.14.6",
+    "@xylabs/react-quick-tip-button": "^2.14.6",
+    "@xylabs/react-shared": "^2.14.6",
+    "@xyo-network/api": "^2.21.16",
+    "@xyo-network/network": "^2.21.16",
+    "@xyo-network/payload": "^2.21.16",
+    "@xyo-network/react-archive": "^2.26.14",
+    "@xyo-network/react-archivist-api": "^2.26.14",
+    "@xyo-network/react-auth-service": "^2.26.14",
+    "@xyo-network/react-network": "^2.26.14",
+    "@xyo-network/react-property": "^2.26.14",
+    "@xyo-network/react-schema": "^2.26.14",
+    "@xyo-network/react-shared": "^2.26.14",
+    "@xyo-network/utils": "^2.21.16",
+    "luxon": "^3.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-icons": "^4.4.0",
@@ -94,6 +94,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.26.11",
+  "version": "2.26.14",
   "packageManager": "yarn@3.1.1"
 }

package/src/hooks/ResolvePayloadArgs.ts

@@ -0,0 +1,6 @@
+import { XyoApiError } from '@xyo-network/api'
+import { XyoPayload } from '@xyo-network/payload'
+
+export type UsePayload = [XyoPayload?, boolean?, XyoApiError?]
+
+export type UseHuriOrHash = [...UsePayload, boolean?]

package/src/hooks/index.ts

@@ -1,4 +1,5 @@
 export * from './lib'
+export * from './ResolvePayloadArgs'
 export * from './useGetSchema'
 export * from './useHuriHash'
 export * from './usePayload'

package/src/hooks/useHuriHash.stories.tsx

@@ -56,6 +56,7 @@ const UseHuriHashComponent: React.FC<UseHuriHashComponentProps> = ({ huriOrHash,
         </FlexRow>
       ) : null}
       <FlexCol my={3}>
+        {notFound === undefined && networkNotFound === undefined ? 'Loading...' : null}
         {notFound ? <Alert severity="warning">Not Found</Alert> : null}
         {networkNotFound ? <Alert severity="warning">Network Not Found</Alert> : null}
         <Suspense fallback={<FlexCol busy />}>

package/src/hooks/useHuriHash.tsx

@@ -1,19 +1,15 @@
-import { XyoApiError } from '@xyo-network/api'
-import { Huri, XyoPayload } from '@xyo-network/payload'
-import { useCallback } from 'react'
+import { Huri } from '@xyo-network/payload'
+import { useCallback, useEffect } from 'react'
 
 import { FetchHuriHashOptions } from './lib'
+import { UseHuriOrHash } from './ResolvePayloadArgs'
 import { usePayload } from './usePayload'
 import { useResolveHuri } from './useResolveHuri'
 
 /**
  * Resolve a hash or a huri regardless of network
  */
-const useHuriHash = (
-  huriOrHash?: string | Huri,
-  huriUri?: string,
-  options?: FetchHuriHashOptions
-): [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined] => {
+const useHuriHash = (huriOrHash?: string | Huri, huriUri?: string, options?: FetchHuriHashOptions): UseHuriOrHash => {
   const hash = useCallback((huriOrHash?: string | Huri) => {
     if (huriOrHash) {
       if (typeof huriOrHash === 'string') {
@@ -25,13 +21,16 @@ const useHuriHash = (
     }
   }, [])
 
-  const foundHash = hash(huriOrHash)
+  const providedHash = hash(huriOrHash)
 
   // Optimistically try to grab the has from the current network and archive
-  const [payload, notFound, apiError] = usePayload(foundHash)
+  const [payload, notFound, apiError] = usePayload(providedHash)
+
+  // if a huriUri was passed, we can safely override the notFound from the hash only query
+  const notFoundOverride = huriUri ? true : notFound
 
   // If payload isn't found, fallback to the huriUri
-  const [huriPayload, huriPayloadNotFound, huriApiError, networkNotFound] = useResolveHuri(huriUri, notFound, options)
+  const [huriPayload, huriPayloadNotFound, huriApiError, networkNotFound] = useResolveHuri(huriUri, notFoundOverride, options)
 
   return [payload ?? huriPayload, huriPayloadNotFound, apiError ?? huriApiError, networkNotFound]
 }

package/src/hooks/usePayload.tsx

@@ -3,11 +3,14 @@ import { XyoApiError } from '@xyo-network/api'
 import { XyoPayload } from '@xyo-network/payload'
 import { useArchive } from '@xyo-network/react-archive'
 import { useArchivistApi } from '@xyo-network/react-archivist-api'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 
-export const usePayload = (hash?: string): [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined] => {
+import { UsePayload } from './ResolvePayloadArgs'
+
+export const usePayload = (hash?: string): UsePayload => {
   const { api } = useArchivistApi()
   const { archive } = useArchive()
+  const [localHash, setLocalHash] = useState<string>()
   const [notFound, setNotFound] = useState<boolean>()
   const [apiError, setApiError] = useState<XyoApiError>()
   const [payload, setPayload] = useState<XyoPayload>()
@@ -18,29 +21,39 @@ export const usePayload = (hash?: string): [XyoPayload | undefined, boolean | un
     setNotFound(undefined)
   }
 
+  // allow for hash changes to retrigger the api call
+  useEffect(() => {
+    if (hash !== localHash) {
+      setLocalHash(hash)
+      reset()
+    }
+  }, [hash, localHash])
+
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-      if (api && hash && hash.length > 0) {
+      if (api && localHash && localHash.length > 0 && notFound === undefined) {
+        reset()
         try {
-          reset()
-          const result = await api?.archive(archive).payload.hash(hash).get()
+          const result = await api?.archive(archive).payload.hash(localHash).get()
           if (mounted()) {
             if (result?.length) {
               setPayload(result[0])
-            } else if (result) {
+              setNotFound(false)
+            } else if (result?.length === 0) {
               setNotFound(true)
               setPayload(undefined)
             }
           }
         } catch (e) {
           reset()
+          setNotFound(false)
           setApiError(e as XyoApiError)
           console.error(e)
         }
       }
     },
-    [hash, api, archive]
+    [hash, api, archive, payload, notFound, localHash]
   )
   return [payload, notFound, apiError]
 }

package/src/hooks/useResolveHuri.tsx

@@ -5,12 +5,9 @@ import { useNetwork } from '@xyo-network/react-network'
 import { useEffect, useState } from 'react'
 
 import { FetchHuriHashOptions, findHuriNetwork } from './lib'
+import { UseHuriOrHash } from './ResolvePayloadArgs'
 
-const useResolveHuri = (
-  huriUri?: string,
-  dependentNotFound?: boolean,
-  options?: FetchHuriHashOptions
-): [XyoPayload | undefined, boolean | undefined, XyoApiError | undefined, boolean | undefined] => {
+const useResolveHuri = (huriUri?: string, dependentNotFound?: boolean, options?: FetchHuriHashOptions): UseHuriOrHash => {
   const { network, networks, setNetwork } = useNetwork()
   const [huriPayload, setHuriPayload] = useState<XyoPayload>()
   const [huriPayloadNotFound, setHuriPayloadNotFound] = useState<boolean>()
@@ -19,6 +16,12 @@ const useResolveHuri = (
 
   const { changeActiveNetwork } = options ?? {}
 
+  const reset = () => {
+    setHuriPayload(undefined)
+    setHuriPayloadNotFound(undefined)
+    setHuriApiError(undefined)
+  }
+
   useEffect(() => {
     // Initially, sync local not found with dependent's status
     setHuriPayloadNotFound(dependentNotFound)
@@ -28,7 +31,8 @@ const useResolveHuri = (
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
       // if dependent value is resolved, don't do anything, if not resolved, try to resolve huriUri
-      if ((dependentNotFound === undefined || dependentNotFound) && huriUri) {
+      if (dependentNotFound && huriUri) {
+        reset()
         const huriInstance = new Huri(huriUri)
 
         const foundHuriNetwork = findHuriNetwork(huriInstance, networks)
@@ -51,6 +55,8 @@ const useResolveHuri = (
             }
           } catch (e) {
             if (mounted()) {
+              setHuriPayloadNotFound(false)
+              setHuriPayload(undefined)
               setHuriApiError(e as XyoApiError)
             }
           }