@dxos/plugin-presenter 0.8.4-main.67995b8 → 0.8.4-main.69d29f4

package/package.json

@@ -1,18 +1,22 @@
 {
   "name": "@dxos/plugin-presenter",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.69d29f4",
   "description": "Braneframe presenter 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",
   "exports": {
     ".": {
-      "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "source": "./src/index.ts"
+      "source": "./src/index.ts",
+      "types": "./dist/types/src/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -24,58 +28,60 @@
     "src"
   ],
   "dependencies": {
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@effect-atom/atom": "^0.4.13",
+    "@effect-atom/atom-react": "^0.4.6",
     "hastscript": "^7.1.0",
     "highlight.js": "^11.9.0",
     "marked": "^12.0.2",
-    "react-markdown": "^8.0.5",
+    "react-markdown": "^10.1.0",
     "react-resize-detector": "^11.0.1",
     "rehype-add-classes": "^1.0.0",
     "rehype-highlight": "^6.0.0",
     "remark-frontmatter": "^5.0.0",
     "remark-parse-frontmatter": "^1.0.3",
     "reveal.js": "^5.1.0",
-    "@dxos/app-framework": "0.8.4-main.67995b8",
-    "@dxos/async": "0.8.4-main.67995b8",
-    "@dxos/echo": "0.8.4-main.67995b8",
-    "@dxos/local-storage": "0.8.4-main.67995b8",
-    "@dxos/echo-schema": "0.8.4-main.67995b8",
-    "@dxos/log": "0.8.4-main.67995b8",
-    "@dxos/plugin-client": "0.8.4-main.67995b8",
-    "@dxos/plugin-deck": "0.8.4-main.67995b8",
-    "@dxos/plugin-graph": "0.8.4-main.67995b8",
-    "@dxos/plugin-markdown": "0.8.4-main.67995b8",
-    "@dxos/live-object": "0.8.4-main.67995b8",
-    "@dxos/plugin-stack": "0.8.4-main.67995b8",
-    "@dxos/react-client": "0.8.4-main.67995b8",
-    "@dxos/react-ui-stack": "0.8.4-main.67995b8",
-    "@dxos/schema": "0.8.4-main.67995b8",
-    "@dxos/react-ui-form": "0.8.4-main.67995b8"
+    "@dxos/app-framework": "0.8.4-main.69d29f4",
+    "@dxos/echo": "0.8.4-main.69d29f4",
+    "@dxos/async": "0.8.4-main.69d29f4",
+    "@dxos/effect": "0.8.4-main.69d29f4",
+    "@dxos/log": "0.8.4-main.69d29f4",
+    "@dxos/plugin-client": "0.8.4-main.69d29f4",
+    "@dxos/operation": "0.8.4-main.69d29f4",
+    "@dxos/plugin-deck": "0.8.4-main.69d29f4",
+    "@dxos/plugin-graph": "0.8.4-main.69d29f4",
+    "@dxos/plugin-stack": "0.8.4-main.69d29f4",
+    "@dxos/plugin-markdown": "0.8.4-main.69d29f4",
+    "@dxos/react-client": "0.8.4-main.69d29f4",
+    "@dxos/react-ui-form": "0.8.4-main.69d29f4",
+    "@dxos/react-ui-mosaic": "0.8.4-main.69d29f4",
+    "@dxos/react-ui-stack": "0.8.4-main.69d29f4",
+    "@dxos/schema": "0.8.4-main.69d29f4",
+    "@dxos/util": "0.8.4-main.69d29f4",
+    "@dxos/types": "0.8.4-main.69d29f4"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/platform": "0.93.6",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
     "@types/reveal.js": "^5.0.3",
-    "effect": "3.17.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/random": "0.8.4-main.67995b8",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8",
-    "@dxos/storybook-utils": "0.8.4-main.67995b8"
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "7.1.9",
+    "@dxos/random": "0.8.4-main.69d29f4",
+    "@dxos/react-ui": "0.8.4-main.69d29f4",
+    "@dxos/storybook-utils": "0.8.4-main.69d29f4",
+    "@dxos/ui-theme": "0.8.4-main.69d29f4"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8"
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/platform": "0.93.6",
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.69d29f4",
+    "@dxos/ui-theme": "0.8.4-main.69d29f4"
   },
   "publishConfig": {
     "access": "public"

package/src/PresenterPlugin.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { definePlugin, defineModule, Events, contributes, Capabilities } from '@dxos/app-framework';
+import { Common, Plugin } from '@dxos/app-framework';
 
 import { AppGraphBuilder, PresenterSettings, ReactSurface } from './capabilities';
 import { meta } from './meta';
@@ -11,26 +11,10 @@ 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.)
 
-export const PresenterPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: PresenterSettings,
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-  ]);
+export const PresenterPlugin = Plugin.define(meta).pipe(
+  Common.Plugin.addSettingsModule({ activate: PresenterSettings }),
+  Common.Plugin.addTranslationsModule({ translations }),
+  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
+  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  Plugin.make,
+);

package/src/capabilities/app-graph-builder/app-graph-builder.ts

@@ -0,0 +1,105 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
+
+import { Capability, Common } from '@dxos/app-framework';
+import { Obj } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
+import { DeckCapabilities } from '@dxos/plugin-deck';
+import { ATTENDABLE_PATH_SEPARATOR, DeckOperation } from '@dxos/plugin-deck/types';
+import { GraphBuilder, type Node, NodeMatcher } from '@dxos/plugin-graph';
+import { Markdown } from '@dxos/plugin-markdown/types';
+import { Collection } from '@dxos/schema';
+
+import { meta } from '../../meta';
+import { PresenterCapabilities, PresenterOperation } from '../../types';
+
+/** Match nodes that can be presented (Collection or Document). */
+const whenPresentable = (node: Node.Node) =>
+  Option.orElse(NodeMatcher.whenEchoType(Collection.Collection)(node), () =>
+    NodeMatcher.whenEchoType(Markdown.Document)(node),
+  );
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const capabilities = yield* Capability.Service;
+
+    const extensions = yield* GraphBuilder.createExtension({
+      id: `${meta.id}/root`,
+      // TODO(wittjosiah): This is a hack to work around presenter previously relying on "variant". Remove.
+      match: whenPresentable,
+      connector: (object, get) => {
+        const settingsAtom = capabilities.get(PresenterCapabilities.Settings);
+        const settings = get(settingsAtom);
+        const isPresentable = settings?.presentCollections
+          ? Obj.instanceOf(Collection.Collection, object) || Obj.instanceOf(Markdown.Document, object)
+          : Obj.instanceOf(Markdown.Document, object);
+        if (!isPresentable) {
+          return Effect.succeed([]);
+        }
+        const id = Obj.getDXN(object).toString();
+        return Effect.succeed([
+          {
+            id: [id, 'presenter'].join(ATTENDABLE_PATH_SEPARATOR),
+            data: { type: meta.id, object },
+            type: meta.id,
+            properties: {
+              label: 'Presenter',
+              icon: 'ph--presentation--regular',
+              disposition: 'hidden',
+            },
+          },
+        ]);
+      },
+      actions: (object, get) => {
+        const settingsAtom = capabilities.get(PresenterCapabilities.Settings);
+        const settings = get(settingsAtom);
+        const isPresentable = settings?.presentCollections
+          ? Obj.instanceOf(Collection.Collection, object) || Obj.instanceOf(Markdown.Document, object)
+          : Obj.instanceOf(Markdown.Document, object);
+        if (!isPresentable) {
+          return Effect.succeed([]);
+        }
+        const dxn = Obj.getDXN(object);
+        const id = dxn.toString();
+        const { spaceId } = dxn.asEchoDXN()!;
+        return Effect.succeed([
+          {
+            id: `${PresenterOperation.TogglePresentation.meta.key}/${id}`,
+            // TODO(burdon): Allow function so can generate state when activated.
+            //  So can set explicit fullscreen state coordinated with current presenter state.
+            data: Effect.fnUntraced(function* () {
+              const deckState = yield* Common.Capability.getAtomValue(DeckCapabilities.State);
+              const deck = deckState.decks[deckState.activeDeck];
+              const presenterId = [id, 'presenter'].join(ATTENDABLE_PATH_SEPARATOR);
+              if (!deck?.fullscreen) {
+                yield* Operation.invoke(DeckOperation.Adjust, {
+                  type: 'solo--fullscreen' as const,
+                  id: presenterId,
+                });
+              }
+              yield* Operation.invoke(Common.LayoutOperation.Open, {
+                subject: [presenterId],
+                workspace: spaceId,
+              });
+            }),
+            properties: {
+              label: ['toggle presentation label', { ns: meta.id }],
+              icon: 'ph--presentation--regular',
+              disposition: 'list-item',
+              keyBinding: {
+                macos: 'shift+meta+p',
+                windows: 'shift+alt+p',
+              },
+            },
+          },
+        ]);
+      },
+    });
+
+    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+  }),
+);

package/src/capabilities/app-graph-builder/index.ts

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

package/src/capabilities/index.ts

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

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,70 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capability, Common } from '@dxos/app-framework';
+import { useSettingsState } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
+import { Markdown } from '@dxos/plugin-markdown/types';
+import { Collection } from '@dxos/schema';
+
+import {
+  CollectionPresenterContainer,
+  DocumentPresenterContainer,
+  MarkdownSlide,
+  PresenterSettings,
+} from '../../components';
+import { meta } from '../../meta';
+import { type PresenterSettingsProps } from '../../types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Common.Capability.ReactSurface, [
+      Common.createSurface({
+        id: `${meta.id}/document`,
+        role: 'article',
+        position: 'hoist',
+        filter: (data): data is { subject: { 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} />,
+      }),
+      Common.createSurface({
+        id: `${meta.id}/collection`,
+        role: 'article',
+        position: 'hoist',
+        filter: (data): data is { subject: { 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 }) => <CollectionPresenterContainer role={role} subject={data.subject.object} />,
+      }),
+      Common.createSurface({
+        id: `${meta.id}/slide`,
+        role: 'slide',
+        filter: (data): data is { subject: Markdown.Document } => Obj.instanceOf(Markdown.Document, data.subject),
+        component: ({ data }) => <MarkdownSlide document={data.subject} />,
+      }),
+      Common.createSurface({
+        id: `${meta.id}/plugin-settings`,
+        role: 'article',
+        filter: (data): data is { subject: Common.Capability.Settings } =>
+          Common.Capability.isSettings(data.subject) && data.subject.prefix === meta.id,
+        component: ({ data: { subject } }) => {
+          const { settings, updateSettings } = useSettingsState<PresenterSettingsProps>(subject.atom);
+          return <PresenterSettings settings={settings} onSettingsChange={updateSettings} />;
+        },
+      }),
+    ]),
+  ),
+);

package/src/capabilities/settings/index.ts

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

package/src/capabilities/settings/settings.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability, Common } from '@dxos/app-framework';
+import { createKvsStore } from '@dxos/effect';
+
+import { meta } from '../../meta';
+import { PresenterCapabilities, PresenterSettingsSchema } from '../../types';
+
+export default Capability.makeModule(() =>
+  Effect.sync(() => {
+    const settingsAtom = createKvsStore({
+      key: meta.id,
+      schema: PresenterSettingsSchema,
+      defaultValue: () => ({}),
+    });
+
+    return [
+      Capability.contributes(PresenterCapabilities.Settings, settingsAtom),
+      Capability.contributes(Common.Capability.Settings, {
+        prefix: meta.id,
+        schema: PresenterSettingsSchema,
+        atom: settingsAtom,
+      }),
+    ];
+  }),
+);

package/src/components/CollectionPresenterContainer.tsx

@@ -2,26 +2,27 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { type FC, useContext, useState } from 'react';
+import React, { useContext, useState } from 'react';
 
-import { Surface } from '@dxos/app-framework';
-import { StackItem } from '@dxos/react-ui-stack';
-import { type DataType } from '@dxos/schema';
+import { Surface, type SurfaceComponentProps } from '@dxos/app-framework/react';
+import { Layout } from '@dxos/react-ui-mosaic';
+import { type Collection } from '@dxos/schema';
 
-import { Layout, PageNumber, Pager } from './Presenter';
 import { PresenterContext } from '../types';
 import { useExitPresenter } from '../useExitPresenter';
 
-const CollectionPresenterContainer: FC<{ collection: DataType.Collection }> = ({ collection }) => {
-  const [slide, setSlide] = useState(0);
+import { PageNumber, Pager, Layout as PresenterLayout } from './Presenter';
 
-  const { running } = useContext(PresenterContext);
+type CollectionPresenterContainerProps = SurfaceComponentProps<Collection.Collection>;
 
+const CollectionPresenterContainer = ({ role, subject: collection }: CollectionPresenterContainerProps) => {
+  const [slide, setSlide] = useState(0);
+  const { running } = useContext(PresenterContext);
   const handleExit = useExitPresenter(collection);
 
   return (
-    <StackItem.Content classNames='relative'>
-      <Layout
+    <Layout.Main role={role} classNames='relative'>
+      <PresenterLayout
         bottomRight={<PageNumber index={slide} count={collection.objects.length} />}
         bottomLeft={
           <Pager
@@ -33,10 +34,9 @@ const CollectionPresenterContainer: FC<{ collection: DataType.Collection }> = ({
           />
         }
       >
-        {/* TODO(wittjosiah): Better slide placeholder. */}
-        <Surface role='slide' data={{ subject: collection.objects[slide] }} placeholder={<></>} />
-      </Layout>
-    </StackItem.Content>
+        <Surface role='slide' data={{ subject: collection.objects[slide] }} />
+      </PresenterLayout>
+    </Layout.Main>
   );
 };
 

package/src/components/DocumentPresenterContainer.tsx

@@ -4,18 +4,19 @@
 import React, { type FC } from 'react';
 
 import { type Markdown } from '@dxos/plugin-markdown/types';
-import { StackItem } from '@dxos/react-ui-stack';
+import { Layout } from '@dxos/react-ui-mosaic';
 
-import { RevealPlayer } from './RevealPlayer';
 import { useExitPresenter } from '../useExitPresenter';
 
+import { RevealPlayer } from './RevealPlayer';
+
 const DocumentPresenterContainer: FC<{ document: Markdown.Document }> = ({ document }) => {
   const handleExit = useExitPresenter(document);
 
   return (
-    <StackItem.Content classNames='relative'>
+    <Layout.Main classNames='relative'>
       <RevealPlayer content={document.content.target?.content ?? ''} onExit={handleExit} />
-    </StackItem.Content>
+    </Layout.Main>
   );
 };
 

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

@@ -2,16 +2,15 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
+
+import { createSlide } from '../../testing';
 
 import { Container } from './Container';
 import { Slide, type SlideProps } from './Slide';
-import { createSlide } from '../../testing';
 
 const DefaultStory = ({ content = '' }: SlideProps) => {
   return (
@@ -21,37 +20,39 @@ const DefaultStory = ({ content = '' }: SlideProps) => {
   );
 };
 
-export const Default = {
+const meta = {
+  title: 'plugins/plugin-presenter/Container',
+  render: DefaultStory,
+  decorators: [withTheme],
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
   args: {
     content: createSlide({ number: 1 }),
   },
 };
 
-export const Code = {
+export const Code: Story = {
   args: {
     content: createSlide({ code: true }),
   },
 };
 
-export const List = {
+export const List: Story = {
   args: {
     content: createSlide({ list: 3 }),
   },
 };
 
-export const Ordered = {
+export const Ordered: Story = {
   args: {
     content: createSlide({ ordered: 4 }),
   },
 };
-
-const meta: Meta<typeof Slide> = {
-  title: 'plugins/plugin-presenter/Container',
-  render: DefaultStory,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
-  parameters: {
-    layout: 'fullscreen',
-  },
-};
-
-export default meta;

package/src/components/Markdown/Container.tsx

@@ -6,7 +6,7 @@ import React, { type PropsWithChildren, useState } from 'react';
 import { useResizeDetector } from 'react-resize-detector';
 
 import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 export type ContainerProps = ThemedClassName<PropsWithChildren<{}>>;
 
@@ -36,7 +36,7 @@ export const Container = ({ children, classNames }: ContainerProps) => {
   // https://www.npmjs.com/package/react-markdown
   return (
     <div ref={containerRef} className={mx('flex grow relative overflow-hidden bg-attention', classNames)}>
-      <div className={mx('flex w-full h-full overflow-hidden absolute')} style={props}>
+      <div className={mx('flex is-full bs-full overflow-hidden absolute')} style={props}>
         {width && height && children}
       </div>
     </div>

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

@@ -2,30 +2,34 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 
-import { type Meta } from '@storybook/react-vite';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { Slide } from './Slide';
 import { createSlide } from '../../testing';
 
-const meta: Meta = {
+import { Slide } from './Slide';
+
+const meta = {
   title: 'plugins/plugin-presenter/Slide',
   component: Slide,
+  decorators: [withTheme],
   parameters: {
     layout: 'fullscreen',
   },
-};
+} satisfies Meta<typeof Slide>;
 
 export default meta;
 
-export const Default = {
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
   args: {
     content: createSlide(),
   },
 };
 
-export const Code = {
+export const Code: Story = {
   args: {
     content: createSlide({ code: true }),
   },