@xyo-network/os-react-runtime 4.2.0-rc.8 → 4.2.0

package/dist/browser/index.mjs

@@ -2242,21 +2242,19 @@ import { usePromise as usePromise11 } from "@xylabs/react-promise";
 import { asArchivistInstance } from "@xyo-network/archivist-model";
 import { isDappInjectableParams } from "@xyo-network/os-model";
 import { DappCaller as DappCaller2 } from "@xyo-network/os-runtime";
-import { useNavigate as useNavigate5, useParams as useParams3, useSearchParams as useSearchParams2 } from "react-router-dom";
+import { useNavigate as useNavigate5, useSearchParams as useSearchParams2 } from "react-router-dom";
 var useManageDappInjectableParamsFromRoute = /* @__PURE__ */ __name((context) => {
   const [queryParams] = useSearchParams2();
-  const params = useParams3();
   const navigate = useNavigate5();
   const [, callerError] = usePromise11(async () => {
-    if (context && (params || queryParams)) {
+    if (context && queryParams) {
       const dappCaller = new DappCaller2(context);
       const pathname = globalThis.location.pathname;
       await dappCaller.setDappInjectableRouteParams(queryParams, pathname);
     }
   }, [
     context,
-    queryParams,
-    params
+    queryParams
   ]);
   const [, listenerError] = usePromise11(async () => {
     let archivist;
@@ -2355,9 +2353,9 @@ var useManageDappIntentRequest = /* @__PURE__ */ __name((context, dappId) => {
 // src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappPathFromRoute.tsx
 import { usePromise as usePromise13 } from "@xylabs/react-promise";
 import { useCallback as useCallback5, useEffect as useEffect14, useRef as useRef5 } from "react";
-import { useNavigate as useNavigate6, useParams as useParams4 } from "react-router-dom";
+import { useNavigate as useNavigate6, useParams as useParams3 } from "react-router-dom";
 var useManageDappPathFromRoute = /* @__PURE__ */ __name((context, dappName) => {
-  const params = useParams4();
+  const params = useParams3();
   const { path: pathParam } = params;
   const dappMenuCaller = useDappMenuCaller(context, {
     ignoreProvidedNode: true
@@ -2393,7 +2391,7 @@ var useManageDappPathFromRoute = /* @__PURE__ */ __name((context, dappName) => {
     defaultPath,
     menuSelection
   ]);
-  usePromise13(async () => {
+  const [, updateErrors] = usePromise13(async () => {
     if (context && pathParam !== currentPathRef.current) {
       await updateMenuArchivist(pathParam);
       currentPathRef.current = pathParam;
@@ -2403,6 +2401,7 @@ var useManageDappPathFromRoute = /* @__PURE__ */ __name((context, dappName) => {
     pathParam,
     updateMenuArchivist
   ]);
+  return updateErrors;
 }, "useManageDappPathFromRoute");
 
 // src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappStateFromRoute.tsx
@@ -2410,9 +2409,9 @@ import { usePromise as usePromise14 } from "@xylabs/react-promise";
 import { DappIntentTypes as DappIntentTypes9 } from "@xyo-network/os-model";
 import { DappIntentCaller as DappIntentCaller5, NameTransforms as NameTransforms3 } from "@xyo-network/os-runtime";
 import { useRef as useRef6 } from "react";
-import { useParams as useParams5 } from "react-router-dom";
+import { useParams as useParams4 } from "react-router-dom";
 var useManageDappStateFromRoute = /* @__PURE__ */ __name((intentPayload) => {
-  const params = useParams5();
+  const params = useParams4();
   const { dappName: dappNameParam } = params;
   const sendIntent = useSendDappIntent();
   const intentCaller = useDappIntentCaller();
@@ -3133,10 +3132,12 @@ var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWall
   const { active, minimized } = dappState ?? {};
   const TypedDappComponent = useMemo12(() => DappComponent, []);
   useSyncOsRegisteredAccessInterfaces(context);
-  useManageDappPathFromRoute(context, name);
-  useManageDappInjectableParamsFromRoute(context);
+  const routingError = useManageDappPathFromRoute(context, name);
+  const injectableErrors = useManageDappInjectableParamsFromRoute(context);
   const { activePath, error: menuError, menuConfig, menuItemsVisible, onPathChange } = useDappMenu(context, name);
   const resolvedErrors = [
+    ...injectableErrors,
+    routingError,
     nodeCreateError,
     menuError,
     ...errors ?? []
@@ -4022,7 +4023,7 @@ var DappPathSwitcher = /* @__PURE__ */ __name(({ activePath, pathToComponent })
   });
   const possibleZIndex = pathToComponent?.findIndex((item) => item.path === activePath);
   const zIndex = possibleZIndex !== -1 && possibleZIndex !== void 0 ? possibleZIndex : 1;
-  return /* @__PURE__ */ React42.createElement(React42.Fragment, null, transitions((transitionProps, activePath2) => /* @__PURE__ */ React42.createElement(animated3.div, {
+  return /* @__PURE__ */ React42.createElement(React42.Fragment, null, transitions((transitionProps, activePathRef) => /* @__PURE__ */ React42.createElement(animated3.div, {
     style: {
       ...transitionProps,
       alignItems: "stretch",
@@ -4039,10 +4040,10 @@ var DappPathSwitcher = /* @__PURE__ */ __name(({ activePath, pathToComponent })
       zIndex
     }
   }, (() => {
-    const activeIndex = pathToComponent?.findIndex(({ path: componentPath }) => activePath2 === componentPath);
+    const activeIndex = pathToComponent?.findIndex(({ path: componentPath }) => activePathRef === componentPath);
     const activeItem = pathToComponent && activeIndex !== -1 && activeIndex !== void 0 ? pathToComponent[activeIndex] : void 0;
     return activeItem ? activeItem.component : /* @__PURE__ */ React42.createElement(ErrorRender4, {
-      error: new Error(`No component found for path: ${activePath2}`),
+      error: new Error(`No component found for path: ${activePathRef}`),
       scope: "DappPathSwitcher"
     });
   })())));