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

package/src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappStateFromRoute.tsx

@@ -2,44 +2,50 @@ import { usePromise } from '@xylabs/react-promise'
 import type { DappIntent } from '@xyo-network/os-model'
 import { DappIntentTypes } from '@xyo-network/os-model'
 import { DappIntentCaller, NameTransforms } from '@xyo-network/os-runtime'
-import { useNavigationType, useParams } from 'react-router-dom'
+import { useRef } from 'react'
+import { useParams } from 'react-router-dom'
 
 import { useDappIntentCaller, useSendDappIntent } from '../../../../../../../hooks/index.ts'
 
-/** React to changes in `dappName` route param */
-export const useManageDappStateFromRoute = (intentPayload?: DappIntent, dappName?: string) => {
+/** Launch or close the dapp based off changes to the `dappName` route param */
+export const useManageDappStateFromRoute = (intentPayload?: DappIntent) => {
   const params = useParams()
   const { dappName: dappNameParam } = params
   const sendIntent = useSendDappIntent()
-  const navigationType = useNavigationType()
   const intentCaller = useDappIntentCaller()
 
+  // refs to track the dappName param and the last intent sent
+  const dappNameParamRef = useRef<string>()
+  const intentRef = useRef<DappIntent>()
+
   // auto-close the dapp if it was launched and the route param goes undefined (i.e. back button clicked)
   usePromise(async () => {
     const launched = intentPayload?.intent === DappIntentTypes.Launch
-    if (launched && dappNameParam === undefined && sendIntent && navigationType === 'POP') {
-      const closeIntent = DappIntentCaller.buildIntent(DappIntentCaller.OsDappName, DappIntentTypes.Close, dappName)
+    const dappNameParamRemoved = !!dappNameParamRef.current && dappNameParam === undefined
+    // The last intent was Launch and the dappName param was removed
+    if (launched && dappNameParamRemoved && sendIntent) {
+      const closeIntent = DappIntentCaller.buildIntent(DappIntentCaller.OsDappName, DappIntentTypes.Close)
       await sendIntent(closeIntent)
     }
-  }, [dappName, dappNameParam, intentPayload, navigationType, sendIntent])
+
+    // sync back the dappNameParamRef for future checks
+    dappNameParamRef.current = dappNameParam
+  }, [dappNameParam, intentPayload, sendIntent])
 
   // auto-launch the dapp if the route param matches the dapp name
   usePromise(async () => {
-    if (dappNameParam && dappName && sendIntent && intentCaller) {
+    if (dappNameParam && sendIntent && intentCaller) {
       const dappNameParamDeSlugged = new NameTransforms(dappNameParam).deSlug()
+      // no intents have been sent yet and the dappName param is set so we need to auto launch the dapp
+      const autoLaunchNeeded = intentRef.current === undefined && dappNameParam
 
-      const notLaunched = intentPayload?.intent !== DappIntentTypes.Launch
-      const paramMatchesDappName = dappNameParamDeSlugged === dappName
-
-      if (notLaunched && paramMatchesDappName) {
-        const latestIntent = await intentCaller.latestIntent()
-        const existing = latestIntent && latestIntent.targetDappId === dappNameParamDeSlugged
-        if (!existing) {
-          const launchIntent = DappIntentCaller.buildIntent(DappIntentCaller.OsDappName, DappIntentTypes.Launch, dappNameParamDeSlugged)
-          await sendIntent(launchIntent)
-          return
-        }
+      if (autoLaunchNeeded) {
+        const launchIntent = DappIntentCaller.buildIntent(DappIntentCaller.OsDappName, DappIntentTypes.Launch, dappNameParamDeSlugged)
+        await sendIntent(launchIntent)
+        // sync back the intentRef to ensure the auto launch only happens once
+        intentRef.current = launchIntent
+        return
       }
     }
-  }, [dappNameParam, dappName, sendIntent, intentCaller, intentPayload?.intent])
+  }, [dappNameParam, sendIntent, intentCaller, intentPayload?.intent])
 }

package/src/modules/Dapp/modules/Window/hooks/route/index.ts

@@ -1,2 +1 @@
 export * from './helpers/index.ts'
-export * from './useManageDappBasedOffRoute.js'

package/dist/browser/modules/Dapp/modules/Window/hooks/route/useManageDappBasedOffRoute.d.ts

@@ -1,19 +0,0 @@
-import type { DappIntent, XyOsContext } from '@xyo-network/os-model';
-/**
- * Manage the dapp based off the route params and intent type
- *
- * This hook centralizes the logic for managing the dapp based off the route.
- *
- * It reacts to changes in the route params and performs the following:
- *
- * 1. Launch or close the dapp based off changes to the `dappName` route params
- * 2. Update the menu archivist based off changes in the the `path` route param
- * 3. Update the dapp archivist with injectable params based off changes in the query params
- *
- * @param intentPayload - The intent type of the dapp
- * @param dappName - The name of the dapp
- * @param dappNode - The node instance of the dapp
- * @param context - The context of the dapp
- */
-export declare const useManageDappBasedOffRoute: (intentPayload?: DappIntent, dappName?: string, context?: XyOsContext | null) => (Error | undefined)[];
-//# sourceMappingURL=useManageDappBasedOffRoute.d.ts.map

package/dist/browser/modules/Dapp/modules/Window/hooks/route/useManageDappBasedOffRoute.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useManageDappBasedOffRoute.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/Dapp/modules/Window/hooks/route/useManageDappBasedOffRoute.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AASpE;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,0BAA0B,mBAAoB,UAAU,aAAa,MAAM,YAAY,WAAW,GAAG,IAAI,0BAOrH,CAAA"}

package/src/modules/Dapp/modules/Window/hooks/route/useManageDappBasedOffRoute.tsx

@@ -1,33 +0,0 @@
-import type { DappIntent, XyOsContext } from '@xyo-network/os-model'
-
-import {
-  useManageDappInjectableParamsFromRoute,
-  useManageDappIntentRequest,
-  useManageDappPathFromRoute,
-  useManageDappStateFromRoute,
-} from './helpers/index.ts'
-
-/**
- * Manage the dapp based off the route params and intent type
- *
- * This hook centralizes the logic for managing the dapp based off the route.
- *
- * It reacts to changes in the route params and performs the following:
- *
- * 1. Launch or close the dapp based off changes to the `dappName` route params
- * 2. Update the menu archivist based off changes in the the `path` route param
- * 3. Update the dapp archivist with injectable params based off changes in the query params
- *
- * @param intentPayload - The intent type of the dapp
- * @param dappName - The name of the dapp
- * @param dappNode - The node instance of the dapp
- * @param context - The context of the dapp
- */
-export const useManageDappBasedOffRoute = (intentPayload?: DappIntent, dappName?: string, context?: XyOsContext | null) => {
-  const handleIntentError = useManageDappIntentRequest(context, dappName)
-  useManageDappStateFromRoute(intentPayload, dappName)
-  useManageDappPathFromRoute(context, dappName)
-  const injectableErrors = useManageDappInjectableParamsFromRoute(context)
-
-  return [...injectableErrors, handleIntentError]
-}