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

package/dist/browser/DappPathSwitcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DappPathSwitcher.d.ts","sourceRoot":"","sources":["../../src/DappPathSwitcher.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAkB,MAAM,OAAO,CAAA;AAEtC,MAAM,WAAW,eAAe,CAAC,SAAS,SAAS,MAAM,GAAG,MAAM;IAChE,SAAS,EAAE,SAAS,CAAA;IACpB,IAAI,EAAE,SAAS,CAAA;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,eAAe,CAAC,EAAE,eAAe,EAAE,CAAA;CACpC;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CA2C5D,CAAA"}
+{"version":3,"file":"DappPathSwitcher.d.ts","sourceRoot":"","sources":["../../src/DappPathSwitcher.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,MAAM,WAAW,eAAe,CAAC,SAAS,SAAS,MAAM,GAAG,MAAM;IAChE,SAAS,EAAE,SAAS,CAAA;IACpB,IAAI,EAAE,SAAS,CAAA;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,eAAe,CAAC,EAAE,eAAe,EAAE,CAAA;CACpC;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAyC5D,CAAA"}

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);
-  const routingErrors = useManageDappInjectableParamsFromRoute(context);
+  const routingError = useManageDappPathFromRoute(context, name);
+  const injectableErrors = useManageDappInjectableParamsFromRoute(context);
   const { activePath, error: menuError, menuConfig, menuItemsVisible, onPathChange } = useDappMenu(context, name);
   const resolvedErrors = [
-    ...routingErrors,
+    ...injectableErrors,
+    routingError,
     nodeCreateError,
     menuError,
     ...errors ?? []
@@ -3209,7 +3210,6 @@ var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWall
 var DappContainer = /* @__PURE__ */ __name(({ currentIntent, dappSet, xnsNodeUrl, xnsNetwork }) => {
   const { dapp, dappIcon } = dappSet;
   const { dappWallet, context, nodeCreateError } = useDappContextCreator(xnsNodeUrl, xnsNetwork, dapp, currentIntent);
-  useManageDappPathFromRoute(context, dapp.config.name);
   const dappState = useMemo13(() => {
     if (currentIntent?.targetDappId === dapp.config.name) {
       return deriveDappState(currentIntent);
@@ -4005,7 +4005,7 @@ var WidgetCardExamples = /* @__PURE__ */ __name(() => {
 // src/DappPathSwitcher.tsx
 import { animated as animated3, useTransition } from "@react-spring/web";
 import { ErrorRender as ErrorRender4 } from "@xylabs/react-error";
-import React42, { useMemo as useMemo18 } from "react";
+import React42 from "react";
 var DappPathSwitcher = /* @__PURE__ */ __name(({ activePath, pathToComponent }) => {
   const transitions = useTransition(activePath, {
     enter: {
@@ -4023,18 +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;
-  const activeComponent = useMemo18(() => {
-    const activeIndex = pathToComponent?.findIndex(({ path: componentPath }) => activePath === 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: ${activePath}`),
-      scope: "DappPathSwitcher"
-    });
-  }, [
-    activePath,
-    pathToComponent
-  ]);
-  return /* @__PURE__ */ React42.createElement(React42.Fragment, null, transitions((transitionProps) => /* @__PURE__ */ React42.createElement(animated3.div, {
+  return /* @__PURE__ */ React42.createElement(React42.Fragment, null, transitions((transitionProps, activePathRef) => /* @__PURE__ */ React42.createElement(animated3.div, {
     style: {
       ...transitionProps,
       alignItems: "stretch",
@@ -4050,7 +4039,14 @@ var DappPathSwitcher = /* @__PURE__ */ __name(({ activePath, pathToComponent })
       top: 0,
       zIndex
     }
-  }, activeComponent)));
+  }, (() => {
+    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: ${activePathRef}`),
+      scope: "DappPathSwitcher"
+    });
+  })())));
 }, "DappPathSwitcher");
 
 // src/dapps/shared/accounts/components/AnimatedComponents/GenericAnimations/ShiftAnimation.tsx
@@ -4420,10 +4416,10 @@ import React52 from "react";
 
 // src/dapps/shared/table/head/hooks/useVisibleColumns.tsx
 import { useMediaQuery as useMediaQuery2 } from "@mui/material";
-import { useMemo as useMemo19 } from "react";
+import { useMemo as useMemo18 } from "react";
 var useVisibleColumns = /* @__PURE__ */ __name((tableHeadCells) => {
   const isMedium = useMediaQuery2((theme) => theme.breakpoints.down("lg"));
-  const VisibleTableCells = useMemo19(() => {
+  const VisibleTableCells = useMemo18(() => {
     return isMedium ? tableHeadCells.filter((cell) => cell.showOnMobile) : tableHeadCells;
   }, [
     isMedium,
@@ -4502,7 +4498,7 @@ var NextIteratorFlexbox = /* @__PURE__ */ __name(({ next: changePage, loading, .
 
 // src/settings/Theme/ThemeProvider.tsx
 import { InvertibleMuiThemeProvider } from "@xylabs/react-invertible-theme";
-import React54, { useMemo as useMemo20 } from "react";
+import React54, { useMemo as useMemo19 } from "react";
 
 // src/settings/Theme/ThemeCssVars.ts
 import { alpha as alpha9, createTheme, darken as darken2, lighten } from "@mui/material";
@@ -4797,7 +4793,7 @@ var ThemeCssVars = createTheme({
 
 // src/settings/Theme/ThemeProvider.tsx
 var AppOsThemeProvider = /* @__PURE__ */ __name(({ children }) => {
-  const initialValue = useMemo20(() => {
+  const initialValue = useMemo19(() => {
     const validValues = [
       "light",
       "dark"