@dxos/plugin-presenter 0.8.4-main.2e9d522 → 0.8.4-main.5ea62a8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-presenter",
-  "version": "0.8.4-main.2e9d522",
+  "version": "0.8.4-main.5ea62a8",
   "description": "Braneframe presenter plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,6 +10,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs"
     }
@@ -35,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.2e9d522",
-    "@dxos/async": "0.8.4-main.2e9d522",
-    "@dxos/echo": "0.8.4-main.2e9d522",
-    "@dxos/live-object": "0.8.4-main.2e9d522",
-    "@dxos/echo-schema": "0.8.4-main.2e9d522",
-    "@dxos/local-storage": "0.8.4-main.2e9d522",
-    "@dxos/log": "0.8.4-main.2e9d522",
-    "@dxos/plugin-client": "0.8.4-main.2e9d522",
-    "@dxos/plugin-deck": "0.8.4-main.2e9d522",
-    "@dxos/plugin-graph": "0.8.4-main.2e9d522",
-    "@dxos/plugin-markdown": "0.8.4-main.2e9d522",
-    "@dxos/plugin-stack": "0.8.4-main.2e9d522",
-    "@dxos/react-client": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-form": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-stack": "0.8.4-main.2e9d522",
-    "@dxos/schema": "0.8.4-main.2e9d522"
+    "@dxos/app-framework": "0.8.4-main.5ea62a8",
+    "@dxos/async": "0.8.4-main.5ea62a8",
+    "@dxos/echo": "0.8.4-main.5ea62a8",
+    "@dxos/live-object": "0.8.4-main.5ea62a8",
+    "@dxos/echo-schema": "0.8.4-main.5ea62a8",
+    "@dxos/local-storage": "0.8.4-main.5ea62a8",
+    "@dxos/plugin-client": "0.8.4-main.5ea62a8",
+    "@dxos/log": "0.8.4-main.5ea62a8",
+    "@dxos/plugin-deck": "0.8.4-main.5ea62a8",
+    "@dxos/plugin-markdown": "0.8.4-main.5ea62a8",
+    "@dxos/plugin-graph": "0.8.4-main.5ea62a8",
+    "@dxos/plugin-stack": "0.8.4-main.5ea62a8",
+    "@dxos/react-client": "0.8.4-main.5ea62a8",
+    "@dxos/react-ui-form": "0.8.4-main.5ea62a8",
+    "@dxos/react-ui-stack": "0.8.4-main.5ea62a8",
+    "@dxos/schema": "0.8.4-main.5ea62a8"
   },
   "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.2e9d522",
-    "@dxos/react-ui": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-theme": "0.8.4-main.2e9d522",
-    "@dxos/storybook-utils": "0.8.4-main.2e9d522"
+    "vite": "7.1.1",
+    "@dxos/react-ui": "0.8.4-main.5ea62a8",
+    "@dxos/random": "0.8.4-main.5ea62a8",
+    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8",
+    "@dxos/storybook-utils": "0.8.4-main.5ea62a8"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -73,8 +74,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-theme": "0.8.4-main.2e9d522"
+    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8",
+    "@dxos/react-ui": "0.8.4-main.5ea62a8"
   },
   "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,12 +5,12 @@
 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';
 import { createExtension, rxFromSignal } from '@dxos/plugin-graph';
-import { DocumentType } from '@dxos/plugin-markdown/types';
+import { Markdown } from '@dxos/plugin-markdown/types';
 import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
 import { DataType } from '@dxos/schema';
 
@@ -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(
@@ -32,8 +65,8 @@ export default (context: PluginContext) =>
                 rxFromSignal(() => settingsStore?.getStore<PresenterSettingsProps>(PRESENTER_PLUGIN)?.value),
               );
               const isPresentable = settings?.presentCollections
-                ? Obj.instanceOf(DataType.Collection, node.data) || Obj.instanceOf(DocumentType, node.data)
-                : Obj.instanceOf(DocumentType, node.data);
+                ? 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) => {
@@ -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

@@ -7,14 +7,14 @@ import React from 'react';
 import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
 import { SettingsStore } from '@dxos/local-storage';
-import { DocumentType } from '@dxos/plugin-markdown/types';
+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,22 +25,32 @@ export default () =>
       id: `${PRESENTER_PLUGIN}/document`,
       role: 'article',
       position: 'hoist',
-      filter: (data): data is { subject: DocumentType; variant: 'presenter' } =>
-        Obj.instanceOf(DocumentType, 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`,
       role: 'slide',
-      filter: (data): data is { subject: DocumentType } => Obj.instanceOf(DocumentType, data.subject),
+      filter: (data): data is { subject: Markdown.Document } => Obj.instanceOf(Markdown.Document, data.subject),
       component: ({ data }) => <MarkdownSlide document={data.subject} />,
     }),
     createSurface({

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

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

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/MarkdownSlide.tsx

@@ -4,11 +4,11 @@
 
 import React, { type FC } from 'react';
 
-import { type DocumentType } from '@dxos/plugin-markdown/types';
+import { type Markdown } from '@dxos/plugin-markdown/types';
 
 import { Container, Slide } from './Markdown';
 
-const MarkdownSlide: FC<{ document: DocumentType }> = ({ document }) => {
+const MarkdownSlide: FC<{ document: Markdown.Document }> = ({ document }) => {
   const content = document.content.target?.content;
   if (!content) {
     return null;

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 = {};

package/src/components/Presenter/Pager.tsx

@@ -4,7 +4,7 @@
 
 import React, { useEffect } from 'react';
 
-import { Button, useControlledState, Icon } from '@dxos/react-ui';
+import { Button, Icon, useControlledState } from '@dxos/react-ui';
 
 export type PagerProps = {
   index?: number;
@@ -14,8 +14,8 @@ export type PagerProps = {
   onExit?: () => void;
 };
 
-export const Pager = ({ index: controlledIndex = 0, count = 0, keys, onChange, onExit }: PagerProps) => {
-  const [index, setIndex] = useControlledState(controlledIndex);
+export const Pager = ({ index: indexParam = 0, count = 0, keys, onChange, onExit }: PagerProps) => {
+  const [index, setIndex] = useControlledState(indexParam);
   useEffect(() => {
     onChange?.(index);
   }, [index]);

package/src/components/PresenterSettings.tsx

@@ -5,7 +5,7 @@
 import React from 'react';
 
 import { Input, useTranslation } from '@dxos/react-ui';
-import { DeprecatedFormContainer, DeprecatedFormInput } from '@dxos/react-ui-form';
+import { ControlGroup, ControlItemInput, ControlPage, ControlSection } from '@dxos/react-ui-form';
 
 import { PRESENTER_PLUGIN } from '../meta';
 import { type PresenterSettingsProps } from '../types';
@@ -14,13 +14,17 @@ export const PresenterSettings = ({ settings }: { settings: PresenterSettingsPro
   const { t } = useTranslation(PRESENTER_PLUGIN);
 
   return (
-    <DeprecatedFormContainer>
-      <DeprecatedFormInput label={t('present collections label')}>
-        <Input.Switch
-          checked={settings.presentCollections}
-          onCheckedChange={(checked) => (settings.presentCollections = !!checked)}
-        />
-      </DeprecatedFormInput>
-    </DeprecatedFormContainer>
+    <ControlPage>
+      <ControlSection title={t('settings title', { ns: PRESENTER_PLUGIN })}>
+        <ControlGroup>
+          <ControlItemInput title={t('present collections label')}>
+            <Input.Switch
+              checked={settings.presentCollections}
+              onCheckedChange={(checked) => (settings.presentCollections = !!checked)}
+            />
+          </ControlItemInput>
+        </ControlGroup>
+      </ControlSection>
+    </ControlPage>
   );
 };

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

@@ -6,10 +6,11 @@ import '@dxos-theme';
 
 import { type Meta } from '@storybook/react-vite';
 
-import { RevealPlayer } from './RevealPlayer';
 import CONTENT from '../../../testing/deck.md?raw';
 import { translations } from '../../translations';
 
+import { RevealPlayer } from './RevealPlayer';
+
 // https://revealjs.com/markdown
 // https://developer.mozilla.org/en-US/docs/Web/CSS/background-position
 // https://colorhunt.co/palettes/dark
@@ -18,14 +19,14 @@ import { translations } from '../../translations';
 // https://fontsource.org/fonts
 // https://fonts.google.com
 
-const meta: Meta<typeof RevealPlayer> = {
+const meta = {
   title: 'plugins/plugin-presenter/RevealPlayer',
   component: RevealPlayer,
   parameters: {
     layout: 'fullscreen',
     translations,
   },
-};
+} satisfies Meta<typeof RevealPlayer>;
 
 export default meta;