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

package/src/components/PresenterSettings/PresenterSettings.tsx

@@ -0,0 +1,32 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React from 'react';
+
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { Input, useTranslation } from '@dxos/react-ui';
+import { Settings as SettingsForm } from '@dxos/react-ui-form';
+
+import { meta } from '#meta';
+import { type 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.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.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

@@ -4,11 +4,10 @@
 
 import { type Meta } from '@storybook/react-vite';
 
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import CONTENT from '../../../testing/deck.md?raw';
 import { translations } from '../../translations';
-
 import { RevealPlayer } from './RevealPlayer';
 
 // https://revealjs.com/markdown
@@ -20,9 +19,9 @@ import { RevealPlayer } from './RevealPlayer';
 // https://fonts.google.com
 
 const meta = {
-  title: 'plugins/plugin-presenter/RevealPlayer',
+  title: 'plugins/plugin-presenter/components/RevealPlayer',
   component: RevealPlayer,
-  decorators: [withTheme],
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   parameters: {
     layout: 'fullscreen',
     translations,

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';
@@ -17,8 +15,8 @@ import Reveal from 'reveal.js';
 import RevealHighlight from 'reveal.js/plugin/highlight/highlight';
 import RevealMarkdown from 'reveal.js/plugin/markdown/plugin.js';
 
-import { type ThemedClassName, useAsyncEffect } from '@dxos/react-ui';
-import { mx } from '@dxos/ui-theme';
+import { useAsyncEffect } from '@dxos/react-ui';
+import { composable, composableProps } from '@dxos/ui-theme';
 
 const styles = `
 <style type="text/css">
@@ -61,118 +59,119 @@ const styles = `
 </style>
 `;
 
-export type RevealProps = ThemedClassName<{
+export type RevealProps = {
   content: string;
   slide?: number;
   fullscreen?: boolean;
   onExit?: () => void;
-}>;
-
-export const RevealPlayer = ({ classNames, content, slide, fullscreen = true, onExit }: RevealProps) => {
-  const deckDivRef = useRef<HTMLDivElement>(null);
-  const deckRef = useRef<Reveal.Api | null>(null);
-
-  useAsyncEffect(async () => {
-    if (deckRef.current) {
-      return;
-    }
-
-    // Required for syntax highlighting.
-    hljs.registerLanguage('typescript', typescript);
-
-    // https://revealjs.com/react
-    // https://revealjs.com/config
-    // https://github.com/hakimel/reveal.js
-    // TODO(burdon): Fragments and scroll view steps 2 at a time (safe mode?)
-    deckRef.current = new Reveal(deckDivRef.current!, {
-      // view: 'scroll',
-      progress: false,
-      transition: 'none',
-      slideNumber: false,
-      embedded: true,
-
-      // Disable autoplay to prevent errors in headless environments (e.g., CI).
-      autoPlayMedia: false,
-
-      // TODO(burdon): Speaker view requires server to serve popout window.
-      // https://revealjs.com/speaker-view
-      showNotes: false,
-
-      // width: 1600,
-      // height: 900,
-      margin: 0.1,
-      // center: false,
-      // minScale: 0.1,
-      // maxScale: 1.4,
-
-      // https://revealjs.com/markdown
-      // TODO(burdon): Requires server to serve popout window.
-      plugins: [RevealMarkdown, RevealHighlight],
-
-      // See https://marked.js.org/using_advanced#options
-      markdown: {
-        gfm: true,
-        smartypants: true,
-        highlight: (code, language) => {
-          if (language) {
-            return hljs.highlight(code, { language }).value;
-          }
+};
 
-          return hljs.highlightAuto(code).value;
+export const RevealPlayer = composable<HTMLDivElement, RevealProps>(
+  ({ content, slide, fullscreen = true, onExit, children, ...props }, forwardedRef) => {
+    const deckDivRef = useRef<HTMLDivElement>(null);
+    const deckRef = useRef<Reveal.Api | null>(null);
+
+    useAsyncEffect(async () => {
+      if (deckRef.current) {
+        return;
+      }
+
+      // Required for syntax highlighting.
+      hljs.registerLanguage('typescript', typescript);
+
+      // https://revealjs.com/react
+      // https://revealjs.com/config
+      // https://github.com/hakimel/reveal.js
+      // TODO(burdon): Fragments and scroll view steps 2 at a time (safe mode?)
+      deckRef.current = new Reveal(deckDivRef.current!, {
+        // view: 'scroll',
+        progress: false,
+        transition: 'none',
+        slideNumber: false,
+        embedded: true,
+
+        // Disable autoplay to prevent errors in headless environments (e.g., CI).
+        autoPlayMedia: false,
+
+        // TODO(burdon): Speaker view requires server to serve popout window.
+        // https://revealjs.com/speaker-view
+        showNotes: false,
+
+        // width: 1600,
+        // height: 900,
+        margin: 0.1,
+        // center: false,
+        // minScale: 0.1,
+        // maxScale: 1.4,
+
+        // https://revealjs.com/markdown
+        // TODO(burdon): Requires server to serve popout window.
+        plugins: [RevealMarkdown, RevealHighlight],
+
+        // See https://marked.js.org/using_advanced#options
+        markdown: {
+          gfm: true,
+          smartypants: true,
+          highlight: (code, language) => {
+            if (language) {
+              return hljs.highlight(code, { language }).value;
+            }
+
+            return hljs.highlightAuto(code).value;
+          },
         },
-      },
-    });
+      });
 
-    await deckRef.current.initialize();
+      await deckRef.current.initialize();
 
-    if (slide !== undefined) {
-      deckRef.current.slide(slide < 0 ? deckRef.current?.getTotalSlides() + slide : slide - 1);
-    }
+      if (slide !== undefined) {
+        deckRef.current.slide(slide < 0 ? deckRef.current?.getTotalSlides() + slide : slide - 1);
+      }
 
-    deckRef.current.addKeyBinding({ keyCode: 27, key: 'Escape', description: 'Exit full screen' }, () => {
-      onExit?.();
-    });
+      deckRef.current.addKeyBinding({ keyCode: 27, key: 'Escape', description: 'Exit full screen' }, () => {
+        onExit?.();
+      });
 
-    return () => {
-      try {
-        if (deckRef.current) {
-          deckRef.current.destroy();
-          deckRef.current = null;
+      return () => {
+        try {
+          if (deckRef.current) {
+            deckRef.current.destroy();
+            deckRef.current = null;
+          }
+        } catch {
+          // Ignore.
         }
-      } catch {
-        // Ignore.
-      }
-    };
-  });
-
-  // TOOD(burdon): Trap cursor keys (otherwise tabster grabs focus.)
-  return (
-    <div
-      className={mx(
-        'grid place-items-center is-full bs-full overflow-hidden bg-black',
-        fullscreen && 'absolute inset-0',
-        classNames,
-      )}
-    >
-      <div className='relative aspect-video is-full bs-full bs-auto max-bs-full overflow-hidden'>
-        <div ref={deckDivRef} className='absolute inset-0 reveal'>
-          {/* NOTE: Must be in head. */}
-          <style>
-            <link rel='preconnect' href='https://fonts.googleapis.com' />
-            <link rel='preconnect' href='https://fonts.gstatic.com' {...{ crossOrigin: '' }} />
-            <link
-              rel='stylesheet'
-              href='https://fonts.googleapis.com/css2?family=Raleway:ital,wght@0,100..900;1,100..900&display=swap'
-            />
-          </style>
-          <div className='slides'>
-            <div className='!text-center' />
-            <section {...{ 'data-markdown': [] }}>
-              <textarea {...{ 'data-template': true }} defaultValue={[styles, content].join('\n')}></textarea>
-            </section>
+      };
+    });
+
+    // TOOD(burdon): Trap cursor keys (otherwise tabster grabs focus.)
+    return (
+      <div
+        {...composableProps(props, {
+          classNames: ['dx-container grid place-items-center bg-black', fullscreen && 'absolute inset-0'],
+        })}
+        ref={forwardedRef}
+      >
+        <div role='none' 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>
+              <link rel='preconnect' href='https://fonts.googleapis.com' />
+              <link rel='preconnect' href='https://fonts.gstatic.com' {...{ crossOrigin: '' }} />
+              <link
+                rel='stylesheet'
+                href='https://fonts.googleapis.com/css2?family=Raleway:ital,wght@0,100..900;1,100..900&display=swap'
+              />
+            </style>
+            <div className='slides'>
+              <div className='text-center!' />
+              <section {...{ 'data-markdown': [] }}>
+                <textarea {...{ 'data-template': true }} defaultValue={[styles, content].join('\n')}></textarea>
+              </section>
+            </div>
           </div>
         </div>
       </div>
-    </div>
-  );
-};
+    );
+  },
+);

package/src/components/index.ts

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

package/src/containers/CollectionPresenterContainer/CollectionPresenterContainer.tsx

@@ -0,0 +1,44 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+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 { Panel } from '@dxos/react-ui';
+
+import { PageNumber, Pager, Layout as PresenterLayout } from '#components';
+import { PresenterContext } from '#types';
+
+import { useExitPresenter } from '../../useExitPresenter';
+
+export type CollectionPresenterContainerProps = AppSurface.ObjectArticleProps<Collection.Collection>;
+
+export const CollectionPresenterContainer = ({ role, subject: collection }: CollectionPresenterContainerProps) => {
+  const [slide, setSlide] = useState(0);
+  const { running } = useContext(PresenterContext);
+  const handleExit = useExitPresenter(collection);
+
+  return (
+    <Panel.Root role={role} classNames='relative'>
+      <Panel.Content asChild>
+        <PresenterLayout
+          bottomRight={<PageNumber index={slide} count={collection.objects.length} />}
+          bottomLeft={
+            <Pager
+              index={slide}
+              count={collection.objects.length}
+              keys={running}
+              onChange={setSlide}
+              onExit={handleExit}
+            />
+          }
+        >
+          <Surface.Surface role='slide' data={{ subject: collection.objects[slide] }} />
+        </PresenterLayout>
+      </Panel.Content>
+    </Panel.Root>
+  );
+};

package/src/containers/CollectionPresenterContainer/index.ts

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

package/src/containers/DocumentPresenterContainer/DocumentPresenterContainer.tsx

@@ -0,0 +1,24 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React, { type FC } from 'react';
+
+import { type Markdown } from '@dxos/plugin-markdown/types';
+import { Panel } from '@dxos/react-ui';
+
+import { RevealPlayer } from '#components';
+
+import { useExitPresenter } from '../../useExitPresenter';
+
+export const DocumentPresenterContainer: FC<{ document: Markdown.Document }> = ({ document }) => {
+  const handleExit = useExitPresenter(document);
+
+  return (
+    <Panel.Root classNames='relative'>
+      <Panel.Content asChild>
+        <RevealPlayer content={document.content.target?.content ?? ''} onExit={handleExit} />
+      </Panel.Content>
+    </Panel.Root>
+  );
+};

package/src/containers/DocumentPresenterContainer/index.ts

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

package/src/{components → containers/MarkdownSlide}/MarkdownSlide.tsx

@@ -6,23 +6,21 @@ import React from 'react';
 
 import { type Markdown } from '@dxos/plugin-markdown/types';
 
-import { Container, Slide } from './Markdown';
+import { Panel, Slide } from '#components';
 
 type MarkdownSlideProps = {
   document: Markdown.Document;
 };
 
-const MarkdownSlide = ({ document }: MarkdownSlideProps) => {
+export const MarkdownSlide = ({ document }: MarkdownSlideProps) => {
   const content = document.content.target?.content;
   if (!content) {
     return null;
   }
 
   return (
-    <Container>
+    <Panel>
       <Slide content={content} />
-    </Container>
+    </Panel>
   );
 };
-
-export default MarkdownSlide;

package/src/containers/MarkdownSlide/index.ts

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

package/src/containers/index.ts

@@ -0,0 +1,9 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export const CollectionPresenterContainer: ComponentType<any> = lazy(() => import('./CollectionPresenterContainer'));
+export const DocumentPresenterContainer: ComponentType<any> = lazy(() => import('./DocumentPresenterContainer'));
+export const MarkdownSlide: ComponentType<any> = lazy(() => import('./MarkdownSlide'));

package/src/meta.ts

@@ -6,7 +6,7 @@ import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/presenter',
+  id: 'org.dxos.plugin.presenter',
   name: 'Presenter',
   description: trim`
     Transform markdown documents into interactive presentation slideshows.

package/src/operations/definitions.ts

@@ -0,0 +1,23 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+
+import { Collection } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
+import { Markdown } from '@dxos/plugin-markdown/types';
+
+import { meta } from '#meta';
+
+const PRESENTER_OPERATION = `${meta.id}.operation`;
+
+// TODO(wittjosiah): This appears to be unused.
+export const TogglePresentation = Operation.make({
+  meta: { key: `${PRESENTER_OPERATION}.toggle-presentation`, name: 'Toggle Presentation' },
+  input: Schema.Struct({
+    object: Schema.Union(Markdown.Document, Collection.Collection),
+    state: Schema.optional(Schema.Boolean),
+  }),
+  output: Schema.Void,
+});

package/src/operations/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * as PresenterOperation from './definitions';

package/src/testing.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 
 type SlideOptions = {
   text?: string;
@@ -26,21 +26,21 @@ export const createSlide = (options: SlideOptions = {}) => {
 
   const list = (length = 3) =>
     Array.from({ length })
-      .map(() => `- ${faker.lorem.sentence(3)}`)
+      .map(() => `- ${random.lorem.sentence(3)}`)
       .join('\n');
 
   const ordered = (length = 3) =>
     Array.from({ length })
-      .map((_, i) => `${i + 1}. ${faker.lorem.sentence(3)}`)
+      .map((_, i) => `${i + 1}. ${random.lorem.sentence(3)}`)
       .join('\n');
 
   return [
-    `# ${num}${faker.lorem.sentence(3)}`,
-    options.text && faker.lorem.sentences(),
+    `# ${num}${random.lorem.sentence(3)}`,
+    options.text && random.lorem.sentences(),
     options.code && code(),
     options.list && list(options.list),
     options.ordered && ordered(options.ordered),
-    faker.lorem.sentences(),
+    random.lorem.sentences(),
   ]
     .filter(Boolean)
     .join('\n\r');

package/src/translations.ts

@@ -4,16 +4,17 @@
 
 import { type Resource } from '@dxos/react-ui';
 
-import { meta } from './meta';
+import { meta } from '#meta';
 
 export const translations = [
   {
     'en-US': {
       [meta.id]: {
-        'plugin name': 'Presenter',
-        'settings title': 'Presenter settings',
-        'toggle presentation label': 'Present',
-        'present collections label': 'Present collections (experimental)',
+        '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

@@ -0,0 +1,15 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+// @import-as-namespace
+
+import * as Schema from 'effect/Schema';
+
+export const Settings = Schema.mutable(
+  Schema.Struct({
+    presentCollections: Schema.optional(Schema.Boolean),
+  }),
+);
+
+export type Settings = Schema.Schema.Type<typeof Settings>;

package/src/types/index.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type Atom } from '@effect-atom/atom-react';
+import { type Context, createContext } from 'react';
+
+import { Capability } from '@dxos/app-framework';
+
+import { meta } from '#meta';
+
+import * as Settings from './Settings';
+
+export type PresenterContextType = {
+  running: boolean;
+  start: () => void;
+  stop: () => void;
+};
+
+export const PresenterContext: Context<PresenterContextType> = createContext<PresenterContextType>({
+  running: false,
+  start: () => {},
+  stop: () => {},
+});
+
+export * as Settings from './Settings';
+
+export namespace PresenterCapabilities {
+  export const Settings = Capability.make<Atom.Writable<Settings.Settings>>(`${meta.id}.capability.settings`);
+}

package/src/useExitPresenter.ts

@@ -5,11 +5,11 @@
 import { useAtomValue } from '@effect-atom/atom-react';
 import { useCallback, useMemo } from 'react';
 
-import { Common } from '@dxos/app-framework';
-import { useCapability, useOperationInvoker } from '@dxos/app-framework/react';
+import { useCapability, useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation, getObjectPathFromObject, getSpacePath } from '@dxos/app-toolkit';
 import { Obj } from '@dxos/echo';
 import { DeckCapabilities } from '@dxos/plugin-deck';
-import { DeckOperation } from '@dxos/plugin-deck/types';
+import { DeckOperation } from '@dxos/plugin-deck/operations';
 
 export const useExitPresenter = (object: any) => {
   const { invokePromise } = useOperationInvoker();
@@ -20,16 +20,18 @@ export const useExitPresenter = (object: any) => {
   const deck = useMemo(() => state.decks[state.activeDeck], [state.decks, state.activeDeck]);
 
   return useCallback(() => {
-    const objectId = Obj.getDXN(object).toString();
+    const objectPath = getObjectPathFromObject(object);
+    const db = Obj.getDatabase(object);
     if (deck?.fullscreen) {
       void invokePromise(DeckOperation.Adjust, {
-        type: 'solo--fullscreen',
-        id: objectId,
+        type: 'solo--fullscreen' as const,
+        id: objectPath,
       });
     }
-    return invokePromise(Common.LayoutOperation.Open, {
-      subject: [objectId],
-      workspace: Obj.getDatabase(object)?.spaceId,
+
+    return invokePromise(LayoutOperation.Open, {
+      subject: [objectPath],
+      workspace: db ? getSpacePath(db.spaceId) : undefined,
     });
   }, [invokePromise, object, deck]);
 };