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

package/package.json

@@ -1,18 +1,36 @@
 {
   "name": "@dxos/plugin-presenter",
-  "version": "0.8.4-main.f5c0578",
+  "version": "0.8.4-main.fcfe5033a5",
   "description": "Braneframe presenter plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#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",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "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"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -24,58 +42,62 @@
     "src"
   ],
   "dependencies": {
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@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",
-    "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/app-framework": "0.8.4-main.f5c0578",
-    "@dxos/async": "0.8.4-main.f5c0578",
-    "@dxos/echo": "0.8.4-main.f5c0578",
-    "@dxos/echo-schema": "0.8.4-main.f5c0578",
-    "@dxos/local-storage": "0.8.4-main.f5c0578",
-    "@dxos/log": "0.8.4-main.f5c0578",
-    "@dxos/plugin-client": "0.8.4-main.f5c0578",
-    "@dxos/live-object": "0.8.4-main.f5c0578",
-    "@dxos/plugin-deck": "0.8.4-main.f5c0578",
-    "@dxos/plugin-graph": "0.8.4-main.f5c0578",
-    "@dxos/plugin-markdown": "0.8.4-main.f5c0578",
-    "@dxos/plugin-stack": "0.8.4-main.f5c0578",
-    "@dxos/react-client": "0.8.4-main.f5c0578",
-    "@dxos/react-ui-form": "0.8.4-main.f5c0578",
-    "@dxos/react-ui-stack": "0.8.4-main.f5c0578",
-    "@dxos/schema": "0.8.4-main.f5c0578"
+    "@dxos/app-framework": "0.8.4-main.fcfe5033a5",
+    "@dxos/async": "0.8.4-main.fcfe5033a5",
+    "@dxos/app-toolkit": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo": "0.8.4-main.fcfe5033a5",
+    "@dxos/log": "0.8.4-main.fcfe5033a5",
+    "@dxos/effect": "0.8.4-main.fcfe5033a5",
+    "@dxos/operation": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-client": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-deck": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-markdown": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-graph": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-stack": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-client": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-attention": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-form": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-mosaic": "0.8.4-main.fcfe5033a5",
+    "@dxos/schema": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-stack": "0.8.4-main.fcfe5033a5",
+    "@dxos/types": "0.8.4-main.fcfe5033a5",
+    "@dxos/util": "0.8.4-main.fcfe5033a5"
   },
   "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-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.17.7",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/random": "0.8.4-main.f5c0578",
-    "@dxos/react-ui": "0.8.4-main.f5c0578",
-    "@dxos/react-ui-theme": "0.8.4-main.f5c0578",
-    "@dxos/storybook-utils": "0.8.4-main.f5c0578"
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/react-ui": "0.8.4-main.fcfe5033a5",
+    "@dxos/random": "0.8.4-main.fcfe5033a5",
+    "@dxos/storybook-utils": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5"
   },
   "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.f5c0578",
-    "@dxos/react-ui-theme": "0.8.4-main.f5c0578"
+    "@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.fcfe5033a5",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5"
   },
   "publishConfig": {
     "access": "public"

package/src/PresenterPlugin.tsx

@@ -2,35 +2,21 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, Events, contributes, defineModule, definePlugin } 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 { 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 = () =>
-  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 = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addSettingsModule({ activate: PresenterSettings }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.make,
+);

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

@@ -2,81 +2,103 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
-import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities, AppNode, LayoutOperation, getObjectPathFromObject, getSpacePath } from '@dxos/app-toolkit';
 import { Obj } from '@dxos/echo';
+import { Collection } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
 import { DeckCapabilities } from '@dxos/plugin-deck';
-import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
-import { createExtension, rxFromSignal } from '@dxos/plugin-graph';
+import { DeckOperation } from '@dxos/plugin-deck/operations';
+import { GraphBuilder, type Node, NodeMatcher } from '@dxos/plugin-graph';
 import { Markdown } from '@dxos/plugin-markdown/types';
-import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
-import { DataType } from '@dxos/schema';
+import { linkedSegment } from '@dxos/react-ui-attention';
 
-import { PRESENTER_PLUGIN } from '../meta';
-import { PresenterAction, type PresenterSettingsProps } from '../types';
+import { meta } from '#meta';
+import { PresenterOperation } from '#operations';
+import { PresenterCapabilities } from '#types';
 
-export default (context: PluginContext) =>
-  contributes(
-    Capabilities.AppGraphBuilder,
-    createExtension({
-      id: PRESENTER_PLUGIN,
-      actions: (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);
-              const spaceId = getSpace(object)?.id;
-              return [
-                {
-                  id: `${PresenterAction.TogglePresentation._tag}/${id}`,
-                  // TODO(burdon): Allow function so can generate state when activated.
-                  //  So can set explicit fullscreen state coordinated with current presenter state.
-                  data: async () => {
-                    const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-                    const layout = context.getCapability(DeckCapabilities.MutableDeckState);
-                    const presenterId = [id, 'presenter'].join(ATTENDABLE_PATH_SEPARATOR);
-                    if (!layout.deck.fullscreen) {
-                      void dispatch(
-                        createIntent(DeckAction.Adjust, {
-                          type: 'solo--fullscreen',
-                          id: presenterId,
-                        }),
-                      );
-                    }
-                    await dispatch(
-                      createIntent(LayoutAction.Open, {
-                        part: 'main',
-                        subject: [presenterId],
-                        options: { workspace: spaceId },
-                      }),
-                    );
-                  },
-                  properties: {
-                    label: ['toggle presentation label', { ns: PRESENTER_PLUGIN }],
-                    icon: 'ph--presentation--regular',
-                    keyBinding: {
-                      macos: 'shift+meta+p',
-                      windows: 'shift+alt+p',
-                    },
-                  },
-                },
-              ];
-            }),
-            Option.getOrElse(() => []),
-          ),
-        ),
-    }),
+/** Match nodes that can be presented (Collection or Document). */
+const whenPresentable = (node: Node.Node) =>
+  Option.orElse(NodeMatcher.whenEchoType(Collection.Collection)(node), () =>
+    NodeMatcher.whenEchoType(Markdown.Document)(node),
   );
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const capabilities = yield* Capability.Service;
+
+    const extensions = yield* GraphBuilder.createExtension({
+      id: 'root',
+      // TODO(wittjosiah): This is a hack to work around presenter previously relying on "variant". Remove.
+      match: whenPresentable,
+      connector: (object, get) => {
+        const settingsAtom = capabilities.get(PresenterCapabilities.Settings);
+        const settings = get(settingsAtom);
+        const isPresentable = settings?.presentCollections
+          ? Obj.instanceOf(Collection.Collection, object) || Obj.instanceOf(Markdown.Document, object)
+          : Obj.instanceOf(Markdown.Document, object);
+        if (!isPresentable) {
+          return Effect.succeed([]);
+        }
+
+        return Effect.succeed([
+          AppNode.makeCompanion({
+            id: linkedSegment('presenter'),
+            label: 'Presenter',
+            icon: 'ph--presentation--regular',
+            data: { type: meta.id, object },
+          }),
+        ]);
+      },
+      actions: (object, get) => {
+        const settingsAtom = capabilities.get(PresenterCapabilities.Settings);
+        const settings = get(settingsAtom);
+        const isPresentable = settings?.presentCollections
+          ? Obj.instanceOf(Collection.Collection, object) || Obj.instanceOf(Markdown.Document, object)
+          : Obj.instanceOf(Markdown.Document, object);
+        const db = Obj.getDatabase(object);
+        if (!isPresentable || !db) {
+          return Effect.succeed([]);
+        }
+        const objectPath = getObjectPathFromObject(object);
+
+        return Effect.succeed([
+          {
+            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* Capabilities.getAtomValue(DeckCapabilities.State);
+              const deck = deckState.decks[deckState.activeDeck];
+              const presenterId = `${objectPath}/${linkedSegment('presenter')}`;
+              if (!deck?.fullscreen) {
+                yield* Operation.invoke(DeckOperation.Adjust, {
+                  type: 'solo--fullscreen' as const,
+                  id: presenterId,
+                });
+              }
+              yield* Operation.invoke(LayoutOperation.Open, {
+                subject: [presenterId],
+                workspace: getSpacePath(db.spaceId),
+              });
+            }),
+            properties: {
+              label: ['toggle-presentation.label', { ns: meta.id }],
+              icon: 'ph--presentation--regular',
+              disposition: 'list-item',
+              keyBinding: {
+                macos: 'shift+meta+p',
+                windows: 'shift+alt+p',
+              },
+            },
+          },
+        ]);
+      },
+    });
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);

package/src/capabilities/index.ts

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

@@ -2,52 +2,67 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
+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 { SettingsStore } from '@dxos/local-storage';
+import { Collection } from '@dxos/echo';
 import { Markdown } from '@dxos/plugin-markdown/types';
-import { DataType } from '@dxos/schema';
 
-import {
-  CollectionPresenterContainer,
-  DocumentPresenterContainer,
-  MarkdownSlide,
-  PresenterSettings,
-} from '../components';
-import { PRESENTER_PLUGIN } from '../meta';
-import { type PresenterSettingsProps } from '../types';
+import { PresenterSettings } from '#components';
+import { CollectionPresenterContainer, DocumentPresenterContainer, MarkdownSlide } from '#containers';
+import { meta } from '#meta';
+import { type Settings } from '#types';
 
-export default () =>
-  contributes(Capabilities.ReactSurface, [
-    createSurface({
-      id: `${PRESENTER_PLUGIN}/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} />,
-    }),
-    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} />,
-    }),
-    createSurface({
-      id: `${PRESENTER_PLUGIN}/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`,
-      role: 'article',
-      filter: (data): data is { subject: SettingsStore<PresenterSettingsProps> } =>
-        data.subject instanceof SettingsStore && data.subject.prefix === PRESENTER_PLUGIN,
-      component: ({ data: { subject } }) => <PresenterSettings settings={subject.value} />,
-    }),
-  ]);
+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.ts

@@ -2,18 +2,30 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes } from '@dxos/app-framework';
-import { live } from '@dxos/live-object';
+import * as Effect from 'effect/Effect';
 
-import { meta } from '../meta';
-import { type PresenterSettingsProps, PresenterSettingsSchema } from '../types';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { createKvsStore } from '@dxos/effect';
 
-export default () => {
-  const settings = live<PresenterSettingsProps>({});
+import { meta } from '#meta';
+import { PresenterCapabilities, Settings } from '#types';
 
-  return contributes(Capabilities.Settings, {
-    prefix: meta.id,
-    schema: PresenterSettingsSchema,
-    value: settings,
-  });
-};
+export default Capability.makeModule(() =>
+  Effect.sync(() => {
+    const settingsAtom = createKvsStore({
+      key: meta.id,
+      schema: Settings.Settings,
+      defaultValue: () => ({}),
+    });
+
+    return [
+      Capability.contributes(PresenterCapabilities.Settings, settingsAtom),
+      Capability.contributes(AppCapabilities.Settings, {
+        prefix: meta.id,
+        schema: Settings.Settings,
+        atom: settingsAtom,
+      }),
+    ];
+  }),
+);

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

@@ -0,0 +1,58 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+
+import { createSlide } from '#testing';
+
+import { Panel } from './Panel';
+import { Slide, type SlideProps } from './Slide';
+
+const DefaultStory = ({ content = '' }: SlideProps) => {
+  return (
+    <Panel classNames='bg-neutral-200'>
+      <Slide content={content} />
+    </Panel>
+  );
+};
+
+const meta = {
+  title: 'plugins/plugin-presenter/components/Panel',
+  render: DefaultStory,
+  decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
+  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: Story = {
+  args: {
+    content: createSlide({ code: true }),
+  },
+};
+
+export const List: Story = {
+  args: {
+    content: createSlide({ list: 3 }),
+  },
+};
+
+export const Ordered: Story = {
+  args: {
+    content: createSlide({ ordered: 4 }),
+  },
+};

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

@@ -6,14 +6,14 @@ import React, { type PropsWithChildren, useState } from 'react';
 import { useResizeDetector } from 'react-resize-detector';
 
 import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+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 w-full h-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>