@dxos/plugin-preview 0.8.4-main.72ec0f3 → 0.8.4-main.937b3ca

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/plugin-preview",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.937b3ca",
   "description": "Preview plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
@@ -24,44 +28,49 @@
     "src"
   ],
   "dependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@dxos/app-framework": "0.8.4-main.72ec0f3",
-    "@dxos/client": "0.8.4-main.72ec0f3",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/app-graph": "0.8.4-main.72ec0f3",
-    "@dxos/keys": "0.8.4-main.72ec0f3",
-    "@dxos/lit-ui": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-attention": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-client": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-deck": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-space": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-form": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-editor": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-table": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/schema": "0.8.4-main.72ec0f3",
-    "@dxos/types": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-menu": "0.8.4-main.72ec0f3"
+    "@effect-atom/atom-react": "^0.4.6",
+    "@dxos/app-framework": "0.8.4-main.937b3ca",
+    "@dxos/async": "0.8.4-main.937b3ca",
+    "@dxos/effect": "0.8.4-main.937b3ca",
+    "@dxos/client": "0.8.4-main.937b3ca",
+    "@dxos/keys": "0.8.4-main.937b3ca",
+    "@dxos/lit-ui": "0.8.4-main.937b3ca",
+    "@dxos/app-graph": "0.8.4-main.937b3ca",
+    "@dxos/echo": "0.8.4-main.937b3ca",
+    "@dxos/log": "0.8.4-main.937b3ca",
+    "@dxos/plugin-client": "0.8.4-main.937b3ca",
+    "@dxos/plugin-attention": "0.8.4-main.937b3ca",
+    "@dxos/plugin-deck": "0.8.4-main.937b3ca",
+    "@dxos/operation": "0.8.4-main.937b3ca",
+    "@dxos/plugin-space": "0.8.4-main.937b3ca",
+    "@dxos/react-client": "0.8.4-main.937b3ca",
+    "@dxos/react-ui": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-editor": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-form": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-menu": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-mosaic": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-table": "0.8.4-main.937b3ca",
+    "@dxos/types": "0.8.4-main.937b3ca",
+    "@dxos/schema": "0.8.4-main.937b3ca",
+    "@dxos/ui-editor": "0.8.4-main.937b3ca",
+    "@dxos/ui-theme": "0.8.4-main.937b3ca",
+    "@dxos/util": "0.8.4-main.937b3ca"
   },
   "devDependencies": {
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/random": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3"
+    "@dxos/echo-db": "0.8.4-main.937b3ca",
+    "@dxos/plugin-testing": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-components": "0.8.4-main.937b3ca",
+    "@dxos/random": "0.8.4-main.937b3ca",
+    "@dxos/storybook-utils": "0.8.4-main.937b3ca"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0"
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3"
   },
   "publishConfig": {
     "access": "public"

package/src/PreviewPlugin.tsx

@@ -2,33 +2,21 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
-import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
+import { Common, Plugin } from '@dxos/app-framework';
 import { Organization, Person } from '@dxos/types';
 
 import { PreviewPopover, ReactSurface } from './capabilities';
 import { meta } from './meta';
 import { translations } from './translations';
 
-export const PreviewPlugin = definePlugin(meta, () => [
-  defineModule({
-    id: `${meta.id}/module/translations`,
-    activatesOn: Events.SetupTranslations,
-    activate: () => contributes(Capabilities.Translations, translations),
-  }),
-  defineModule({
-    id: `${meta.id}/module/schema`,
-    activatesOn: ClientEvents.SetupSchema,
-    activate: () => [contributes(ClientCapabilities.Schema, [Person.Person, Organization.Organization])],
-  }),
-  defineModule({
-    id: `${meta.id}/module/preview-popover`,
-    activatesOn: Events.Startup,
+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 }),
+  Plugin.addModule({
+    id: 'preview-popover',
+    activatesOn: Common.ActivationEvent.Startup,
     activate: PreviewPopover,
   }),
-  defineModule({
-    id: `${meta.id}/module/react-surface`,
-    activatesOn: Events.SetupReactSurface,
-    activate: ReactSurface,
-  }),
-]);
+  Plugin.make,
+);

package/src/capabilities/index.ts

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

package/src/capabilities/preview-popover/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const PreviewPopover = Capability.lazy('PreviewPopover', () => import('./preview-popover'));

package/src/capabilities/preview-popover/preview-popover.ts

@@ -0,0 +1,77 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability, Common } from '@dxos/app-framework';
+import { addEventListener } from '@dxos/async';
+import { type Client } from '@dxos/client';
+import { type Space, parseId } from '@dxos/client/echo';
+import { DXN } from '@dxos/keys';
+import { log } from '@dxos/log';
+import { ClientCapabilities } from '@dxos/plugin-client';
+import { DX_ANCHOR_ACTIVATE, type DxAnchorActivate } from '@dxos/react-ui';
+import { type PreviewLinkRef, type PreviewLinkTarget } from '@dxos/ui-editor';
+
+const customEventOptions = { capture: true, passive: false };
+
+const handlePreviewLookup = async (
+  client: Client,
+  defaultSpace: Space,
+  { ref, label }: PreviewLinkRef,
+): Promise<PreviewLinkTarget | null> => {
+  try {
+    const object = await defaultSpace.db.makeRef(DXN.parse(ref)).load();
+    return { label, object };
+  } catch {
+    return null;
+  }
+};
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    // Get context for lazy capability access in callbacks.
+    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 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 });
+      if (!result) {
+        return;
+      }
+
+      await invokePromise(Common.LayoutOperation.UpdatePopover, {
+        subject: result.object,
+        state: true,
+        variant: 'virtual',
+        anchor: trigger,
+        ...(kind && { kind }),
+        ...(title && { title }),
+        ...(side && { side }),
+        ...(props && { props }),
+      });
+    };
+
+    let cleanup: () => void;
+    if (document.defaultView) {
+      cleanup = addEventListener(
+        document.defaultView,
+        DX_ANCHOR_ACTIVATE as any,
+        handleAnchorActivate,
+        customEventOptions,
+      );
+    } else {
+      log.warn('No default view found');
+    }
+
+    return Capability.contributes(Common.Capability.Null, null, () => Effect.sync(() => cleanup?.()));
+  }),
+);

package/src/capabilities/react-surface/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/react-surface/react-surface.tsx

@@ -0,0 +1,97 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capability, Common } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
+import { Card } from '@dxos/react-ui-mosaic';
+import { type ProjectionModel } from '@dxos/schema';
+import { Organization, Person, Project, Task } from '@dxos/types';
+
+import { FormCard, OrganizationCard, PersonCard, ProjectCard, TaskCard } from '../../cards';
+import { meta } from '../../meta';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Common.Capability.ReactSurface, [
+      //
+      // Specific schema types.
+      // TODO(burdon): Create helpers and factor out.
+      //
+
+      Common.createSurface<{ subject: Person.Person }>({
+        id: `${meta.id}/schema-popover--contact`,
+        role: 'card--content',
+        position: 'hoist',
+        filter: (data): data is { subject: Person.Person } => Obj.instanceOf(Person.Person, data.subject),
+        component: ({ data, role }) => {
+          return <PersonCard role={role} subject={data.subject} />;
+        },
+      }),
+      Common.createSurface({
+        id: `${meta.id}/schema-popover--organization`,
+        role: 'card--content',
+        position: 'hoist',
+        filter: (data): data is { subject: Organization.Organization } =>
+          Obj.instanceOf(Organization.Organization, data.subject),
+        component: ({ data, role }) => {
+          return <OrganizationCard role={role} subject={data.subject} />;
+        },
+      }),
+      Common.createSurface({
+        id: `${meta.id}/schema-popover--project`,
+        role: 'card--content',
+        position: 'hoist',
+        filter: (data): data is { subject: Project.Project } => Obj.instanceOf(Project.Project, data.subject),
+        component: ({ data, role }) => {
+          return <ProjectCard role={role} subject={data.subject} />;
+        },
+      }),
+      Common.createSurface({
+        id: `${meta.id}/schema-popover--task`,
+        role: 'card--content',
+        position: 'hoist',
+        filter: (data): data is { subject: Task.Task } => Obj.instanceOf(Task.Task, data.subject),
+        component: ({ data, role }) => {
+          return <TaskCard role={role} subject={data.subject} />;
+        },
+      }),
+
+      //
+      // Fallback for any object.
+      //
+
+      Common.createSurface({
+        id: `${meta.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} />;
+        },
+      }),
+
+      Common.createSurface({
+        id: `${meta.id}/section`,
+        role: ['section'],
+        position: 'fallback',
+        filter: (data): data is { subject: Obj.Unknown } => Obj.isObject(data.subject),
+        component: ({ data }) => {
+          return (
+            <div role='none' className='flex is-full justify-center'>
+              <div role='none' className='pbs-2 pbe-2 card-min-width card-max-width'>
+                <Card.Root>
+                  <Surface role='card--content' data={data} limit={1} />
+                </Card.Root>
+              </div>
+            </div>
+          );
+        },
+      }),
+    ]),
+  ),
+);

package/src/cards/FormCard.tsx

@@ -0,0 +1,63 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useCallback } from 'react';
+
+import { Common } from '@dxos/app-framework';
+import { type SurfaceComponentProps, useOperationInvoker } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
+import { type JsonPath, splitJsonPath } from '@dxos/effect';
+import { IconButton, 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';
+
+export const FormCard = ({ subject, projection }: SurfaceComponentProps & { projection?: ProjectionModel }) => {
+  const { invokePromise } = useOperationInvoker();
+  const schema = Obj.getSchema(subject);
+  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 handleSave = useCallback((values: any, { changed }: { changed: Record<string, boolean> }) => {
+    const paths = Object.keys(changed).filter((path) => changed[path]);
+    Obj.change(subject, () => {
+      for (const path of paths) {
+        const value = values[path];
+        const parts = splitJsonPath(path as JsonPath);
+        Obj.setValue(subject, parts, value);
+      }
+    });
+  }, []);
+
+  const label = Obj.getLabel(subject) ?? Obj.getTypename(subject) ?? t('unable to create preview message');
+
+  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}>
+        <Form.Viewport>
+          <Form.Content>
+            <Form.FieldSet />
+          </Form.Content>
+        </Form.Viewport>
+      </Form.Root>
+    </Card.Root>
+  );
+};

package/src/cards/OrganizationCard.tsx

@@ -4,31 +4,26 @@
 
 import React from 'react';
 
-import { Card } from '@dxos/react-ui-stack';
+import { type SurfaceComponentProps } from '@dxos/app-framework/react';
+import { Card } from '@dxos/react-ui-mosaic';
 import { type Organization } from '@dxos/types';
 
-import { CardHeader, CardLink } from '../components';
-import { type CardPreviewProps } from '../types';
-
-export const OrganizationCard = ({
-  children,
-  subject,
-  role,
-  activeSpace,
-}: CardPreviewProps<Organization.Organization>) => {
-  const { name, image, description, website } = subject;
+export const OrganizationCard = ({ subject }: SurfaceComponentProps<Organization.Organization>) => {
+  const { image, description, website } = subject;
 
   return (
-    <Card.SurfaceRoot id={subject.id} role={role}>
+    <Card.Content>
       <Card.Poster
         alt={name ?? ''}
         {...(image ? { image } : { icon: 'ph--building-office--regular' })}
         classNames={!image && 'opacity-50'}
       />
-      <CardHeader label={name} subject={subject} activeSpace={activeSpace} />
-      {description && <Card.Text classNames='line-clamp-2'>{description}</Card.Text>}
-      {website && <CardLink label={website} href={website} />}
-      {children}
-    </Card.SurfaceRoot>
+      {description && (
+        <Card.Row>
+          <Card.Text variant='description'>{description}</Card.Text>
+        </Card.Row>
+      )}
+      {website && <Card.Link label={website} href={website} />}
+    </Card.Content>
   );
 };

package/src/cards/PersonCard.tsx

@@ -2,62 +2,46 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { Fragment } from 'react';
+import React from 'react';
 
-import { Avatar, Icon } from '@dxos/react-ui';
-import { Card, cardHeading, cardText } from '@dxos/react-ui-stack';
-import { mx } from '@dxos/react-ui-theme';
+import { type SurfaceComponentProps } from '@dxos/app-framework/react';
+import { Avatar } from '@dxos/react-ui';
+import { Card } from '@dxos/react-ui-mosaic';
 import { type Person } from '@dxos/types';
 
-import { CardRow, CardSubjectMenu, gridRow } from '../components';
-import { type CardPreviewProps } from '../types';
-
-export const PersonCard = ({ children, role, subject, activeSpace, onSelect }: CardPreviewProps<Person.Person>) => {
-  const { fullName, image, organization: { target: organization } = {}, emails = [] } = subject;
+export const PersonCard = ({ subject }: SurfaceComponentProps<Person.Person>) => {
+  const { image, organization: { target: organization } = {}, emails = [] } = subject;
 
   return (
-    <Card.SurfaceRoot id={subject.id} role={role}>
-      <Avatar.Root>
-        <Card.Text role='group' classNames={mx('grid gap-2 grid-cols-[1fr_min-content]')}>
-          <div role='none' className={mx(gridRow, 'grid-rows-2')}>
-            {activeSpace ? <CardSubjectMenu subject={subject} activeSpace={activeSpace} /> : <div />}
-            <Avatar.Label asChild>
-              <h2 className={mx(cardHeading, 'grow truncate')}>{fullName}</h2>
-            </Avatar.Label>
-          </div>
-          <Avatar.Content
-            imgSrc={image}
-            icon='ph--user--regular'
-            size={16}
-            classNames={['text-subdued', !image && 'opacity-50']}
-            hue='neutral'
-            variant='square'
+    <Avatar.Root>
+      <Card.Content>
+        {image && (
+          <Card.Row className='plb-1'>
+            <Avatar.Content
+              imgSrc={image}
+              icon='ph--user--regular'
+              size={16}
+              classNames={!image && 'opacity-50'}
+              hue='neutral'
+              variant='square'
+            />
+          </Card.Row>
+        )}
+        {organization?.name && (
+          <Card.Action
+            icon='ph--buildings--regular'
+            label={organization.name}
+            // onClick={onSelect ? () => onSelect(organization) : undefined}
           />
-        </Card.Text>
-      </Avatar.Root>
-      {organization?.name && (
-        <CardRow
-          icon='ph--buildings--regular'
-          label={organization.name}
-          onClick={onSelect ? () => onSelect(organization) : undefined}
-        />
-      )}
-      {emails.length > 0 && (
-        <dl className={mx(cardText, gridRow, '[&_dt]:text-subdued [&_dt]:pbs-0.5 [&_dd]:min-is-0')}>
-          {emails.map(({ label, value }) => (
-            <Fragment key={value}>
-              <dt>
-                <span className='sr-only'>{label}</span>
-                <Icon icon='ph--at--regular' size={5} />
-              </dt>
-              <dd key={value} className='col-span-2 break-words'>
-                {value}
-              </dd>
-            </Fragment>
-          ))}
-        </dl>
-      )}
-      {children}
-    </Card.SurfaceRoot>
+        )}
+        {emails.map(({ value }) => (
+          <Card.Row key={value} icon='ph--at--regular'>
+            <Card.Text truncate className='text-primaryText'>
+              {value}
+            </Card.Text>
+          </Card.Row>
+        ))}
+      </Card.Content>
+    </Avatar.Root>
   );
 };

package/src/cards/ProjectCard.tsx

@@ -4,21 +4,19 @@
 
 import React from 'react';
 
+import { type SurfaceComponentProps } from '@dxos/app-framework/react';
 import { Obj } from '@dxos/echo';
-import { Card } from '@dxos/react-ui-stack';
+import { Card } from '@dxos/react-ui-mosaic';
 import { type Project } from '@dxos/types';
 
-import { CardHeader } from '../components';
-import { type CardPreviewProps } from '../types';
-
-export const ProjectCard = ({ subject, role, activeSpace }: CardPreviewProps<Project.Project>) => {
+export const ProjectCard = ({ subject }: SurfaceComponentProps<Project.Project>) => {
   const { name, image, description } = subject;
 
   return (
-    <Card.SurfaceRoot id={subject.id} role={role}>
+    <Card.Content>
       {image && <Card.Poster image={image} alt={Obj.getLabel(subject) ?? ''} aspect='auto' />}
-      <CardHeader label={name} subject={subject} activeSpace={activeSpace} />
-      {description && <Card.Text classNames='line-clamp-2'>{description}</Card.Text>}
-    </Card.SurfaceRoot>
+      {/* <CardHeader label={name} subject={subject} db={db} /> */}
+      {description && <Card.Text variant='description'>{description}</Card.Text>}
+    </Card.Content>
   );
 };

package/src/cards/TaskCard.tsx

@@ -5,14 +5,11 @@
 import * as SchemaAST from 'effect/SchemaAST';
 import React from 'react';
 
+import { type SurfaceComponentProps } from '@dxos/app-framework/react';
 import { type PropertyMetaAnnotation, PropertyMetaAnnotationId } from '@dxos/echo/internal';
-import { Card, cardNoSpacing, cardSpacing } from '@dxos/react-ui-stack';
-import { mx } from '@dxos/react-ui-theme';
+import { Card } from '@dxos/react-ui-mosaic';
 import { Task } from '@dxos/types';
 
-import { CardSubjectMenu } from '../components';
-import { type CardPreviewProps } from '../types';
-
 // TODO(thure): Should this move upstream as a helper? Is there an easier way to get options?
 const getActiveStatusOption = (status?: string) => {
   const properties = SchemaAST.getPropertySignatures(Task.Task.ast);
@@ -26,21 +23,18 @@ const getActiveStatusOption = (status?: string) => {
   return options.find(({ id }) => id === status);
 };
 
-export const TaskCard = ({ subject, role, activeSpace }: CardPreviewProps<Task.Task>) => {
+export const TaskCard = ({ subject }: SurfaceComponentProps<Task.Task>) => {
   const { title, status } = subject;
   const statusOption = getActiveStatusOption(status);
 
   return (
-    <Card.SurfaceRoot id={subject.id} role={role}>
-      <div role='none' className={mx('flex items-center gap-2', cardSpacing)}>
-        <Card.Heading classNames={[cardNoSpacing, 'min-is-0 flex-1 truncate']}>{title}</Card.Heading>
-        {statusOption && (
-          <span className='dx-tag' data-hue={statusOption.color}>
-            {statusOption.title}
-          </span>
-        )}
-        <CardSubjectMenu subject={subject} activeSpace={activeSpace} />
-      </div>
-    </Card.SurfaceRoot>
+    <Card.Content>
+      <Card.Heading classNames='min-is-0 flex-1 truncate'>{title}</Card.Heading>
+      {statusOption && (
+        <span className='dx-tag' data-hue={statusOption.color}>
+          {statusOption.title}
+        </span>
+      )}
+    </Card.Content>
   );
 };

package/src/cards/index.ts

@@ -2,6 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
+export * from './FormCard';
 export * from './OrganizationCard';
 export * from './PersonCard';
 export * from './ProjectCard';

package/src/index.ts

@@ -3,6 +3,5 @@
 //
 
 export * from './meta';
-export type * from './types';
 
 export * from './PreviewPlugin';