@dxos/plugin-presenter 0.8.4-main.f5c0578 → 0.8.4-main.fcfe5033a5

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 { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { createSlide } from '../../testing';
+import { createSlide } from '#testing';
 
 import { Slide } from './Slide';
 
-const meta: Meta = {
-  title: 'plugins/plugin-presenter/Slide',
+const meta = {
+  title: 'plugins/plugin-presenter/components/Slide',
   component: Slide,
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   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

@@ -2,21 +2,22 @@
 // Copyright 2023 DXOS.org
 //
 
+import 'highlight.js/styles/github.css';
+
 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/index.ts

@@ -2,5 +2,5 @@
 // Copyright 2022 DXOS.org
 //
 
-export * from './Container';
+export * from './Panel';
 export * from './Slide';

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/theme.ts

@@ -5,14 +5,14 @@
 // TODO(burdon): Create theme type and picker.
 
 export const theme = {
-  root: 'bg-attention leading-relaxed font-mono',
+  root: 'bg-attention-surface leading-relaxed font-mono',
 
   padding: 'px-40 py-16 gap-8',
 
   nodes: {
-    h1: 'text-[80px] text-accentText',
-    h2: 'text-[60px] text-accentText',
-    h3: 'text-[48px] text-accentText',
+    h1: 'text-[80px] text-accent-text',
+    h2: 'text-[60px] text-accent-text',
+    h3: 'text-[48px] text-accent-text',
 
     p: 'text-[48px]',
 
@@ -20,7 +20,7 @@ export const theme = {
     ol: 'my-[16px] ml-24 leading-relaxed list-decimal',
     li: 'pl-6 text-[48px]',
 
-    pre: 'w-full mx-0 my-[32px] p-0 __border-l-[16px] bg-inputSurface p-4 __whitespace-pre-line',
+    pre: 'w-full mx-0 my-[32px] p-4 bg-input-surface',
     code: 'p-0 text-[40px]',
   },
 };

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

@@ -4,30 +4,31 @@
 
 import React, { type PropsWithChildren, type ReactNode } from 'react';
 
-import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { composable, composableProps } from '@dxos/ui-theme';
 
-export type LayoutProps = ThemedClassName<
-  PropsWithChildren<{
-    className?: string;
-    topLeft?: ReactNode;
-    topRight?: ReactNode;
-    bottomLeft?: ReactNode;
-    bottomRight?: ReactNode;
-  }>
->;
+export type LayoutProps = PropsWithChildren<{
+  topLeft?: ReactNode;
+  topRight?: ReactNode;
+  bottomLeft?: ReactNode;
+  bottomRight?: ReactNode;
+}>;
 
-export const Layout = ({ children, classNames, topLeft, topRight, bottomLeft, bottomRight }: LayoutProps) => {
-  return (
-    <div className={mx('flex grow relative overflow-hidden bg-attention', classNames)}>
-      <div className={mx('flex flex-col grow overflow-hidden')}>{children}</div>
+export const Layout = composable<HTMLDivElement, LayoutProps>(
+  ({ children, topLeft, topRight, bottomLeft, bottomRight, ...props }, forwardedRef) => {
+    return (
+      <div
+        {...composableProps(props, { classNames: 'flex grow relative overflow-hidden bg-attention-surface' })}
+        ref={forwardedRef}
+      >
+        <div className='flex flex-col grow overflow-hidden'>{children}</div>
 
-      <div className='z-[200]'>
-        <div className='absolute top-4 left-4'>{topLeft}</div>
-        <div className='absolute top-4 right-4'>{topRight}</div>
-        <div className='absolute bottom-4 left-4'>{bottomLeft}</div>
-        <div className='absolute bottom-4 right-4'>{bottomRight}</div>
+        <div className='z-[200]'>
+          <div className='absolute top-4 left-4'>{topLeft}</div>
+          <div className='absolute top-4 right-4'>{topRight}</div>
+          <div className='absolute bottom-4 left-4'>{bottomLeft}</div>
+          <div className='absolute bottom-4 right-4'>{bottomRight}</div>
+        </div>
       </div>
-    </div>
-  );
-};
+    );
+  },
+);

package/src/components/Presenter/Pager.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, { useState } from 'react';
 
-import { withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { PageNumber, Pager, type PagerProps, StartButton } from './Pager';
 
@@ -24,15 +22,17 @@ const DefaultStory = ({ count = 20 }: PagerProps) => {
   );
 };
 
-export const Default = {};
-
-const meta: Meta<PagerProps> = {
-  title: 'plugins/plugin-presenter/Pager',
+const meta = {
+  title: 'plugins/plugin-presenter/components/Pager',
   render: DefaultStory,
-  decorators: [withTheme],
+  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, Icon, useControlledState } from '@dxos/react-ui';
+import { IconButton, 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: indexProp = 0, count = 0, keys, onChange, onExit }: PagerProps) => {
+  const [index, setIndex] = useControlledState(indexProp);
   useEffect(() => {
     onChange?.(index);
   }, [index]);
@@ -76,18 +76,46 @@ export const Pager = ({ index: controlledIndex = 0, count = 0, keys, onChange, o
 
   return (
     <div className='flex items-center text-neutral-500'>
-      <Button variant='ghost' classNames='p-0' onClick={() => onChange?.(0)}>
-        <Icon icon='ph--caret-double-left--regular' size={6} />
-      </Button>
-      <Button variant='ghost' classNames='p-0' onClick={() => handleChangeIndex(-1)}>
-        <Icon icon='ph--caret-left--regular' size={6} />
-      </Button>
-      <Button variant='ghost' classNames='p-0' onClick={() => handleChangeIndex(1)}>
-        <Icon icon='ph--caret-right--regular' size={6} />
-      </Button>
-      <Button variant='ghost' classNames='p-0' onClick={() => onChange?.(count - 1)}>
-        <Icon icon='ph--caret-double-right--regular' size={6} />
-      </Button>
+      <IconButton
+        icon='ph--caret-double-left--regular'
+        size={6}
+        label='Jump to first'
+        iconOnly
+        noTooltip
+        variant='ghost'
+        classNames='p-0'
+        onClick={() => onChange?.(0)}
+      />
+      <IconButton
+        icon='ph--caret-left--regular'
+        size={6}
+        label='Previous'
+        iconOnly
+        noTooltip
+        variant='ghost'
+        classNames='p-0'
+        onClick={() => handleChangeIndex(-1)}
+      />
+      <IconButton
+        icon='ph--caret-right--regular'
+        size={6}
+        label='Next'
+        iconOnly
+        noTooltip
+        variant='ghost'
+        classNames='p-0'
+        onClick={() => handleChangeIndex(1)}
+      />
+      <IconButton
+        icon='ph--caret-double-right--regular'
+        size={6}
+        label='Jump to last'
+        iconOnly
+        noTooltip
+        variant='ghost'
+        classNames='p-0'
+        onClick={() => onChange?.(count - 1)}
+      />
     </div>
   );
 };
@@ -113,8 +141,15 @@ export const PageNumber = ({ index = 0, count = 1 }: PageNumberProps) => {
 
 export const StartButton = ({ running, onClick }: { running?: boolean; onClick?: (start: boolean) => void }) => {
   return (
-    <Button variant='ghost' classNames='p-0' onClick={() => onClick?.(!running)}>
-      {(running && <Icon icon='ph--x--regular' size={6} />) || <Icon icon='ph--play--regular' size={6} />}
-    </Button>
+    <IconButton
+      icon={running ? 'ph--x--regular' : 'ph--play--regular'}
+      size={6}
+      label={running ? 'Stop' : 'Play'}
+      iconOnly
+      noTooltip
+      variant='ghost'
+      classNames='p-0'
+      onClick={() => onClick?.(!running)}
+    />
   );
 };

package/src/components/PresenterSettings/PresenterSettings.stories.tsx

@@ -0,0 +1,31 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '../../translations';
+import { PresenterSettings } from './PresenterSettings';
+
+const meta = {
+  title: 'plugins/plugin-presenter/components/PresenterSettings',
+  component: PresenterSettings,
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
+  tags: ['settings'],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof PresenterSettings>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    settings: { presentCollections: true },
+  },
+};

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

@@ -2,13 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta } from '@storybook/react-vite';
 
+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
@@ -19,14 +18,15 @@ import { RevealPlayer } from './RevealPlayer';
 // https://fontsource.org/fonts
 // https://fonts.google.com
 
-const meta: Meta<typeof RevealPlayer> = {
-  title: 'plugins/plugin-presenter/RevealPlayer',
+const meta = {
+  title: 'plugins/plugin-presenter/components/RevealPlayer',
   component: RevealPlayer,
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   parameters: {
     layout: 'fullscreen',
     translations,
   },
-};
+} satisfies Meta<typeof RevealPlayer>;
 
 export default meta;