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

package/dist/browser/index.mjs

@@ -1021,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();
     }
@@ -2409,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";
@@ -3148,6 +3133,8 @@ var DappWindow = /* @__PURE__ */ __name(({ context, dappSet, dappState, dappWall
   const { active, minimized } = dappState ?? {};
   const TypedDappComponent = useMemo12(() => DappComponent, []);
   useSyncOsRegisteredAccessInterfaces(context);
+  useManageDappPathFromRoute(context, name);
+  useManageDappInjectableParamsFromRoute(context);
   const { activePath, error: menuError, menuConfig, menuItemsVisible, onPathChange } = useDappMenu(context, name);
   const resolvedErrors = [
     nodeCreateError,
@@ -3288,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: {
@@ -3307,7 +3293,7 @@ var DappsRow = /* @__PURE__ */ __name(({ chipLabel, installType, registeredDapps
     in: !!filteredRegisteredDappSets?.length,
     timeout: 1e3
   }, /* @__PURE__ */ React29.createElement(StyledGridContainer, null, filteredRegisteredDappSets?.map((dappSet) => /* @__PURE__ */ React29.createElement(DappContainerMemo, {
-    currentIntent: intentPayload,
+    currentIntent,
     key: dappSet.dapp.config.name,
     dappSet,
     xnsNodeUrl,
@@ -4931,7 +4917,6 @@ export {
   useExposedNode,
   useIntentResourceViews,
   useKernel,
-  useManageDappBasedOffRoute,
   useManageDappInjectableParamsFromRoute,
   useManageDappIntentRequest,
   useManageDappPathFromRoute,