@dxos/plugin-presenter 0.8.4-main.7996785055 → 0.8.4-main.8baae0fced

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-presenter",
-  "version": "0.8.4-main.7996785055",
+  "version": "0.8.4-main.8baae0fced",
   "description": "Braneframe presenter plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,26 +8,72 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "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"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "workerd": "./src/PresenterPlugin.workerd.ts",
+        "node": "./src/PresenterPlugin.node.ts",
+        "default": "./src/PresenterPlugin.tsx"
+      },
+      "types": "./dist/types/src/PresenterPlugin.d.ts",
+      "workerd": "./dist/lib/neutral/PresenterPlugin.workerd.mjs",
+      "node": "./dist/lib/neutral/PresenterPlugin.node.mjs",
+      "default": "./dist/lib/neutral/PresenterPlugin.mjs"
+    },
+    "#testing": "./src/testing.ts",
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "types": "./dist/types/src/index.d.ts"
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./operations": {
-      "source": "./src/operations/index.ts",
-      "types": "./dist/types/src/operations/index.d.ts",
-      "browser": "./dist/lib/browser/operations/index.mjs"
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.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"
@@ -45,25 +91,26 @@
     "remark-frontmatter": "^5.0.0",
     "remark-parse-frontmatter": "^1.0.3",
     "reveal.js": "^5.1.0",
-    "@dxos/app-framework": "0.8.4-main.7996785055",
-    "@dxos/app-toolkit": "0.8.4-main.7996785055",
-    "@dxos/async": "0.8.4-main.7996785055",
-    "@dxos/log": "0.8.4-main.7996785055",
-    "@dxos/echo": "0.8.4-main.7996785055",
-    "@dxos/operation": "0.8.4-main.7996785055",
-    "@dxos/plugin-client": "0.8.4-main.7996785055",
-    "@dxos/plugin-graph": "0.8.4-main.7996785055",
-    "@dxos/plugin-deck": "0.8.4-main.7996785055",
-    "@dxos/plugin-markdown": "0.8.4-main.7996785055",
-    "@dxos/plugin-stack": "0.8.4-main.7996785055",
-    "@dxos/react-client": "0.8.4-main.7996785055",
-    "@dxos/react-ui-form": "0.8.4-main.7996785055",
-    "@dxos/react-ui-mosaic": "0.8.4-main.7996785055",
-    "@dxos/types": "0.8.4-main.7996785055",
-    "@dxos/schema": "0.8.4-main.7996785055",
-    "@dxos/react-ui-stack": "0.8.4-main.7996785055",
-    "@dxos/util": "0.8.4-main.7996785055",
-    "@dxos/effect": "0.8.4-main.7996785055"
+    "@dxos/app-framework": "0.8.4-main.8baae0fced",
+    "@dxos/app-toolkit": "0.8.4-main.8baae0fced",
+    "@dxos/async": "0.8.4-main.8baae0fced",
+    "@dxos/compute": "0.8.4-main.8baae0fced",
+    "@dxos/echo": "0.8.4-main.8baae0fced",
+    "@dxos/effect": "0.8.4-main.8baae0fced",
+    "@dxos/log": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-deck": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-graph": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-client": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-markdown": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-stack": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-attention": "0.8.4-main.8baae0fced",
+    "@dxos/react-client": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-mosaic": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-form": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-stack": "0.8.4-main.8baae0fced",
+    "@dxos/schema": "0.8.4-main.8baae0fced",
+    "@dxos/types": "0.8.4-main.8baae0fced",
+    "@dxos/util": "0.8.4-main.8baae0fced"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -74,11 +121,12 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/random": "0.8.4-main.7996785055",
-    "@dxos/react-ui": "0.8.4-main.7996785055",
-    "@dxos/storybook-utils": "0.8.4-main.7996785055",
-    "@dxos/ui-theme": "0.8.4-main.7996785055"
+    "vite": "^8.0.13",
+    "@dxos/plugin-testing": "0.8.4-main.8baae0fced",
+    "@dxos/random": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui": "0.8.4-main.8baae0fced",
+    "@dxos/storybook-utils": "0.8.4-main.8baae0fced",
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -86,8 +134,8 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.7996785055",
-    "@dxos/react-ui": "0.8.4-main.7996785055"
+    "@dxos/react-ui": "0.8.4-main.8baae0fced",
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced"
   },
   "publishConfig": {
     "access": "public"

package/src/PresenterPlugin.node.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { AppGraphBuilder } from '#capabilities';
+import { meta } from '#meta';
+
+export const PresenterPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  Plugin.make,
+);
+
+export default PresenterPlugin;

package/src/PresenterPlugin.test.ts

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

package/src/PresenterPlugin.tsx

@@ -5,9 +5,9 @@
 import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 
-import { AppGraphBuilder, PresenterSettings, ReactSurface } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
+import { AppGraphBuilder, PresenterSettings, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
 
 // TODO(burdon): Only scale markdown content.
 // TODO(burdon): Map stack content; Slide content type (e.g., markdown, sketch, IPFS image, table, etc.)
@@ -19,3 +19,5 @@ export const PresenterPlugin = Plugin.define(meta).pipe(
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.make,
 );
+
+export default PresenterPlugin;

package/src/PresenterPlugin.workerd.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from '#meta';
+
+export const PresenterPlugin = Plugin.define(meta).pipe(Plugin.make);
+
+export default PresenterPlugin;

package/src/capabilities/{app-graph-builder/app-graph-builder.ts → app-graph-builder.ts}

@@ -6,26 +6,17 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import {
-  AppCapabilities,
-  LayoutOperation,
-  companionId,
-  companionSegment,
-  getObjectPathFromObject,
-  getSpacePath,
-} from '@dxos/app-toolkit';
-import { Obj } from '@dxos/echo';
-import { Collection } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
-import { DeckCapabilities } from '@dxos/plugin-deck';
-import { PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
-import { DeckOperation } from '@dxos/plugin-deck/operations';
+import { AppCapabilities, AppNode, LayoutOperation, getObjectPathFromObject, getSpacePath } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { Collection, Obj } from '@dxos/echo';
+import { DeckCapabilities, DeckOperation } from '@dxos/plugin-deck';
 import { GraphBuilder, type Node, NodeMatcher } from '@dxos/plugin-graph';
-import { Markdown } from '@dxos/plugin-markdown/types';
+import { Markdown } from '@dxos/plugin-markdown';
+import { linkedSegment } from '@dxos/react-ui-attention';
 
-import { meta } from '../../meta';
-import { PresenterCapabilities } from '../../types';
-import { PresenterOperation } from '../../operations';
+import { meta } from '#meta';
+import { PresenterOperation } from '#types';
+import { PresenterCapabilities } from '#types';
 
 /** Match nodes that can be presented (Collection or Document). */
 const whenPresentable = (node: Node.Node) =>
@@ -38,7 +29,7 @@ export default Capability.makeModule(
     const capabilities = yield* Capability.Service;
 
     const extensions = yield* GraphBuilder.createExtension({
-      id: `${meta.id}.root`,
+      id: 'root',
       // TODO(wittjosiah): This is a hack to work around presenter previously relying on "variant". Remove.
       match: whenPresentable,
       connector: (object, get) => {
@@ -52,16 +43,12 @@ export default Capability.makeModule(
         }
 
         return Effect.succeed([
-          {
-            id: companionSegment('presenter'),
+          AppNode.makeCompanion({
+            id: linkedSegment('presenter'),
+            label: 'Presenter',
+            icon: 'ph--presentation--regular',
             data: { type: meta.id, object },
-            type: PLANK_COMPANION_TYPE,
-            properties: {
-              label: 'Presenter',
-              icon: 'ph--presentation--regular',
-              disposition: 'hidden',
-            },
-          },
+          }),
         ]);
       },
       actions: (object, get) => {
@@ -84,7 +71,7 @@ export default Capability.makeModule(
             data: Effect.fnUntraced(function* () {
               const deckState = yield* Capabilities.getAtomValue(DeckCapabilities.State);
               const deck = deckState.decks[deckState.activeDeck];
-              const presenterId = companionId(objectPath, 'presenter');
+              const presenterId = `${objectPath}/${linkedSegment('presenter')}`;
               if (!deck?.fullscreen) {
                 yield* Operation.invoke(DeckOperation.Adjust, {
                   type: 'solo--fullscreen' as const,
@@ -97,7 +84,7 @@ export default Capability.makeModule(
               });
             }),
             properties: {
-              label: ['toggle presentation label', { ns: meta.id }],
+              label: ['toggle-presentation.label', { ns: meta.id }],
               icon: 'ph--presentation--regular',
               disposition: 'list-item',
               keyBinding: {

package/src/capabilities/index.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './app-graph-builder';
-export * from './react-surface';
-export * from './settings';
+import { Capability } from '@dxos/app-framework';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
+export const PresenterSettings = Capability.lazy('PresenterSettings', () => import('./settings'));

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,67 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface, useSettingsState } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Collection, Obj } from '@dxos/echo';
+import { Markdown } from '@dxos/plugin-markdown';
+
+import { PresenterSettings } from '#components';
+import { CollectionPresenterArticle, DocumentPresenterContainer, MarkdownSlide } from '#containers';
+import { meta } from '#meta';
+import { type Settings } from '#types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'document',
+        position: 'first',
+        filter: AppSurface.predicate(
+          AppSurface.Article,
+          (data): data is AppSurface.ArticleData<{ type: typeof meta.id; object: Markdown.Document }> =>
+            !!data.subject &&
+            typeof data.subject === 'object' &&
+            'type' in data.subject &&
+            'object' in data.subject &&
+            data.subject.type === meta.id &&
+            Obj.instanceOf(Markdown.Document, data.subject.object),
+        ),
+        component: ({ data }) => <DocumentPresenterContainer document={data.subject.object} />,
+      }),
+      Surface.create({
+        id: 'collection',
+        position: 'first',
+        filter: AppSurface.predicate(
+          AppSurface.Article,
+          (data): data is AppSurface.ArticleData<{ type: typeof meta.id; object: Collection.Collection }> =>
+            !!data.subject &&
+            typeof data.subject === 'object' &&
+            'type' in data.subject &&
+            'object' in data.subject &&
+            data.subject.type === meta.id &&
+            Obj.instanceOf(Collection.Collection, data.subject.object),
+        ),
+        component: ({ role, data }) => <CollectionPresenterArticle role={role} subject={data.subject.object} />,
+      }),
+      Surface.create({
+        id: 'slide',
+        filter: AppSurface.object(AppSurface.Slide, Markdown.Document),
+        component: ({ data }) => <MarkdownSlide document={data.subject} />,
+      }),
+      Surface.create({
+        id: 'plugin-settings',
+        filter: AppSurface.settings(AppSurface.Article, meta.id),
+        component: ({ data: { subject } }) => {
+          const { settings, updateSettings } = useSettingsState<Settings.Settings>(subject.atom);
+          return <PresenterSettings settings={settings} onSettingsChange={updateSettings} />;
+        },
+      }),
+    ]),
+  ),
+);

package/src/capabilities/{settings/settings.ts → settings.ts}

@@ -8,14 +8,14 @@ import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { createKvsStore } from '@dxos/effect';
 
-import { meta } from '../../meta';
-import { PresenterCapabilities, PresenterSettingsSchema } from '../../types';
+import { meta } from '#meta';
+import { PresenterCapabilities, Settings } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.sync(() => {
     const settingsAtom = createKvsStore({
       key: meta.id,
-      schema: PresenterSettingsSchema,
+      schema: Settings.Settings,
       defaultValue: () => ({}),
     });
 
@@ -23,7 +23,7 @@ export default Capability.makeModule(() =>
       Capability.contributes(PresenterCapabilities.Settings, settingsAtom),
       Capability.contributes(AppCapabilities.Settings, {
         prefix: meta.id,
-        schema: PresenterSettingsSchema,
+        schema: Settings.Settings,
         atom: settingsAtom,
       }),
     ];

package/src/components/Markdown/Panel.stories.tsx

@@ -7,7 +7,7 @@ import React from 'react';
 
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { createSlide } from '../../testing';
+import { createSlide } from '#testing';
 
 import { Panel } from './Panel';
 import { Slide, type SlideProps } from './Slide';

package/src/components/Markdown/Slide.stories.tsx

@@ -6,7 +6,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { createSlide } from '../../testing';
+import { createSlide } from '#testing';
 
 import { Slide } from './Slide';
 

package/src/components/Markdown/Slide.tsx

@@ -2,6 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
+import 'highlight.js/styles/github.css';
+
 import { h } from 'hastscript';
 import React from 'react';
 import ReactMarkdown, { type Options as ReactMarkdownOptions } from 'react-markdown';
@@ -10,8 +12,6 @@ import rehypeHighlight from 'rehype-highlight';
 import remarkFrontmatter from 'remark-frontmatter';
 import remarkParseFrontmatter from 'remark-parse-frontmatter';
 
-import 'highlight.js/styles/github.css';
-
 import styles from './styles.css?raw';
 import { theme } from './theme';
 

package/src/components/PresenterSettings/PresenterSettings.stories.tsx

@@ -0,0 +1,32 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '#translations';
+
+import { PresenterSettings } from './PresenterSettings';
+
+const meta = {
+  title: 'plugins/plugin-presenter/components/PresenterSettings',
+  component: PresenterSettings,
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
+  tags: ['settings'],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof PresenterSettings>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    settings: { presentCollections: true },
+  },
+};

package/src/components/PresenterSettings/PresenterSettings.tsx

@@ -0,0 +1,31 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React from 'react';
+
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { useTranslation } from '@dxos/react-ui';
+import { Settings as SettingsForm } from '@dxos/react-ui-form';
+
+import { meta } from '#meta';
+import { Settings } from '#types';
+
+export type PresenterSettingsProps = AppSurface.SettingsArticleProps<Settings.Settings>;
+
+export const PresenterSettings = ({ settings, onSettingsChange }: PresenterSettingsProps) => {
+  const { t } = useTranslation(meta.id);
+
+  return (
+    <SettingsForm.Viewport>
+      <SettingsForm.Section title={t('settings.title', { ns: meta.id })}>
+        <SettingsForm.FieldSet
+          readonly={!onSettingsChange}
+          schema={Settings.Settings}
+          values={settings}
+          onValuesChanged={(values) => onSettingsChange?.(() => values)}
+        />
+      </SettingsForm.Section>
+    </SettingsForm.Viewport>
+  );
+};

package/src/components/PresenterSettings/index.ts

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

package/src/components/RevealPlayer/RevealPlayer.stories.tsx

@@ -6,9 +6,9 @@ import { type Meta } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import CONTENT from '../../../testing/deck.md?raw';
-import { translations } from '../../translations';
+import { translations } from '#translations';
 
+import CONTENT from '../../../testing/deck.md?raw';
 import { RevealPlayer } from './RevealPlayer';
 
 // https://revealjs.com/markdown

package/src/components/RevealPlayer/RevealPlayer.tsx

@@ -3,9 +3,7 @@
 //
 
 import 'reveal.js/dist/reveal.css';
-
 import 'reveal.js/dist/theme/black.css';
-
 // https://github.com/highlightjs/highlight.js/tree/main/src/styles
 // import 'highlight.js/styles/github-dark.css';
 import 'highlight.js/styles/tokyo-night-dark.css';
@@ -154,7 +152,7 @@ export const RevealPlayer = composable<HTMLDivElement, RevealProps>(
         })}
         ref={forwardedRef}
       >
-        <div role='none' className='relative aspect-video h-full w-full h-auto max-h-full overflow-hidden'>
+        <div className='relative aspect-video h-full w-full h-auto max-h-full overflow-hidden'>
           <div ref={deckDivRef} className='absolute inset-0 reveal'>
             {/* NOTE: Must be in head. */}
             <style>

package/src/components/index.ts

@@ -2,6 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
+import { type ComponentType, lazy } from 'react';
+
 export * from './Markdown';
 export * from './Presenter';
 export * from './RevealPlayer';
+
+export const PresenterSettings: ComponentType<any> = lazy(() => import('./PresenterSettings'));

package/src/containers/{CollectionPresenterContainer/CollectionPresenterContainer.tsx → CollectionPresenterArticle/CollectionPresenterArticle.tsx}

@@ -5,17 +5,18 @@
 import React, { useContext, useState } from 'react';
 
 import { Surface } from '@dxos/app-framework/ui';
-import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
-import { type Collection } from '@dxos/echo';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { type Collection, Obj } from '@dxos/echo';
 import { Panel } from '@dxos/react-ui';
 
-import { PageNumber, Pager, Layout as PresenterLayout } from '../../components';
-import { PresenterContext } from '../../types';
+import { PageNumber, Pager, Layout as PresenterLayout } from '#components';
+import { PresenterContext } from '#types';
+
 import { useExitPresenter } from '../../useExitPresenter';
 
-type CollectionPresenterContainerProps = SurfaceComponentProps<Collection.Collection>;
+export type CollectionPresenterArticleProps = AppSurface.ObjectArticleProps<Collection.Collection>;
 
-export const CollectionPresenterContainer = ({ role, subject: collection }: CollectionPresenterContainerProps) => {
+export const CollectionPresenterArticle = ({ role, subject: collection }: CollectionPresenterArticleProps) => {
   const [slide, setSlide] = useState(0);
   const { running } = useContext(PresenterContext);
   const handleExit = useExitPresenter(collection);
@@ -35,7 +36,13 @@ export const CollectionPresenterContainer = ({ role, subject: collection }: Coll
             />
           }
         >
-          <Surface.Surface role='slide' data={{ subject: collection.objects[slide] }} />
+          <Surface.Surface
+            type={AppSurface.Slide}
+            data={{
+              subject: collection.objects[slide],
+              attendableId: Obj.getDXN(collection).toString(),
+            }}
+          />
         </PresenterLayout>
       </Panel.Content>
     </Panel.Root>

package/src/containers/CollectionPresenterArticle/index.ts

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

package/src/containers/DocumentPresenterContainer/DocumentPresenterContainer.tsx

@@ -4,10 +4,11 @@
 
 import React, { type FC } from 'react';
 
-import { type Markdown } from '@dxos/plugin-markdown/types';
+import { type Markdown } from '@dxos/plugin-markdown';
 import { Panel } from '@dxos/react-ui';
 
-import { RevealPlayer } from '../../components';
+import { RevealPlayer } from '#components';
+
 import { useExitPresenter } from '../../useExitPresenter';
 
 export const DocumentPresenterContainer: FC<{ document: Markdown.Document }> = ({ document }) => {