@xyo-network/react-network 2.25.61 → 2.25.64

package/dist/esm/contexts/Provider/Route.js

@@ -1,11 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { defaultNetworkConfigs, findNetworkConfig } from '../../lib';
 import { NetworkContext } from '../Context';
 import { useNetwork } from '../use';
 import { NetworkMemoryProvider } from './Memory';
 const NetworkRouteProviderInner = ({ children }) => {
+    const [initialized, setInitialized] = useState(false);
     const { network, setNetwork } = useNetwork();
     const [params, setParams] = useSearchParams();
     const slug = params.get('network');
@@ -38,8 +39,9 @@ const NetworkRouteProviderInner = ({ children }) => {
                 setNetwork?.(routeNetwork);
             }
         }
+        setInitialized(true);
     }, [routeNetwork, network, setNetworkParam, setNetwork]);
-    return _jsx(NetworkContext.Provider, { value: { network, networks: defaultNetworkConfigs, provided: true, setNetwork: setNetworkLocal }, children: children });
+    return (_jsx(NetworkContext.Provider, { value: { network, networks: defaultNetworkConfigs, provided: true, setNetwork: setNetworkLocal }, children: initialized ? children : null }));
 };
 export const NetworkRouteProvider = ({ defaultNetwork, ...props }) => {
     return (_jsx(NetworkMemoryProvider, { defaultNetwork: defaultNetwork, children: _jsx(NetworkRouteProviderInner, { ...props }) }));

package/dist/esm/contexts/Provider/Route.js.map

@@ -1 +1 @@
-{"version":3,"file":"Route.js","sourceRoot":"","sources":["../../../../src/contexts/Provider/Route.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAElD,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAGhD,MAAM,yBAAyB,GAA2B,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACzE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;IAE5C,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,eAAe,EAAE,CAAA;IAE7C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAClC,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAE/D,wCAAwC;IACxC,MAAM,eAAe,GAAG,WAAW,CACjC,CAAC,OAA2B,EAAE,EAAE;QAC9B,IAAI,OAAO,EAAE;YACX,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;YACnC,SAAS,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;YACpC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAA;SACtB;aAAM;YACL,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;SACzB;IACH,CAAC,EACD,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAChC,CAAA;IAED,kEAAkE;IAClE,MAAM,eAAe,GAAG,WAAW,CACjC,CAAC,OAA0B,EAAE,EAAE;QAC7B,eAAe,CAAC,OAAO,CAAC,CAAA;QACxB,UAAU,EAAE,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC,EACD,CAAC,eAAe,EAAE,UAAU,CAAC,CAC9B,CAAA;IAED,0CAA0C;IAC1C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,OAAO,EAAE;YAC5B,IAAI,YAAY,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE;gBACvD,kFAAkF;gBAClF,eAAe,CAAC,OAAO,CAAC,CAAA;aACzB;iBAAM,IAAI,YAAY,EAAE;gBACvB,6EAA6E;gBAC7E,UAAU,EAAE,CAAC,YAAY,CAAC,CAAA;aAC3B;SACF;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC,CAAA;IAExD,OAAO,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,YAAG,QAAQ,GAA2B,CAAA;AACxK,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAiD,CAAC,EAAE,cAAc,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACjH,OAAO,CACL,KAAC,qBAAqB,IAAC,cAAc,EAAE,cAAc,YACnD,KAAC,yBAAyB,OAAK,KAAK,GAAI,GAClB,CACzB,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"Route.js","sourceRoot":"","sources":["../../../../src/contexts/Provider/Route.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAElD,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAGhD,MAAM,yBAAyB,GAA2B,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IACzE,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACrD,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;IAE5C,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,eAAe,EAAE,CAAA;IAE7C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAClC,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAE/D,wCAAwC;IACxC,MAAM,eAAe,GAAG,WAAW,CACjC,CAAC,OAA2B,EAAE,EAAE;QAC9B,IAAI,OAAO,EAAE;YACX,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;YACnC,SAAS,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;YACpC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAA;SACtB;aAAM;YACL,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;SACzB;IACH,CAAC,EACD,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAChC,CAAA;IAED,kEAAkE;IAClE,MAAM,eAAe,GAAG,WAAW,CACjC,CAAC,OAA0B,EAAE,EAAE;QAC7B,eAAe,CAAC,OAAO,CAAC,CAAA;QACxB,UAAU,EAAE,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC,EACD,CAAC,eAAe,EAAE,UAAU,CAAC,CAC9B,CAAA;IAED,0CAA0C;IAC1C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,OAAO,EAAE;YAC5B,IAAI,YAAY,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE;gBACvD,kFAAkF;gBAClF,eAAe,CAAC,OAAO,CAAC,CAAA;aACzB;iBAAM,IAAI,YAAY,EAAE;gBACvB,6EAA6E;gBAC7E,UAAU,EAAE,CAAC,YAAY,CAAC,CAAA;aAC3B;SACF;QACD,cAAc,CAAC,IAAI,CAAC,CAAA;IACtB,CAAC,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC,CAAA;IAExD,OAAO,CACL,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,YACtH,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,GACN,CAC3B,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAiD,CAAC,EAAE,cAAc,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACjH,OAAO,CACL,KAAC,qBAAqB,IAAC,cAAc,EAAE,cAAc,YACnD,KAAC,yBAAyB,OAAK,KAAK,GAAI,GAClB,CACzB,CAAA;AACH,CAAC,CAAA"}

package/package.json

@@ -12,14 +12,14 @@
   "dependencies": {
     "@emotion/react": "^11.9.3",
     "@emotion/styled": "^11.9.3",
-    "@mui/material": "^5.8.3",
-    "@xylabs/react-common": "^2.12.24",
-    "@xylabs/react-shared": "^2.12.24",
+    "@mui/material": "^5.8.4",
+    "@xylabs/react-common": "^2.14.3",
+    "@xylabs/react-shared": "^2.14.3",
     "@xylabs/sdk-js": "^2.5.7",
     "@xyo-network/network": "^2.20.45",
-    "@xyo-network/react-shared": "^2.25.61",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
+    "@xyo-network/react-shared": "^2.25.64",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-router-dom": "^6.3.0",
     "tslib": "^2.4.0"
   },
@@ -63,8 +63,8 @@
   "resolutions": {
     "@storybook/react/webpack": "^5",
     "bn.js": "^5.2.0",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "webpack": "^5"
   },
   "publishConfig": {
@@ -80,6 +80,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.25.61",
+  "version": "2.25.64",
   "packageManager": "yarn@3.1.1"
 }

package/src/components/SelectEx/NetworkSelectEx.stories.tsx

@@ -1,16 +1,19 @@
 import { Card, CardContent } from '@mui/material'
 import { ComponentMeta, ComponentStory } from '@storybook/react'
-import { SelectExProps } from '@xylabs/react-common'
 import { FlexCol } from '@xylabs/react-flexbox'
+import { useEffect, useState } from 'react'
+import { BrowserRouter } from 'react-router-dom'
 
-import { authDecorator, WrappedArgs } from '../../../../../.storybook'
-import { NetworkMemoryProvider, useNetwork } from '../../contexts'
+import { NetworkMemoryProvider, NetworkRouteProvider, useNetwork } from '../../contexts'
 import { NetworkSelectEx } from './NetworkSelectEx'
 
 const StorybookEntry = {
-  argTypes: {},
+  argTypes: {
+    responsive: {
+      defaultValue: false,
+    },
+  },
   component: NetworkSelectEx,
-  decorators: [authDecorator],
   parameters: {
     docs: {
       page: null,
@@ -36,10 +39,7 @@ const Template: ComponentStory<typeof NetworkSelectEx> = (args) => {
   return <NetworkSelectEx {...args}></NetworkSelectEx>
 }
 
-const TemplateWithProvider: ComponentStory<typeof NetworkSelectEx> = (args) => {
-  const combinedArgs = args as WrappedArgs & SelectExProps<string>
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { authState, ...props } = combinedArgs
+const TemplateWithMemoryProvider: ComponentStory<typeof NetworkSelectEx> = (props) => {
   return (
     <NetworkMemoryProvider>
       <NetworkSelectEx {...props}></NetworkSelectEx>
@@ -48,13 +48,53 @@ const TemplateWithProvider: ComponentStory<typeof NetworkSelectEx> = (args) => {
   )
 }
 
+const TemplateWithRouteProvider: ComponentStory<typeof NetworkSelectEx> = (props) => {
+  const url = new URL(window.location.toString())
+  url.searchParams.set('network', 'main')
+  history.pushState({}, '', url)
+  return (
+    <BrowserRouter>
+      <NetworkRouteProvider>
+        <TemplateWithRouteProviderInner {...props} />
+      </NetworkRouteProvider>
+    </BrowserRouter>
+  )
+}
+
+const TemplateWithRouteProviderInner: ComponentStory<typeof NetworkSelectEx> = (props) => {
+  const { network } = useNetwork()
+  const [uris, setUris] = useState<(string | undefined)[]>([])
+
+  useEffect(() => {
+    setUris((previous) => [...previous, network?.nodes?.find((node) => node.type === 'archivist')?.uri])
+  }, [network?.nodes])
+
+  useEffect(() => {
+    if (uris.length > 1) {
+      throw Error('Error: Route Provider sent multiple network uris but should only send one.')
+    }
+  })
+
+  return (
+    <>
+      <NetworkSelectEx {...props}></NetworkSelectEx>
+      {uris.map((uri) => (
+        <p key={uri}>{uri}</p>
+      ))}
+    </>
+  )
+}
+
 const Default = Template.bind({})
 Default.args = {}
 
-const WithProvider = TemplateWithProvider.bind({})
-WithProvider.args = {}
+const WithMemoryProvider = TemplateWithMemoryProvider.bind({})
+WithMemoryProvider.args = {}
+
+const WithRouteProvider = TemplateWithRouteProvider.bind({})
+WithRouteProvider.args = {}
 
-export { Default, WithProvider }
+export { Default, WithMemoryProvider, WithRouteProvider }
 
 // eslint-disable-next-line import/no-default-export
 export default StorybookEntry

package/src/contexts/Provider/Route.tsx

@@ -1,6 +1,6 @@
 import { WithChildren } from '@xylabs/react-shared'
 import { XyoNetworkPayload } from '@xyo-network/network'
-import { useCallback, useEffect } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { useSearchParams } from 'react-router-dom'
 
 import { defaultNetworkConfigs, findNetworkConfig } from '../../lib'
@@ -10,6 +10,7 @@ import { NetworkMemoryProvider } from './Memory'
 import { NetworkProviderProps } from './Props'
 
 const NetworkRouteProviderInner: React.FC<WithChildren> = ({ children }) => {
+  const [initialized, setInitialized] = useState(false)
   const { network, setNetwork } = useNetwork()
 
   const [params, setParams] = useSearchParams()
@@ -51,9 +52,14 @@ const NetworkRouteProviderInner: React.FC<WithChildren> = ({ children }) => {
         setNetwork?.(routeNetwork)
       }
     }
+    setInitialized(true)
   }, [routeNetwork, network, setNetworkParam, setNetwork])
 
-  return <NetworkContext.Provider value={{ network, networks: defaultNetworkConfigs, provided: true, setNetwork: setNetworkLocal }}>{children}</NetworkContext.Provider>
+  return (
+    <NetworkContext.Provider value={{ network, networks: defaultNetworkConfigs, provided: true, setNetwork: setNetworkLocal }}>
+      {initialized ? children : null}
+    </NetworkContext.Provider>
+  )
 }
 
 export const NetworkRouteProvider: React.FC<WithChildren<NetworkProviderProps>> = ({ defaultNetwork, ...props }) => {