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

package/dist/browser/modules/Dapp/Page/Row.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Row.d.ts","sourceRoot":"","sources":["../../../../../src/modules/Dapp/Page/Row.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAkB,MAAM,OAAO,CAAA;AAOtC,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,gBAAgB,CAAA;IAC7B,kBAAkB,CAAC,EAAE,sBAAsB,EAAE,CAAA;IAC7C,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAuC5C,CAAA;AAED,eAAO,MAAM,mBAAmB,ySAQ7B,CAAA"}
+{"version":3,"file":"Row.d.ts","sourceRoot":"","sources":["../../../../../src/modules/Dapp/Page/Row.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAkB,MAAM,OAAO,CAAA;AAOtC,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,gBAAgB,CAAA;IAC7B,kBAAkB,CAAC,EAAE,sBAAsB,EAAE,CAAA;IAC7C,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAuC5C,CAAA;AAED,eAAO,MAAM,mBAAmB,ySAQ7B,CAAA"}

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

@@ -8,6 +8,7 @@ export interface DappWindowProps {
     dappSet?: RegisteredReactDappSet;
     dappState?: DappState;
     dappWallet?: WalletInstance;
+    errors?: Error[];
     intent?: DappIntent;
     nodeCreateError?: Error;
 }

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":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAIzE,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,WAAW,GAAG,IAAI,CAAA;IAC5B,OAAO,CAAC,EAAE,sBAAsB,CAAA;IAChC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,eAAe,CAAC,EAAE,KAAK,CAAA;CACxB;AAED,gIAAgI;AAChI,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAwHhD,CAAA"}
+{"version":3,"file":"DappWindow.d.ts","sourceRoot":"","sources":["../../../../../../src/modules/Dapp/modules/Window/DappWindow.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAIzE,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,WAAW,GAAG,IAAI,CAAA;IAC5B,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,CAkHhD,CAAA"}

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

@@ -1,6 +1,7 @@
 export * from './lib/index.ts';
 export * from './menu/index.ts';
 export * from './route/index.ts';
+export * from './useDappMenuResourceValues.tsx';
 export * from './useDecomposeDappSet.js';
 export * from './useSkipLoadingScreen.js';
 export * from './useSyncOsRegisteredAccessInterfaces.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/Dapp/modules/Window/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0CAA0C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/modules/Dapp/modules/Window/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0CAA0C,CAAA"}

package/dist/browser/modules/Dapp/modules/Window/hooks/lib/deriveDappState.d.ts

@@ -1,8 +1,8 @@
-import type { DappIntent, XyOsContext } from '@xyo-network/os-model';
+import type { DappIntent } from '@xyo-network/os-model';
 export interface DappState {
     active: boolean;
+    closed: boolean;
     minimized: boolean;
-    open: boolean;
 }
-export declare const deriveDappState: (intent?: DappIntent, context?: XyOsContext | null) => DappState;
+export declare const deriveDappState: (intent?: DappIntent) => DappState;
 //# sourceMappingURL=deriveDappState.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deriveDappState.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/Dapp/modules/Window/hooks/lib/deriveDappState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGpE,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,OAAO,CAAA;CACd;AAED,eAAO,MAAM,eAAe,YAAa,UAAU,YAAY,WAAW,GAAG,IAAI,KAAG,SAUnF,CAAA"}
+{"version":3,"file":"deriveDappState.d.ts","sourceRoot":"","sources":["../../../../../../../../src/modules/Dapp/modules/Window/hooks/lib/deriveDappState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGvD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,EAAE,OAAO,CAAA;CACnB;AAED,eAAO,MAAM,eAAe,YAAa,UAAU,KAAG,SAUrD,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/os-react-runtime",
-  "version": "4.2.0-rc.2",
+  "version": "4.2.0-rc.4",
   "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.2",
-    "@xyo-network/bios-model": "^4.2.0-rc.2",
+    "@xyo-network/bios-browser": "^4.2.0-rc.4",
+    "@xyo-network/bios-model": "^4.2.0-rc.4",
     "@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.2",
-    "@xyo-network/kernel-model": "^4.2.0-rc.2",
+    "@xyo-network/kernel": "^4.2.0-rc.4",
+    "@xyo-network/kernel-model": "^4.2.0-rc.4",
     "@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.2",
-    "@xyo-network/os-react-debug": "^4.2.0-rc.2",
-    "@xyo-network/os-react-model": "^4.2.0-rc.2",
-    "@xyo-network/os-runtime": "^4.2.0-rc.2",
+    "@xyo-network/os-model": "^4.2.0-rc.4",
+    "@xyo-network/os-react-debug": "^4.2.0-rc.4",
+    "@xyo-network/os-react-model": "^4.2.0-rc.4",
+    "@xyo-network/os-runtime": "^4.2.0-rc.4",
     "@xyo-network/payload-model": "^3.6.6",
     "@xyo-network/react-archivist": "^4.3.1",
     "@xyo-network/react-card": "^4.3.1",

package/src/modules/Dapp/Container.tsx

@@ -24,9 +24,9 @@ export const DappContainer: React.FC<DappContainerProps> = ({
 
   const dappState = useMemo(() => {
     if (currentIntent?.targetDappId === dapp.config.name) {
-      return deriveDappState(currentIntent, context)
+      return deriveDappState(currentIntent)
     }
-  }, [currentIntent, context, dapp])
+  }, [currentIntent, dapp])
 
   return (
     <DappIconButton

package/src/modules/Dapp/Page/Row.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable @eslint-react/no-array-index-key */
 import {
   Divider, Fade, styled,
 } from '@mui/material'
@@ -42,10 +41,10 @@ export const DappsRow: React.FC<DappsRowProps> = ({
             <Fade in={!!filteredRegisteredDappSets?.length} timeout={1000}>
               <StyledGridContainer>
                 {filteredRegisteredDappSets?.map(
-                  (dappSet, index) => (
+                  dappSet => (
                     <DappContainerMemo
                       currentIntent={intentPayload}
-                      key={index}
+                      key={dappSet.dapp.config.name}
                       dappSet={dappSet as RegisteredReactDappSet}
                       xnsNodeUrl={xnsNodeUrl}
                       xnsNetwork={xnsNetwork}

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

@@ -16,7 +16,7 @@ import { DappBar } from './AppBar.js'
 import { DappChrome } from './Chrome.js'
 import type { DappState } from './hooks/index.ts'
 import {
-  decomposeDappSet, useDappMenu, useManageDappBasedOffRoute, useSyncOsRegisteredAccessInterfaces,
+  decomposeDappSet, useDappMenu, useSyncOsRegisteredAccessInterfaces,
 } from './hooks/index.ts'
 import { DappLoadingFlexbox } from './LoadingFlexbox.js'
 import { DappBottomNavigation, DappMenuDrawer } from './menu/index.ts'
@@ -26,35 +26,33 @@ export interface DappWindowProps {
   dappSet?: RegisteredReactDappSet
   dappState?: DappState
   dappWallet?: WalletInstance
+  errors?: Error[]
   intent?: DappIntent
   nodeCreateError?: Error
 }
 
 /** A component that can load immediately, but delays node loading and dapp mounting till corresponding launch intent arrives */
 export const DappWindow: React.FC<DappWindowProps> = ({
-  context, dappSet, dappState, dappWallet, intent, nodeCreateError,
+  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 = useMemo(() => DappComponent as React.FC<{
     name?: string
   }>, [])
 
-  // TODO - see if we can move this outside of the DappWindow component
-  const errors = useManageDappBasedOffRoute(intent, name, context)
   useSyncOsRegisteredAccessInterfaces(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 (
     <>
@@ -102,16 +100,13 @@ export const DappWindow: React.FC<DappWindowProps> = ({
             />
           )}
           /* Ensure that loading goes away when error occurs */
-          splashScreen={resolvedError ? null : <DappLoadingFlexbox minimize={!!minimized} name={name} open={!!open} />}
+          splashScreen={hasErrors ? null : <DappLoadingFlexbox minimize={!!minimized} name={name} open={!!active} />}
         >
-          {resolvedError || errors?.length > 0
+          {hasErrors
             ? (
                 <FlexCol padding={2}>
-                  {resolvedError
-                    ? <ErrorRender error={resolvedError} scope="DappWindow" />
-                    : null}
-                  {errors.map((error, index) => (
-                    <ErrorRender key={index} error={error} scope="DappWindowErrors" />
+                  {resolvedErrors?.map((error, index) => (
+                    <ErrorRender key={index} error={error} scope="DappWindow" />
                   ))}
                 </FlexCol>
               )

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

@@ -1,6 +1,7 @@
 export * from './lib/index.ts'
 export * from './menu/index.ts'
 export * from './route/index.ts'
+export * from './useDappMenuResourceValues.tsx'
 export * from './useDecomposeDappSet.js'
 export * from './useSkipLoadingScreen.js'
 export * from './useSyncOsRegisteredAccessInterfaces.js'

package/src/modules/Dapp/modules/Window/hooks/lib/deriveDappState.ts

@@ -1,20 +1,20 @@
-import type { DappIntent, XyOsContext } from '@xyo-network/os-model'
+import type { DappIntent } from '@xyo-network/os-model'
 import { DappIntentTypes } from '@xyo-network/os-model'
 
 export interface DappState {
   active: boolean
+  closed: boolean
   minimized: boolean
-  open: boolean
 }
 
-export const deriveDappState = (intent?: DappIntent, context?: XyOsContext | null): DappState => {
+export const deriveDappState = (intent?: DappIntent): DappState => {
   const minimized = intent?.intent === DappIntentTypes.Minimize
-  const open = intent?.intent === DappIntentTypes.Launch
-  const active = !!(context && open)
+  const active = intent?.intent === DappIntentTypes.Launch
+  const closed = intent?.intent === DappIntentTypes.Close
 
   return {
     active,
+    closed,
     minimized,
-    open,
   }
 }

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

@@ -6,7 +6,7 @@ import {
 import { useNavigate, useParams } from 'react-router-dom'
 
 import { DappPathHelpers } from '../lib/index.ts'
-import { useDappMenuDependencies } from '../useDappMenuResourceValues.js'
+import { useDappMenuDependencies } from '../useDappMenuResourceValues.tsx'
 
 /**
  * Use the passed in dapp Node to resolve menu related modules and return the menu related items