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

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

@@ -8,4 +8,5 @@ export interface DappContainerProps {
     xnsNodeUrl: string | undefined;
 }
 export declare const DappContainer: React.FC<DappContainerProps>;
+export declare const DappContainerMemo: React.NamedExoticComponent<DappContainerProps>;
 //# sourceMappingURL=Container.d.ts.map

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,KAAkB,MAAM,OAAO,CAAA;AAMtC,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"}
+{"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/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.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,UAAU,CAAA;IACnB,eAAe,CAAC,EAAE,KAAK,CAAA;CACxB;AAED,gIAAgI;AAChI,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAsHhD,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.1",
+  "version": "4.2.0-rc.3",
   "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.1",
-    "@xyo-network/bios-model": "^4.2.0-rc.1",
+    "@xyo-network/bios-browser": "^4.2.0-rc.3",
+    "@xyo-network/bios-model": "^4.2.0-rc.3",
     "@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.1",
-    "@xyo-network/kernel-model": "^4.2.0-rc.1",
+    "@xyo-network/kernel": "^4.2.0-rc.3",
+    "@xyo-network/kernel-model": "^4.2.0-rc.3",
     "@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.1",
-    "@xyo-network/os-react-debug": "^4.2.0-rc.1",
-    "@xyo-network/os-react-model": "^4.2.0-rc.1",
-    "@xyo-network/os-runtime": "^4.2.0-rc.1",
+    "@xyo-network/os-model": "^4.2.0-rc.3",
+    "@xyo-network/os-react-debug": "^4.2.0-rc.3",
+    "@xyo-network/os-react-model": "^4.2.0-rc.3",
+    "@xyo-network/os-runtime": "^4.2.0-rc.3",
     "@xyo-network/payload-model": "^3.6.6",
     "@xyo-network/react-archivist": "^4.3.1",
     "@xyo-network/react-card": "^4.3.1",

package/src/hooks/os/useDappContextCreator.tsx

@@ -28,6 +28,8 @@ export const useDappContextCreator = (
   const context = useXyOsUiContext()
   const [windowDappNodeSet, setWindowDappNodeSet] = useState<WindowDappNodeSet>({ context: undefined, dappWallet: undefined })
   const [dappWindowNodeError, setDappWindowNodeError] = useState<Error>()
+  // ensure the dapp is targeted by the current intent
+  const targetedDapp = !!(dapp && context && currentIntent?.targetDappId === dapp?.config.name)
 
   // Keep a ref of the windowDappNodeSet to use in effect hooks without needing it as a dependency
   const windowDappNodeSetRef = useRef<WindowDappNodeSet>(windowDappNodeSet)
@@ -36,7 +38,7 @@ export const useDappContextCreator = (
   }, [windowDappNodeSet])
 
   const createNode = useCallback(async () => {
-    if (dapp && context) {
+    if (targetedDapp) {
       try {
         const windowDappNodeSet = await RunningDappCache.findOrCreate(dapp, context, allowedNames ?? [], xnsNodeUrl, xnsNetwork)
         setWindowDappNodeSet(windowDappNodeSet)
@@ -44,7 +46,7 @@ export const useDappContextCreator = (
         setDappWindowNodeError(e as Error)
       }
     }
-  }, [dapp, context, allowedNames])
+  }, [dapp, currentIntent, context, allowedNames])
 
   useEffect(() => {
     if (createOnMount) {
@@ -58,21 +60,24 @@ export const useDappContextCreator = (
   useAsyncEffect(
 
     async () => {
-      switch (currentIntent?.intent) {
-        case DappIntentTypes.Launch: {
-          await createNode()
-          break
-        }
-        case DappIntentTypes.Close: {
-          if (windowDappNodeSetRef.current.context) {
-            // In case a cached dapp was closed, clear its Dapp Archivist to allow for a fresh start upon next launch
-            await DappContextCreator.resetDappArchivist(windowDappNodeSetRef.current.context)
-            setWindowDappNodeSet({ context: null, dappWallet: undefined })
+      // unless the dapp was passed, do nothing
+      if (targetedDapp) {
+        switch (currentIntent?.intent) {
+          case DappIntentTypes.Launch: {
+            await createNode()
+            break
+          }
+          case DappIntentTypes.Close: {
+            if (windowDappNodeSetRef.current.context) {
+              // In case a cached dapp was closed, clear its Dapp Archivist to allow for a fresh start upon next launch
+              await DappContextCreator.resetDappArchivist(windowDappNodeSetRef.current.context)
+              setWindowDappNodeSet({ context: null, dappWallet: undefined })
+            }
+            break
           }
-          break
+          case DappIntentTypes.Minimize:
+          // do nothing
         }
-        case DappIntentTypes.Minimize:
-        // do nothing
       }
     },
     [createNode, currentIntent],

package/src/modules/Dapp/Container.tsx

@@ -1,6 +1,6 @@
 import type { DappIntent } from '@xyo-network/os-model'
 import type { RegisteredReactDappSet } from '@xyo-network/os-react-model'
-import React, { useMemo } from 'react'
+import React, { memo, useMemo } from 'react'
 
 import { useDappContextCreator } from '../../hooks/index.ts'
 import { DappIconButton } from './Button/index.ts'
@@ -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
@@ -46,3 +46,5 @@ export const DappContainer: React.FC<DappContainerProps> = ({
     </DappIconButton>
   )
 }
+
+export const DappContainerMemo = memo(DappContainer)

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'
@@ -8,7 +7,7 @@ import React, { useMemo } from 'react'
 
 import { useDappIntentListener } from '../../../hooks/index.ts'
 import { DappInstallTypeFilters } from '../../../utils/index.ts'
-import { DappContainer } from '../Container.js'
+import { DappContainerMemo } from '../Container.tsx'
 import { DividerChip } from './DividerChip.js'
 
 export interface DappsRowProps {
@@ -42,10 +41,10 @@ export const DappsRow: React.FC<DappsRowProps> = ({
             <Fade in={!!filteredRegisteredDappSets?.length} timeout={1000}>
               <StyledGridContainer>
                 {filteredRegisteredDappSets?.map(
-                  (dappSet, index) => (
-                    <DappContainer
+                  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

@@ -38,9 +38,7 @@ export const DappWindow: React.FC<DappWindowProps> = ({
     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
@@ -102,7 +100,7 @@ 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={resolvedError ? null : <DappLoadingFlexbox minimize={!!minimized} name={name} open={!!active} />}
         >
           {resolvedError || errors?.length > 0
             ? (

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,
   }
 }