@dxos/plugin-preview 0.8.4-main.9735255 → 0.8.4-main.abd8ff62ef

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-preview",
-  "version": "0.8.4-main.9735255",
+  "version": "0.8.4-main.abd8ff62ef",
   "description": "Preview plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,63 +12,77 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": "./src/capabilities/index.ts",
+    "#meta": "./src/meta.ts",
+    "#plugin": {
+      "browser": "./src/PreviewPlugin.tsx",
+      "node": "./src/PreviewPlugin.node.ts",
+      "default": "./src/PreviewPlugin.tsx"
+    },
+    "#translations": "./src/translations.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@dxos/app-graph": "0.8.4-main.9735255",
-    "@dxos/app-framework": "0.8.4-main.9735255",
-    "@dxos/async": "0.8.4-main.9735255",
-    "@dxos/echo": "0.8.4-main.9735255",
-    "@dxos/client": "0.8.4-main.9735255",
-    "@dxos/effect": "0.8.4-main.9735255",
-    "@dxos/lit-ui": "0.8.4-main.9735255",
-    "@dxos/keys": "0.8.4-main.9735255",
-    "@dxos/log": "0.8.4-main.9735255",
-    "@dxos/operation": "0.8.4-main.9735255",
-    "@dxos/plugin-attention": "0.8.4-main.9735255",
-    "@dxos/plugin-client": "0.8.4-main.9735255",
-    "@dxos/plugin-space": "0.8.4-main.9735255",
-    "@dxos/plugin-deck": "0.8.4-main.9735255",
-    "@dxos/react-client": "0.8.4-main.9735255",
-    "@dxos/react-ui": "0.8.4-main.9735255",
-    "@dxos/react-ui-form": "0.8.4-main.9735255",
-    "@dxos/react-ui-editor": "0.8.4-main.9735255",
-    "@dxos/react-ui-menu": "0.8.4-main.9735255",
-    "@dxos/react-ui-table": "0.8.4-main.9735255",
-    "@dxos/react-ui-mosaic": "0.8.4-main.9735255",
-    "@dxos/schema": "0.8.4-main.9735255",
-    "@dxos/types": "0.8.4-main.9735255",
-    "@dxos/ui-theme": "0.8.4-main.9735255",
-    "@dxos/util": "0.8.4-main.9735255",
-    "@dxos/ui-editor": "0.8.4-main.9735255"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@dxos/app-framework": "0.8.4-main.abd8ff62ef",
+    "@dxos/app-graph": "0.8.4-main.abd8ff62ef",
+    "@dxos/app-toolkit": "0.8.4-main.abd8ff62ef",
+    "@dxos/async": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo": "0.8.4-main.abd8ff62ef",
+    "@dxos/effect": "0.8.4-main.abd8ff62ef",
+    "@dxos/keys": "0.8.4-main.abd8ff62ef",
+    "@dxos/client": "0.8.4-main.abd8ff62ef",
+    "@dxos/lit-ui": "0.8.4-main.abd8ff62ef",
+    "@dxos/operation": "0.8.4-main.abd8ff62ef",
+    "@dxos/log": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-attention": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-deck": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-editor": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-mosaic": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-menu": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.abd8ff62ef",
+    "@dxos/schema": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-table": "0.8.4-main.abd8ff62ef",
+    "@dxos/types": "0.8.4-main.abd8ff62ef",
+    "@dxos/util": "0.8.4-main.abd8ff62ef",
+    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef",
+    "@dxos/ui-editor": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-form": "0.8.4-main.abd8ff62ef"
   },
   "devDependencies": {
-    "effect": "3.19.11",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/plugin-testing": "0.8.4-main.9735255",
-    "@dxos/echo-db": "0.8.4-main.9735255",
-    "@dxos/random": "0.8.4-main.9735255",
-    "@dxos/storybook-utils": "0.8.4-main.9735255",
-    "@dxos/react-ui-components": "0.8.4-main.9735255"
+    "vite": "^8.0.10",
+    "@dxos/plugin-testing": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo-db": "0.8.4-main.abd8ff62ef",
+    "@dxos/random": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-components": "0.8.4-main.abd8ff62ef",
+    "@dxos/storybook-utils": "0.8.4-main.abd8ff62ef"
   },
   "peerDependencies": {
-    "effect": "3.19.11",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3"
   },

package/src/PreviewPlugin.node.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Organization, Person } from '@dxos/types';
+
+import { meta } from '#meta';
+
+export const PreviewPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addSchemaModule({ schema: [Person.Person, Organization.Organization] }),
+  Plugin.make,
+);
+
+export default PreviewPlugin;

package/src/PreviewPlugin.test.ts

@@ -0,0 +1,25 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ClientPlugin } from '@dxos/plugin-client';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { PreviewPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('PreviewPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), PreviewPlugin()],
+    });
+
+    // After autoStart: schema auto-cascades from ClientPlugin.
+    expect(harness.manager.getActive()).toContain(moduleId('schema'));
+  });
+});

package/src/PreviewPlugin.tsx

@@ -2,21 +2,24 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Common, Plugin } from '@dxos/app-framework';
+import { ActivationEvents, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 import { Organization, Person } from '@dxos/types';
 
-import { PreviewPopover, ReactSurface } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
+import { PreviewPopover, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
 
 export const PreviewPlugin = Plugin.define(meta).pipe(
-  Common.Plugin.addTranslationsModule({ translations }),
-  Common.Plugin.addSchemaModule({ schema: [Person.Person, Organization.Organization], id: 'schema' }),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addSchemaModule({ schema: [Person.Person, Organization.Organization] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({
     id: 'preview-popover',
-    activatesOn: Common.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activate: PreviewPopover,
   }),
   Plugin.make,
 );
+
+export default PreviewPlugin;

package/src/capabilities/index.ts

@@ -2,5 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './preview-popover';
-export * from './react-surface';
+import { Capability } from '@dxos/app-framework';
+
+export const PreviewPopover = Capability.lazy('PreviewPopover', () => import('./preview-popover'));
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/{preview-popover/preview-popover.ts → preview-popover.ts}

@@ -4,13 +4,15 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities, LayoutOperation, getPersonalSpace, getSpaceIdFromPath } from '@dxos/app-toolkit';
 import { addEventListener } from '@dxos/async';
 import { type Client } from '@dxos/client';
-import { type Space, parseId } from '@dxos/client/echo';
+import { type Space } from '@dxos/client/echo';
+import { Obj } from '@dxos/echo';
 import { DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { ClientCapabilities } from '@dxos/plugin-client';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
 import { DX_ANCHOR_ACTIVATE, type DxAnchorActivate } from '@dxos/react-ui';
 import { type PreviewLinkRef, type PreviewLinkTarget } from '@dxos/ui-editor';
 
@@ -19,10 +21,10 @@ const customEventOptions = { capture: true, passive: false };
 const handlePreviewLookup = async (
   client: Client,
   defaultSpace: Space,
-  { ref, label }: PreviewLinkRef,
+  { dxn, label }: PreviewLinkRef,
 ): Promise<PreviewLinkTarget | null> => {
   try {
-    const object = await defaultSpace.db.makeRef(DXN.parse(ref)).load();
+    const object = await defaultSpace.db.makeRef(DXN.parse(dxn)).load();
     return { label, object };
   } catch {
     return null;
@@ -35,20 +37,37 @@ export default Capability.makeModule(
     const capabilities = yield* Capability.Service;
 
     // TODO(wittjosiah): Factor out lookup handlers to other plugins to make not ECHO-specific.
-    const handleAnchorActivate = async ({ refId, label, trigger, kind, title, side, props }: DxAnchorActivate) => {
-      const { invokePromise } = capabilities.get(Common.Capability.OperationInvoker);
+    const handleAnchorActivate = async ({
+      dxn,
+      label,
+      trigger,
+      kind = 'card',
+      title: titleProp,
+      side,
+      props,
+    }: DxAnchorActivate) => {
+      const { invokePromise } = capabilities.get(Capabilities.OperationInvoker);
       const client = capabilities.get(ClientCapabilities.Client);
-      const registry = capabilities.get(Common.Capability.AtomRegistry);
-      const [layoutAtom] = capabilities.getAll(Common.Capability.Layout);
-      const layout = registry.get(layoutAtom);
-      const { spaceId } = parseId(layout.workspace);
-      const space = (spaceId && client.spaces.get(spaceId)) ?? client.spaces.default;
-      const result = await handlePreviewLookup(client, space, { ref: refId, label });
+      const registry = capabilities.get(Capabilities.AtomRegistry);
+      // Layout is optional: in standalone harnesses (Storybook, tests) no plugin contributes
+      // `AppCapabilities.Layout`, and `getAll` returns an empty array. Reading `registry.get(undefined)`
+      // would crash inside Atom's identity check (`'~atom/Serializable' in undefined`). When layout
+      // isn't available, fall through to the personal-space default.
+      const [layoutAtom] = capabilities.getAll(AppCapabilities.Layout);
+      const spaceId = layoutAtom && getSpaceIdFromPath(registry.get(layoutAtom).workspace);
+      const space = (spaceId && client.spaces.get(spaceId)) ?? getPersonalSpace(client);
+      if (!space) {
+        return;
+      }
+      const result = await handlePreviewLookup(client, space, { dxn, label });
       if (!result) {
         return;
       }
 
-      await invokePromise(Common.LayoutOperation.UpdatePopover, {
+      const title = titleProp ?? Obj.getLabel(result.object);
+
+      await invokePromise(LayoutOperation.UpdatePopover, {
+        subjectRef: dxn,
         subject: result.object,
         state: true,
         variant: 'virtual',
@@ -69,9 +88,9 @@ export default Capability.makeModule(
         customEventOptions,
       );
     } else {
-      log.warn('No default view found');
+      log.warn('no default view found');
     }
 
-    return Capability.contributes(Common.Capability.Null, null, () => Effect.sync(() => cleanup?.()));
+    return Capability.contributes(Capabilities.Null, null, () => Effect.sync(() => cleanup?.()));
   }),
 );

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,118 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Obj } from '@dxos/echo';
+import { Card } from '@dxos/react-ui';
+import { Expando, type ProjectionModel } from '@dxos/schema';
+import { Organization, Person, Pipeline, Task } from '@dxos/types';
+
+import { ExpandoCard, FormCard, JsonCard, OrganizationCard, PersonCard, ProjectCard, TaskCard } from '../cards';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      //
+      // Specific schema types.
+      // TODO(burdon): Create helpers and factor out.
+      //
+
+      Surface.create<{ subject: Person.Person }>({
+        id: 'schema-popover--contact',
+        position: 'hoist',
+        filter: AppSurface.object(AppSurface.Card, Person.Person),
+        component: ({ data, role }) => {
+          return (
+            <>
+              <PersonCard role={role} subject={data.subject} />
+              <Surface.Surface type={AppSurface.Related} data={data} limit={1} />
+            </>
+          );
+        },
+      }),
+      Surface.create({
+        id: 'schema-popover--organization',
+        position: 'hoist',
+        filter: AppSurface.object(AppSurface.Card, Organization.Organization),
+        component: ({ data, role }) => {
+          return (
+            <>
+              <OrganizationCard role={role} subject={data.subject} />
+              <Surface.Surface type={AppSurface.Related} data={data} limit={1} />
+            </>
+          );
+        },
+      }),
+      Surface.create({
+        id: 'schema-popover--project',
+        position: 'hoist',
+        filter: AppSurface.object(AppSurface.Card, Pipeline.Pipeline),
+        component: ({ data, role }) => {
+          return <ProjectCard role={role} subject={data.subject} />;
+        },
+      }),
+      Surface.create({
+        id: 'schema-popover--task',
+        position: 'hoist',
+        filter: AppSurface.object(AppSurface.Card, Task.Task),
+        component: ({ data, role }) => {
+          return <TaskCard role={role} subject={data.subject} />;
+        },
+      }),
+      Surface.create<AppSurface.ObjectCardData<Expando.Expando>>({
+        id: 'schema-popover--expando',
+        filter: AppSurface.object(AppSurface.Card, Expando.Expando),
+        component: ({ data, role }) => {
+          return <ExpandoCard role={role} subject={data.subject} ignorePaths={data.ignorePaths} />;
+        },
+      }),
+
+      //
+      // Fallback for any object.
+      //
+
+      Surface.create({
+        id: 'fallback-popover',
+        role: 'card--content',
+        position: 'fallback',
+        filter: (data): data is { subject: Obj.Unknown; projection?: ProjectionModel } => Obj.isObject(data.subject),
+        component: ({ data, role }) => {
+          return <FormCard role={role} subject={data.subject} projection={data.projection} />;
+        },
+      }),
+
+      Surface.create({
+        id: 'fallback-json',
+        role: 'card--content',
+        position: 'fallback',
+        filter: (data): data is Record<string, unknown> => true,
+        component: ({ data }) => {
+          return <JsonCard data={data} />;
+        },
+      }),
+
+      Surface.create({
+        id: 'section',
+        position: 'fallback',
+        filter: AppSurface.subject(AppSurface.Section, Obj.isObject),
+        component: ({ data }) => {
+          return (
+            <div role='none' className='flex w-full justify-center'>
+              <div role='none' className='py-2 dx-card-min-width dx-card-max-width'>
+                <Card.Root>
+                  <Surface.Surface type={AppSurface.Card} data={data} limit={1} />
+                </Card.Root>
+              </div>
+            </div>
+          );
+        },
+      }),
+    ]),
+  ),
+);

package/src/cards/ExpandoCard.tsx

@@ -0,0 +1,76 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+import React, { useCallback, useMemo } from 'react';
+
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { Obj } from '@dxos/echo';
+import { type JsonPath, splitJsonPath } from '@dxos/effect';
+import { Card } from '@dxos/react-ui';
+import { Form } from '@dxos/react-ui-form';
+
+const schemaForValue = (value: unknown): Schema.Schema.AnyNoContext | undefined => {
+  switch (typeof value) {
+    case 'string':
+      return Schema.String;
+    case 'number':
+      return Schema.Number;
+    case 'boolean':
+      return Schema.Boolean;
+    default:
+      return undefined;
+  }
+};
+
+/**
+ * Reserved keys: `id`, plus any `~`-prefixed key (ECHO uses `~`-prefixed
+ * string keys to brand entity instances and schemas — KindId,
+ * SchemaKindId, SnapshotKindId, etc. — and the `~` namespace is reserved
+ * for that purpose). They show up in `Object.keys` but aren't user data.
+ */
+const isInternalKey = (key: string) => key === 'id' || key.startsWith('~');
+
+export const ExpandoCard = ({ subject, ignorePaths }: AppSurface.ObjectCardProps) => {
+  const schema = useMemo(() => {
+    const ignored = new Set(ignorePaths ?? []);
+    const fields: Record<string, Schema.Schema.AnyNoContext> = {};
+    for (const key of Object.keys(subject)) {
+      if (isInternalKey(key) || ignored.has(key)) {
+        continue;
+      }
+      const fieldSchema = schemaForValue((subject as any)[key]);
+      if (fieldSchema) {
+        fields[key] = fieldSchema;
+      }
+    }
+    return Schema.Struct(fields);
+  }, [subject, ignorePaths]);
+
+  const handleSave = useCallback(
+    (values: any, { changed }: { changed: Record<string, boolean> }) => {
+      const paths = Object.keys(changed).filter((path) => changed[path]);
+      Obj.update(subject, () => {
+        for (const path of paths) {
+          const value = values[path];
+          const parts = splitJsonPath(path as JsonPath);
+          Obj.setValue(subject, parts, value);
+        }
+      });
+    },
+    [subject],
+  );
+
+  return (
+    <Card.Content>
+      <Form.Root schema={schema} values={subject} autoSave onSave={handleSave}>
+        <Form.Viewport>
+          <Form.Content>
+            <Form.FieldSet />
+          </Form.Content>
+        </Form.Viewport>
+      </Form.Root>
+    </Card.Content>
+  );
+};

package/src/cards/FormCard.tsx

@@ -2,38 +2,26 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 
-import { Common } from '@dxos/app-framework';
-import { type SurfaceComponentProps, useOperationInvoker } from '@dxos/app-framework/react';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
 import { type JsonPath, splitJsonPath } from '@dxos/effect';
-import { IconButton, useTranslation } from '@dxos/react-ui';
+import { Card, useTranslation } from '@dxos/react-ui';
 import { Form, omitId } from '@dxos/react-ui-form';
-import { Card } from '@dxos/react-ui-mosaic';
 import { type ProjectionModel } from '@dxos/schema';
 import { descriptionMessage, mx } from '@dxos/ui-theme';
 
-import { meta } from '../meta';
+import { meta } from '#meta';
 
-export const FormCard = ({ subject, projection }: SurfaceComponentProps & { projection?: ProjectionModel }) => {
-  const { invokePromise } = useOperationInvoker();
-  const schema = Obj.getSchema(subject);
+export const FormCard = ({ subject, projection }: AppSurface.ObjectCardProps & { projection?: ProjectionModel }) => {
   const { t } = useTranslation(meta.id);
-
-  const handleNavigate = useCallback(async () => {
-    await invokePromise(Common.LayoutOperation.UpdatePopover, { state: false, anchorId: '' });
-    await invokePromise(Common.LayoutOperation.Open, { subject: [Obj.getDXN(subject).toString()] });
-  }, [invokePromise, subject]);
-
-  if (!schema) {
-    // TODO(burdon): Use Alert.
-    return <p className={mx(descriptionMessage)}>{t('unable to create preview message')}</p>;
-  }
+  const echoSchema = Obj.getSchema(subject);
+  const schema = useMemo(() => echoSchema && omitId(echoSchema), [echoSchema]);
 
   const handleSave = useCallback((values: any, { changed }: { changed: Record<string, boolean> }) => {
     const paths = Object.keys(changed).filter((path) => changed[path]);
-    Obj.change(subject, () => {
+    Obj.update(subject, () => {
       for (const path of paths) {
         const value = values[path];
         const parts = splitJsonPath(path as JsonPath);
@@ -42,22 +30,19 @@ export const FormCard = ({ subject, projection }: SurfaceComponentProps & { proj
     });
   }, []);
 
-  const label = Obj.getLabel(subject) ?? Obj.getTypename(subject) ?? t('unable to create preview message');
+  if (!schema) {
+    return <p className={mx(descriptionMessage)}>{t('unable-to-create-preview.message')}</p>;
+  }
 
   return (
-    <Card.Root id={subject.id}>
-      <Card.Heading classNames='flex items-center'>
-        {label}
-        <span className='grow' />
-        <IconButton iconOnly icon='ph--arrow-right--regular' label={t('open object label')} onClick={handleNavigate} />
-      </Card.Heading>
-      <Form.Root schema={omitId(schema)} projection={projection} values={subject} autoSave onSave={handleSave}>
+    <Card.Content>
+      <Form.Root schema={schema} projection={projection} values={subject} autoSave onSave={handleSave}>
         <Form.Viewport>
           <Form.Content>
             <Form.FieldSet />
           </Form.Content>
         </Form.Viewport>
       </Form.Root>
-    </Card.Root>
+    </Card.Content>
   );
 };

package/src/cards/JsonCard.tsx

@@ -0,0 +1,19 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { Card } from '@dxos/react-ui';
+import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
+
+export const JsonCard = ({ data }: { data: unknown }) => {
+  return (
+    <Card.Content>
+      <span />
+      {/* TODO(wittjosiah): Span whole row. */}
+      <JsonHighlighter data={data} />
+      <span />
+    </Card.Content>
+  );
+};

package/src/cards/OrganizationCard.tsx

@@ -4,12 +4,12 @@
 
 import React from 'react';
 
-import { type SurfaceComponentProps } from '@dxos/app-framework/react';
-import { Card } from '@dxos/react-ui-mosaic';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { Card } from '@dxos/react-ui';
 import { type Organization } from '@dxos/types';
 
-export const OrganizationCard = ({ subject }: SurfaceComponentProps<Organization.Organization>) => {
-  const { image, description, website } = subject;
+export const OrganizationCard = ({ subject }: AppSurface.ObjectCardProps<Organization.Organization>) => {
+  const { name, image, description, website } = subject;
 
   return (
     <Card.Content>