@dxos/plugin-space 0.8.4-main.d05673bc65 → 0.8.4-main.d9fc60f731

package/src/containers/EntityRenamePopover/EntityRenamePopover.tsx

@@ -0,0 +1,52 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React, { useCallback, useRef, useState } from 'react';
+
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Entity } from '@dxos/echo';
+import { log } from '@dxos/log';
+import { Button, Input, useTranslation } from '@dxos/react-ui';
+import { osTranslations } from '@dxos/ui-theme';
+
+import { meta } from '#meta';
+
+export const ENTITY_RENAME_POPOVER = `${meta.id}.EntityRenamePopover`;
+
+export const EntityRenamePopover = ({ entity }: { entity: Entity.Unknown }) => {
+  const { t } = useTranslation(meta.id);
+  const doneButton = useRef<HTMLButtonElement>(null);
+  const [name, setName] = useState(Entity.getLabel(entity));
+  const { invokePromise } = useOperationInvoker();
+
+  const handleDone = useCallback(() => {
+    try {
+      name && Entity.update(entity, () => Entity.setLabel(entity, name));
+    } catch (err) {
+      log.error('Failed to rename entity', { err });
+    }
+    void invokePromise(LayoutOperation.UpdatePopover, { anchorId: '', state: false });
+  }, [entity, name, invokePromise]);
+
+  return (
+    <div className='p-2 flex gap-2'>
+      <div className='flex-1'>
+        <Input.Root>
+          <Input.Label srOnly>{t('object-name.label')}</Input.Label>
+          <Input.TextInput
+            placeholder={t('object.placeholder')}
+            value={name}
+            data-testid='spacePlugin.renameObject.input'
+            onChange={({ target: { value } }) => setName(value)}
+            onKeyDown={({ key }) => key === 'Enter' && doneButton.current?.click()}
+          />
+        </Input.Root>
+      </div>
+      <Button ref={doneButton} classNames='self-stretch' onClick={handleDone}>
+        {t('done.label', { ns: osTranslations })}
+      </Button>
+    </div>
+  );
+};

package/src/containers/EntityRenamePopover/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export { EntityRenamePopover as default } from './EntityRenamePopover';

package/src/containers/ImportSpaceDialog/ImportSpaceDialog.tsx

@@ -0,0 +1,62 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import React, { useCallback } from 'react';
+import { FileUploader } from 'react-drag-drop-files';
+
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
+import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
+
+import { meta } from '#meta';
+import { SpaceOperation } from '#operations';
+
+export const ImportSpaceDialog = () => {
+  const { t } = useTranslation(meta.id);
+  const { invokePromise } = useOperationInvoker();
+
+  const handleFile = useCallback(
+    async (file: File) => {
+      const contents = new Uint8Array(await file.arrayBuffer());
+      const { data: result } = await invokePromise(SpaceOperation.ImportSpace, {
+        archive: { filename: file.name, contents },
+      });
+      await invokePromise(LayoutOperation.UpdateDialog, { state: false });
+      if (result?.space) {
+        await invokePromise(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(result.space.id) });
+      }
+    },
+    [invokePromise],
+  );
+
+  return (
+    <Dialog.Content>
+      <Dialog.Header>
+        <Dialog.Title>{t('import-space-dialog.title')}</Dialog.Title>
+        <Dialog.Close asChild>
+          <Dialog.ActionIconButton action='close' />
+        </Dialog.Close>
+      </Dialog.Header>
+      <Dialog.Body>
+        <p className='my-4'>{t('import-space-dialog.description')}</p>
+        <FileUploader
+          types={['json', 'tar']}
+          classes='block my-4 p-8 border-2 border-dashed border-neutral-500/50 rounded-sm flex items-center justify-center gap-2 cursor-pointer'
+          dropMessageStyle={{ border: 'none', backgroundColor: '#EEE' }}
+          handleChange={(file: File) => {
+            void handleFile(file);
+          }}
+        >
+          <Icon icon='ph--file-plus--duotone' size={8} />
+          <span>{t('import-space-dialog.upload.label')}</span>
+        </FileUploader>
+      </Dialog.Body>
+      <Dialog.ActionBar>
+        <Dialog.Close asChild>
+          <Button variant='primary'>{t('cancel.label')}</Button>
+        </Dialog.Close>
+      </Dialog.ActionBar>
+    </Dialog.Content>
+  );
+};

package/src/containers/ImportSpaceDialog/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export { ImportSpaceDialog as default } from './ImportSpaceDialog';

package/src/containers/InlineSyncStatus/InlineSyncStatus.tsx

@@ -12,7 +12,7 @@ import { type Space, useSpaceSyncState } from '@dxos/react-client/echo';
 import { Tooltip, useTranslation } from '@dxos/react-ui';
 import { AttentionGlyph, useAttention } from '@dxos/react-ui-attention';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 const useEdgeStatus = (): EdgeStatus.ConnectionState => {
   const [status, setStatus] = useState(EdgeStatus.ConnectionState.NOT_CONNECTED);
@@ -39,7 +39,7 @@ export const InlineSyncStatus = ({ space, open }: { space: Space; open?: boolean
   const syncing = connectedToEdge && edgeSyncEnabled && syncState && syncState.missingOnLocal > 0;
 
   return (
-    <Tooltip.Trigger asChild content={t('syncing label')} side='bottom'>
+    <Tooltip.Trigger asChild content={t('syncing.label')} side='bottom'>
       <AttentionGlyph
         syncing={syncing}
         attended={attended}

package/src/containers/InlineSyncStatus/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-import { InlineSyncStatus } from './InlineSyncStatus';
-
-export default InlineSyncStatus;
+export { InlineSyncStatus as default } from './InlineSyncStatus';

package/src/containers/JoinDialog/JoinDialog.stories.tsx

@@ -0,0 +1,43 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
+import { corePlugins } from '@dxos/plugin-testing';
+import { Dialog } from '@dxos/react-ui';
+
+import { translations } from '#translations';
+
+import { JoinDialog } from './JoinDialog';
+
+const DefaultStory = () => (
+  <Dialog.Root defaultOpen>
+    <Dialog.Overlay>
+      <JoinDialog />
+    </Dialog.Overlay>
+  </Dialog.Root>
+);
+
+const meta = {
+  title: 'plugins/plugin-space/containers/JoinDialog',
+  component: JoinDialog,
+  render: DefaultStory,
+  decorators: [
+    withPluginManager({
+      plugins: [...corePlugins(), ClientPlugin({})],
+    }),
+  ],
+  parameters: {
+    translations,
+  },
+} satisfies Meta<typeof JoinDialog>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/containers/JoinDialog/JoinDialog.tsx

@@ -9,7 +9,7 @@ import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
 import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { Trigger } from '@dxos/async';
 import { Graph } from '@dxos/plugin-graph';
-import { ObservabilityOperation } from '@dxos/plugin-observability/types';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { type InvitationResult } from '@dxos/react-client/invitations';
@@ -17,7 +17,7 @@ import { Dialog, useTranslation } from '@dxos/react-ui';
 import { JoinPanel, type JoinPanelProps } from '@dxos/shell/react';
 import { osTranslations } from '@dxos/ui-theme';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 export const JOIN_DIALOG = `${meta.id}.JoinDialog`;
 
@@ -42,8 +42,8 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
         invokePromise(LayoutOperation.AddToast, {
           id: `${meta.id}.join-success`,
           duration: 5_000,
-          title: ['join success label', { ns: meta.id }],
-          closeLabel: ['dismiss label', { ns: meta.id }],
+          title: ['join-success.label', { ns: meta.id }],
+          closeLabel: ['dismiss.label', { ns: meta.id }],
         }),
         invokePromise(LayoutOperation.UpdateDialog, { state: false }),
       ]);
@@ -77,7 +77,7 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
         ]);
       }
 
-      await onDone?.(result);
+      onDone?.(result);
 
       if (space) {
         await invokePromise(ObservabilityOperation.SendEvent, {
@@ -91,15 +91,18 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
     [invokePromise, client, graph, navigableCollections, onDone],
   );
 
+  // TODO(burdon): Move JoinHeading into Dialog.Heading.
   return (
     <Dialog.Content>
-      <Dialog.Title classNames='sr-only'>{t('join space label', { ns: osTranslations })}</Dialog.Title>
-      <JoinPanel
-        {...props}
-        exitActionParent={<Dialog.Close asChild />}
-        doneActionParent={<Dialog.Close asChild />}
-        onDone={handleDone}
-      />
+      <Dialog.Title classNames='sr-only'>{t('join-space.label', { ns: osTranslations })}</Dialog.Title>
+      <Dialog.Body>
+        <JoinPanel
+          {...props}
+          exitActionParent={<Dialog.Close asChild />}
+          doneActionParent={<Dialog.Close asChild />}
+          onDone={handleDone}
+        />
+      </Dialog.Body>
     </Dialog.Content>
   );
 };

package/src/containers/MembersContainer/MembersContainer.tsx

@@ -2,17 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { type Dispatch, type SetStateAction, useCallback, useMemo, useState } from 'react';
+import * as Option from 'effect/Option';
+import React, { type Dispatch, type SetStateAction, useMemo, useState } from 'react';
 import { QR } from 'react-qr-rounded';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { Obj } from '@dxos/echo';
-import { Collection } from '@dxos/echo';
+import { RootCollectionAnnotation } from '@dxos/app-toolkit';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Annotation, Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { useConfig } from '@dxos/react-client';
-import { type Space, useSpaceInvitations } from '@dxos/react-client/echo';
+import { useSpaceInvitations } from '@dxos/react-client/echo';
 import { type CancellableInvitationObservable, Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
-import { Button, Clipboard, Icon, Input, useId, useTranslation } from '@dxos/react-ui';
+import { Button, Clipboard, Icon, useId, useTranslation } from '@dxos/react-ui';
 import { Settings } from '@dxos/react-ui-form';
 import {
   type ActionMenuItem,
@@ -27,9 +29,8 @@ import {
 } from '@dxos/shell/react';
 import { hexToEmoji } from '@dxos/util';
 
-import { meta } from '../../meta';
-import { SpaceOperation } from '../../types';
-import { COMPOSER_SPACE_LOCK } from '../../util';
+import { meta } from '#meta';
+import { SpaceOperation } from '#operations';
 
 // TODO(wittjosiah): Copied from Shell.
 const activeActionKey = 'dxos:react-shell/space-manager/active-action';
@@ -42,10 +43,9 @@ const handleInvitationEvent = (invitation: Invitation, subscription: ZenObservab
   }
 };
 
-export type MembersContainerProps = {
-  space: Space;
+export type MembersContainerProps = AppSurface.SpaceArticleProps<{
   createInvitationUrl: (invitationCode: string) => string;
-};
+}>;
 
 export const MembersContainer = ({ space, createInvitationUrl }: MembersContainerProps) => {
   const { t } = useTranslation(meta.id);
@@ -64,20 +64,14 @@ export const MembersContainer = ({ space, createInvitationUrl }: MembersContaine
   };
 
   // TODO(wittjosiah): Track which was the most recently viewed object.
-  const target = space.properties[Collection.Collection.typename]?.target?.objects[0]?.target;
-
-  const locked = space.properties[COMPOSER_SPACE_LOCK];
-  const handleChangeLocked = useCallback(() => {
-    Obj.change(space.properties, (p) => {
-      p[COMPOSER_SPACE_LOCK] = !locked;
-    });
-  }, [locked, space]);
+  const target = Annotation.get(space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined)?.target
+    ?.objects[0]?.target;
 
   const inviteActions = useMemo(
     (): Record<string, ActionMenuItem> => ({
       inviteOne: {
-        label: t('invite one label', { ns: shellTranslationKey }),
-        description: t('invite one description', { ns: shellTranslationKey }),
+        label: t('invite-one.label', { ns: shellTranslationKey }),
+        description: t('invite-one.description', { ns: shellTranslationKey }),
         icon: 'ph--user-plus--regular',
         testId: 'membersContainer.inviteOne',
         onClick: async () => {
@@ -86,7 +80,7 @@ export const MembersContainer = ({ space, createInvitationUrl }: MembersContaine
             type: Invitation.Type.INTERACTIVE,
             authMethod: Invitation.AuthMethod.SHARED_SECRET,
             multiUse: false,
-            target: target && Obj.getDXN(target).toString(),
+            target: target && Obj.getURI(target),
           });
           if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== 'production') {
             const subscription: ZenObservable.Subscription = (invitation as CancellableInvitationObservable).subscribe(
@@ -96,8 +90,8 @@ export const MembersContainer = ({ space, createInvitationUrl }: MembersContaine
         },
       },
       inviteMany: {
-        label: t('invite many label', { ns: shellTranslationKey }),
-        description: t('invite many description', { ns: shellTranslationKey }),
+        label: t('invite-many.label', { ns: shellTranslationKey }),
+        description: t('invite-many.description', { ns: shellTranslationKey }),
         icon: 'ph--users-three--regular',
         testId: 'membersContainer.inviteMany',
         onClick: async () => {
@@ -106,7 +100,7 @@ export const MembersContainer = ({ space, createInvitationUrl }: MembersContaine
             type: Invitation.Type.DELEGATED,
             authMethod: Invitation.AuthMethod.KNOWN_PUBLIC_KEY,
             multiUse: true,
-            target: target && Obj.getDXN(target).toString(),
+            target: target && Obj.getURI(target),
           });
           if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== 'production') {
             const subscription: ZenObservable.Subscription = (invitation as CancellableInvitationObservable).subscribe(
@@ -129,49 +123,38 @@ export const MembersContainer = ({ space, createInvitationUrl }: MembersContaine
 
   return (
     <Clipboard.Provider>
-      <Settings.Root>
-        <Settings.Section title={t('members verbose label')} description={t('members description')}>
-          <Settings.Frame>
-            <Settings.FrameItem title={t('members label')}>
+      <Settings.Viewport>
+        <Settings.Section title={t('members-verbose.label')} description={t('members.description')}>
+          <Settings.Panel>
+            <div role='group' className='min-w-0'>
+              <h3 className='text-lg mb-2'>{t('members.label')}</h3>
               <SpaceMemberList spaceKey={space.key} includeSelf />
-            </Settings.FrameItem>
-            {locked && (
-              <Settings.FrameItem title={t('invitations label')}>
-                <p className='text-description mb-2'>{t('locked space description')}</p>
-              </Settings.FrameItem>
-            )}
-            {!locked && (
-              <Settings.FrameItem title={t('invitations label')}>
-                {selectedInvitation && <InvitationSection {...selectedInvitation} onBack={handleBack} />}
-                {!selectedInvitation && (
-                  <>
-                    <p className='text-description mb-2'>{t('space invitation description')}</p>
-                    <InvitationList
-                      className='mb-2'
-                      send={handleSend}
-                      invitations={visibleInvitations ?? []}
-                      onClickRemove={(invitation) => invitation.cancel()}
-                      createInvitationUrl={createInvitationUrl}
-                    />
-                    <BifurcatedAction
-                      actions={inviteActions}
-                      activeAction={activeAction}
-                      onChangeActiveAction={setActiveAction as Dispatch<SetStateAction<string>>}
-                      data-testid='membersContainer.createInvitation'
-                    />
-                  </>
-                )}
-              </Settings.FrameItem>
-            )}
-          </Settings.Frame>
-          {/* TODO(wittjosiah): Make Settings.ItemInput & Settings.Frame compatible. */}
-          <div className='justify-center p-0 mt-4 grid grid-cols-1 md:grid-cols-[1fr_min-content]'>
-            <Settings.ItemInput title={t('space locked label')} description={t('space locked description')}>
-              <Input.Switch checked={locked} onCheckedChange={handleChangeLocked} classNames='justify-self-end' />
-            </Settings.ItemInput>
-          </div>
+            </div>
+            <div role='group' className='min-w-0'>
+              <h3 className='text-lg mb-2'>{t('invitations.label')}</h3>
+              {selectedInvitation && <InvitationSection {...selectedInvitation} onBack={handleBack} />}
+              {!selectedInvitation && (
+                <>
+                  <p className='text-description mb-2'>{t('space-invitation.description')}</p>
+                  <InvitationList
+                    className='mb-2'
+                    send={handleSend}
+                    invitations={visibleInvitations ?? []}
+                    onClickRemove={(invitation) => invitation.cancel()}
+                    createInvitationUrl={createInvitationUrl}
+                  />
+                  <BifurcatedAction
+                    actions={inviteActions}
+                    activeAction={activeAction}
+                    onChangeActiveAction={setActiveAction as Dispatch<SetStateAction<string>>}
+                    data-testid='membersContainer.createInvitation'
+                  />
+                </>
+              )}
+            </div>
+          </Settings.Panel>
         </Settings.Section>
-      </Settings.Root>
+      </Settings.Viewport>
     </Clipboard.Provider>
   );
 };
@@ -227,9 +210,9 @@ const InvitationQR = ({ id, url, onCancel }: { id: string; url: string; onCancel
   const emoji = hexToEmoji(id);
   return (
     <>
-      <p className='text-description'>{t('qr code description', { ns: meta.id })}</p>
+      <p className='text-description'>{t('qr-code.description', { ns: meta.id })}</p>
       <div role='group' className='grid grid-cols-[1fr_min-content] my-2 gap-2'>
-        <div role='none' className='w-full aspect-square relative text-description'>
+        <div className='w-full aspect-square relative text-description'>
           <QR
             rounding={100}
             backgroundColor='transparent'
@@ -245,12 +228,12 @@ const InvitationQR = ({ id, url, onCancel }: { id: string; url: string; onCancel
           </Centered>
         </div>
         <span id={qrLabel} className='sr-only'>
-          {t('qr label')}
+          {t('qr.label')}
         </span>
         <Clipboard.Button value={url ?? 'never'} />
       </div>
       <Button variant='ghost' onClick={onCancel}>
-        {t('cancel label')}
+        {t('cancel.label')}
       </Button>
     </>
   );
@@ -262,12 +245,12 @@ const InvitationAuthCode = ({ id, code, onCancel }: { id: string; code: string;
 
   return (
     <>
-      <p className='text-description'>{t('auth other device emoji message')}</p>
+      <p className='text-description'>{t('auth-other-device-emoji.message')}</p>
       {emoji && <Emoji text={emoji} className='mx-auto my-2 text-center' />}
-      <p className='text-description'>{t('auth code message')}</p>
+      <p className='text-description'>{t('auth-code.message')}</p>
       <AuthCode code={code} large classNames='mx-auto my-2 text-center grow' />
       <Button variant='ghost' onClick={onCancel}>
-        {t('cancel label')}
+        {t('cancel.label')}
       </Button>
     </>
   );

package/src/containers/MembersContainer/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { MembersContainer } from './MembersContainer';
-
-export default MembersContainer;
+export { MembersContainer as default } from './MembersContainer';

package/src/containers/MenuFooter/MenuFooter.tsx

@@ -4,25 +4,25 @@
 
 import React from 'react';
 
+import { isPersonalSpace } from '@dxos/app-toolkit';
 import { getSpace } from '@dxos/client/echo';
 import { type Obj } from '@dxos/echo';
-import { useClient } from '@dxos/react-client';
 import { DropdownMenu, Icon, toLocalizedString, useTranslation } from '@dxos/react-ui';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
+
 import { getSpaceDisplayName } from '../../util';
 
 export const MenuFooter = ({ object }: { object: Obj.Unknown }) => {
   const { t } = useTranslation(meta.id);
-  const client = useClient();
   const space = getSpace(object);
-  const spaceName = space ? getSpaceDisplayName(space, { personal: client.spaces.default === space }) : '';
+  const spaceName = space ? getSpaceDisplayName(space, { personal: isPersonalSpace(space) }) : '';
   return space ? (
     <>
       <DropdownMenu.Separator />
-      <DropdownMenu.GroupLabel>{t('menu footer label')}</DropdownMenu.GroupLabel>
+      <DropdownMenu.GroupLabel>{t('menu-footer.label')}</DropdownMenu.GroupLabel>
       <dl className='ps-2 mb-2 text-xs grid grid-cols-[max-content_1fr] gap-2'>
-        <dt className='uppercase text-[.75em] tracking-wide font-medium mt-px self-start'>{t('location label')}</dt>
+        <dt className='uppercase text-[.75em] tracking-wide font-medium mt-px self-start'>{t('location.label')}</dt>
         <dd className='line-clamp-3'>
           <Icon icon='ph--planet--regular' classNames='inline-block me-1' />
           {toLocalizedString(spaceName, t)}

package/src/containers/MenuFooter/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-import { MenuFooter } from './MenuFooter';
-
-export default MenuFooter;
+export { MenuFooter as default } from './MenuFooter';

package/src/containers/ObjectCardStack/ObjectCardStack.tsx

@@ -4,17 +4,16 @@
 
 import React, { forwardRef, useState } from 'react';
 
-import { Obj } from '@dxos/echo';
-import { type View } from '@dxos/echo';
-import { Filter, useQuery, useSchema } from '@dxos/react-client/echo';
+import { Filter, Obj, type View } from '@dxos/echo';
+import { useQuery, useType } from '@dxos/react-client/echo';
 import { Card, Message, Panel, ScrollArea, Toolbar, useTranslation } from '@dxos/react-ui';
 import { useSelected } from '@dxos/react-ui-attention';
+import { ObjectForm } from '@dxos/react-ui-form';
 import { Mosaic } from '@dxos/react-ui-mosaic';
 import { getTypenameFromQuery } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
-import { ObjectForm } from '../../components';
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 export type ObjectCardStackProps = {
   view: View.View;
@@ -28,27 +27,27 @@ export const ObjectCardStack = forwardRef<HTMLDivElement, ObjectCardStackProps>(
   const { t } = useTranslation(meta.id);
   const db = Obj.getDatabase(view);
   const typename = view.query ? getTypenameFromQuery(view.query.ast) : undefined;
-  const schema = useSchema(db, typename);
+  const type = useType(db, typename);
 
-  const queriedObjects = useQuery(db, schema ? Filter.type(schema) : Filter.nothing());
+  const queriedObjects = useQuery(db, type ? Filter.type(type) : Filter.nothing());
   const selectedRows = useSelected(objectId, 'multi');
   const selectedObjects = selectedRows.map((id) => queriedObjects.find((obj) => obj.id === id)).filter(isNonNullable);
 
   const [viewport, setViewport] = useState<HTMLElement | null>(null);
 
-  if (!schema) {
+  if (!type) {
     return null;
   }
 
   return (
-    <Panel.Root className='dx-article' ref={forwardedRef}>
+    <Panel.Root className='dx-document' ref={forwardedRef}>
       <Panel.Toolbar asChild>
         <Toolbar.Root />
       </Panel.Toolbar>
       <Panel.Content>
         {selectedObjects.length === 0 ? (
           <Message.Root>
-            <Message.Title>{t('row details no selection label')}</Message.Title>
+            <Message.Title>{t('row-details-no-selection.label')}</Message.Title>
           </Message.Root>
         ) : (
           <Mosaic.Root>
@@ -66,7 +65,7 @@ export const ObjectCardStack = forwardRef<HTMLDivElement, ObjectCardStackProps>(
                     Tile={({ ...props }) => (
                       <Mosaic.Tile {...props}>
                         <Card.Root>
-                          <ObjectForm object={props.data} schema={schema} />
+                          <ObjectForm object={props.data} type={type} />
                         </Card.Root>
                       </Mosaic.Tile>
                     )}

package/src/containers/ObjectCardStack/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { ObjectCardStack } from './ObjectCardStack';
-
-export default ObjectCardStack;
+export { ObjectCardStack as default } from './ObjectCardStack';

package/src/containers/ObjectProperties/ObjectProperties.tsx

@@ -0,0 +1,32 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { forwardRef, useMemo } from 'react';
+
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { type Obj } from '@dxos/echo';
+import { Panel, Toolbar } from '@dxos/react-ui';
+import { ObjectProperties as NaturalObjectProperties } from '@dxos/react-ui-form';
+
+export type ObjectPropertiesProps = AppSurface.ObjectPropertiesProps<Obj.Unknown>;
+
+export const ObjectProperties = forwardRef<HTMLDivElement, ObjectPropertiesProps>(
+  ({ role, subject: object }, forwardedRef) => {
+    const data = useMemo<AppSurface.ObjectPropertiesData>(() => ({ subject: object }), [object]);
+
+    return (
+      <Panel.Root role={role} className='dx-document' ref={forwardedRef}>
+        <Panel.Toolbar asChild>
+          <Toolbar.Root />
+        </Panel.Toolbar>
+        <Panel.Content asChild>
+          <NaturalObjectProperties object={object}>
+            <Surface.Surface type={AppSurface.ObjectProperties} data={data} />
+          </NaturalObjectProperties>
+        </Panel.Content>
+      </Panel.Root>
+    );
+  },
+);

package/src/containers/ObjectProperties/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { ObjectProperties as default } from './ObjectProperties';