@dxos/plugin-presenter 0.8.4-main.9735255 → 0.8.4-main.abd8ff62ef

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-presenter",
-  "version": "0.8.4-main.9735255",
+  "version": "0.8.4-main.abd8ff62ef",
   "description": "Braneframe presenter plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,24 +12,47 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#plugin": {
+      "browser": "./src/PresenterPlugin.tsx",
+      "node": "./src/PresenterPlugin.node.ts",
+      "default": "./src/PresenterPlugin.tsx"
+    },
+    "#capabilities": "./src/capabilities/index.ts",
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#testing": "./src/testing.ts",
+    "#translations": "./src/translations.ts",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
-      "browser": "./dist/lib/browser/index.mjs",
       "source": "./src/index.ts",
+      "browser": "./dist/lib/browser/index.mjs",
       "types": "./dist/types/src/index.d.ts"
+    },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "browser": "./dist/lib/browser/operations/index.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@effect-atom/atom": "^0.4.13",
-    "@effect-atom/atom-react": "^0.4.6",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
     "hastscript": "^7.1.0",
     "highlight.js": "^11.9.0",
     "marked": "^12.0.2",
@@ -40,48 +63,51 @@
     "remark-frontmatter": "^5.0.0",
     "remark-parse-frontmatter": "^1.0.3",
     "reveal.js": "^5.1.0",
-    "@dxos/app-framework": "0.8.4-main.9735255",
-    "@dxos/async": "0.8.4-main.9735255",
-    "@dxos/echo": "0.8.4-main.9735255",
-    "@dxos/effect": "0.8.4-main.9735255",
-    "@dxos/operation": "0.8.4-main.9735255",
-    "@dxos/log": "0.8.4-main.9735255",
-    "@dxos/plugin-client": "0.8.4-main.9735255",
-    "@dxos/plugin-deck": "0.8.4-main.9735255",
-    "@dxos/plugin-graph": "0.8.4-main.9735255",
-    "@dxos/react-client": "0.8.4-main.9735255",
-    "@dxos/plugin-markdown": "0.8.4-main.9735255",
-    "@dxos/plugin-stack": "0.8.4-main.9735255",
-    "@dxos/react-ui-mosaic": "0.8.4-main.9735255",
-    "@dxos/react-ui-stack": "0.8.4-main.9735255",
-    "@dxos/react-ui-form": "0.8.4-main.9735255",
-    "@dxos/schema": "0.8.4-main.9735255",
-    "@dxos/util": "0.8.4-main.9735255",
-    "@dxos/types": "0.8.4-main.9735255"
+    "@dxos/async": "0.8.4-main.abd8ff62ef",
+    "@dxos/app-framework": "0.8.4-main.abd8ff62ef",
+    "@dxos/app-toolkit": "0.8.4-main.abd8ff62ef",
+    "@dxos/compute": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo": "0.8.4-main.abd8ff62ef",
+    "@dxos/log": "0.8.4-main.abd8ff62ef",
+    "@dxos/effect": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-deck": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-markdown": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-graph": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-attention": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-stack": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-mosaic": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-form": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-stack": "0.8.4-main.abd8ff62ef",
+    "@dxos/schema": "0.8.4-main.abd8ff62ef",
+    "@dxos/types": "0.8.4-main.abd8ff62ef",
+    "@dxos/util": "0.8.4-main.abd8ff62ef"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "@types/reveal.js": "^5.0.3",
-    "effect": "3.19.11",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/random": "0.8.4-main.9735255",
-    "@dxos/react-ui": "0.8.4-main.9735255",
-    "@dxos/ui-theme": "0.8.4-main.9735255",
-    "@dxos/storybook-utils": "0.8.4-main.9735255"
+    "vite": "^8.0.10",
+    "@dxos/random": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-testing": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
+    "@dxos/storybook-utils": "0.8.4-main.abd8ff62ef",
+    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.9735255",
-    "@dxos/ui-theme": "0.8.4-main.9735255"
+    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui": "0.8.4-main.abd8ff62ef"
   },
   "publishConfig": {
     "access": "public"

package/src/PresenterPlugin.node.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { AppGraphBuilder } from '#capabilities';
+import { meta } from '#meta';
+
+export const PresenterPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  Plugin.make,
+);
+
+export default PresenterPlugin;

package/src/PresenterPlugin.test.ts

@@ -0,0 +1,23 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { PresenterPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('PresenterPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [PresenterPlugin()],
+    });
+
+    expect(harness.manager.getActive()).toContain(moduleId('AppGraphBuilder'));
+  });
+});

package/src/PresenterPlugin.tsx

@@ -2,19 +2,22 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Common, Plugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 
-import { AppGraphBuilder, PresenterSettings, ReactSurface } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
+import { AppGraphBuilder, PresenterSettings, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+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 = Plugin.define(meta).pipe(
-  Common.Plugin.addSettingsModule({ activate: PresenterSettings }),
-  Common.Plugin.addTranslationsModule({ translations }),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
-  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addSettingsModule({ activate: PresenterSettings }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
   Plugin.make,
 );
+
+export default PresenterPlugin;

package/src/capabilities/{app-graph-builder/app-graph-builder.ts → app-graph-builder.ts}

@@ -5,17 +5,20 @@
 import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities, AppNode, LayoutOperation, getObjectPathFromObject, getSpacePath } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
+import { Collection } from '@dxos/echo';
 import { DeckCapabilities } from '@dxos/plugin-deck';
-import { ATTENDABLE_PATH_SEPARATOR, DeckOperation } from '@dxos/plugin-deck/types';
+import { DeckOperation } from '@dxos/plugin-deck/operations';
 import { GraphBuilder, type Node, NodeMatcher } from '@dxos/plugin-graph';
 import { Markdown } from '@dxos/plugin-markdown/types';
-import { Collection } from '@dxos/schema';
+import { linkedSegment } from '@dxos/react-ui-attention';
 
-import { meta } from '../../meta';
-import { PresenterCapabilities, PresenterOperation } from '../../types';
+import { meta } from '#meta';
+import { PresenterOperation } from '#operations';
+import { PresenterCapabilities } from '#types';
 
 /** Match nodes that can be presented (Collection or Document). */
 const whenPresentable = (node: Node.Node) =>
@@ -28,7 +31,7 @@ export default Capability.makeModule(
     const capabilities = yield* Capability.Service;
 
     const extensions = yield* GraphBuilder.createExtension({
-      id: `${meta.id}/root`,
+      id: 'root',
       // TODO(wittjosiah): This is a hack to work around presenter previously relying on "variant". Remove.
       match: whenPresentable,
       connector: (object, get) => {
@@ -40,18 +43,14 @@ export default Capability.makeModule(
         if (!isPresentable) {
           return Effect.succeed([]);
         }
-        const id = Obj.getDXN(object).toString();
+
         return Effect.succeed([
-          {
-            id: [id, 'presenter'].join(ATTENDABLE_PATH_SEPARATOR),
+          AppNode.makeCompanion({
+            id: linkedSegment('presenter'),
+            label: 'Presenter',
+            icon: 'ph--presentation--regular',
             data: { type: meta.id, object },
-            type: meta.id,
-            properties: {
-              label: 'Presenter',
-              icon: 'ph--presentation--regular',
-              disposition: 'hidden',
-            },
-          },
+          }),
         ]);
       },
       actions: (object, get) => {
@@ -60,34 +59,34 @@ export default Capability.makeModule(
         const isPresentable = settings?.presentCollections
           ? Obj.instanceOf(Collection.Collection, object) || Obj.instanceOf(Markdown.Document, object)
           : Obj.instanceOf(Markdown.Document, object);
-        if (!isPresentable) {
+        const db = Obj.getDatabase(object);
+        if (!isPresentable || !db) {
           return Effect.succeed([]);
         }
-        const dxn = Obj.getDXN(object);
-        const id = dxn.toString();
-        const { spaceId } = dxn.asEchoDXN()!;
+        const objectPath = getObjectPathFromObject(object);
+
         return Effect.succeed([
           {
-            id: `${PresenterOperation.TogglePresentation.meta.key}/${id}`,
+            id: PresenterOperation.TogglePresentation.meta.key,
             // TODO(burdon): Allow function so can generate state when activated.
             //  So can set explicit fullscreen state coordinated with current presenter state.
             data: Effect.fnUntraced(function* () {
-              const deckState = yield* Common.Capability.getAtomValue(DeckCapabilities.State);
+              const deckState = yield* Capabilities.getAtomValue(DeckCapabilities.State);
               const deck = deckState.decks[deckState.activeDeck];
-              const presenterId = [id, 'presenter'].join(ATTENDABLE_PATH_SEPARATOR);
+              const presenterId = `${objectPath}/${linkedSegment('presenter')}`;
               if (!deck?.fullscreen) {
                 yield* Operation.invoke(DeckOperation.Adjust, {
                   type: 'solo--fullscreen' as const,
                   id: presenterId,
                 });
               }
-              yield* Operation.invoke(Common.LayoutOperation.Open, {
+              yield* Operation.invoke(LayoutOperation.Open, {
                 subject: [presenterId],
-                workspace: spaceId,
+                workspace: getSpacePath(db.spaceId),
               });
             }),
             properties: {
-              label: ['toggle presentation label', { ns: meta.id }],
+              label: ['toggle-presentation.label', { ns: meta.id }],
               icon: 'ph--presentation--regular',
               disposition: 'list-item',
               keyBinding: {
@@ -100,6 +99,6 @@ export default Capability.makeModule(
       },
     });
 
-    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

package/src/capabilities/index.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './app-graph-builder';
-export * from './react-surface';
-export * from './settings';
+import { Capability } from '@dxos/app-framework';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
+export const PresenterSettings = Capability.lazy('PresenterSettings', () => import('./settings'));

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,68 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface, useSettingsState } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Obj } from '@dxos/echo';
+import { Collection } from '@dxos/echo';
+import { Markdown } from '@dxos/plugin-markdown/types';
+
+import { PresenterSettings } from '#components';
+import { CollectionPresenterContainer, DocumentPresenterContainer, MarkdownSlide } from '#containers';
+import { meta } from '#meta';
+import { type Settings } from '#types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'document',
+        position: 'hoist',
+        filter: AppSurface.predicate(
+          AppSurface.Article,
+          (data): data is AppSurface.ArticleData<{ 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} />,
+      }),
+      Surface.create({
+        id: 'collection',
+        position: 'hoist',
+        filter: AppSurface.predicate(
+          AppSurface.Article,
+          (data): data is AppSurface.ArticleData<{ type: typeof meta.id; object: Collection.Collection }> =>
+            !!data.subject &&
+            typeof data.subject === 'object' &&
+            'type' in data.subject &&
+            'object' in data.subject &&
+            data.subject.type === meta.id &&
+            Obj.instanceOf(Collection.Collection, data.subject.object),
+        ),
+        component: ({ role, data }) => <CollectionPresenterContainer role={role} subject={data.subject.object} />,
+      }),
+      Surface.create({
+        id: 'slide',
+        filter: AppSurface.object(AppSurface.Slide, Markdown.Document),
+        component: ({ data }) => <MarkdownSlide document={data.subject} />,
+      }),
+      Surface.create({
+        id: 'plugin-settings',
+        filter: AppSurface.settings(AppSurface.Article, meta.id),
+        component: ({ data: { subject } }) => {
+          const { settings, updateSettings } = useSettingsState<Settings.Settings>(subject.atom);
+          return <PresenterSettings settings={settings} onSettingsChange={updateSettings} />;
+        },
+      }),
+    ]),
+  ),
+);

package/src/capabilities/{settings/settings.ts → settings.ts}

@@ -4,25 +4,26 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { createKvsStore } from '@dxos/effect';
 
-import { meta } from '../../meta';
-import { PresenterCapabilities, PresenterSettingsSchema } from '../../types';
+import { meta } from '#meta';
+import { PresenterCapabilities, Settings } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.sync(() => {
     const settingsAtom = createKvsStore({
       key: meta.id,
-      schema: PresenterSettingsSchema,
+      schema: Settings.Settings,
       defaultValue: () => ({}),
     });
 
     return [
       Capability.contributes(PresenterCapabilities.Settings, settingsAtom),
-      Capability.contributes(Common.Capability.Settings, {
+      Capability.contributes(AppCapabilities.Settings, {
         prefix: meta.id,
-        schema: PresenterSettingsSchema,
+        schema: Settings.Settings,
         atom: settingsAtom,
       }),
     ];

package/src/components/Markdown/{Container.stories.tsx → Panel.stories.tsx}

@@ -5,25 +5,25 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { createSlide } from '../../testing';
+import { createSlide } from '#testing';
 
-import { Container } from './Container';
+import { Panel } from './Panel';
 import { Slide, type SlideProps } from './Slide';
 
 const DefaultStory = ({ content = '' }: SlideProps) => {
   return (
-    <Container classNames='bg-neutral-200'>
+    <Panel classNames='bg-neutral-200'>
       <Slide content={content} />
-    </Container>
+    </Panel>
   );
 };
 
 const meta = {
-  title: 'plugins/plugin-presenter/Container',
+  title: 'plugins/plugin-presenter/components/Panel',
   render: DefaultStory,
-  decorators: [withTheme],
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   parameters: {
     layout: 'fullscreen',
   },

package/src/components/Markdown/{Container.tsx → Panel.tsx}

@@ -8,12 +8,12 @@ import { useResizeDetector } from 'react-resize-detector';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { mx } from '@dxos/ui-theme';
 
-export type ContainerProps = ThemedClassName<PropsWithChildren<{}>>;
+export type PanelProps = ThemedClassName<PropsWithChildren<{}>>;
 
 /**
- * Scaled markdown container.
+ * Scaled markdown panel.
  */
-export const Container = ({ children, classNames }: ContainerProps) => {
+export const Panel = ({ children, classNames }: PanelProps) => {
   const [props, setProps] = useState({});
   const {
     ref: containerRef,
@@ -35,8 +35,8 @@ export const Container = ({ children, classNames }: ContainerProps) => {
   // TODO(burdon): Reconcile highlight colors with markdown editor.
   // https://www.npmjs.com/package/react-markdown
   return (
-    <div ref={containerRef} className={mx('flex grow relative overflow-hidden bg-attention', classNames)}>
-      <div className={mx('flex is-full bs-full overflow-hidden absolute')} style={props}>
+    <div ref={containerRef} className={mx('flex grow relative overflow-hidden bg-attention-surface', classNames)}>
+      <div className={mx('dx-container absolute')} style={props}>
         {width && height && children}
       </div>
     </div>

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

@@ -4,16 +4,16 @@
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { createSlide } from '../../testing';
+import { createSlide } from '#testing';
 
 import { Slide } from './Slide';
 
 const meta = {
-  title: 'plugins/plugin-presenter/Slide',
+  title: 'plugins/plugin-presenter/components/Slide',
   component: Slide,
-  decorators: [withTheme],
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   parameters: {
     layout: 'fullscreen',
   },

package/src/components/Markdown/Slide.tsx

@@ -2,6 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
+import 'highlight.js/styles/github.css';
+
 import { h } from 'hastscript';
 import React from 'react';
 import ReactMarkdown, { type Options as ReactMarkdownOptions } from 'react-markdown';
@@ -10,8 +12,6 @@ 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';
 

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/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: 'pli-40 plb-16 gap-8',
+  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: 'is-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/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/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>
-  );
-};
+    );
+  },
+);