@dxos/react-client 0.8.4-main.937b3ca → 0.8.4-main.9be5663bfe

package/docs/README.md

@@ -168,41 +168,41 @@ dxos/react-client --> dxos/react-async
 
 ## Dependencies
 
-| Module | Direct |
-|---|---|
-| [`@dxos/async`](../../../common/async/docs/README.md) | ✓ |
-| [`@dxos/broadcast`](../../../core/mesh/broadcast/docs/README.md) |  |
-| [`@dxos/client`](../../client/docs/README.md) | ✓ |
-| [`@dxos/client-services`](../../client-services/docs/README.md) | ✓ |
-| [`@dxos/codec-protobuf`](../../../common/codec-protobuf/docs/README.md) | ✓ |
-| [`@dxos/config`](../../config/docs/README.md) | ✓ |
-| [`@dxos/context`](../../../common/context/docs/README.md) |  |
-| [`@dxos/credentials`](../../../core/halo/credentials/docs/README.md) |  |
-| [`@dxos/crypto`](../../../common/crypto/docs/README.md) |  |
-| [`@dxos/debug`](../../../common/debug/docs/README.md) | ✓ |
-| [`@dxos/echo-db`](../../../core/echo/echo-db/docs/README.md) |  |
-| [`@dxos/errors`](../../errors/docs/README.md) |  |
-| [`@dxos/feed-store`](../../../common/feed-store/docs/README.md) |  |
-| [`@dxos/hypercore`](../../../common/hypercore/docs/README.md) |  |
-| [`@dxos/keyring`](../../../core/halo/keyring/docs/README.md) |  |
-| [`@dxos/keys`](../../../common/keys/docs/README.md) | ✓ |
-| [`@dxos/log`](../../../common/log/docs/README.md) | ✓ |
-| [`@dxos/mesh-protocol`](../../../core/mesh/mesh-protocol/docs/README.md) |  |
-| [`@dxos/messaging`](../../../core/mesh/messaging/docs/README.md) | ✓ |
-| [`@dxos/model-factory`](../../../core/echo/model-factory/docs/README.md) |  |
-| [`@dxos/network-generator`](../../../core/mesh/network-generator/docs/README.md) |  |
-| [`@dxos/network-manager`](../../../core/mesh/network-manager/docs/README.md) |  |
-| [`@dxos/document-model`](../../../core/echo/document-model/docs/README.md) |  |
-| [`@dxos/protocol-plugin-presence`](../../../core/mesh/protocol-plugin-presence/docs/README.md) |  |
-| [`@dxos/protocol-plugin-replicator`](../../../core/mesh/protocol-plugin-replicator/docs/README.md) |  |
-| [`@dxos/protocol-plugin-rpc`](../../../core/mesh/protocol-plugin-rpc/docs/README.md) |  |
-| [`@dxos/protocols`](../../../core/protocols/docs/README.md) | ✓ |
-| [`@dxos/random-access-storage`](../../../common/random-access-storage/docs/README.md) |  |
-| [`@dxos/react-async`](../../../common/react-async/docs/README.md) | ✓ |
-| [`@dxos/rpc`](../../../core/mesh/rpc/docs/README.md) | ✓ |
-| [`@dxos/rpc-tunnel`](../../../core/mesh/rpc-tunnel/docs/README.md) | ✓ |
-| [`@dxos/teleport`](../../../core/mesh/teleport/docs/README.md) |  |
-| [`@dxos/teleport-plugin-replicator`](../../../core/mesh/teleport-plugin-replicator/docs/README.md) |  |
-| [`@dxos/text-model`](../../../core/echo/text-model/docs/README.md) |  |
-| [`@dxos/timeframe`](../../../common/timeframe/docs/README.md) |  |
-| [`@dxos/util`](../../../common/util/docs/README.md) | ✓ |
+| Module                                                                                             | Direct  |
+| -------------------------------------------------------------------------------------------------- | ------- |
+| [`@dxos/async`](../../../common/async/docs/README.md)                                              | ✓ |
+| [`@dxos/broadcast`](../../../core/mesh/broadcast/docs/README.md)                                   |         |
+| [`@dxos/client`](../../client/docs/README.md)                                                      | ✓ |
+| [`@dxos/client-services`](../../client-services/docs/README.md)                                    | ✓ |
+| [`@dxos/codec-protobuf`](../../../common/codec-protobuf/docs/README.md)                            | ✓ |
+| [`@dxos/config`](../../config/docs/README.md)                                                      | ✓ |
+| [`@dxos/context`](../../../common/context/docs/README.md)                                          |         |
+| [`@dxos/credentials`](../../../core/halo/credentials/docs/README.md)                               |         |
+| [`@dxos/crypto`](../../../common/crypto/docs/README.md)                                            |         |
+| [`@dxos/debug`](../../../common/debug/docs/README.md)                                              | ✓ |
+| [`@dxos/echo-db`](../../../core/echo/echo-db/docs/README.md)                                       |         |
+| [`@dxos/errors`](../../errors/docs/README.md)                                                      |         |
+| [`@dxos/feed-store`](../../../common/feed-store/docs/README.md)                                    |         |
+| [`@dxos/hypercore`](../../../common/hypercore/docs/README.md)                                      |         |
+| [`@dxos/keyring`](../../../core/halo/keyring/docs/README.md)                                       |         |
+| [`@dxos/keys`](../../../common/keys/docs/README.md)                                                | ✓ |
+| [`@dxos/log`](../../../common/log/docs/README.md)                                                  | ✓ |
+| [`@dxos/mesh-protocol`](../../../core/mesh/mesh-protocol/docs/README.md)                           |         |
+| [`@dxos/messaging`](../../../core/mesh/messaging/docs/README.md)                                   | ✓ |
+| [`@dxos/model-factory`](../../../core/echo/model-factory/docs/README.md)                           |         |
+| [`@dxos/network-generator`](../../../core/mesh/network-generator/docs/README.md)                   |         |
+| [`@dxos/network-manager`](../../../core/mesh/network-manager/docs/README.md)                       |         |
+| [`@dxos/document-model`](../../../core/echo/document-model/docs/README.md)                         |         |
+| [`@dxos/protocol-plugin-presence`](../../../core/mesh/protocol-plugin-presence/docs/README.md)     |         |
+| [`@dxos/protocol-plugin-replicator`](../../../core/mesh/protocol-plugin-replicator/docs/README.md) |         |
+| [`@dxos/protocol-plugin-rpc`](../../../core/mesh/protocol-plugin-rpc/docs/README.md)               |         |
+| [`@dxos/protocols`](../../../core/protocols/docs/README.md)                                        | ✓ |
+| [`@dxos/random-access-storage`](../../../common/random-access-storage/docs/README.md)              |         |
+| [`@dxos/react-async`](../../../common/react-async/docs/README.md)                                  | ✓ |
+| [`@dxos/rpc`](../../../core/mesh/rpc/docs/README.md)                                               | ✓ |
+| [`@dxos/rpc-tunnel`](../../../core/mesh/rpc-tunnel/docs/README.md)                                 | ✓ |
+| [`@dxos/teleport`](../../../core/mesh/teleport/docs/README.md)                                     |         |
+| [`@dxos/teleport-plugin-replicator`](../../../core/mesh/teleport-plugin-replicator/docs/README.md) |         |
+| [`@dxos/text-model`](../../../core/echo/text-model/docs/README.md)                                 |         |
+| [`@dxos/timeframe`](../../../common/timeframe/docs/README.md)                                      |         |
+| [`@dxos/util`](../../../common/util/docs/README.md)                                                | ✓ |

package/moon.yml

@@ -1,9 +1,9 @@
-type: library
+layer: library
 language: typescript
 tags:
-  - e2e
   - ts-build
   - ts-test
+  - ts-test-storybook
   - typedoc
   - pack
   - storybook
@@ -18,6 +18,3 @@ tasks:
       - '--entryPoint=src/mesh/index.ts'
       - '--entryPoint=src/testing/index.ts'
       - '--entryPoint=src/worker.ts'
-  test:
-    inputs:
-      - .storybook/*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "0.8.4-main.937b3ca",
+  "version": "0.8.4-main.9be5663bfe",
   "description": "React client API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -89,21 +89,20 @@
     }
   },
   "dependencies": {
-    "react-error-boundary": "^4.0.13",
-    "@dxos/async": "0.8.4-main.937b3ca",
-    "@dxos/codec-protobuf": "0.8.4-main.937b3ca",
-    "@dxos/client": "0.8.4-main.937b3ca",
-    "@dxos/config": "0.8.4-main.937b3ca",
-    "@dxos/context": "0.8.4-main.937b3ca",
-    "@dxos/debug": "0.8.4-main.937b3ca",
-    "@dxos/echo-react": "0.8.4-main.937b3ca",
-    "@dxos/echo": "0.8.4-main.937b3ca",
-    "@dxos/invariant": "0.8.4-main.937b3ca",
-    "@dxos/log": "0.8.4-main.937b3ca",
-    "@dxos/protocols": "0.8.4-main.937b3ca",
-    "@dxos/node-std": "0.8.4-main.937b3ca",
-    "@dxos/react-hooks": "0.8.4-main.937b3ca",
-    "@dxos/util": "0.8.4-main.937b3ca"
+    "@dxos/async": "0.8.4-main.9be5663bfe",
+    "@dxos/context": "0.8.4-main.9be5663bfe",
+    "@dxos/debug": "0.8.4-main.9be5663bfe",
+    "@dxos/codec-protobuf": "0.8.4-main.9be5663bfe",
+    "@dxos/echo": "0.8.4-main.9be5663bfe",
+    "@dxos/client": "0.8.4-main.9be5663bfe",
+    "@dxos/log": "0.8.4-main.9be5663bfe",
+    "@dxos/node-std": "0.8.4-main.9be5663bfe",
+    "@dxos/protocols": "0.8.4-main.9be5663bfe",
+    "@dxos/react-hooks": "0.8.4-main.9be5663bfe",
+    "@dxos/util": "0.8.4-main.9be5663bfe",
+    "@dxos/config": "0.8.4-main.9be5663bfe",
+    "@dxos/invariant": "0.8.4-main.9be5663bfe",
+    "@dxos/echo-react": "0.8.4-main.9be5663bfe"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
@@ -111,21 +110,21 @@
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "typedoc": "0.28.1",
-    "@dxos/random": "0.8.4-main.937b3ca",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.937b3ca",
-    "@dxos/react-ui": "0.8.4-main.937b3ca",
-    "@dxos/storybook-utils": "0.8.4-main.937b3ca",
-    "@dxos/test-utils": "0.8.4-main.937b3ca",
-    "@dxos/ui-theme": "0.8.4-main.937b3ca"
+    "@dxos/random": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.9be5663bfe",
+    "@dxos/test-utils": "0.8.4-main.9be5663bfe",
+    "@dxos/storybook-utils": "0.8.4-main.9be5663bfe",
+    "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
   },
   "peerDependencies": {
     "react": "~19.2.3",
     "react-dom": "~19.2.3"
   },
   "optionalDependencies": {
-    "@dxos/random": "0.8.4-main.937b3ca",
-    "@dxos/react-ui": "0.8.4-main.937b3ca",
-    "@dxos/ui-theme": "0.8.4-main.937b3ca"
+    "@dxos/random": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui": "0.8.4-main.9be5663bfe",
+    "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
   },
   "publishConfig": {
     "access": "public"

package/src/client/ClientProvider.test.tsx

@@ -11,7 +11,6 @@ import { Client, Config, SystemStatus, fromHost } from '@dxos/client';
 import { log } from '@dxos/log';
 
 import { useIdentity } from '../halo';
-
 import { ClientProvider } from './ClientProvider';
 import { useClient } from './useClient';
 

package/src/client/ClientProvider.tsx

@@ -18,7 +18,6 @@ import { useAsyncEffect, useControlledState } from '@dxos/react-hooks';
 import { type MaybePromise, type Provider, getAsyncProviderValue } from '@dxos/util';
 
 import { printBanner } from '../banner';
-
 import { ClientContext, type ClientContextProps } from './context';
 
 /**

package/src/client/useConfig.test.tsx

@@ -9,7 +9,6 @@ import { waitForCondition } from '@dxos/async';
 import { Config, SystemStatus } from '@dxos/client';
 
 import { createClient, createClientContextProvider } from '../testing/util';
-
 import { useConfig } from './useConfig';
 
 // TODO(burdon): Disabled in CI since flaky.

package/src/echo/useQueue.ts

@@ -19,11 +19,10 @@ export type UseQueueOptions = {
 
 /**
  * Polls the given Edge queue.
+ * @deprecated Use `useQuery` instead.
  */
-// TODO(burdon): Replace polling with socket?
 // TODO(dmaretskyi): Move into client package.
 // TODO(dmaretskyi): Consider passing the space into the hook to support queue DXNs without space id.
-// TODO(ZaymonFC): If queue is unchanged returned object should be refferentially stable on poll.
 export const useQueue = <T extends Entity.Unknown>(
   queueDxn?: DXN,
   options: UseQueueOptions = {},

package/src/echo/useSpaceInvitations.ts

@@ -10,7 +10,6 @@ import { type SpaceId } from '@dxos/client/echo';
 import { useMulticastObservable } from '@dxos/react-hooks';
 
 import { type CancellableInvitationObservable, useInvitationStatus } from '../invitations';
-
 import { useSpace } from './useSpaces';
 
 // TODO(wittjosiah): Currently unable to remove `PublicKey` from this api.

package/src/echo/useSpaces.test.tsx

@@ -6,19 +6,18 @@ import { act, renderHook } from '@testing-library/react';
 import { describe, expect, test } from 'vitest';
 
 import { createClient, createClientContextProvider } from '../testing/util';
-
 import { useSpace, useSpaces } from './useSpaces';
 
 describe('useSpaces', () => {
   test('lists existing spaces', async () => {
-    const { client } = await createClient({ createIdentity: true });
+    const { client } = await createClient({ createIdentity: true, createSpace: true });
     const wrapper = await createClientContextProvider(client);
     const { result } = renderHook(() => useSpaces(), { wrapper });
     expect(result.current.length).to.eq(1);
   });
 
   test('updates when new spaces are created', async () => {
-    const { client } = await createClient({ createIdentity: true });
+    const { client } = await createClient({ createIdentity: true, createSpace: true });
     const wrapper = await createClientContextProvider(client);
     const { result, rerender } = renderHook(() => useSpaces(), { wrapper });
     expect(result.current.length).to.eq(1);
@@ -31,20 +30,14 @@ describe('useSpaces', () => {
 });
 
 describe('useSpace', () => {
-  test('gets default space', async () => {
-    const { client } = await createClient();
+  test('returns undefined when no id provided', async () => {
+    const { client } = await createClient({ createIdentity: true });
     const wrapper = await createClientContextProvider(client);
-    const { result, rerender } = renderHook(() => useSpace(), { wrapper });
+    const { result } = renderHook(() => useSpace(undefined), { wrapper });
     expect(result.current).to.be.undefined;
-    await act(async () => {
-      await client.halo.createIdentity();
-      await client.spaces.waitUntilReady();
-    });
-    rerender();
-    expect(result.current).to.not.be.undefined;
   });
 
-  test('gets space by key', async () => {
+  test('gets space by id', async () => {
     const { client, space } = await createClient({ createIdentity: true, createSpace: true });
     const wrapper = await createClientContextProvider(client);
     const { result } = renderHook(() => useSpace(space!.id), { wrapper });

package/src/echo/useSpaces.ts

@@ -2,61 +2,45 @@
 // Copyright 2020 DXOS.org
 //
 
-import { useState } from 'react';
-
 import { PublicKey } from '@dxos/client';
 import { type Space, type SpaceId, SpaceState } from '@dxos/client/echo';
-import { useAsyncEffect, useMulticastObservable } from '@dxos/react-hooks';
+import { useMulticastObservable } from '@dxos/react-hooks';
 
 import { useClient } from '../client';
 
 /**
  * Get a specific Space using its id.
  * The space is not guaranteed to be in the ready state.
- * Returns the default space if no id is provided.
+ * Returns undefined if no id is provided.
  * Requires a ClientProvider somewhere in the parent tree.
  *
- * @param spaceId the id of the space to look for
+ * @param spaceId the id of the space to look for.
  */
 // TODO(wittjosiah): Currently unable to remove `PublicKey` from this api.
 //  When initially joining a space that is all that is returned.
 export const useSpace = (spaceId?: SpaceId | PublicKey): Space | undefined => {
   const client = useClient();
   const spaces = useMulticastObservable<Space[]>(client.spaces);
-  const [ready, setReady] = useState(false);
+  if (!spaceId) {
+    return undefined;
+  }
 
-  useAsyncEffect(async () => {
-    // Only wait for ready if looking for the default space.
-    if (spaceId) {
-      return;
+  return spaces.find((space) => {
+    if (spaceId instanceof PublicKey) {
+      return space.key.equals(spaceId);
     }
 
-    await client.spaces.waitUntilReady();
-    setReady(true);
-  }, [client, spaceId]);
-
-  if (spaceId) {
-    return spaces.find((space) => {
-      if (spaceId instanceof PublicKey) {
-        return space.key.equals(spaceId);
-      }
-
-      return space.id === spaceId;
-    });
-  }
-
-  if (ready && client.halo.identity.get()) {
-    return client.spaces.default;
-  }
+    return space.id === spaceId;
+  });
 };
 
 /**
  * Get a Space database by the id of the space.
  * The space is not guaranteed to be in the ready state.
- * Returns the default space if no id is provided.
+ * Returns undefined if no id is provided.
  * Requires a ClientProvider somewhere in the parent tree.
  *
- * @param spaceId the id of the space to look for
+ * @param spaceId the id of the space to look for.
  */
 export const useDatabase = (spaceId?: SpaceId): Space['db'] | undefined => {
   const space = useSpace(spaceId);
@@ -74,7 +58,7 @@ export type UseSpacesProps = {
  * Get all Spaces available to current user.
  * Requires a ClientProvider somewhere in the parent tree.
  * By default, only ready spaces are returned.
- * @returns an array of Spaces
+ * @returns an array of Spaces.
  */
 export const useSpaces = ({ all = false }: UseSpacesProps = {}): Space[] => {
   const client = useClient();

package/src/echo/useSyncState.ts

@@ -8,11 +8,12 @@ import { type PeerSyncState, type Space, type SpaceSyncStateMap } from '@dxos/cl
 import { Context } from '@dxos/context';
 import { type SpaceId } from '@dxos/keys';
 import { EdgeService } from '@dxos/protocols';
+import { compositeKey } from '@dxos/util';
 
 import { useClient } from '../client';
 
 const isEdgePeerId = (peerId: string, spaceId: SpaceId) =>
-  peerId.startsWith(`${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}`);
+  peerId.startsWith(compositeKey(EdgeService.AUTOMERGE_REPLICATOR, spaceId));
 
 /**
  * Hook Subscribes to sync state for each space.

package/src/halo/Passkey.stories.tsx

@@ -9,12 +9,11 @@ import { Config, PublicKey } from '@dxos/client';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { Button } from '@dxos/react-ui';
-import { withTheme } from '@dxos/react-ui/testing';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { useClient } from '../client';
 import { withClientProvider } from '../testing';
-
 import { useCredentials } from './useCredentials';
 import { useIdentity } from './useIdentity';
 
@@ -105,7 +104,7 @@ const Test = () => {
 
   return (
     <>
-      <div className='mbe-4 flex gap-2'>
+      <div className='mb-4 flex gap-2'>
         <Button disabled={!!identity} onClick={handleCreateIdentity}>
           Create Identity
         </Button>
@@ -116,7 +115,7 @@ const Test = () => {
           Authenticate with Passkey
         </Button>
       </div>
-      <div className='flex flex-col min-w-[28rem] divide-y divide-separator border border-separator rounded'>
+      <div className='flex flex-col min-w-[28rem] divide-y divide-separator border border-separator rounded-sm'>
         <SyntaxHighlighter language='json'>
           {JSON.stringify({ identity, credentials: credentials.length }, null, 2)}
         </SyntaxHighlighter>
@@ -148,7 +147,7 @@ const config = new Config({
 const meta = {
   title: 'sdk/react-client/Passkeys',
   render: Test,
-  decorators: [withClientProvider({ config }), withTheme],
+  decorators: [withClientProvider({ config }), withTheme()],
 } satisfies Meta;
 
 export default meta;

package/src/halo/useDevices.test.tsx

@@ -6,7 +6,6 @@ import { renderHook } from '@testing-library/react';
 import { describe, expect, test } from 'vitest';
 
 import { createClient, createClientContextProvider } from '../testing/util';
-
 import { useDevices } from './useDevices';
 
 describe('useDevices', () => {

package/src/testing/ClientRepeater.stories.tsx

@@ -7,17 +7,16 @@ import React from 'react';
 
 import { Obj } from '@dxos/echo';
 import { Input } from '@dxos/react-ui';
-import { withTheme } from '@dxos/react-ui/testing';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { useClient } from '../client';
 import { useSpace } from '../echo';
-
 import { type ClientRepeatedComponentProps, ClientRepeater } from './ClientRepeater';
 
 const meta = {
   title: 'sdk/react-client/ClientRepeater',
-  decorators: [withTheme],
+  decorators: [withTheme()],
 } satisfies Meta<typeof Input>;
 
 export default meta;
@@ -47,8 +46,8 @@ const ClientSpace = ({ spaceId }: ClientRepeatedComponentProps) => {
           placeholder='Name'
           value={space.properties.name}
           onChange={(event) =>
-            Obj.change(space.properties, (p) => {
-              p.name = event.target.value;
+            Obj.change(space.properties, (obj) => {
+              obj.name = event.target.value;
             })
           }
         />

package/src/testing/ClientRepeater.tsx

@@ -7,12 +7,11 @@ import React, { type FC, useRef, useState } from 'react';
 import { Client } from '@dxos/client';
 import { TestBuilder, performInvitation } from '@dxos/client/testing';
 import { type Type } from '@dxos/echo';
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { useAsyncEffect } from '@dxos/react-hooks';
 
 import { ClientProvider } from '../client';
 import { type SpaceId } from '../echo';
-
 import { type WithClientProviderProps } from './withClientProvider';
 
 export type ClientRepeatedComponentProps = { id: number; count: number; spaceId?: SpaceId };
@@ -26,7 +25,7 @@ export type ClientRepeaterProps<P extends ClientRepeatedComponentProps> = {
   controls?: FC<ClientRepeaterControlsProps>;
   count?: number;
   clients?: Client[];
-  types?: Type.Obj.Any[];
+  types?: Type.AnyObj[];
   args?: Omit<P, 'id' | 'count'>;
 } & Pick<WithClientProviderProps, 'createIdentity' | 'createSpace' | 'onCreateSpace'>;
 
@@ -67,7 +66,7 @@ export const ClientRepeater = <P extends ClientRepeatedComponentProps>(props: Cl
 
     if (createSpace) {
       const client = clients[0];
-      const space = await client.spaces.create({ name: faker.commerce.productName() });
+      const space = await client.spaces.create({ name: random.commerce.productName() });
       setSpaceId(space.id);
       await onCreateSpace?.({ client, space }, {});
       await Promise.all(clients.slice(1).flatMap((client) => performInvitation({ host: space, guest: client.spaces })));

package/src/testing/util.tsx

@@ -24,7 +24,6 @@ export const createClient = async ({
   let space: Space | undefined;
   if (createSpace) {
     space = await client.spaces.create();
-    await client.spaces.waitUntilReady();
   }
 
   return { client, space };

package/src/testing/withClientProvider.stories.tsx

@@ -4,15 +4,14 @@
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
+import { expect, within } from 'storybook/test';
 
 import { log } from '@dxos/log';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
-import { render } from '@dxos/storybook-utils';
+import { withLayout, withTheme, Loading } from '@dxos/react-ui/testing';
 
 import { useClient } from '../client';
 import { type Space, useSpaces } from '../echo';
-
 import { type WithClientProviderProps, withClientProvider, withMultiClientProvider } from './withClientProvider';
 
 const SpaceInfo = ({ space }: { space: Space }) => {
@@ -24,7 +23,7 @@ const DefaultStory = () => {
   const client = useClient();
   const spaces = useSpaces();
   if (!client) {
-    return null;
+    return <Loading data={{ client: !!client }} />;
   }
 
   return (
@@ -39,8 +38,9 @@ const DefaultStory = () => {
 
 const meta = {
   title: 'sdk/react-client/withClientProvider',
-  render: render(DefaultStory),
-  decorators: [withTheme],
+  render: DefaultStory,
+  decorators: [withTheme()],
+  tags: ['test'],
 } satisfies Meta<typeof DefaultStory>;
 
 export default meta;
@@ -63,11 +63,16 @@ export const Default: Story = {
   parameters: {
     layout: 'centered',
   },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    const initializedText = await canvas.findByText(/"initialized": true/i, {}, { timeout: 30_000 });
+    await expect(initializedText).toBeVisible();
+  },
 };
 
 export const Multiple: Story = {
   decorators: [
-    withTheme,
+    withTheme(),
     withLayout({ classNames: 'grid grid-cols-3' }),
     withMultiClientProvider({ ...clientProps, numClients: 3 }),
   ],

package/src/testing/withClientProvider.tsx

@@ -3,18 +3,17 @@
 //
 
 import { type Decorator, type StoryContext } from '@storybook/react';
-import React, { type PropsWithChildren, useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { type FallbackProps, ErrorBoundary as NaturalErrorBoundary } from 'react-error-boundary';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
 
 import { Trigger } from '@dxos/async';
 import { type Client } from '@dxos/client';
 import { type Space, type SpaceId } from '@dxos/client/echo';
 import { TestBuilder, performInvitation } from '@dxos/client/testing';
 import { log } from '@dxos/log';
+import { ErrorBoundary } from '@dxos/react-ui';
 import { type MaybePromise } from '@dxos/util';
 
 import { ClientProvider, type ClientProviderProps } from '../client';
-
 import { ClientStory } from './context';
 
 type InitializeProps = {
@@ -39,8 +38,6 @@ const initializeClient = async (
   if (createIdentity || createSpace) {
     if (!client.halo.identity.get()) {
       await client.halo.createIdentity();
-      await client.spaces.waitUntilReady();
-      await client.spaces.default.waitUntilReady();
       await onCreateIdentity?.({ client }, context);
     }
   }
@@ -87,7 +84,7 @@ export const withClientProvider = ({
     };
 
     return (
-      <ErrorBoundary>
+      <ErrorBoundary name='client-provider'>
         <ClientProvider onInitialized={handleInitialized} {...props}>
           <ClientStory.Provider value={data}>
             <Story />
@@ -178,7 +175,7 @@ export const withMultiClientProvider = ({
             {...props}
           >
             <ClientStory.Provider value={{ index, spaceId }}>
-              <ErrorBoundary>
+              <ErrorBoundary name='client-provider'>
                 <Story />
               </ErrorBoundary>
             </ClientStory.Provider>
@@ -188,34 +185,3 @@ export const withMultiClientProvider = ({
     );
   };
 };
-
-const ErrorBoundary = ({ children }: PropsWithChildren) => {
-  const [error, setError] = useState<Error>();
-  useEffect(() => {
-    const handleError = (event: PromiseRejectionEvent) => {
-      setError(event.reason);
-    };
-
-    window.addEventListener('unhandledrejection', handleError);
-    return () => window.removeEventListener('unhandledrejection', handleError);
-  }, []);
-
-  if (error) {
-    return <ErrorFallback error={error} resetErrorBoundary={() => setError(undefined)} />;
-  }
-
-  return <NaturalErrorBoundary FallbackComponent={ErrorFallback}>{children}</NaturalErrorBoundary>;
-};
-
-const ErrorFallback = ({ error }: FallbackProps) => {
-  const { name, message, stack } =
-    error instanceof Error ? error : { name: 'Error', message: String(error), stack: undefined };
-
-  return (
-    <div role='alert' className='flex flex-col p-4 gap-4 overflow-auto'>
-      <h1 className='text-xl text-red-500'>{name}</h1>
-      <div className='text-lg'>{message}</div>
-      {stack && <pre className='whitespace-pre-wrap text-sm text-subdued'>{stack}</pre>}
-    </div>
-  );
-};

package/typedoc.json

@@ -9,4 +9,4 @@
     "src/mesh/index.ts",
     "src/worker.ts"
   ]
-}
+}