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

package/src/modules/Dapp/modules/Window/hooks/menu/useDappMenu.tsx

@@ -5,6 +5,7 @@ import {
 } from 'react'
 import { useNavigate, useParams } from 'react-router-dom'
 
+import type { DappMenuProperties } from '../../types/index.ts'
 import { DappPathHelpers } from '../lib/index.ts'
 import { useDappMenuDependencies } from '../useDappMenuResourceValues.tsx'
 
@@ -12,7 +13,7 @@ import { useDappMenuDependencies } from '../useDappMenuResourceValues.tsx'
  * Use the passed in dapp Node to resolve menu related modules and return the menu related items
  */
 
-export const useDappMenu = (context?: XyOsContext | null, dappName?: DappName) => {
+export const useDappMenu = (context?: XyOsContext | null, dappName?: DappName): DappMenuProperties => {
   const [error, setError] = useState<Error>()
   const params = useParams()
   const navigate = useNavigate()
@@ -65,7 +66,7 @@ export const useDappMenu = (context?: XyOsContext | null, dappName?: DappName) =
     activePath,
     error,
     menuConfig: menuConfigs?.[0],
-    menuItemsVisible,
+    menuItems: menuItemsVisible,
     onPathChange,
   }
 }

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

@@ -5,23 +5,20 @@ import { asArchivistInstance } from '@xyo-network/archivist-model'
 import type { XyOsContext } from '@xyo-network/os-model'
 import { isDappInjectableParams } from '@xyo-network/os-model'
 import { DappCaller } from '@xyo-network/os-runtime'
-import {
-  useNavigate, useParams, useSearchParams,
-} from 'react-router-dom'
+import { useNavigate, useSearchParams } from 'react-router-dom'
 
 /** Update the dapp archivist with injectable params based off changes in the query params */
 export const useManageDappInjectableParamsFromRoute = (context?: XyOsContext | null) => {
   const [queryParams] = useSearchParams()
-  const params = useParams()
   const navigate = useNavigate()
 
   const [, callerError] = usePromise(async () => {
-    if (context && (params || queryParams)) {
+    if (context && queryParams) {
       const dappCaller = new DappCaller(context)
       const pathname = globalThis.location.pathname
       await dappCaller.setDappInjectableRouteParams(queryParams, pathname)
     }
-  }, [context, queryParams, params])
+  }, [context, queryParams])
 
   // Update the route if the dapp inserts a new injectable params payload and the path is different
   const [, listenerError] = usePromise(async () => {

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

@@ -65,10 +65,12 @@ export const useManageDappPathFromRoute = (context?: XyOsContext | null, dappNam
   }, [dappName, context, defaultPath, menuSelection])
 
   // Sync the menu archivist when the route changes (no menuSelection dependency)
-  usePromise(async () => {
+  const [, updateErrors] = usePromise(async () => {
     if (context && pathParam !== currentPathRef.current) {
       await updateMenuArchivist(pathParam)
       currentPathRef.current = pathParam
     }
   }, [context, pathParam, updateMenuArchivist])
+
+  return updateErrors
 }

package/src/modules/Dapp/modules/Window/hooks/useDecomposeDapp.tsx

@@ -0,0 +1,21 @@
+import type { RegisteredReactDapp } from '@xyo-network/os-react-model'
+import { useMemo } from 'react'
+
+import { NodeManifest } from '../NodeManifest.tsx'
+
+export const useDecomposeDapp = (dapp?: RegisteredReactDapp) => {
+  const DappComponent = useMemo(() => dapp?.params.modes?.window?.component ?? NodeManifest, []) as React.FC<{
+    name?: string
+  }>
+  const name = dapp?.config.name
+  const version = dapp?.config.version
+  const scrollable = dapp?.params.modes?.window?.scrollable ?? true
+
+  return {
+    DappComponent,
+    dapp,
+    name,
+    scrollable,
+    version,
+  }
+}

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

@@ -1,6 +1,8 @@
 export * from './AppBar.tsx'
 export * from './Chrome.tsx'
 export * from './components/index.ts'
-export * from './DappWindow.js'
+export * from './DappWindow.tsx'
 export * from './hooks/index.ts'
 export * from './menu/index.ts'
+export * from './Rendered.tsx'
+export * from './types/index.ts'

package/src/modules/Dapp/modules/Window/types/DappMenuProperties.ts

@@ -0,0 +1,9 @@
+import type { DappNavItem, DappNavMenuConfig } from '@xyo-network/os-model'
+
+export interface DappMenuProperties {
+  activePath?: string
+  error?: Error
+  menuConfig?: DappNavMenuConfig
+  menuItems?: DappNavItem[]
+  onPathChange: (path: string) => void
+}

package/src/modules/Dapp/modules/Window/types/DappWindowProps.ts

@@ -0,0 +1,14 @@
+import type { RegisteredReactDapp, XyOsUiContext } from '@xyo-network/os-react-model'
+import type { WalletInstance } from '@xyo-network/wallet-model'
+
+import type { DappState } from '../hooks/index.ts'
+import type { DappMenuProperties } from './DappMenuProperties.ts'
+
+export interface DappWindowProps {
+  context?: XyOsUiContext | null
+  dapp?: RegisteredReactDapp
+  dappMenuProperties?: DappMenuProperties
+  dappState?: DappState
+  dappWallet?: WalletInstance
+  errors?: (Error | undefined)[]
+}

package/src/modules/Dapp/modules/Window/types/index.ts

@@ -0,0 +1,2 @@
+export * from './DappMenuProperties.ts'
+export * from './DappWindowProps.ts'

package/dist/browser/modules/Dapp/modules/Window/hooks/useDecomposeDappSet.d.ts

@@ -1,9 +0,0 @@
-import type { RegisteredReactDappSet } from '@xyo-network/os-react-model';
-export declare const decomposeDappSet: (dappSet?: RegisteredReactDappSet) => {
-    DappComponent: import("react").FC<{}> | (() => import("react/jsx-runtime").JSX.Element);
-    dapp: import("@xyo-network/os-react-model").RegisteredReactDapp | undefined;
-    name: string | undefined;
-    scrollable: boolean;
-    version: string | undefined;
-};
-//# sourceMappingURL=useDecomposeDappSet.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"useDecomposeDappSet.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/Dapp/modules/Window/hooks/useDecomposeDappSet.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAIzE,eAAO,MAAM,gBAAgB,aAAc,sBAAsB;;;;;;CAchE,CAAA"}

package/src/modules/Dapp/modules/Window/hooks/useDecomposeDappSet.tsx

@@ -1,19 +0,0 @@
-import type { RegisteredReactDappSet } from '@xyo-network/os-react-model'
-
-import { NodeManifest } from '../NodeManifest.js'
-
-export const decomposeDappSet = (dappSet?: RegisteredReactDappSet) => {
-  const { dapp } = dappSet ?? {}
-  const DappComponent = dapp?.params.modes?.window?.component ?? NodeManifest
-  const name = dapp?.config.name
-  const version = dapp?.config.version
-  const scrollable = dapp?.params.modes?.window?.scrollable ?? true
-
-  return {
-    DappComponent,
-    dapp,
-    name,
-    scrollable,
-    version,
-  }
-}