@dxos/plugin-presenter 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-presenter",
-  "version": "0.8.4-main.9be5663bfe",
+  "version": "0.8.4-main.abd8ff62ef",
   "description": "Braneframe presenter plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -13,12 +13,18 @@
   "sideEffects": true,
   "type": "module",
   "imports": {
+    "#plugin": {
+      "browser": "./src/PresenterPlugin.tsx",
+      "node": "./src/PresenterPlugin.node.ts",
+      "default": "./src/PresenterPlugin.tsx"
+    },
     "#capabilities": "./src/capabilities/index.ts",
     "#components": "./src/components/index.ts",
     "#containers": "./src/containers/index.ts",
     "#meta": "./src/meta.ts",
     "#operations": "./src/operations/index.ts",
     "#testing": "./src/testing.ts",
+    "#translations": "./src/translations.ts",
     "#types": "./src/types/index.ts"
   },
   "exports": {
@@ -31,12 +37,15 @@
       "source": "./src/operations/index.ts",
       "types": "./dist/types/src/operations/index.d.ts",
       "browser": "./dist/lib/browser/operations/index.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
@@ -54,26 +63,26 @@
     "remark-frontmatter": "^5.0.0",
     "remark-parse-frontmatter": "^1.0.3",
     "reveal.js": "^5.1.0",
-    "@dxos/app-framework": "0.8.4-main.9be5663bfe",
-    "@dxos/app-toolkit": "0.8.4-main.9be5663bfe",
-    "@dxos/async": "0.8.4-main.9be5663bfe",
-    "@dxos/effect": "0.8.4-main.9be5663bfe",
-    "@dxos/log": "0.8.4-main.9be5663bfe",
-    "@dxos/operation": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-client": "0.8.4-main.9be5663bfe",
-    "@dxos/echo": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-deck": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-graph": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-stack": "0.8.4-main.9be5663bfe",
-    "@dxos/plugin-markdown": "0.8.4-main.9be5663bfe",
-    "@dxos/react-client": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-attention": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-form": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-mosaic": "0.8.4-main.9be5663bfe",
-    "@dxos/schema": "0.8.4-main.9be5663bfe",
-    "@dxos/types": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-stack": "0.8.4-main.9be5663bfe",
-    "@dxos/util": "0.8.4-main.9be5663bfe"
+    "@dxos/async": "0.8.4-main.abd8ff62ef",
+    "@dxos/app-framework": "0.8.4-main.abd8ff62ef",
+    "@dxos/app-toolkit": "0.8.4-main.abd8ff62ef",
+    "@dxos/compute": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo": "0.8.4-main.abd8ff62ef",
+    "@dxos/log": "0.8.4-main.abd8ff62ef",
+    "@dxos/effect": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-deck": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-markdown": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-graph": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-attention": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-stack": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-mosaic": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-form": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-stack": "0.8.4-main.abd8ff62ef",
+    "@dxos/schema": "0.8.4-main.abd8ff62ef",
+    "@dxos/types": "0.8.4-main.abd8ff62ef",
+    "@dxos/util": "0.8.4-main.abd8ff62ef"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -84,11 +93,12 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/random": "0.8.4-main.9be5663bfe",
-    "@dxos/storybook-utils": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui": "0.8.4-main.9be5663bfe",
-    "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
+    "vite": "^8.0.10",
+    "@dxos/random": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-testing": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
+    "@dxos/storybook-utils": "0.8.4-main.abd8ff62ef",
+    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -96,8 +106,8 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui": "0.8.4-main.9be5663bfe"
+    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui": "0.8.4-main.abd8ff62ef"
   },
   "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

@@ -7,8 +7,7 @@ import { AppPlugin } from '@dxos/app-toolkit';
 
 import { AppGraphBuilder, PresenterSettings, ReactSurface } from '#capabilities';
 import { meta } from '#meta';
-
-import { translations } from './translations';
+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.)
@@ -20,3 +19,5 @@ export const PresenterPlugin = Plugin.define(meta).pipe(
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.make,
 );
+
+export default PresenterPlugin;

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

@@ -7,9 +7,9 @@ import * as Option from 'effect/Option';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { AppCapabilities, AppNode, LayoutOperation, getObjectPathFromObject, getSpacePath } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
 import { Collection } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 import { DeckCapabilities } from '@dxos/plugin-deck';
 import { DeckOperation } from '@dxos/plugin-deck/operations';
 import { GraphBuilder, type Node, NodeMatcher } from '@dxos/plugin-graph';

package/src/capabilities/react-surface.tsx

@@ -22,40 +22,42 @@ export default Capability.makeModule(() =>
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
         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),
+        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',
-        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),
+        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 }) => <CollectionPresenterContainer role={role} subject={data.subject.object} />,
       }),
       Surface.create({
         id: 'slide',
-        role: 'slide',
-        filter: AppSurface.objectSection(Markdown.Document),
+        filter: AppSurface.object(AppSurface.Slide, Markdown.Document),
         component: ({ data }) => <MarkdownSlide document={data.subject} />,
       }),
       Surface.create({
         id: 'plugin-settings',
-        role: 'article',
-        filter: AppSurface.settingsArticle(meta.id),
+        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/components/PresenterSettings/PresenterSettings.stories.tsx

@@ -6,7 +6,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { PresenterSettings } from './PresenterSettings';
 
 const meta = {

package/src/components/PresenterSettings/PresenterSettings.tsx

@@ -5,11 +5,11 @@
 import React from 'react';
 
 import { type AppSurface } from '@dxos/app-toolkit/ui';
-import { Input, useTranslation } from '@dxos/react-ui';
+import { useTranslation } from '@dxos/react-ui';
 import { Settings as SettingsForm } from '@dxos/react-ui-form';
 
 import { meta } from '#meta';
-import { type Settings } from '#types';
+import { Settings } from '#types';
 
 export type PresenterSettingsProps = AppSurface.SettingsArticleProps<Settings.Settings>;
 
@@ -19,13 +19,12 @@ export const PresenterSettings = ({ settings, onSettingsChange }: PresenterSetti
   return (
     <SettingsForm.Viewport>
       <SettingsForm.Section title={t('settings.title', { ns: meta.id })}>
-        <SettingsForm.Item title={t('present-collections.label')} description={t('present-collections.description')}>
-          <Input.Switch
-            disabled={!onSettingsChange}
-            checked={settings.presentCollections}
-            onCheckedChange={(checked) => onSettingsChange?.((s) => ({ ...s, presentCollections: !!checked }))}
-          />
-        </SettingsForm.Item>
+        <SettingsForm.FieldSet
+          readonly={!onSettingsChange}
+          schema={Settings.Settings}
+          values={settings}
+          onValuesChanged={(values) => onSettingsChange?.(() => values)}
+        />
       </SettingsForm.Section>
     </SettingsForm.Viewport>
   );

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

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

package/src/containers/CollectionPresenterContainer/CollectionPresenterContainer.tsx

@@ -5,8 +5,8 @@
 import React, { useContext, useState } from 'react';
 
 import { Surface } from '@dxos/app-framework/ui';
-import { type AppSurface } 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';
@@ -36,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/index.ts

@@ -2,7 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './components';
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
 
 export * from './meta';
-export * from './PresenterPlugin';
+
+export const PresenterPlugin = Plugin.lazy(meta, () => import('#plugin'));

package/src/operations/definitions.ts

@@ -4,8 +4,8 @@
 
 import * as Schema from 'effect/Schema';
 
+import { Operation } from '@dxos/compute';
 import { Collection } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 import { Markdown } from '@dxos/plugin-markdown/types';
 
 import { meta } from '#meta';

package/src/translations.ts

@@ -13,8 +13,6 @@ export const translations = [
         'plugin.name': 'Presenter',
         'settings.title': 'Presenter settings',
         'toggle-presentation.label': 'Present',
-        'present-collections.label': 'Present collections (experimental)',
-        'present-collections.description': 'Enable presenting collections of documents as a slideshow.',
       },
     },
   },

package/src/types/Settings.ts

@@ -8,8 +8,13 @@ import * as Schema from 'effect/Schema';
 
 export const Settings = Schema.mutable(
   Schema.Struct({
-    presentCollections: Schema.optional(Schema.Boolean),
+    presentCollections: Schema.optional(
+      Schema.Boolean.annotations({
+        title: 'Present collections (experimental)',
+        description: 'Enable presenting collections of documents as a slideshow.',
+      }),
+    ),
   }),
 );
 
-export type Settings = Schema.Schema.Type<typeof Settings>;
+export interface Settings extends Schema.Schema.Type<typeof Settings> {}

package/dist/lib/browser/PresenterSettings-DZO2DC53.mjs

@@ -1,29 +0,0 @@
-import "./chunk-J5LGTIGS.mjs";
-
-// src/components/PresenterSettings/PresenterSettings.tsx
-import React from "react";
-import { Input, useTranslation } from "@dxos/react-ui";
-import { Settings as SettingsForm } from "@dxos/react-ui-form";
-import { meta } from "#meta";
-var PresenterSettings = ({ settings, onSettingsChange }) => {
-  const { t } = useTranslation(meta.id);
-  return /* @__PURE__ */ React.createElement(SettingsForm.Viewport, null, /* @__PURE__ */ React.createElement(SettingsForm.Section, {
-    title: t("settings.title", {
-      ns: meta.id
-    })
-  }, /* @__PURE__ */ React.createElement(SettingsForm.Item, {
-    title: t("present-collections.label"),
-    description: t("present-collections.description")
-  }, /* @__PURE__ */ React.createElement(Input.Switch, {
-    disabled: !onSettingsChange,
-    checked: settings.presentCollections,
-    onCheckedChange: (checked) => onSettingsChange?.((s) => ({
-      ...s,
-      presentCollections: !!checked
-    }))
-  }))));
-};
-export {
-  PresenterSettings as default
-};
-//# sourceMappingURL=PresenterSettings-DZO2DC53.mjs.map

package/dist/lib/browser/PresenterSettings-DZO2DC53.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/components/PresenterSettings/PresenterSettings.tsx"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport React from 'react';\n\nimport { type AppSurface } from '@dxos/app-toolkit/ui';\nimport { Input, useTranslation } from '@dxos/react-ui';\nimport { Settings as SettingsForm } from '@dxos/react-ui-form';\n\nimport { meta } from '#meta';\nimport { type Settings } from '#types';\n\nexport type PresenterSettingsProps = AppSurface.SettingsArticleProps<Settings.Settings>;\n\nexport const PresenterSettings = ({ settings, onSettingsChange }: PresenterSettingsProps) => {\n  const { t } = useTranslation(meta.id);\n\n  return (\n    <SettingsForm.Viewport>\n      <SettingsForm.Section title={t('settings.title', { ns: meta.id })}>\n        <SettingsForm.Item title={t('present-collections.label')} description={t('present-collections.description')}>\n          <Input.Switch\n            disabled={!onSettingsChange}\n            checked={settings.presentCollections}\n            onCheckedChange={(checked) => onSettingsChange?.((s) => ({ ...s, presentCollections: !!checked }))}\n          />\n        </SettingsForm.Item>\n      </SettingsForm.Section>\n    </SettingsForm.Viewport>\n  );\n};\n"],
-  "mappings": ";;;AAIA,OAAOA,WAAW;AAGlB,SAASC,OAAOC,sBAAsB;AACtC,SAASC,YAAYC,oBAAoB;AAEzC,SAASC,YAAY;AAKd,IAAMC,oBAAoB,CAAC,EAAEC,UAAUC,iBAAgB,MAA0B;AACtF,QAAM,EAAEC,EAAC,IAAKC,eAAeC,KAAKC,EAAE;AAEpC,SACE,sBAAA,cAACC,aAAaC,UAAQ,MACpB,sBAAA,cAACD,aAAaE,SAAO;IAACC,OAAOP,EAAE,kBAAkB;MAAEQ,IAAIN,KAAKC;IAAG,CAAA;KAC7D,sBAAA,cAACC,aAAaK,MAAI;IAACF,OAAOP,EAAE,2BAAA;IAA8BU,aAAaV,EAAE,iCAAA;KACvE,sBAAA,cAACW,MAAMC,QAAM;IACXC,UAAU,CAACd;IACXe,SAAShB,SAASiB;IAClBC,iBAAiB,CAACF,YAAYf,mBAAmB,CAACkB,OAAO;MAAE,GAAGA;MAAGF,oBAAoB,CAAC,CAACD;IAAQ,EAAA;;AAM3G;",
-  "names": ["React", "Input", "useTranslation", "Settings", "SettingsForm", "meta", "PresenterSettings", "settings", "onSettingsChange", "t", "useTranslation", "meta", "id", "SettingsForm", "Viewport", "Section", "title", "ns", "Item", "description", "Input", "Switch", "disabled", "checked", "presentCollections", "onCheckedChange", "s"]
-}