@dxos/plugin-presenter 0.8.4-main.28f8d3d → 0.8.4-main.406dc2a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-presenter",
-  "version": "0.8.4-main.28f8d3d",
+  "version": "0.8.4-main.406dc2a",
   "description": "Braneframe presenter plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -25,57 +25,56 @@
   ],
   "dependencies": {
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@preact/signals-core": "^1.12.1",
     "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/async": "0.8.4-main.28f8d3d",
-    "@dxos/echo-schema": "0.8.4-main.28f8d3d",
-    "@dxos/app-framework": "0.8.4-main.28f8d3d",
-    "@dxos/echo": "0.8.4-main.28f8d3d",
-    "@dxos/live-object": "0.8.4-main.28f8d3d",
-    "@dxos/local-storage": "0.8.4-main.28f8d3d",
-    "@dxos/log": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-client": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-deck": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-graph": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-stack": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-markdown": "0.8.4-main.28f8d3d",
-    "@dxos/react-client": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-form": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-stack": "0.8.4-main.28f8d3d",
-    "@dxos/schema": "0.8.4-main.28f8d3d"
+    "@dxos/app-framework": "0.8.4-main.406dc2a",
+    "@dxos/async": "0.8.4-main.406dc2a",
+    "@dxos/echo": "0.8.4-main.406dc2a",
+    "@dxos/live-object": "0.8.4-main.406dc2a",
+    "@dxos/log": "0.8.4-main.406dc2a",
+    "@dxos/plugin-client": "0.8.4-main.406dc2a",
+    "@dxos/local-storage": "0.8.4-main.406dc2a",
+    "@dxos/plugin-deck": "0.8.4-main.406dc2a",
+    "@dxos/plugin-graph": "0.8.4-main.406dc2a",
+    "@dxos/plugin-markdown": "0.8.4-main.406dc2a",
+    "@dxos/plugin-stack": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-form": "0.8.4-main.406dc2a",
+    "@dxos/react-client": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-stack": "0.8.4-main.406dc2a",
+    "@dxos/schema": "0.8.4-main.406dc2a"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.90.2",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
+    "@effect-rx/rx-react": "0.42.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.1",
     "@types/reveal.js": "^5.0.3",
-    "effect": "3.17.7",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/random": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-theme": "0.8.4-main.28f8d3d",
-    "@dxos/storybook-utils": "0.8.4-main.28f8d3d"
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/random": "0.8.4-main.406dc2a",
+    "@dxos/react-ui": "0.8.4-main.406dc2a",
+    "@dxos/storybook-utils": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-theme": "0.8.4-main.406dc2a"
   },
   "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.28f8d3d",
-    "@dxos/react-ui-theme": "0.8.4-main.28f8d3d"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-theme": "0.8.4-main.406dc2a"
   },
   "publishConfig": {
     "access": "public"

package/src/PresenterPlugin.tsx

@@ -11,26 +11,25 @@ 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 = 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,
+  }),
+]);

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

@@ -3,7 +3,8 @@
 //
 
 import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 
 import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
@@ -14,23 +15,52 @@ import { Markdown } from '@dxos/plugin-markdown/types';
 import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
 import { DataType } from '@dxos/schema';
 
-import { PRESENTER_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { PresenterAction, type PresenterSettingsProps } from '../types';
 
 export default (context: PluginContext) =>
   contributes(
     Capabilities.AppGraphBuilder,
     createExtension({
-      id: PRESENTER_PLUGIN,
+      id: meta.id,
+      // TODO(wittjosiah): This is a hack to work around presenter previously relying on "variant". Remove.
+      connector: (node) =>
+        Rx.make((get) =>
+          Function.pipe(
+            get(node),
+            Option.flatMap((node) => {
+              const [settingsStore] = get(context.capabilities(Capabilities.SettingsStore));
+              const settings = get(rxFromSignal(() => settingsStore?.getStore<PresenterSettingsProps>(meta.id)?.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: meta.id, object },
+                  type: meta.id,
+                  properties: {
+                    label: 'Presenter',
+                    icon: 'ph--presentation--regular',
+                    disposition: 'hidden',
+                  },
+                },
+              ];
+            }),
+            Option.getOrElse(() => []),
+          ),
+        ),
       actions: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => {
               const [settingsStore] = get(context.capabilities(Capabilities.SettingsStore));
-              const settings = get(
-                rxFromSignal(() => settingsStore?.getStore<PresenterSettingsProps>(PRESENTER_PLUGIN)?.value),
-              );
+              const settings = get(rxFromSignal(() => settingsStore?.getStore<PresenterSettingsProps>(meta.id)?.value));
               const isPresentable = settings?.presentCollections
                 ? Obj.instanceOf(DataType.Collection, node.data) || Obj.instanceOf(Markdown.Document, node.data)
                 : Obj.instanceOf(Markdown.Document, node.data);
@@ -65,8 +95,9 @@ export default (context: PluginContext) =>
                     );
                   },
                   properties: {
-                    label: ['toggle presentation label', { ns: PRESENTER_PLUGIN }],
+                    label: ['toggle presentation label', { ns: meta.id }],
                     icon: 'ph--presentation--regular',
+                    disposition: 'list-item',
                     keyBinding: {
                       macos: 'shift+meta+p',
                       windows: 'shift+alt+p',

package/src/capabilities/react-surface.tsx

@@ -16,38 +16,48 @@ import {
   MarkdownSlide,
   PresenterSettings,
 } from '../components';
-import { PRESENTER_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type PresenterSettingsProps } from '../types';
 
 export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
-      id: `${PRESENTER_PLUGIN}/document`,
+      id: `${meta.id}/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 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} />,
     }),
     createSurface({
-      id: `${PRESENTER_PLUGIN}/collection`,
+      id: `${meta.id}/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 meta.id; object: DataType.Collection } } =>
+        !!data.subject &&
+        typeof data.subject === 'object' &&
+        'type' in data.subject &&
+        'object' in data.subject &&
+        data.subject.type === meta.id &&
+        Obj.instanceOf(DataType.Collection, data.subject.object),
+      component: ({ data }) => <CollectionPresenterContainer collection={data.subject.object} />,
     }),
     createSurface({
-      id: `${PRESENTER_PLUGIN}/slide`,
+      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} />,
     }),
     createSurface({
-      id: `${PRESENTER_PLUGIN}/plugin-settings`,
+      id: `${meta.id}/plugin-settings`,
       role: 'article',
       filter: (data): data is { subject: SettingsStore<PresenterSettingsProps> } =>
-        data.subject instanceof SettingsStore && data.subject.prefix === PRESENTER_PLUGIN,
+        data.subject instanceof SettingsStore && data.subject.prefix === meta.id,
       component: ({ data: { subject } }) => <PresenterSettings settings={subject.value} />,
     }),
   ]);

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

@@ -2,12 +2,10 @@
 // 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';
 
@@ -22,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/Slide.stories.tsx

@@ -2,31 +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 { createSlide } from '../../testing';
 
 import { Slide } from './Slide';
 
-const meta: Meta = {
+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 }),
   },

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} />,
+};