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

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,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"}
+{"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"}

package/dist/browser/hooks/os/useDappContextCreator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDappContextCreator.d.ts","sourceRoot":"","sources":["../../../../src/hooks/os/useDappContextCreator.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAC9C,MAAM,uBAAuB,CAAA;AAS9B;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,eACpB,MAAM,GAAG,SAAS,cAClB,MAAM,GAAG,SAAS,SACvB,cAAc,kBACL,UAAU,iBACX,MAAM,EAAE,8BAEtB,iBAAiB,GAAG;IACrB,eAAe,CAAC,EAAE,KAAK,CAAA;CA2DxB,CAAA"}
+{"version":3,"file":"useDappContextCreator.d.ts","sourceRoot":"","sources":["../../../../src/hooks/os/useDappContextCreator.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAC9C,MAAM,uBAAuB,CAAA;AAS9B;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,eACpB,MAAM,GAAG,SAAS,cAClB,MAAM,GAAG,SAAS,SACvB,cAAc,kBACL,UAAU,iBACX,MAAM,EAAE,8BAEtB,iBAAiB,GAAG;IACrB,eAAe,CAAC,EAAE,KAAK,CAAA;CAgExB,CAAA"}

package/dist/browser/index.mjs

@@ -167,7 +167,7 @@ import { FlexCol as FlexCol13 } from "@xylabs/react-flexbox";
 import React33 from "react";
 
 // src/modules/Dapp/Container.tsx
-import React26, { useMemo as useMemo13 } from "react";
+import React26, { memo, useMemo as useMemo13 } from "react";
 
 // src/hooks/access-requests/useBuildDappAccessRequestResource.ts
 import { usePromise } from "@xylabs/react-promise";
@@ -639,6 +639,7 @@ var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp
     dappWallet: void 0
   });
   const [dappWindowNodeError, setDappWindowNodeError] = useState3();
+  const targetedDapp = !!(dapp && context && currentIntent?.targetDappId === dapp?.config.name);
   const windowDappNodeSetRef = useRef(windowDappNodeSet);
   useEffect7(() => {
     windowDappNodeSetRef.current = windowDappNodeSet;
@@ -646,7 +647,7 @@ var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp
     windowDappNodeSet
   ]);
   const createNode = useCallback3(async () => {
-    if (dapp && context) {
+    if (targetedDapp) {
       try {
         const windowDappNodeSet2 = await RunningDappCache.findOrCreate(dapp, context, allowedNames ?? [], xnsNodeUrl, xnsNetwork);
         setWindowDappNodeSet(windowDappNodeSet2);
@@ -656,6 +657,7 @@ var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp
     }
   }, [
     dapp,
+    currentIntent,
     context,
     allowedNames
   ]);
@@ -670,22 +672,24 @@ var useDappContextCreator = /* @__PURE__ */ __name((xnsNodeUrl, xnsNetwork, dapp
     createNode
   ]);
   useAsyncEffect2(async () => {
-    switch (currentIntent?.intent) {
-      case DappIntentTypes4.Launch: {
-        await createNode();
-        break;
-      }
-      case DappIntentTypes4.Close: {
-        if (windowDappNodeSetRef.current.context) {
-          await DappContextCreator.resetDappArchivist(windowDappNodeSetRef.current.context);
-          setWindowDappNodeSet({
-            context: null,
-            dappWallet: void 0
-          });
+    if (targetedDapp) {
+      switch (currentIntent?.intent) {
+        case DappIntentTypes4.Launch: {
+          await createNode();
+          break;
         }
-        break;
+        case DappIntentTypes4.Close: {
+          if (windowDappNodeSetRef.current.context) {
+            await DappContextCreator.resetDappArchivist(windowDappNodeSetRef.current.context);
+            setWindowDappNodeSet({
+              context: null,
+              dappWallet: void 0
+            });
+          }
+          break;
+        }
+        case DappIntentTypes4.Minimize:
       }
-      case DappIntentTypes4.Minimize:
     }
   }, [
     createNode,
@@ -1017,7 +1021,7 @@ var WidgetCaller = class extends OsCallerBase {
 var useWidgetDapps = /* @__PURE__ */ __name((registeredDapps, widgetTrayLayout) => {
   const context = useXyOsUiContext();
   return usePromise8(async () => {
-    if (registeredDapps && context && widgetTrayLayout) {
+    if (registeredDapps && registeredDapps.length > 0 && context && widgetTrayLayout) {
       const caller = new WidgetCaller(context, registeredDapps, widgetTrayLayout);
       return await caller.buildWidgetComponents();
     }
@@ -2152,14 +2156,14 @@ var DappPathHelpers = {
 
 // src/modules/Dapp/modules/Window/hooks/lib/deriveDappState.ts
 import { DappIntentTypes as DappIntentTypes7 } from "@xyo-network/os-model";
-var deriveDappState = /* @__PURE__ */ __name((intent, context) => {
+var deriveDappState = /* @__PURE__ */ __name((intent) => {
   const minimized = intent?.intent === DappIntentTypes7.Minimize;
-  const open = intent?.intent === DappIntentTypes7.Launch;
-  const active = !!(context && open);
+  const active = intent?.intent === DappIntentTypes7.Launch;
+  const closed = intent?.intent === DappIntentTypes7.Close;
   return {
     active,
-    minimized,
-    open
+    closed,
+    minimized
   };
 }, "deriveDappState");
 
@@ -2405,62 +2409,47 @@ var useManageDappPathFromRoute = /* @__PURE__ */ __name((context, dappName) => {
 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 { useNavigationType, useParams as useParams5 } from "react-router-dom";
-var useManageDappStateFromRoute = /* @__PURE__ */ __name((intentPayload, dappName) => {
+import { useRef as useRef6 } from "react";
+import { useParams as useParams5 } from "react-router-dom";
+var useManageDappStateFromRoute = /* @__PURE__ */ __name((intentPayload) => {
   const params = useParams5();
   const { dappName: dappNameParam } = params;
   const sendIntent = useSendDappIntent();
-  const navigationType = useNavigationType();
   const intentCaller = useDappIntentCaller();
+  const dappNameParamRef = useRef6();
+  const intentRef = useRef6();
   usePromise14(async () => {
     const launched = intentPayload?.intent === DappIntentTypes9.Launch;
-    if (launched && dappNameParam === void 0 && sendIntent && navigationType === "POP") {
-      const closeIntent = DappIntentCaller5.buildIntent(DappIntentCaller5.OsDappName, DappIntentTypes9.Close, dappName);
+    const dappNameParamRemoved = !!dappNameParamRef.current && dappNameParam === void 0;
+    if (launched && dappNameParamRemoved && sendIntent) {
+      const closeIntent = DappIntentCaller5.buildIntent(DappIntentCaller5.OsDappName, DappIntentTypes9.Close);
       await sendIntent(closeIntent);
     }
+    dappNameParamRef.current = dappNameParam;
   }, [
-    dappName,
     dappNameParam,
     intentPayload,
-    navigationType,
     sendIntent
   ]);
   usePromise14(async () => {
-    if (dappNameParam && dappName && sendIntent && intentCaller) {
+    if (dappNameParam && sendIntent && intentCaller) {
       const dappNameParamDeSlugged = new NameTransforms3(dappNameParam).deSlug();
-      const notLaunched = intentPayload?.intent !== DappIntentTypes9.Launch;
-      const paramMatchesDappName = dappNameParamDeSlugged === dappName;
-      if (notLaunched && paramMatchesDappName) {
-        const latestIntent = await intentCaller.latestIntent();
-        const existing = latestIntent && latestIntent.targetDappId === dappNameParamDeSlugged;
-        if (!existing) {
-          const launchIntent = DappIntentCaller5.buildIntent(DappIntentCaller5.OsDappName, DappIntentTypes9.Launch, dappNameParamDeSlugged);
-          await sendIntent(launchIntent);
-          return;
-        }
+      const autoLaunchNeeded = intentRef.current === void 0 && dappNameParam;
+      if (autoLaunchNeeded) {
+        const launchIntent = DappIntentCaller5.buildIntent(DappIntentCaller5.OsDappName, DappIntentTypes9.Launch, dappNameParamDeSlugged);
+        await sendIntent(launchIntent);
+        intentRef.current = launchIntent;
+        return;
       }
     }
   }, [
     dappNameParam,
-    dappName,
     sendIntent,
     intentCaller,
     intentPayload?.intent
   ]);
 }, "useManageDappStateFromRoute");
 
-// src/modules/Dapp/modules/Window/hooks/route/useManageDappBasedOffRoute.tsx
-var useManageDappBasedOffRoute = /* @__PURE__ */ __name((intentPayload, dappName, context) => {
-  const handleIntentError = useManageDappIntentRequest(context, dappName);
-  useManageDappStateFromRoute(intentPayload, dappName);
-  useManageDappPathFromRoute(context, dappName);
-  const injectableErrors = useManageDappInjectableParamsFromRoute(context);
-  return [
-    ...injectableErrors,
-    handleIntentError
-  ];
-}, "useManageDappBasedOffRoute");
-
 // src/modules/Dapp/modules/Window/NodeManifest.tsx
 import { usePromise as usePromise15 } from "@xylabs/react-promise";
 import { useProvidedNode } from "@xyo-network/react-node";
@@ -3139,14 +3128,20 @@ var DappMenuDrawer = /* @__PURE__ */ __name(({ activePath, context, iconSvg, nam
 }, "DappMenuDrawer");
 
 // src/modules/Dapp/modules/Window/DappWindow.tsx
-var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWallet, intent, nodeCreateError }) => {
+var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWallet, errors, nodeCreateError }) => {
   const { DappComponent, name, scrollable = true, version } = decomposeDappSet(dappSet);
-  const { active, minimized, open } = dappState ?? {};
+  const { active, minimized } = dappState ?? {};
   const TypedDappComponent = useMemo12(() => DappComponent, []);
-  const errors = useManageDappBasedOffRoute(intent, name, context);
   useSyncOsRegisteredAccessInterfaces(context);
+  useManageDappPathFromRoute(context, name);
+  useManageDappInjectableParamsFromRoute(context);
   const { activePath, error: menuError, menuConfig, menuItemsVisible, onPathChange } = useDappMenu(context, name);
-  const resolvedError = nodeCreateError || menuError;
+  const resolvedErrors = [
+    nodeCreateError,
+    menuError,
+    ...errors ?? []
+  ].filter(Boolean);
+  const hasErrors = resolvedErrors.length > 0;
   return /* @__PURE__ */ React25.createElement(React25.Fragment, null, active ? /* @__PURE__ */ React25.createElement(Helmet, null, /* @__PURE__ */ React25.createElement("title", null, activePath ? `${new NameTransforms4(activePath).deSlug()} | ` : "", " ", name, " ", "dApp")) : null, /* @__PURE__ */ React25.createElement(ErrorBoundary, null, /* @__PURE__ */ React25.createElement(DappChrome, {
     appBar: /* @__PURE__ */ React25.createElement(React25.Fragment, null, /* @__PURE__ */ React25.createElement(DappBar, {
       context,
@@ -3156,7 +3151,7 @@ var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWall
     })),
     height: "100dvh",
     width: "100dvw",
-    largeScreenMenu: /* @__PURE__ */ React25.createElement(DappMenuDrawer, {
+    largeScreenMenu: active && /* @__PURE__ */ React25.createElement(DappMenuDrawer, {
       context,
       name,
       version,
@@ -3165,7 +3160,7 @@ var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWall
       menuConfig,
       menuItems: menuItemsVisible
     }),
-    smallScreenMenu: /* @__PURE__ */ React25.createElement(DappBottomNavigation, {
+    smallScreenMenu: active && /* @__PURE__ */ React25.createElement(DappBottomNavigation, {
       activePath,
       onPathChange,
       menuConfig,
@@ -3175,20 +3170,17 @@ var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWall
       }
     }),
     /* Ensure that loading goes away when error occurs */
-    splashScreen: resolvedError ? null : /* @__PURE__ */ React25.createElement(DappLoadingFlexbox, {
+    splashScreen: hasErrors ? null : /* @__PURE__ */ React25.createElement(DappLoadingFlexbox, {
       minimize: !!minimized,
       name,
-      open: !!open
+      open: !!active
     })
-  }, resolvedError || errors?.length > 0 ? /* @__PURE__ */ React25.createElement(FlexCol10, {
+  }, hasErrors ? /* @__PURE__ */ React25.createElement(FlexCol10, {
     padding: 2
-  }, resolvedError ? /* @__PURE__ */ React25.createElement(ErrorRender3, {
-    error: resolvedError,
-    scope: "DappWindow"
-  }) : null, errors.map((error, index) => /* @__PURE__ */ React25.createElement(ErrorRender3, {
-    key: index,
+  }, resolvedErrors?.map((error) => /* @__PURE__ */ React25.createElement(ErrorRender3, {
+    key: error?.message,
     error,
-    scope: "DappWindowErrors"
+    scope: "DappWindow"
   }))) : null, /* @__PURE__ */ React25.createElement(WalletProvider, {
     rootWallet: dappWallet
   }, context === null ? null : /* @__PURE__ */ React25.createElement(XyOsUiContextProvider, {
@@ -3219,11 +3211,10 @@ var DappContainer = /* @__PURE__ */ __name(({ currentIntent, dappSet, xnsNodeUrl
   const { dappWallet, context, nodeCreateError } = useDappContextCreator(xnsNodeUrl, xnsNetwork, dapp, currentIntent);
   const dappState = useMemo13(() => {
     if (currentIntent?.targetDappId === dapp.config.name) {
-      return deriveDappState(currentIntent, context);
+      return deriveDappState(currentIntent);
     }
   }, [
     currentIntent,
-    context,
     dapp
   ]);
   return /* @__PURE__ */ React26.createElement(DappIconButton, {
@@ -3240,6 +3231,7 @@ var DappContainer = /* @__PURE__ */ __name(({ currentIntent, dappSet, xnsNodeUrl
     nodeCreateError
   }));
 }, "DappContainer");
+var DappContainerMemo = /* @__PURE__ */ memo(DappContainer);
 
 // src/modules/Dapp/ContainerFlexbox.tsx
 import { Container as Container2 } from "@mui/material";
@@ -3283,12 +3275,11 @@ var DividerChip = /* @__PURE__ */ __name(({ registeredDapps, ...props }) => {
 }, "DividerChip");
 
 // src/modules/Dapp/Page/Row.tsx
-var DappsRow = /* @__PURE__ */ __name(({ chipLabel, installType, registeredDappsSet, xnsNetwork, xnsNodeUrl }) => {
+var DappsRow = /* @__PURE__ */ __name(({ chipLabel, currentIntent, installType, registeredDappsSet, xnsNetwork, xnsNodeUrl }) => {
   const filteredRegisteredDappSets = useMemo14(() => DappInstallTypeFilters[installType](registeredDappsSet), [
     installType,
     registeredDappsSet
   ]);
-  const { intentPayload } = useDappIntentListener(null);
   return /* @__PURE__ */ React29.createElement(React29.Fragment, null, /* @__PURE__ */ React29.createElement(Divider4, {
     variant: "middle",
     sx: {
@@ -3301,9 +3292,9 @@ var DappsRow = /* @__PURE__ */ __name(({ chipLabel, installType, registeredDapps
   })), filteredRegisteredDappSets?.length ? /* @__PURE__ */ React29.createElement(Fade2, {
     in: !!filteredRegisteredDappSets?.length,
     timeout: 1e3
-  }, /* @__PURE__ */ React29.createElement(StyledGridContainer, null, filteredRegisteredDappSets?.map((dappSet, index) => /* @__PURE__ */ React29.createElement(DappContainer, {
-    currentIntent: intentPayload,
-    key: index,
+  }, /* @__PURE__ */ React29.createElement(StyledGridContainer, null, filteredRegisteredDappSets?.map((dappSet) => /* @__PURE__ */ React29.createElement(DappContainerMemo, {
+    currentIntent,
+    key: dappSet.dapp.config.name,
     dappSet,
     xnsNodeUrl,
     xnsNetwork
@@ -4013,7 +4004,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 from "react";
+import React42, { useMemo as useMemo18 } from "react";
 var DappPathSwitcher = /* @__PURE__ */ __name(({ activePath, pathToComponent }) => {
   const transitions = useTransition(activePath, {
     enter: {
@@ -4031,7 +4022,18 @@ 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, {
+  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, {
     style: {
       ...transitionProps,
       alignItems: "stretch",
@@ -4047,14 +4049,7 @@ var DappPathSwitcher = /* @__PURE__ */ __name(({ activePath, pathToComponent })
       top: 0,
       zIndex
     }
-  }, (() => {
-    const activeIndex = pathToComponent?.findIndex(({ path: componentPath }) => activePath2 === 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}`),
-      scope: "DappPathSwitcher"
-    });
-  })())));
+  }, activeComponent)));
 }, "DappPathSwitcher");
 
 // src/dapps/shared/accounts/components/AnimatedComponents/GenericAnimations/ShiftAnimation.tsx
@@ -4424,10 +4419,10 @@ import React52 from "react";
 
 // src/dapps/shared/table/head/hooks/useVisibleColumns.tsx
 import { useMediaQuery as useMediaQuery2 } from "@mui/material";
-import { useMemo as useMemo18 } from "react";
+import { useMemo as useMemo19 } from "react";
 var useVisibleColumns = /* @__PURE__ */ __name((tableHeadCells) => {
   const isMedium = useMediaQuery2((theme) => theme.breakpoints.down("lg"));
-  const VisibleTableCells = useMemo18(() => {
+  const VisibleTableCells = useMemo19(() => {
     return isMedium ? tableHeadCells.filter((cell) => cell.showOnMobile) : tableHeadCells;
   }, [
     isMedium,
@@ -4506,7 +4501,7 @@ var NextIteratorFlexbox = /* @__PURE__ */ __name(({ next: changePage, loading, .
 
 // src/settings/Theme/ThemeProvider.tsx
 import { InvertibleMuiThemeProvider } from "@xylabs/react-invertible-theme";
-import React54, { useMemo as useMemo19 } from "react";
+import React54, { useMemo as useMemo20 } from "react";
 
 // src/settings/Theme/ThemeCssVars.ts
 import { alpha as alpha9, createTheme, darken as darken2, lighten } from "@mui/material";
@@ -4801,7 +4796,7 @@ var ThemeCssVars = createTheme({
 
 // src/settings/Theme/ThemeProvider.tsx
 var AppOsThemeProvider = /* @__PURE__ */ __name(({ children }) => {
-  const initialValue = useMemo19(() => {
+  const initialValue = useMemo20(() => {
     const validValues = [
       "light",
       "dark"
@@ -4844,6 +4839,7 @@ export {
   DappChrome,
   DappChromeLarge,
   DappContainer,
+  DappContainerMemo,
   DappInstallTypeFilters,
   DappIntentResourceHooks,
   DappMenuDrawer,
@@ -4916,6 +4912,7 @@ export {
   useDappIntentListener2,
   useDappMenu,
   useDappMenuCaller,
+  useDappMenuDependencies,
   useDappRegistrationResults,
   useDappRegistry,
   useDappSeedPhraseRepository,
@@ -4924,7 +4921,6 @@ export {
   useExposedNode,
   useIntentResourceViews,
   useKernel,
-  useManageDappBasedOffRoute,
   useManageDappInjectableParamsFromRoute,
   useManageDappIntentRequest,
   useManageDappPathFromRoute,