@dxos/plugin-preview 0.8.4-main.3c1ae3b → 0.8.4-main.3fbcb4aa9b

package/package.json

@@ -1,67 +1,115 @@
 {
   "name": "@dxos/plugin-preview",
-  "version": "0.8.4-main.3c1ae3b",
+  "version": "0.8.4-main.3fbcb4aa9b",
   "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,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "node": "./src/PreviewPlugin.node.ts",
+        "default": "./src/PreviewPlugin.tsx"
+      },
+      "types": "./dist/types/src/PreviewPlugin.d.ts",
+      "node": "./dist/lib/neutral/PreviewPlugin.node.mjs",
+      "default": "./dist/lib/neutral/PreviewPlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    }
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./testing": {
+      "source": "./src/testing.ts",
+      "types": "./dist/types/src/testing.d.ts",
+      "default": "./dist/lib/neutral/testing.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@dxos/app-graph": "0.8.4-main.3c1ae3b",
-    "@dxos/app-framework": "0.8.4-main.3c1ae3b",
-    "@dxos/async": "0.8.4-main.3c1ae3b",
-    "@dxos/lit-ui": "0.8.4-main.3c1ae3b",
-    "@dxos/echo": "0.8.4-main.3c1ae3b",
-    "@dxos/client": "0.8.4-main.3c1ae3b",
-    "@dxos/keys": "0.8.4-main.3c1ae3b",
-    "@dxos/log": "0.8.4-main.3c1ae3b",
-    "@dxos/plugin-attention": "0.8.4-main.3c1ae3b",
-    "@dxos/plugin-client": "0.8.4-main.3c1ae3b",
-    "@dxos/plugin-space": "0.8.4-main.3c1ae3b",
-    "@dxos/react-ui": "0.8.4-main.3c1ae3b",
-    "@dxos/react-ui-editor": "0.8.4-main.3c1ae3b",
-    "@dxos/react-client": "0.8.4-main.3c1ae3b",
-    "@dxos/plugin-deck": "0.8.4-main.3c1ae3b",
-    "@dxos/react-ui-menu": "0.8.4-main.3c1ae3b",
-    "@dxos/react-ui-stack": "0.8.4-main.3c1ae3b",
-    "@dxos/react-ui-form": "0.8.4-main.3c1ae3b",
-    "@dxos/react-ui-table": "0.8.4-main.3c1ae3b",
-    "@dxos/react-ui-theme": "0.8.4-main.3c1ae3b",
-    "@dxos/schema": "0.8.4-main.3c1ae3b",
-    "@dxos/types": "0.8.4-main.3c1ae3b",
-    "@dxos/util": "0.8.4-main.3c1ae3b"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@dxos/app-graph": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/app-toolkit": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/app-framework": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/effect": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/keys": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/lit-ui": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/operation": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-attention": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/log": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-deck": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-editor": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-form": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-menu": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/async": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-mosaic": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-table": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/schema": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/types": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/ui-editor": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/util": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b"
   },
   "devDependencies": {
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
-    "vite": "7.1.9",
-    "@dxos/random": "0.8.4-main.3c1ae3b",
-    "@dxos/storybook-utils": "0.8.4-main.3c1ae3b"
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^8.0.10",
+    "@dxos/echo-db": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-testing": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/random": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-components": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/storybook-utils": "0.8.4-main.3fbcb4aa9b"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0"
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3"
   },
   "publishConfig": {
     "access": "public"

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/plugin';
+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', { timeout: 10_000 }, 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,33 +2,24 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
-import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
+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 = 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(
+  AppPlugin.addSchemaModule({ schema: [Person.Person, Organization.Organization] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    id: 'preview-popover',
+    activatesOn: ActivationEvents.Startup,
     activate: PreviewPopover,
   }),
-  defineModule({
-    id: `${meta.id}/module/react-surface`,
-    activatesOn: Events.SetupReactSurface,
-    activate: ReactSurface,
-  }),
-]);
+  Plugin.make,
+);
+
+export default PreviewPlugin;

package/src/capabilities/index.ts

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

package/src/capabilities/preview-popover.ts

@@ -2,68 +2,95 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
+
+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 { DX_ANCHOR_ACTIVATE, type DxAnchorActivate } from '@dxos/react-ui';
-import { type PreviewLinkRef, type PreviewLinkTarget } from '@dxos/react-ui-editor';
+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,
+  { 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;
   }
 };
 
-export default (context: PluginContext) => {
-  // TODO(wittjosiah): Factor out lookup handlers to other plugins to make not ECHO-specific.
-  const handleAnchorActivate = async ({ refId, label, trigger }: DxAnchorActivate) => {
-    const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-    const client = context.getCapability(ClientCapabilities.Client);
-    const [layout] = context.getCapabilities(Capabilities.Layout);
-    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;
-    }
+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 ({
+      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(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;
+      }
+
+      const title = titleProp ?? Obj.getLabel(result.object);
 
-    await dispatch(
-      createIntent(LayoutAction.UpdatePopover, {
-        part: 'popover',
+      await invokePromise(LayoutOperation.UpdatePopover, {
+        subjectRef: dxn,
         subject: result.object,
-        options: {
-          state: true,
-          variant: 'virtual',
-          anchor: trigger,
-        },
-      }),
-    );
-  };
+        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');
-  }
+    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 contributes(Capabilities.Null, null, () => cleanup());
-};
+    return Capability.contributes(Capabilities.Null, null, () => Effect.sync(() => cleanup?.()));
+  }),
+);

package/src/capabilities/react-surface.tsx

@@ -2,121 +2,117 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useCallback } from 'react';
+import * as Effect from 'effect/Effect';
+import React from 'react';
 
-import { Capabilities, LayoutAction, contributes, createIntent, createSurface } from '@dxos/app-framework';
-import { Surface, SurfaceCardRole, useIntentDispatcher } from '@dxos/app-framework/react';
-import { getSpace } from '@dxos/client/echo';
+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 { useActiveSpace } from '@dxos/plugin-space';
-import { type ProjectionModel } from '@dxos/schema';
-import { Organization, Person, Project, Task } from '@dxos/types';
+import { Card } from '@dxos/react-ui';
+import { Expando, type ProjectionModel } from '@dxos/schema';
+import { Organization, Person, Pipeline, Task } from '@dxos/types';
 
-import { FormCard, OrganizationCard, PersonCard, ProjectCard, TaskCard } from '../cards';
-import { meta } from '../meta';
-import { type CardPreviewProps } from '../types';
+import { ExpandoCard, FormCard, JsonCard, OrganizationCard, PersonCard, ProjectCard, TaskCard } from '../cards';
 
-export default () =>
-  contributes(Capabilities.ReactSurface, [
-    //
-    // Specific schema types.
-    // TODO(burdon): Create helpers and factor out.
-    //
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      //
+      // Specific schema types.
+      // TODO(burdon): Create helpers and factor out.
+      //
 
-    // TODO(burdon): Infer Role type.
-    createSurface<{ subject: Person.Person }>({
-      id: `${meta.id}/schema-popover--contact`,
-      role: SurfaceCardRole.literals as any,
-      filter: (data): data is { subject: Person.Person } => Obj.instanceOf(Person.Person, data.subject),
-      component: ({ data, role }) => {
-        const { dispatchPromise: dispatch } = useIntentDispatcher();
-        const space = getSpace(data.subject);
-        const activeSpace = useActiveSpace(); // TODO(burdon): Disambiguate with space?
-        const handleSelect = useCallback<NonNullable<CardPreviewProps['onSelect']>>(
-          (object) =>
-            dispatch(
-              createIntent(LayoutAction.Open, {
-                part: 'main',
-                subject: [Obj.getDXN(object).toString()],
-                options: {
-                  workspace: space?.id,
-                },
-              }),
-            ),
-          [dispatch],
-        );
+      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} />;
+        },
+      }),
 
-        return (
-          <PersonCard
-            role={role as SurfaceCardRole}
-            subject={data.subject}
-            activeSpace={activeSpace}
-            onSelect={handleSelect}
-          >
-            {role === 'card--popover' && <Surface role='related' data={data} />}
-          </PersonCard>
-        );
-      },
-    }),
-    createSurface({
-      id: `${meta.id}/schema-popover--organization`,
-      role: SurfaceCardRole.literals as any,
-      filter: (data): data is { subject: Organization.Organization } =>
-        Obj.instanceOf(Organization.Organization, data.subject),
-      component: ({ data, role }) => {
-        const activeSpace = useActiveSpace();
-        return (
-          <OrganizationCard role={role as SurfaceCardRole} subject={data.subject} activeSpace={activeSpace}>
-            {role === 'card--popover' && <Surface role='related' data={data} />}
-          </OrganizationCard>
-        );
-      },
-    }),
-    createSurface({
-      id: `${meta.id}/schema-popover--project`,
-      role: SurfaceCardRole.literals as any,
-      filter: (data): data is { subject: Project.Project } => Obj.instanceOf(Project.Project, data.subject),
-      component: ({ data, role }) => {
-        const activeSpace = useActiveSpace();
-        return <ProjectCard subject={data.subject} role={role as SurfaceCardRole} activeSpace={activeSpace} />;
-      },
-    }),
-    createSurface({
-      id: `${meta.id}/schema-popover--task`,
-      role: SurfaceCardRole.literals as any,
-      filter: (data): data is { subject: Task.Task } => Obj.instanceOf(Task.Task, data.subject),
-      component: ({ data, role }) => {
-        return <TaskCard subject={data.subject} role={role as SurfaceCardRole} />;
-      },
-    }),
+      //
+      // Fallback for any object.
+      //
 
-    //
-    // 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} />;
+        },
+      }),
 
-    createSurface({
-      id: `${meta.id}/fallback-popover`,
-      role: SurfaceCardRole.literals as any,
-      position: 'fallback',
-      filter: (data): data is { subject: Obj.Any; projection?: ProjectionModel } => Obj.isObject(data.subject),
-      component: ({ data, role }) => {
-        return <FormCard subject={data.subject} projection={data.projection} role={role as SurfaceCardRole} />;
-      },
-    }),
+      Surface.create({
+        id: 'fallback-json',
+        role: 'card--content',
+        position: 'fallback',
+        filter: (data): data is Record<string, unknown> => true,
+        component: ({ data }) => {
+          return <JsonCard data={data} />;
+        },
+      }),
 
-    createSurface({
-      id: `${meta.id}/section`,
-      role: ['section'],
-      position: 'fallback',
-      filter: (data): data is { subject: Obj.Any } => 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'>
-              <Surface role='card' data={data} limit={1} />
+      Surface.create({
+        id: 'section',
+        position: 'fallback',
+        filter: AppSurface.subject(AppSurface.Section, Obj.isObject),
+        component: ({ data }) => {
+          return (
+            <div className='flex w-full justify-center'>
+              <div 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>
-          </div>
-        );
-      },
-    }),
-  ]);
+          );
+        },
+      }),
+    ]),
+  ),
+);