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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-presenter",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.dedc0f3",
   "description": "Braneframe presenter plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,9 +10,9 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "source": "./src/index.ts"
+      "browser": "./dist/lib/browser/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -36,37 +36,37 @@
     "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.dedc0f3",
+    "@dxos/async": "0.8.4-main.dedc0f3",
+    "@dxos/echo-schema": "0.8.4-main.dedc0f3",
+    "@dxos/live-object": "0.8.4-main.dedc0f3",
+    "@dxos/local-storage": "0.8.4-main.dedc0f3",
+    "@dxos/echo": "0.8.4-main.dedc0f3",
+    "@dxos/log": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-client": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-deck": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-markdown": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-graph": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-stack": "0.8.4-main.dedc0f3",
+    "@dxos/react-client": "0.8.4-main.dedc0f3",
+    "@dxos/schema": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-stack": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-form": "0.8.4-main.dedc0f3"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
+    "@effect/platform": "0.90.2",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "@types/reveal.js": "^5.0.3",
-    "effect": "3.17.0",
+    "effect": "3.17.7",
     "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"
+    "vite": "7.1.1",
+    "@dxos/random": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3",
+    "@dxos/storybook-utils": "0.8.4-main.dedc0f3"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -74,8 +74,8 @@
     "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"
+    "@dxos/react-ui": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3"
   },
   "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 { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
 
 import { AppGraphBuilder, PresenterSettings, ReactSurface } from './capabilities';
 import { meta } from './meta';

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

@@ -5,7 +5,7 @@
 import { Rx } from '@effect-rx/rx-react';
 import { Option, pipe } from 'effect';
 
-import { contributes, type PluginContext, Capabilities, createIntent, LayoutAction } from '@dxos/app-framework';
+import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
 import { DeckCapabilities } from '@dxos/plugin-deck';
 import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
@@ -22,6 +22,39 @@ export default (context: PluginContext) =>
     Capabilities.AppGraphBuilder,
     createExtension({
       id: PRESENTER_PLUGIN,
+      // TODO(wittjosiah): This is a hack to work around presenter previously relying on "variant". Remove.
+      connector: (node) =>
+        Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) => {
+              const [settingsStore] = get(context.capabilities(Capabilities.SettingsStore));
+              const settings = get(
+                rxFromSignal(() => settingsStore?.getStore<PresenterSettingsProps>(PRESENTER_PLUGIN)?.value),
+              );
+              const isPresentable = settings?.presentCollections
+                ? Obj.instanceOf(DataType.Collection, node.data) || Obj.instanceOf(Markdown.Document, node.data)
+                : Obj.instanceOf(Markdown.Document, node.data);
+              return isPresentable ? Option.some(node.data) : Option.none();
+            }),
+            Option.map((object) => {
+              const id = fullyQualifiedId(object);
+              return [
+                {
+                  id: [id, 'presenter'].join(ATTENDABLE_PATH_SEPARATOR),
+                  data: { type: PRESENTER_PLUGIN, object },
+                  type: PRESENTER_PLUGIN,
+                  properties: {
+                    label: 'Presenter',
+                    icon: 'ph--presentation--regular',
+                    disposition: 'hidden',
+                  },
+                },
+              ];
+            }),
+            Option.getOrElse(() => []),
+          ),
+        ),
       actions: (node) =>
         Rx.make((get) =>
           pipe(
@@ -67,6 +100,7 @@ export default (context: PluginContext) =>
                   properties: {
                     label: ['toggle presentation label', { ns: PRESENTER_PLUGIN }],
                     icon: 'ph--presentation--regular',
+                    disposition: 'list-item',
                     keyBinding: {
                       macos: 'shift+meta+p',
                       windows: 'shift+alt+p',

package/src/capabilities/react-surface.tsx

@@ -11,10 +11,10 @@ import { Markdown } from '@dxos/plugin-markdown/types';
 import { DataType } from '@dxos/schema';
 
 import {
+  CollectionPresenterContainer,
+  DocumentPresenterContainer,
   MarkdownSlide,
   PresenterSettings,
-  DocumentPresenterContainer,
-  CollectionPresenterContainer,
 } from '../components';
 import { PRESENTER_PLUGIN } from '../meta';
 import { type PresenterSettingsProps } from '../types';
@@ -25,17 +25,27 @@ export default () =>
       id: `${PRESENTER_PLUGIN}/document`,
       role: 'article',
       position: 'hoist',
-      filter: (data): data is { subject: Markdown.Document; variant: 'presenter' } =>
-        Obj.instanceOf(Markdown.Document, data.subject) && data.variant === 'presenter',
-      component: ({ data }) => <DocumentPresenterContainer document={data.subject} />,
+      filter: (data): data is { subject: { type: typeof PRESENTER_PLUGIN; object: Markdown.Document } } =>
+        !!data.subject &&
+        typeof data.subject === 'object' &&
+        'type' in data.subject &&
+        'object' in data.subject &&
+        data.subject.type === PRESENTER_PLUGIN &&
+        Obj.instanceOf(Markdown.Document, data.subject.object),
+      component: ({ data }) => <DocumentPresenterContainer document={data.subject.object} />,
     }),
     createSurface({
       id: `${PRESENTER_PLUGIN}/collection`,
       role: 'article',
       position: 'hoist',
-      filter: (data): data is { subject: DataType.Collection; variant: 'presenter' } =>
-        Obj.instanceOf(DataType.Collection, data.subject) && data.variant === 'presenter',
-      component: ({ data }) => <CollectionPresenterContainer collection={data.subject} />,
+      filter: (data): data is { subject: { type: typeof PRESENTER_PLUGIN; object: DataType.Collection } } =>
+        !!data.subject &&
+        typeof data.subject === 'object' &&
+        'type' in data.subject &&
+        'object' in data.subject &&
+        data.subject.type === PRESENTER_PLUGIN &&
+        Obj.instanceOf(DataType.Collection, data.subject.object),
+      component: ({ data }) => <CollectionPresenterContainer collection={data.subject.object} />,
     }),
     createSurface({
       id: `${PRESENTER_PLUGIN}/slide`,

package/src/capabilities/settings.ts

@@ -6,7 +6,7 @@ import { Capabilities, contributes } from '@dxos/app-framework';
 import { live } from '@dxos/live-object';
 
 import { meta } from '../meta';
-import { PresenterSettingsSchema, type PresenterSettingsProps } from '../types';
+import { type PresenterSettingsProps, PresenterSettingsSchema } from '../types';
 
 export default () => {
   const settings = live<PresenterSettingsProps>({});

package/src/components/CollectionPresenterContainer.tsx

@@ -8,10 +8,11 @@ import { Surface } from '@dxos/app-framework';
 import { StackItem } from '@dxos/react-ui-stack';
 import { type DataType } from '@dxos/schema';
 
-import { Layout, PageNumber, Pager } from './Presenter';
 import { PresenterContext } from '../types';
 import { useExitPresenter } from '../useExitPresenter';
 
+import { Layout, PageNumber, Pager } from './Presenter';
+
 const CollectionPresenterContainer: FC<{ collection: DataType.Collection }> = ({ collection }) => {
   const [slide, setSlide] = useState(0);
 

package/src/components/DocumentPresenterContainer.tsx

@@ -6,9 +6,10 @@ import React, { type FC } from 'react';
 import { type Markdown } from '@dxos/plugin-markdown/types';
 import { StackItem } from '@dxos/react-ui-stack';
 
-import { RevealPlayer } from './RevealPlayer';
 import { useExitPresenter } from '../useExitPresenter';
 
+import { RevealPlayer } from './RevealPlayer';
+
 const DocumentPresenterContainer: FC<{ document: Markdown.Document }> = ({ document }) => {
   const handleExit = useExitPresenter(document);
 

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

@@ -4,14 +4,15 @@
 
 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 { createSlide } from '../../testing';
+
 import { Container } from './Container';
 import { Slide, type SlideProps } from './Slide';
-import { createSlide } from '../../testing';
 
 const DefaultStory = ({ content = '' }: SlideProps) => {
   return (
@@ -21,37 +22,39 @@ const DefaultStory = ({ content = '' }: SlideProps) => {
   );
 };
 
-export const Default = {
+const meta = {
+  title: 'plugins/plugin-presenter/Container',
+  render: DefaultStory,
+  decorators: [withTheme, withLayout({ fullscreen: true })],
+  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/Slide.stories.tsx

@@ -4,28 +4,31 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 
-import { Slide } from './Slide';
 import { createSlide } from '../../testing';
 
-const meta: Meta = {
+import { Slide } from './Slide';
+
+const meta = {
   title: 'plugins/plugin-presenter/Slide',
   component: Slide,
   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 }),
   },

package/src/components/Markdown/Slide.tsx

@@ -4,19 +4,20 @@
 
 import { h } from 'hastscript';
 import React from 'react';
-import ReactMarkdown from 'react-markdown';
-import addClasses from 'rehype-add-classes';
-import highlight from 'rehype-highlight';
+import ReactMarkdown, { type Options as ReactMarkdownOptions } from 'react-markdown';
+import rehypeAddClasses from 'rehype-add-classes';
+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';
 
 export type SlideProps = {
   content?: string;
-  classes?: { [selector: string]: string };
+  classes?: Record<string, string>;
 };
 
 export const Slide = ({ content = '', classes = theme.nodes }: SlideProps) => {
@@ -24,132 +25,13 @@ export const Slide = ({ content = '', classes = theme.nodes }: SlideProps) => {
   //  configurable. Find a way to remove the literal stylesheet here.
   return (
     <>
-      <style>{`
-.dark pre code.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 1em
-}
-.dark code.hljs {
-  padding: 3px 5px
-}
-/*!
-  Theme: GitHub Dark
-  Description: Dark theme as seen on github.com
-  Author: github.com
-  Maintainer: @Hirse
-  Updated: 2021-05-15
-
-  Outdated base version: https://github.com/primer/github-syntax-dark
-  Current colors taken from GitHub's CSS
-*/
-.dark .hljs {
-  color: #c9d1d9;
-  background: #0d1117
-}
-.dark .hljs-doctag,
-.dark .hljs-keyword,
-.dark .hljs-meta .hljs-keyword,
-.dark .hljs-template-tag,
-.dark .hljs-template-variable,
-.dark .hljs-type,
-.dark .hljs-variable.language_ {
-  /* prettylights-syntax-keyword */
-  color: #ff7b72
-}
-.dark .hljs-title,
-.dark .hljs-title.class_,
-.dark .hljs-title.class_.inherited__,
-.dark .hljs-title.function_ {
-  /* prettylights-syntax-entity */
-  color: #d2a8ff
-}
-.dark .hljs-attr,
-.dark .hljs-attribute,
-.dark .hljs-literal,
-.dark .hljs-meta,
-.dark .hljs-number,
-.dark .hljs-operator,
-.dark .hljs-variable,
-.dark .hljs-selector-attr,
-.dark .hljs-selector-class,
-.dark .hljs-selector-id {
-  /* prettylights-syntax-constant */
-  color: #79c0ff
-}
-.dark .hljs-regexp,
-.dark .hljs-string,
-.dark .hljs-meta .hljs-string {
-  /* prettylights-syntax-string */
-  color: #a5d6ff
-}
-.dark .hljs-built_in,
-.dark .hljs-symbol {
-  /* prettylights-syntax-variable */
-  color: #ffa657
-}
-.dark .hljs-comment,
-.dark .hljs-code,
-.dark .hljs-formula {
-  /* prettylights-syntax-comment */
-  color: #8b949e
-}
-.dark .hljs-name,
-.dark .hljs-quote,
-.dark .hljs-selector-tag,
-.dark .hljs-selector-pseudo {
-  /* prettylights-syntax-entity-tag */
-  color: #7ee787
-}
-.dark .hljs-subst {
-  /* prettylights-syntax-storage-modifier-import */
-  color: #c9d1d9
-}
-.dark .hljs-section {
-  /* prettylights-syntax-markup-heading */
-  color: #1f6feb;
-  font-weight: bold
-}
-.dark .hljs-bullet {
-  /* prettylights-syntax-markup-list */
-  color: #f2cc60
-}
-.dark .hljs-emphasis {
-  /* prettylights-syntax-markup-italic */
-  color: #c9d1d9;
-  font-style: italic
-}
-.dark .hljs-strong {
-  /* prettylights-syntax-markup-bold */
-  color: #c9d1d9;
-  font-weight: bold
-}
-.dark .hljs-addition {
-  /* prettylights-syntax-markup-inserted */
-  color: #aff5b4;
-  background-color: #033a16
-}
-.dark .hljs-deletion {
-  /* prettylights-syntax-markup-deleted */
-  color: #ffdcd7;
-  background-color: #67060c
-}
-.dark .hljs-char.escape_,
-.dark .hljs-link,
-.dark .hljs-params,
-.dark .hljs-property,
-.dark .hljs-punctuation,
-.dark .hljs-tag {
-  /* purposely ignored */
-  
-}
-      `}</style>
+      <style>{styles}</style>
       <ReactMarkdown
         components={components}
         // Markdown to HTML.
         remarkPlugins={[[remarkFrontmatter, 'yaml'], remarkParseFrontmatter as any]}
         // HTML processing.
-        rehypePlugins={[highlight, [addClasses, classes], slideLayout]}
+        rehypePlugins={[[rehypeAddClasses, classes], rehypeHighlight as any, slideLayout]}
       >
         {content}
       </ReactMarkdown>
@@ -164,7 +46,7 @@ export const Slide = ({ content = '', classes = theme.nodes }: SlideProps) => {
  *  E.g., layout image from front-matter.
  */
 const slideLayout =
-  (options = {}) =>
+  (_options = {}) =>
   (tree: any, file: any) => {
     const {
       data: { frontmatter = {} },
@@ -210,9 +92,11 @@ const slideLayout =
     tree.children = [root];
   };
 
-const ImageWrapper = ({ node, ...props }: { node: any }) => {
+const ImageWrapper = ({ node: _, ...props }: { node: any }) => {
   const { alt = '', src } = props as { alt: string; src: string };
   return <img alt={alt} src={src} />;
 };
 
-const components = { img: ImageWrapper };
+const components: ReactMarkdownOptions['components'] = {
+  img: ({ node, ...props }) => <ImageWrapper node={node} {...props} />,
+};

package/src/components/Markdown/styles.css

@@ -0,0 +1,104 @@
+/*!
+  Theme: GitHub Dark
+  Description: Dark theme as seen on github.com
+  Author: github.com
+  Maintainer: @Hirse
+  Updated: 2021-05-15
+  Outdated base version: https://github.com/primer/github-syntax-dark
+  Current colors taken from GitHub's CSS
+*/
+/* TODO(burdon): Use tokens. */
+.dark pre code.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 1em;
+}
+.dark code.hljs {
+  padding: 3px 5px;
+}
+.dark .hljs {
+  color: #c9d1d9;
+  background: #0d1117;
+}
+.dark .hljs-doctag,
+.dark .hljs-keyword,
+.dark .hljs-meta .hljs-keyword,
+.dark .hljs-template-tag,
+.dark .hljs-template-variable,
+.dark .hljs-type,
+.dark .hljs-variable.language_ {
+  color: #ff7b72;
+}
+.dark .hljs-title,
+.dark .hljs-title.class_,
+.dark .hljs-title.class_.inherited__,
+.dark .hljs-title.function_ {
+  color: #d2a8ff;
+}
+.dark .hljs-attr,
+.dark .hljs-attribute,
+.dark .hljs-literal,
+.dark .hljs-meta,
+.dark .hljs-number,
+.dark .hljs-operator,
+.dark .hljs-variable,
+.dark .hljs-selector-attr,
+.dark .hljs-selector-class,
+.dark .hljs-selector-id {
+  color: #79c0ff;
+}
+.dark .hljs-regexp,
+.dark .hljs-string,
+.dark .hljs-meta .hljs-string {
+  color: #a5d6ff;
+}
+.dark .hljs-built_in,
+.dark .hljs-symbol {
+  color: #ffa657;
+}
+.dark .hljs-comment,
+.dark .hljs-code,
+.dark .hljs-formula {
+  color: #8b949e;
+}
+.dark .hljs-name,
+.dark .hljs-quote,
+.dark .hljs-selector-tag,
+.dark .hljs-selector-pseudo {
+  color: #7ee787;
+}
+.dark .hljs-subst {
+  color: #c9d1d9;
+}
+.dark .hljs-section {
+  color: #1f6feb;
+  font-weight: bold;
+}
+.dark .hljs-bullet {
+  color: #f2cc60;
+}
+.dark .hljs-emphasis {
+  color: #c9d1d9;
+  font-style: italic;
+}
+.dark .hljs-strong {
+  color: #c9d1d9;
+  font-weight: bold;
+}
+.dark .hljs-addition {
+  color: #aff5b4;
+  background-color: #033a16;
+}
+.dark .hljs-deletion {
+  color: #ffdcd7;
+  background-color: #67060c;
+}
+.dark .hljs-char.escape_,
+.dark .hljs-link,
+.dark .hljs-params,
+.dark .hljs-property,
+.dark .hljs-punctuation,
+.dark .hljs-tag {
+  /* purposely ignored */
+  all: unset;
+}

package/src/components/Markdown/typings.d.ts

@@ -0,0 +1,8 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+declare module '*.css?raw' {
+  const content: string;
+  export default content;
+}

package/src/components/Presenter/Pager.stories.tsx

@@ -4,7 +4,7 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { withTheme } from '@dxos/storybook-utils';
@@ -24,15 +24,17 @@ const DefaultStory = ({ count = 20 }: PagerProps) => {
   );
 };
 
-export const Default = {};
-
-const meta: Meta<PagerProps> = {
+const meta = {
   title: 'plugins/plugin-presenter/Pager',
   render: DefaultStory,
   decorators: [withTheme],
   parameters: {
     layout: 'centered',
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};