@dxos/plugin-space 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/src/capabilities/react-surface.tsx

@@ -5,30 +5,23 @@
 import type * as Schema from 'effect/Schema';
 import React, { useCallback } from 'react';
 
-import { Capabilities, Surface, contributes, createSurface, useCapability, useLayout } from '@dxos/app-framework';
-import { Obj, Type } from '@dxos/echo';
+import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
+import { Surface, useCapability, useLayout } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
 import { findAnnotation } from '@dxos/effect';
 import { SettingsStore } from '@dxos/local-storage';
-import {
-  type Space,
-  SpaceState,
-  fullyQualifiedId,
-  getSpace,
-  isLiveObject,
-  isSpace,
-  parseId,
-  useSpace,
-} from '@dxos/react-client/echo';
+import { type Space, SpaceState, getSpace, isLiveObject, isSpace, parseId, useSpace } from '@dxos/react-client/echo';
 import { Input } from '@dxos/react-ui';
 import { type InputProps, SelectInput } from '@dxos/react-ui-form';
 import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
-import { DataType, type TypenameAnnotation, TypenameAnnotationId } from '@dxos/schema';
+import { Collection, type TypenameAnnotation, TypenameAnnotationId, View } from '@dxos/schema';
 import { type JoinPanelProps } from '@dxos/shell/react';
 
+// TODO(burdon): Component name standard: NounVerbComponent.
 import {
   CREATE_OBJECT_DIALOG,
   CREATE_SPACE_DIALOG,
-  CollectionMain,
+  CollectionArticle,
   CollectionSection,
   CreateObjectDialog,
   type CreateObjectDialogProps,
@@ -38,17 +31,17 @@ import {
   JoinDialog,
   MembersContainer,
   MenuFooter,
+  OBJECT_RENAME_POPOVER,
   ObjectDetailsPanel,
+  ObjectRenamePopover,
   ObjectSettingsContainer,
-  POPOVER_RENAME_OBJECT,
-  POPOVER_RENAME_SPACE,
-  PopoverRenameObject,
-  PopoverRenameSpace,
-  RecordMain,
+  RecordArticle,
+  SPACE_RENAME_POPOVER,
   SchemaContainer,
   SmallPresenceLive,
   SpacePluginSettings,
   SpacePresence,
+  SpaceRenamePopover,
   SpaceSettingsContainer,
   SyncStatus,
   ViewEditor,
@@ -63,8 +56,6 @@ type ReactSurfaceOptions = {
   createInvitationUrl: (invitationCode: string) => string;
 };
 
-const OMIT = [DataType.Collection.typename, Type.getTypename(DataType.QueryCollection)];
-
 export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
@@ -77,7 +68,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
         <Surface
           data={{
             id: data.subject.id,
-            subject: data.subject.properties[DataType.Collection.typename]?.target,
+            subject: data.subject.properties[Collection.Collection.typename]?.target,
           }}
           role={role}
           {...rest}
@@ -89,14 +80,14 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
       role: 'article',
       position: 'fallback',
       filter: (data): data is { subject: Obj.Any } => Obj.isObject(data.subject),
-      component: ({ data }) => <RecordMain record={data.subject} />,
+      component: ({ data }) => <RecordArticle object={data.subject} />,
     }),
     createSurface({
       id: `${meta.id}/collection-fallback`,
       role: 'article',
       position: 'fallback',
-      filter: (data): data is { subject: DataType.Collection } => Obj.instanceOf(DataType.Collection, data.subject),
-      component: ({ data }) => <CollectionMain collection={data.subject} />,
+      filter: (data): data is { subject: Collection.Collection } => Obj.instanceOf(Collection.Collection, data.subject),
+      component: ({ data }) => <CollectionArticle object={data.subject} />,
     }),
     createSurface({
       id: `${meta.id}/plugin-settings`,
@@ -160,12 +151,12 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${meta.id}/selected-objects`,
       role: 'article',
-      filter: (data): data is { companionTo: DataType.View; subject: 'selected-objects' } =>
-        Obj.instanceOf(DataType.View, data.companionTo) && data.subject === 'selected-objects',
+      filter: (data): data is { companionTo: View.View; subject: 'selected-objects' } =>
+        Obj.instanceOf(View.View, data.companionTo) && data.subject === 'selected-objects',
       component: ({ data }) => (
         <ObjectDetailsPanel
-          key={fullyQualifiedId(data.companionTo)}
-          objectId={fullyQualifiedId(data.companionTo)}
+          key={Obj.getDXN(data.companionTo).toString()}
+          objectId={Obj.getDXN(data.companionTo).toString()}
           view={data.companionTo}
         />
       ),
@@ -231,7 +222,11 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
       role: 'form-input',
       filter: (
         data,
-      ): data is { prop: string; schema: Schema.Schema<any>; target: Space | DataType.Collection | undefined } => {
+      ): data is {
+        prop: string;
+        schema: Schema.Schema<any>;
+        target: Space | Collection.Collection | undefined;
+      } => {
         if (data.prop !== 'typename') {
           return false;
         }
@@ -251,21 +246,21 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${meta.id}/object-settings`,
       role: 'object-settings',
-      filter: (data): data is { subject: DataType.View } => Obj.instanceOf(DataType.View, data.subject),
+      filter: (data): data is { subject: View.View } => Obj.instanceOf(View.View, data.subject),
       component: ({ data }) => <ViewEditor view={data.subject} />,
     }),
     createSurface({
-      id: POPOVER_RENAME_SPACE,
+      id: SPACE_RENAME_POPOVER,
       role: 'card--popover',
-      filter: (data): data is { props: Space } => data.component === POPOVER_RENAME_SPACE && isSpace(data.props),
-      component: ({ data }) => <PopoverRenameSpace space={data.props} />,
+      filter: (data): data is { props: Space } => data.component === SPACE_RENAME_POPOVER && isSpace(data.props),
+      component: ({ data }) => <SpaceRenamePopover space={data.props} />,
     }),
     createSurface({
-      id: POPOVER_RENAME_OBJECT,
+      id: OBJECT_RENAME_POPOVER,
       role: 'card--popover',
       filter: (data): data is { props: Obj.Any } =>
-        data.component === POPOVER_RENAME_OBJECT && isLiveObject(data.props),
-      component: ({ data }) => <PopoverRenameObject object={data.props} />,
+        data.component === OBJECT_RENAME_POPOVER && isLiveObject(data.props),
+      component: ({ data }) => <ObjectRenamePopover object={data.props} />,
     }),
     createSurface({
       id: `${meta.id}/menu-footer`,
@@ -308,7 +303,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
         const space = isSpace(data.subject) ? data.subject : getSpace(data.subject);
         const object = isSpace(data.subject)
           ? data.subject.state.get() === SpaceState.SPACE_READY
-            ? (space?.properties[DataType.Collection.typename]?.target as DataType.Collection)
+            ? (space?.properties[Collection.Collection.typename]?.target as Collection.Collection)
             : undefined
           : data.subject;
 
@@ -318,8 +313,8 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${meta.id}/collection-section`,
       role: 'section',
-      filter: (data): data is { subject: DataType.Collection } => Obj.instanceOf(DataType.Collection, data.subject),
-      component: ({ data }) => <CollectionSection collection={data.subject} />,
+      filter: (data): data is { subject: Collection.Collection } => Obj.instanceOf(Collection.Collection, data.subject),
+      component: ({ data }) => <CollectionSection object={data.subject} />,
     }),
     createSurface({
       id: `${meta.id}/status`,

package/src/capabilities/spaces-ready.ts

@@ -14,7 +14,7 @@ import { ClientCapabilities } from '@dxos/plugin-client';
 import { DeckCapabilities } from '@dxos/plugin-deck';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { PublicKey } from '@dxos/react-client';
-import { FQ_ID_LENGTH, SpaceState, parseFullyQualifiedId } from '@dxos/react-client/echo';
+import { SpaceState, parseId } from '@dxos/react-client/echo';
 import { ComplexMap, reduceGroupBy } from '@dxos/util';
 
 import { SpaceAction } from '../types';
@@ -25,6 +25,9 @@ import { SpaceCapabilities } from './capabilities';
 const ACTIVE_NODE_BROADCAST_INTERVAL = 30_000;
 const WAIT_FOR_OBJECT_TIMEOUT = 5_000;
 
+// E.g., dxn:echo:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
+const ECHO_DXN_LENGTH = 3 + 1 + 4 + 1 + 33 + 1 + 26;
+
 export default async (context: PluginContext) => {
   const subscriptions = new SubscriptionList();
   const spaceSubscriptions = new SubscriptionList();
@@ -69,7 +72,7 @@ export default async (context: PluginContext) => {
 
         const id = active[0];
         const node = graph.getNode(id).pipe(Option.getOrNull);
-        if (!node && id.length === FQ_ID_LENGTH) {
+        if (!node && id.length === ECHO_DXN_LENGTH) {
           void graph.initialize(id);
           const timeout = setTimeout(async () => {
             const node = graph.getNode(id).pipe(Option.getOrNull);
@@ -117,7 +120,7 @@ export default async (context: PluginContext) => {
             // Group parts by space for efficient messaging.
             const idsBySpace = reduceGroupBy(active, (id) => {
               try {
-                const [spaceId] = parseFullyQualifiedId(id);
+                const { spaceId } = parseId(id);
                 return spaceId;
               } catch {
                 return null;
@@ -126,7 +129,7 @@ export default async (context: PluginContext) => {
 
             const removedBySpace = reduceGroupBy(inactive, (id) => {
               try {
-                const [spaceId] = parseFullyQualifiedId(id);
+                const { spaceId } = parseId(id);
                 return spaceId;
               } catch {
                 return null;

package/src/components/AwaitingObject.tsx

@@ -4,23 +4,25 @@
 
 import React, { useCallback, useEffect, useState } from 'react';
 
-import { LayoutAction, createIntent, useIntentDispatcher, useLayout } from '@dxos/app-framework';
+import { LayoutAction, createIntent } from '@dxos/app-framework';
+import { useIntentDispatcher, useLayout } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
-import { Filter, fullyQualifiedId, useQuery } from '@dxos/react-client/echo';
+import { Filter, useQuery } from '@dxos/react-client/echo';
 import { Button, Icon, Toast, useTranslation } from '@dxos/react-ui';
 
 import { meta } from '../meta';
 import { SpaceAction } from '../types';
 
-const WAIT_FOR_OBJECT_TIMEOUT = 180e3; // 3 minutes
-const TOAST_TIMEOUT = 240e3; // 4 minutes
+const WAIT_FOR_OBJECT_TIMEOUT = 3 * 60 * 1_000;
+const TOAST_TIMEOUT = 4 * 60 * 1_000;
 
 export const AwaitingObject = ({ id }: { id: string }) => {
+  const { t } = useTranslation(meta.id);
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
   const [open, setOpen] = useState(true);
   const [waiting, setWaiting] = useState(true);
   const [found, setFound] = useState(false);
-  const { t } = useTranslation(meta.id);
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
   const layout = useLayout();
 
   const client = useClient();
@@ -31,17 +33,13 @@ export const AwaitingObject = ({ id }: { id: string }) => {
       return;
     }
 
-    const timeout = setTimeout(() => {
-      setWaiting(false);
-    }, WAIT_FOR_OBJECT_TIMEOUT);
-
-    () => clearTimeout(timeout);
+    const timeout = setTimeout(() => setWaiting(false), WAIT_FOR_OBJECT_TIMEOUT);
+    return () => clearTimeout(timeout);
   }, [id]);
 
   useEffect(() => {
-    if (objects.findIndex((object) => fullyQualifiedId(object) === id) > -1) {
+    if (objects.findIndex((object) => Obj.getDXN(object).toString() === id) > -1) {
       setFound(true);
-
       if (layout.active.includes(id)) {
         setOpen(false);
       }

package/src/components/{CollectionMain.tsx → CollectionArticle.tsx}

@@ -4,13 +4,14 @@
 
 import React from 'react';
 
+import { type SurfaceComponentProps } from '@dxos/app-framework/react';
 import { useTranslation } from '@dxos/react-ui';
 import { baseSurface, descriptionMessage, mx } from '@dxos/react-ui-theme';
-import { type DataType } from '@dxos/schema';
+import { type Collection } from '@dxos/schema';
 
 import { meta } from '../meta';
 
-export const CollectionMain = ({ collection }: { collection: DataType.Collection }) => {
+export const CollectionArticle = ({ object }: SurfaceComponentProps<Collection.Collection>) => {
   const { t } = useTranslation(meta.id);
 
   return (
@@ -23,10 +24,10 @@ export const CollectionMain = ({ collection }: { collection: DataType.Collection
         role='alert'
         className={mx(descriptionMessage, 'rounded-md p-8 font-normal text-lg max-is-[24rem] break-words')}
       >
-        {collection.name ?? t('unnamed collection label')}
+        {object.name ?? t('unnamed collection label')}
       </p>
     </div>
   );
 };
 
-export default CollectionMain;
+export default CollectionArticle;

package/src/components/CollectionSection.tsx

@@ -4,17 +4,19 @@
 
 import React from 'react';
 
+import { type SurfaceComponentProps } from '@dxos/app-framework/react';
 import { useTranslation } from '@dxos/react-ui';
-import { type DataType } from '@dxos/schema';
+import { type Collection } from '@dxos/schema';
 
 import { meta } from '../meta';
 
-export const CollectionSection = ({ collection }: { collection: DataType.Collection }) => {
+export const CollectionSection = ({ role, object }: SurfaceComponentProps<Collection.Collection>) => {
   const { t } = useTranslation(meta.id);
+
   // TODO(wittjosiah): Better placeholder.
   return (
-    <div className='min-bs-[3.5rem] grid grid-rows-subgrid grid-cols-subgrid items-center'>
-      <span className='truncate'>{collection.name ?? t('unnamed collection label')}</span>
+    <div role={role} className='min-bs-[3.5rem] grid grid-rows-subgrid grid-cols-subgrid items-center'>
+      <span className='truncate'>{object.name ?? t('unnamed collection label')}</span>
     </div>
   );
 };

package/src/components/CreateDialog/CreateObjectDialog.stories.tsx

@@ -7,12 +7,12 @@ import React, { useEffect } from 'react';
 
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Filter, Obj, Type } from '@dxos/echo';
+import { Filter, Obj } from '@dxos/echo';
 import { useQuery, useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Dialog } from '@dxos/react-ui';
 import { withTheme } from '@dxos/react-ui/testing';
-import { DataType } from '@dxos/schema';
+import { Collection } from '@dxos/schema';
 import { translations as shellTranslations } from '@dxos/shell/react';
 
 import { translations } from '../../translations';
@@ -37,7 +37,7 @@ const meta = {
   decorators: [
     withTheme, // TODO(wittjosiah): Try to write story which does not depend on plugin manager.
     withPluginManager({ plugins: [IntentPlugin()] }),
-    withClientProvider({ createIdentity: true, createSpace: true, types: [DataType.Collection] }),
+    withClientProvider({ createIdentity: true, createSpace: true, types: [Collection.Collection] }),
   ],
   parameters: {
     translations: [...translations, ...shellTranslations],
@@ -50,7 +50,7 @@ export default meta;
 export const Default: StoryObj<typeof CreateObjectDialog> = {};
 
 export const Typename: StoryObj<typeof CreateObjectDialog> = {
-  args: { typename: Type.getTypename(DataType.Collection) },
+  args: { typename: Collection.Collection.typename },
 };
 
 export const TargetSpace: StoryObj<typeof CreateObjectDialog> = {
@@ -68,11 +68,11 @@ export const TargetSpace: StoryObj<typeof CreateObjectDialog> = {
 export const TargetCollection: StoryObj<typeof CreateObjectDialog> = {
   render: (args) => {
     const space = useSpace();
-    const [collection] = useQuery(space, Filter.type(DataType.Collection));
+    const [collection] = useQuery(space, Filter.type(Collection.Collection));
 
     useEffect(() => {
       if (space) {
-        space.db.add(Obj.make(DataType.Collection, { name: 'My Collection', objects: [] }));
+        space.db.add(Obj.make(Collection.Collection, { name: 'My Collection', objects: [] }));
       }
     }, [space]);
 

package/src/components/CreateDialog/CreateObjectDialog.tsx

@@ -6,22 +6,15 @@ import * as Effect from 'effect/Effect';
 import * as Function from 'effect/Function';
 import React, { useCallback, useRef, useState } from 'react';
 
-import {
-  Capabilities,
-  LayoutAction,
-  chain,
-  createIntent,
-  useCapabilities,
-  useIntentDispatcher,
-  usePluginManager,
-} from '@dxos/app-framework';
+import { Capabilities, LayoutAction, chain, createIntent } from '@dxos/app-framework';
+import { useCapabilities, useIntentDispatcher, usePluginManager } from '@dxos/app-framework/react';
 import { Obj, Query, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { useClient } from '@dxos/react-client';
 import { type Space, getSpace, isLiveObject, isSpace, useQuery, useSpaces } from '@dxos/react-client/echo';
-import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
+import { Dialog, IconButton, useTranslation } from '@dxos/react-ui';
 import { cardDialogContent, cardDialogHeader } from '@dxos/react-ui-stack';
-import { DataType, getTypenameFromQuery } from '@dxos/schema';
+import { Collection, StoredSchema, getTypenameFromQuery } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
 import { SpaceCapabilities } from '../../capabilities';
@@ -48,20 +41,20 @@ export const CreateObjectDialog = ({
   onCreateObject,
   shouldNavigate: _shouldNavigate,
 }: CreateObjectDialogProps) => {
-  const closeRef = useRef<HTMLButtonElement | null>(null);
   const manager = usePluginManager();
   const { t } = useTranslation(meta.id);
-  const client = useClient();
-  const spaces = useSpaces();
   const { dispatch } = useIntentDispatcher();
   const forms = useCapabilities(SpaceCapabilities.ObjectForm);
-  const [target, setTarget] = useState<Space | DataType.Collection | undefined>(initialTarget);
+  const [target, setTarget] = useState<Space | Collection.Collection | undefined>(initialTarget);
   const [typename, setTypename] = useState<string | undefined>(initialTypename);
+  const client = useClient();
+  const spaces = useSpaces();
   const space = isSpace(target) ? target : getSpace(target);
-  const queryCollections = useQuery(space, Query.type(DataType.QueryCollection));
+  const queryCollections = useQuery(space, Query.type(Collection.QueryCollection));
   const hiddenTypenames = queryCollections
     .map((collection) => getTypenameFromQuery(collection.query))
     .filter(isNonNullable);
+  const closeRef = useRef<HTMLButtonElement | null>(null);
 
   const resolve = useCallback<NonNullable<CreateObjectPanelProps['resolve']>>(
     (typename) =>
@@ -83,10 +76,14 @@ export const CreateObjectDialog = ({
         const space = isSpace(target) ? target : getSpace(target);
         invariant(space, 'Missing space');
         const { object } = yield* dispatch(form.getIntent(data, { space }));
-        if (isLiveObject(object) && !Obj.instanceOf(DataType.StoredSchema, object)) {
+        if (isLiveObject(object) && !Obj.instanceOf(StoredSchema, object)) {
           // TODO(wittjosiah): Selection in navtree isn't working as expected when hidden typenames evals to true.
           const hidden = form.hidden || hiddenTypenames.includes(Type.getTypename(form.objectSchema));
-          const addObjectIntent = createIntent(SpaceAction.AddObject, { target, object, hidden });
+          const addObjectIntent = createIntent(SpaceAction.AddObject, {
+            target,
+            object,
+            hidden,
+          });
           const shouldNavigate = _shouldNavigate ?? (() => true);
           if (shouldNavigate(object)) {
             yield* dispatch(Function.pipe(addObjectIntent, chain(LayoutAction.Open, { part: 'main' })));
@@ -107,13 +104,23 @@ export const CreateObjectDialog = ({
       <div role='none' className={cardDialogHeader}>
         <Dialog.Title>
           {t('create object dialog title', {
-            object: t('typename label', { ns: typename, defaultValue: views ? 'View' : 'Item' }),
+            object: t('typename label', {
+              ns: typename,
+              defaultValue: views ? 'View' : 'Item',
+            }),
           })}
         </Dialog.Title>
         <Dialog.Close asChild>
-          <Button ref={closeRef} density='fine' variant='ghost' autoFocus>
-            <Icon icon='ph--x--regular' size={4} />
-          </Button>
+          <IconButton
+            ref={closeRef}
+            icon='ph--x--regular'
+            size={4}
+            label='Close'
+            iconOnly
+            density='fine'
+            variant='ghost'
+            autoFocus
+          />
         </Dialog.Close>
       </div>
 

package/src/components/CreateDialog/CreateObjectPanel.tsx

@@ -12,7 +12,7 @@ import { Icon, toLocalizedString, useDefaultValue, useTranslation } from '@dxos/
 import { Form } from '@dxos/react-ui-form';
 import { SearchList } from '@dxos/react-ui-searchlist';
 import { cardDialogOverflow, cardDialogPaddedOverflow, cardDialogSearchListRoot } from '@dxos/react-ui-stack';
-import { type DataType } from '@dxos/schema';
+import { type Collection } from '@dxos/schema';
 import { type MaybePromise, isNonNullable } from '@dxos/util';
 
 import { useInputSurfaceLookup } from '../../hooks';
@@ -24,7 +24,7 @@ export type CreateObjectPanelProps = {
   forms: ObjectForm[];
   spaces: Space[];
   typename?: string;
-  target?: Space | DataType.Collection;
+  target?: Space | Collection.Collection;
   views?: boolean;
   initialFormValues?: Partial<BaseObject>;
   defaultSpaceId?: SpaceId;

package/src/components/CreateDialog/CreateSpaceDialog.tsx

@@ -6,8 +6,9 @@ import * as Effect from 'effect/Effect';
 import type * as Schema from 'effect/Schema';
 import React, { useCallback, useRef } from 'react';
 
-import { LayoutAction, createIntent, useIntentDispatcher } from '@dxos/app-framework';
-import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
+import { LayoutAction, createIntent } from '@dxos/app-framework';
+import { useIntentDispatcher } from '@dxos/app-framework/react';
+import { Dialog, IconButton, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 import { cardDialogContent, cardDialogHeader } from '@dxos/react-ui-stack';
 
@@ -31,8 +32,18 @@ export const CreateSpaceDialog = () => {
     async (data: FormValues) => {
       const program = Effect.gen(function* () {
         const { space } = yield* dispatch(createIntent(SpaceAction.Create, data));
-        yield* dispatch(createIntent(LayoutAction.SwitchWorkspace, { part: 'workspace', subject: space.id }));
-        yield* dispatch(createIntent(LayoutAction.UpdateDialog, { part: 'dialog', options: { state: false } }));
+        yield* dispatch(
+          createIntent(LayoutAction.SwitchWorkspace, {
+            part: 'workspace',
+            subject: space.id,
+          }),
+        );
+        yield* dispatch(
+          createIntent(LayoutAction.UpdateDialog, {
+            part: 'dialog',
+            options: { state: false },
+          }),
+        );
       });
       await Effect.runPromise(program);
     },
@@ -46,9 +57,16 @@ export const CreateSpaceDialog = () => {
       <div role='none' className={cardDialogHeader}>
         <Dialog.Title>{t('create space dialog title')}</Dialog.Title>
         <Dialog.Close asChild>
-          <Button ref={closeRef} density='fine' variant='ghost' autoFocus>
-            <Icon icon='ph--x--regular' size={4} />
-          </Button>
+          <IconButton
+            ref={closeRef}
+            icon='ph--x--regular'
+            size={4}
+            label='Close'
+            iconOnly
+            density='fine'
+            variant='ghost'
+            autoFocus
+          />
         </Dialog.Close>
       </div>
       <div role='none' className='contents'>

package/src/components/{JoinDialog.tsx → JoinDialog/JoinDialog.tsx}

@@ -4,7 +4,8 @@
 
 import React, { useCallback } from 'react';
 
-import { LayoutAction, createIntent, useAppGraph, useIntentDispatcher } from '@dxos/app-framework';
+import { LayoutAction, createIntent } from '@dxos/app-framework';
+import { useAppGraph, useIntentDispatcher } from '@dxos/app-framework/react';
 import { Trigger } from '@dxos/async';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { useClient } from '@dxos/react-client';
@@ -13,7 +14,7 @@ import { type InvitationResult } from '@dxos/react-client/invitations';
 import { Dialog, useTranslation } from '@dxos/react-ui';
 import { JoinPanel, type JoinPanelProps } from '@dxos/shell/react';
 
-import { meta } from '../meta';
+import { meta } from '../../meta';
 
 export const JOIN_DIALOG = `${meta.id}/JoinDialog`;
 
@@ -69,7 +70,12 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
         space = await trigger.wait();
       }
 
-      await dispatch(createIntent(LayoutAction.SwitchWorkspace, { part: 'workspace', subject: space.id }));
+      await dispatch(
+        createIntent(LayoutAction.SwitchWorkspace, {
+          part: 'workspace',
+          subject: space.id,
+        }),
+      );
 
       // TODO(wittjosiah): If navigableCollections is false and there's no target,
       //   should try to navigate to the first object of the space replicates.
@@ -80,8 +86,18 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
         // If the target has not yet replicated, this will trigger a loading toast.
         await graph.waitForPath({ target }).catch(() => {});
         await Promise.all([
-          dispatch(createIntent(LayoutAction.Open, { part: 'main', subject: [target] })),
-          dispatch(createIntent(LayoutAction.Expose, { part: 'navigation', subject: target })),
+          dispatch(
+            createIntent(LayoutAction.Open, {
+              part: 'main',
+              subject: [target],
+            }),
+          ),
+          dispatch(
+            createIntent(LayoutAction.Expose, {
+              part: 'navigation',
+              subject: target,
+            }),
+          ),
         ]);
       }
 

package/src/components/JoinDialog/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './JoinDialog';

package/src/components/{MembersContainer.stories.tsx → MembersContainer/MembersContainer.stories.tsx}

@@ -13,7 +13,7 @@ import { withTheme } from '@dxos/react-ui/testing';
 import { translations as shellTranslations } from '@dxos/shell/react';
 import { render } from '@dxos/storybook-utils';
 
-import { translations } from '../translations';
+import { translations } from '../../translations';
 
 import { MembersContainer } from './MembersContainer';