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

package/dist/browser/modules/Dapp/Container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../../src/modules/Dapp/Container.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAwB,MAAM,OAAO,CAAA;AAQ5C,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,UAAU,CAAA;IAC1B,OAAO,EAAE,sBAAsB,CAAA;IAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAkCtD,CAAA;AAED,eAAO,MAAM,iBAAiB,gDAAsB,CAAA"}
+{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../../../src/modules/Dapp/Container.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAwB,MAAM,OAAO,CAAA;AAM5C,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,UAAU,CAAA;IAC1B,OAAO,EAAE,sBAAsB,CAAA;IAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAgCtD,CAAA;AAED,eAAO,MAAM,iBAAiB,gDAAsB,CAAA"}

package/dist/browser/modules/Dapp/modules/Window/DappWindow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DappWindow.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/Dapp/modules/Window/DappWindow.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAIxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAkB,MAAM,OAAO,CAAA;AAOtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAOjD,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,CAAA;IAC9B,OAAO,CAAC,EAAE,sBAAsB,CAAA;IAChC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,eAAe,CAAC,EAAE,KAAK,CAAA;CACxB;AAED,gIAAgI;AAChI,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAmHhD,CAAA"}
+{"version":3,"file":"DappWindow.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/Dapp/modules/Window/DappWindow.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAIxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAkB,MAAM,OAAO,CAAA;AAOtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAOjD,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,CAAA;IAC9B,OAAO,CAAC,EAAE,sBAAsB,CAAA;IAChC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,eAAe,CAAC,EAAE,KAAK,CAAA;CACxB;AAED,gIAAgI;AAChI,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAoHhD,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"useManageDappInjectableParamsFromRoute.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappInjectableParamsFromRoute.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAOxD,6FAA6F;AAC7F,eAAO,MAAM,sCAAsC,aAAc,WAAW,GAAG,IAAI,0BA8ClF,CAAA"}
+{"version":3,"file":"useManageDappInjectableParamsFromRoute.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappInjectableParamsFromRoute.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAKxD,6FAA6F;AAC7F,eAAO,MAAM,sCAAsC,aAAc,WAAW,GAAG,IAAI,0BA6ClF,CAAA"}

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

@@ -11,5 +11,5 @@ import type { XyOsContext } from '@xyo-network/os-model';
  * 5. Navigating directly to a path from within the dApp by clicking back
  */
 /** React to changes in the `path` route param */
-export declare const useManageDappPathFromRoute: (context?: XyOsContext | null, dappName?: string) => void;
+export declare const useManageDappPathFromRoute: (context?: XyOsContext | null, dappName?: string) => Error | undefined;
 //# sourceMappingURL=useManageDappPathFromRoute.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useManageDappPathFromRoute.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappPathFromRoute.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAUxD;;;;;;;;;;GAUG;AAEH,iDAAiD;AACjD,eAAO,MAAM,0BAA0B,aAAc,WAAW,GAAG,IAAI,aAAa,MAAM,SAiDzF,CAAA"}
+{"version":3,"file":"useManageDappPathFromRoute.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/modules/Dapp/modules/Window/hooks/route/helpers/useManageDappPathFromRoute.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAUxD;;;;;;;;;;GAUG;AAEH,iDAAiD;AACjD,eAAO,MAAM,0BAA0B,aAAc,WAAW,GAAG,IAAI,aAAa,MAAM,sBAmDzF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/os-react-runtime",
-  "version": "4.2.0-rc.11",
+  "version": "4.2.0-rc.13",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -48,23 +48,23 @@
     "@xylabs/react-shared": "^5.3.14",
     "@xyo-network/archivist-indexeddb": "^3.6.6",
     "@xyo-network/archivist-model": "^3.6.6",
-    "@xyo-network/bios-browser": "^4.2.0-rc.11",
-    "@xyo-network/bios-model": "^4.2.0-rc.11",
+    "@xyo-network/bios-browser": "^4.2.0-rc.13",
+    "@xyo-network/bios-model": "^4.2.0-rc.13",
     "@xyo-network/diviner-boundwitness-indexeddb": "^3.6.6",
     "@xyo-network/diviner-model": "^3.6.6",
     "@xyo-network/diviner-payload-generic": "^3.6.6",
     "@xyo-network/diviner-payload-indexeddb": "^3.6.6",
     "@xyo-network/diviner-payload-model": "^3.6.6",
-    "@xyo-network/kernel": "^4.2.0-rc.11",
-    "@xyo-network/kernel-model": "^4.2.0-rc.11",
+    "@xyo-network/kernel": "^4.2.0-rc.13",
+    "@xyo-network/kernel-model": "^4.2.0-rc.13",
     "@xyo-network/module-event-emitter": "^3.6.6",
     "@xyo-network/module-events": "^3.6.6",
     "@xyo-network/module-factory-locator": "^3.6.6",
     "@xyo-network/node-model": "^3.6.6",
-    "@xyo-network/os-model": "^4.2.0-rc.11",
-    "@xyo-network/os-react-debug": "^4.2.0-rc.11",
-    "@xyo-network/os-react-model": "^4.2.0-rc.11",
-    "@xyo-network/os-runtime": "^4.2.0-rc.11",
+    "@xyo-network/os-model": "^4.2.0-rc.13",
+    "@xyo-network/os-react-debug": "^4.2.0-rc.13",
+    "@xyo-network/os-react-model": "^4.2.0-rc.13",
+    "@xyo-network/os-runtime": "^4.2.0-rc.13",
     "@xyo-network/payload-model": "^3.6.6",
     "@xyo-network/react-archivist": "^4.3.1",
     "@xyo-network/react-card": "^4.3.1",

package/src/DappPathSwitcher.tsx

@@ -1,7 +1,7 @@
 import { animated, useTransition } from '@react-spring/web'
 import { ErrorRender } from '@xylabs/react-error'
 import type { ReactNode } from 'react'
-import React, { useMemo } from 'react'
+import React from 'react'
 
 export interface PathToComponent<PathNames extends string = string> {
   component: ReactNode
@@ -23,17 +23,9 @@ export const DappPathSwitcher: React.FC<DappPathSwitcherProps> = ({ activePath,
   const possibleZIndex = pathToComponent?.findIndex(item => item.path === activePath)
   const zIndex = possibleZIndex !== -1 && possibleZIndex !== undefined ? possibleZIndex : 1
 
-  const activeComponent = useMemo(() => {
-    const activeIndex = pathToComponent?.findIndex(({ path: componentPath }) => activePath === componentPath)
-    const activeItem = pathToComponent && activeIndex !== -1 && activeIndex !== undefined ? pathToComponent[activeIndex] : undefined
-    return activeItem
-      ? activeItem.component
-      : <ErrorRender error={new Error(`No component found for path: ${activePath}`)} scope="DappPathSwitcher" />
-  }, [activePath, pathToComponent])
-
   return (
     <>
-      {transitions(transitionProps => (
+      {transitions((transitionProps, activePathRef) => (
         <animated.div
           style={{
             ...transitionProps,
@@ -51,7 +43,13 @@ export const DappPathSwitcher: React.FC<DappPathSwitcherProps> = ({ activePath,
             zIndex,
           }}
         >
-          {activeComponent}
+          {(() => {
+            const activeIndex = pathToComponent?.findIndex(({ path: componentPath }) => activePathRef === componentPath)
+            const activeItem = pathToComponent && activeIndex !== -1 && activeIndex !== undefined ? pathToComponent[activeIndex] : undefined
+            return activeItem
+              ? activeItem.component
+              : <ErrorRender error={new Error(`No component found for path: ${activePathRef}`)} scope="DappPathSwitcher" />
+          })()}
         </animated.div>
       ))}
     </>

package/src/modules/Dapp/Container.tsx

@@ -4,9 +4,7 @@ import React, { memo, useMemo } from 'react'
 
 import { useDappContextCreator } from '../../hooks/index.ts'
 import { DappIconButton } from './Button/index.ts'
-import {
-  DappWindow, deriveDappState, useManageDappPathFromRoute,
-} from './modules/index.ts'
+import { DappWindow, deriveDappState } from './modules/index.ts'
 
 export interface DappContainerProps {
   currentIntent?: DappIntent
@@ -24,8 +22,6 @@ export const DappContainer: React.FC<DappContainerProps> = ({
     dappWallet, context, nodeCreateError,
   } = useDappContextCreator(xnsNodeUrl, xnsNetwork, dapp, currentIntent)
 
-  useManageDappPathFromRoute(context, dapp.config.name)
-
   const dappState = useMemo(() => {
     if (currentIntent?.targetDappId === dapp.config.name) {
       return deriveDappState(currentIntent)

package/src/modules/Dapp/modules/Window/DappWindow.tsx

@@ -15,7 +15,7 @@ import { DappBar } from './AppBar.js'
 import { DappChrome } from './Chrome.js'
 import type { DappState } from './hooks/index.ts'
 import {
-  decomposeDappSet, useDappMenu, useManageDappInjectableParamsFromRoute, useSyncOsRegisteredAccessInterfaces,
+  decomposeDappSet, useDappMenu, useManageDappInjectableParamsFromRoute, useManageDappPathFromRoute, useSyncOsRegisteredAccessInterfaces,
 } from './hooks/index.ts'
 import { DappLoadingFlexbox } from './LoadingFlexbox.js'
 import { DappBottomNavigation, DappMenuDrawer } from './menu/index.ts'
@@ -45,13 +45,14 @@ export const DappWindow: React.FC<DappWindowProps> = ({
   }>, [])
 
   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, nodeCreateError, menuError, ...(errors ?? [])].filter(Boolean)
+  const resolvedErrors = [...injectableErrors, routingError, nodeCreateError, menuError, ...(errors ?? [])].filter(Boolean)
   const hasErrors = resolvedErrors.length > 0
 
   return (

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
 }