@dxos/react-ui-editor 0.3.11-main.1c19c60 → 0.3.11-main.279d9e6

package/src/extensions/image.ts

@@ -3,28 +3,45 @@
 //
 
 import { syntaxTree } from '@codemirror/language';
-import {
-  type EditorState,
-  type Extension,
-  type RangeSet,
-  RangeSetBuilder,
-  StateField,
-  type Transaction,
-} from '@codemirror/state';
-import { Decoration, EditorView, WidgetType } from '@codemirror/view';
+import { type EditorState, type Extension, StateField, type Transaction, type Range } from '@codemirror/state';
+import { Decoration, type DecorationSet, EditorView, WidgetType } from '@codemirror/view';
 
 export type ImageOptions = {};
 
 export const image = (options: ImageOptions = {}): Extension => {
-  return StateField.define<RangeSet<any>>({
-    create: (state) => update(state, options),
-    update: (_: RangeSet<any>, tr: Transaction) => update(tr.state, options),
+  return StateField.define<DecorationSet>({
+    create: (state) => {
+      return Decoration.set(buildDecorations(0, state.doc.length, state));
+    },
+    update: (value: DecorationSet, tr: Transaction) => {
+      if (!tr.docChanged && !tr.selection) {
+        return value;
+      }
+      // Find range of changes and cursor changes.
+      const cursor = tr.state.selection.main.head;
+      const oldCursor = tr.changes.mapPos(tr.startState.selection.main.head);
+      let from = Math.min(cursor, oldCursor);
+      let to = Math.max(cursor, oldCursor);
+      tr.changes.iterChangedRanges((fromA, toA, fromB, toB) => {
+        from = Math.min(from, fromB);
+        to = Math.max(to, toB);
+      });
+      // Expand to cover lines
+      from = tr.state.doc.lineAt(from).from;
+      to = tr.state.doc.lineAt(to).to;
+      return value.map(tr.changes).update({
+        filterFrom: from,
+        filterTo: to,
+        filter: () => false,
+        add: buildDecorations(from, to, tr.state),
+      });
+    },
     provide: (field) => EditorView.decorations.from(field),
   });
 };
 
-const update = (state: EditorState, options: ImageOptions) => {
-  const builder = new RangeSetBuilder();
+const buildDecorations = (from: number, to: number, state: EditorState) => {
+  const decorations: Range<Decoration>[] = [];
   const cursor = state.selection.main.head;
 
   syntaxTree(state).iterate({
@@ -34,20 +51,20 @@ const update = (state: EditorState, options: ImageOptions) => {
         if (urlNode) {
           const hide = state.readOnly || cursor < node.from || cursor > node.to;
           const url = state.sliceDoc(urlNode.from, urlNode.to);
-          builder.add(
-            hide ? node.from : node.to,
-            node.to,
+          decorations.push(
             Decoration.replace({
               block: true, // Prevent cursor from entering.
               widget: new ImageWidget(url),
-            }),
+            }).range(hide ? node.from : node.to, node.to),
           );
         }
       }
     },
+    from,
+    to,
   });
 
-  return builder.finish();
+  return decorations;
 };
 
 class ImageWidget extends WidgetType {
@@ -55,7 +72,6 @@ class ImageWidget extends WidgetType {
     super();
   }
 
-  // TODO(burdon): Does this need to be unique for each position?
   override eq(other: WidgetType) {
     return this._url === (other as any as ImageWidget)._url;
   }
@@ -64,6 +80,8 @@ class ImageWidget extends WidgetType {
     const img = document.createElement('img');
     img.setAttribute('src', this._url);
     img.setAttribute('class', 'cm-image');
+    // Images are hidden until successfully loaded to avoid flickering effects.
+    img.onload = () => img.classList.add('cm-loaded-image');
     return img;
   }
 }

package/src/extensions/index.ts

@@ -15,7 +15,6 @@ export * from './link';
 export * from './listener';
 export * from './markdown';
 export * from './mention';
-export * from './mermaid';
 export * from './table';
 export * from './tasklist';
 export * from './typewriter';

package/src/extensions/link.ts

@@ -4,20 +4,20 @@
 //
 
 import { syntaxTree } from '@codemirror/language';
+import { type Extension, RangeSetBuilder } from '@codemirror/state';
 import {
-  type EditorState,
-  type Extension,
-  type RangeSet,
-  RangeSetBuilder,
-  StateField,
-  type Transaction,
-} from '@codemirror/state';
-import { Decoration, EditorView, WidgetType, hoverTooltip } from '@codemirror/view';
+  Decoration,
+  type EditorView,
+  WidgetType,
+  hoverTooltip,
+  ViewPlugin,
+  type ViewUpdate,
+  type DecorationSet,
+} from '@codemirror/view';
+import { type SyntaxNode } from '@lezer/common';
 
 import { tooltipContent } from '@dxos/react-ui-theme';
 
-const markdownLinkRegexp = /\[([^\]]+)]\(([^)]+)\)/;
-
 // Adapted from:
 // https://codemirror.net/try/?c=aW1wb3J0IHsgYmFzaWNTZXR1cCwgRWRpdG9yVmlldyB9IGZyb20gImNvZGVtaXJyb3IiCmltcG9ydCB7IG1hcmtkb3duIH0gZnJvbSAiQGNvZGVtaXJyb3IvbGFuZy1tYXJrZG93biIKaW1wb3J0IHsgc3ludGF4VHJlZSB9IGZyb20gIkBjb2RlbWlycm9yL2xhbmd1YWdlIjsKaW1wb3J0IHsgRWRpdG9yU3RhdGUsIFJhbmdlU2V0QnVpbGRlciwgU3RhdGVGaWVsZCB9IGZyb20gIkBjb2RlbWlycm9yL3N0YXRlIjsKaW1wb3J0IHsgRGVjb3JhdGlvbiwgV2lkZ2V0VHlwZSB9IGZyb20gIkBjb2RlbWlycm9yL3ZpZXciOwoKY2xhc3MgTGluayBleHRlbmRzIFdpZGdldFR5cGUgewogIGNvbnN0cnVjdG9yKHRleHQsIHVybCkgewogICAgc3VwZXIoKQogICAgdGhpcy50ZXh0ID0gdGV4dAogICAgdGhpcy51cmwgPSB1cmwKICB9CiAgZXEob3RoZXIpIHsgcmV0dXJuIHRoaXMudGV4dCA9PSBvdGhlci50ZXh0ICYmIHRoaXMudXJsID09IG90aGVyLnVybCB9CiAgdG9ET00oKSB7CiAgICBsZXQgbGluayA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImEiKQogICAgbGluay50ZXh0Q29udGVudCA9IHRoaXMudGV4dAogICAgbGluay5ocmVmID0gdGhpcy51cmwKICAgIHJldHVybiBsaW5rOwogIH0KfQoKbGV0IGRlY29yYXRpb25zRmllbGQgPSBTdGF0ZUZpZWxkLmRlZmluZSh7CiAgY3JlYXRlKCkgewogICAgcmV0dXJuIERlY29yYXRpb24ubm9uZTsKICB9LAogIHVwZGF0ZShfLCB0cikgewogICAgY29uc3QgYnVpbGRlciA9IG5ldyBSYW5nZVNldEJ1aWxkZXIoKTsKICAgIGxldCBjdXJzb3IgPSB0ci5zdGF0ZS5zZWxlY3Rpb24ubWFpbi5oZWFkOwogICAgc3ludGF4VHJlZSh0ci5zdGF0ZSkuaXRlcmF0ZSh7CiAgICAgIGVudGVyOiAobm9kZSkgPT4gewogICAgICAgIGlmICgoY3Vyc29yIDwgbm9kZS5mcm9tIHx8IGN1cnNvciA+IG5vZGUudG8pICYmIG5vZGUubmFtZSA9PSAiTGluayIpIHsKICAgICAgICAgIGxldCBtYXJrcyA9IG5vZGUubm9kZS5nZXRDaGlsZHJlbigiTGlua01hcmsiKTsKICAgICAgICAgIGxldCB0ZXh0ID0gbWFya3MubGVuZ3RoID49IDIgPyB0ci5zdGF0ZS5zbGljZURvYyhtYXJrc1swXS50bywgbWFya3NbMV0uZnJvbSkgOiAiIgoKICAgICAgICAgIGxldCB1cmxOb2RlID0gbm9kZS5ub2RlLmdldENoaWxkKCJVUkwiKTsKICAgICAgICAgIGxldCB1cmwgPSB1cmxOb2RlID8gdHIuc3RhdGUuc2xpY2VEb2ModXJsTm9kZS5mcm9tLCB1cmxOb2RlLnRvKSA6ICIiCiAgICAgICAgICBidWlsZGVyLmFkZChub2RlLmZyb20sIG5vZGUudG8sIERlY29yYXRpb24ucmVwbGFjZSh7CiAgICAgICAgICAgIHdpZGdldDogbmV3IExpbmsodGV4dCwgdXJsKSwKICAgICAgICAgIH0pLAogICAgICAgICAgICAgICAgICAgICApOwogICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgIH0KICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgfSwKICAgIH0pOwogICAgcmV0dXJuIGJ1aWxkZXIuZmluaXNoKCk7CiAgfSwKICBwcm92aWRlOiAoZikgPT4gRWRpdG9yVmlldy5kZWNvcmF0aW9ucy5mcm9tKGYpLAp9KTsKCmxldCB2aWV3ID0gbmV3IEVkaXRvclZpZXcoewogIGRvYzogIiMgSGVsbG8gV29ybGRcblxuW1Rlc3RdKGh0dHBzOi8vZXhhbXBsZS5jb20pXG5cblxuIiwKICBleHRlbnNpb25zOiBbZGVjb3JhdGlvbnNGaWVsZCwgbWFya2Rvd24oKV0sCiAgcGFyZW50OiBkb2N1bWVudC5ib2R5LAp9KTsKCnZpZXcuZm9jdXMoKTs=
 // https://discuss.codemirror.net/t/link-widget-is-clicked-only-if-editor-is-out-of-focus/7433
@@ -34,11 +34,24 @@ export type LinkOptions = {
  */
 export const link = (options: LinkOptions = {}): Extension => {
   const extensions: Extension[] = [
-    StateField.define<RangeSet<any>>({
-      create: (state) => update(state, options),
-      update: (_: RangeSet<any>, tr: Transaction) => update(tr.state, options),
-      provide: (field) => EditorView.decorations.from(field),
-    }),
+    ViewPlugin.fromClass(
+      class {
+        decorations: DecorationSet;
+
+        constructor(view: EditorView) {
+          this.decorations = buildDecorations(view, options);
+        }
+
+        update(update: ViewUpdate) {
+          if (update.docChanged || update.viewportChanged || update.selectionSet) {
+            this.decorations = buildDecorations(update.view, options);
+          }
+        }
+      },
+      {
+        decorations: (v) => v.decorations,
+      },
+    ),
   ];
 
   if (options.onHover) {
@@ -46,41 +59,25 @@ export const link = (options: LinkOptions = {}): Extension => {
       // https://codemirror.net/examples/tooltip
       // https://codemirror.net/docs/ref/#view.hoverTooltip
       // https://github.com/codemirror/view/blob/main/src/tooltip.ts
-      hoverTooltip((view, pos) => {
-        const { from, text } = view.state.doc.lineAt(pos);
-        const p = pos - from;
-
-        let idx = 0;
-        let match;
-        do {
-          match = text.substring(idx).match(markdownLinkRegexp);
-          if (!match) {
-            match = undefined;
-            break;
-          }
-
-          idx = text.indexOf(match[0]);
-          if (p >= idx && p < idx + match[0].length) {
-            break;
-          }
-
-          idx += match[0].length;
-        } while (true);
-
-        if (!match) {
+      hoverTooltip((view, pos, side) => {
+        const syntax = syntaxTree(view.state).resolveInner(pos, side);
+        let link = null;
+        for (let i = 0, node: SyntaxNode | null = syntax; !link && node && i < 5; node = node.parent, i++) {
+          link = node.name === 'Link' ? node : null;
+        }
+        const url = link && link.getChild('URL');
+        if (!url || !link) {
           return null;
         }
-
-        const [, , url] = match ?? [];
-
+        const urlText = view.state.sliceDoc(url.from, url.to);
         return {
-          pos: idx + from,
-          end: idx + from + match[0].length,
+          pos: link.from,
+          end: link.to,
           above: true,
           create: () => {
             const el = document.createElement('div');
             el.className = tooltipContent({}, 'pli-2 plb-1');
-            options.onHover!(el, url);
+            options.onHover!(el, urlText);
             return { dom: el, offset: { x: 0, y: 4 } };
           },
         };
@@ -92,16 +89,12 @@ export const link = (options: LinkOptions = {}): Extension => {
 };
 
 class LinkButton extends WidgetType {
-  constructor(
-    private readonly _pos: number,
-    private readonly _url: string,
-    private readonly _onAttach: LinkOptions['onRender'],
-  ) {
+  constructor(private readonly _url: string, private readonly _onAttach: LinkOptions['onRender']) {
     super();
   }
 
   override eq(other: LinkButton) {
-    return this._pos === other._pos && this._url === other._url;
+    return this._url === other._url;
   }
 
   toDOM(view: EditorView) {
@@ -147,46 +140,51 @@ class LinkText extends WidgetType {
  * possibly overlapping ranges in such a way that they can efficiently be mapped though document changes.
  * https://codemirror.net/docs/ref/#state
  */
-const update = (state: EditorState, options: LinkOptions) => {
-  const builder = new RangeSetBuilder();
+const buildDecorations = (view: EditorView, options: LinkOptions): DecorationSet => {
+  const builder = new RangeSetBuilder<Decoration>();
+  const { state } = view;
   const cursor = state.selection.main.head;
 
-  syntaxTree(state).iterate({
-    enter: (node) => {
-      // Check if cursor is inside text.
-      if (node.name === 'Link') {
-        const marks = node.node.getChildren('LinkMark');
-        const text = marks.length >= 2 ? state.sliceDoc(marks[0].to, marks[1].from) : '';
-        const urlNode = node.node.getChild('URL');
-        const url = urlNode ? state.sliceDoc(urlNode.from, urlNode.to) : '';
-        if (!url) {
-          return false;
-        }
+  for (const { from, to } of view.visibleRanges) {
+    syntaxTree(state).iterate({
+      enter: (node) => {
+        // Check if cursor is inside text.
+        if (node.name === 'Link') {
+          const marks = node.node.getChildren('LinkMark');
+          const text = marks.length >= 2 ? state.sliceDoc(marks[0].to, marks[1].from) : '';
+          const urlNode = node.node.getChild('URL');
+          const url = urlNode ? state.sliceDoc(urlNode.from, urlNode.to) : '';
+          if (!url) {
+            return false;
+          }
 
-        if (state.readOnly || cursor < node.from || cursor > node.to) {
-          builder.add(
-            node.from,
-            node.to,
-            Decoration.replace({
-              widget: new LinkText(text, options.link ? url : undefined),
-            }),
-          );
-        }
+          if (!view.hasFocus || state.readOnly || cursor < node.from || cursor > node.to) {
+            builder.add(
+              node.from,
+              node.to,
+              Decoration.replace({
+                widget: new LinkText(text, options.link ? url : undefined),
+              }),
+            );
+          }
 
-        if (options.onRender) {
-          builder.add(
-            node.to,
-            node.to,
-            Decoration.replace({
-              widget: new LinkButton(node.from, url, options.onRender),
-            }),
-          );
-        }
+          if (options.onRender) {
+            builder.add(
+              node.to,
+              node.to,
+              Decoration.replace({
+                widget: new LinkButton(url, options.onRender),
+              }),
+            );
+          }
 
-        return false;
-      }
-    },
-  });
+          return false;
+        }
+      },
+      from,
+      to,
+    });
+  }
 
   return builder.finish();
 };

package/src/extensions/markdown/highlight.ts

@@ -6,19 +6,18 @@ import { markdownLanguage } from '@codemirror/lang-markdown';
 import { HighlightStyle } from '@codemirror/language';
 import { tags, styleTags, Tag } from '@lezer/highlight';
 import { type MarkdownConfig, Table } from '@lezer/markdown';
-import get from 'lodash.get';
 
 import {
   blockquote,
   bold,
   code,
   codeMark,
+  getToken,
   heading,
   inlineUrl,
   italic,
   mark,
   strikethrough,
-  tokens,
 } from '../../styles';
 
 /**
@@ -193,12 +192,12 @@ export const markdownHighlightStyle = (readonly?: boolean) => {
       // Main content, paragraphs, etc.
       // {
       //   tag: [tags.content],
-      //   fontFamily: get(tokens, 'fontFamily.body', []).join(','),
+      //   fontFamily: getToken('fontFamily.body', []).join(','),
       // },
     ],
     {
       scope: markdownLanguage,
-      all: { fontFamily: get(tokens, 'fontFamily.body', []).join(',') },
+      all: { fontFamily: getToken('fontFamily.body', []).join(',') },
     },
   );
 };

package/src/extensions/table.ts

@@ -98,8 +98,11 @@ class TableWidget extends WidgetType {
     super();
   }
 
-  override eq(other: WidgetType) {
-    return this._table.from === (other as any as TableWidget)?._table?.from;
+  override eq(other: TableWidget) {
+    return (
+      this._table.header?.join() === other._table.header?.join() &&
+      this._table.rows?.join() === other._table.rows?.join()
+    );
   }
 
   toDOM(view: EditorView) {

package/src/extensions/tasklist.ts

@@ -22,7 +22,6 @@ const styles = EditorView.baseTheme({
 
 class CheckboxWidget extends WidgetType {
   constructor(
-    private readonly _pos: number,
     private _checked: boolean,
     private readonly _indent: number,
     private readonly _onCheck?: (check: boolean) => void,
@@ -31,7 +30,7 @@ class CheckboxWidget extends WidgetType {
   }
 
   override eq(other: CheckboxWidget) {
-    return this._pos === other._pos && this._checked === other._checked && this._indent === other._indent;
+    return this._checked === other._checked && this._indent === other._indent;
   }
 
   toDOM(view: EditorView) {
@@ -73,7 +72,6 @@ export const tasklist = (options: TasklistOptions = {}) => {
       const checked = match[2] === 'x' || match[2] === 'X';
       return Decoration.replace({
         widget: new CheckboxWidget(
-          pos,
           checked,
           indent,
           view.state.readOnly

package/src/index.ts

@@ -9,4 +9,5 @@ export { type Extension } from '@codemirror/state';
 export * from './components';
 export * from './extensions';
 export * from './hooks';
+export { getToken } from './styles';
 export * from './themes';

package/src/styles/tokens.ts

@@ -2,6 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
+import get from 'lodash.get';
 import type { StyleSpec } from 'style-mod';
 
 import { tailwindConfig, type TailwindConfig } from '@dxos/react-ui-theme';
@@ -12,3 +13,5 @@ export type ThemeStyles = {
 
 // TODO(thure): Why export the whole theme? Can this be done differently?
 export const tokens: TailwindConfig['theme'] = tailwindConfig({}).theme;
+
+export const getToken = (path: string, defaultValue: any = undefined) => get(tokens, path, defaultValue);

package/src/themes/default.ts

@@ -49,12 +49,12 @@ export const defaultTheme: ThemeStyles = {
   '&.cm-focused': {
     outline: 'none',
   },
-  '& .cm-scroller': {
+  '.cm-scroller': {
     overflow: 'visible',
     fontFamily: get(tokens, 'fontFamily.mono', []).join(','),
   },
 
-  '& .cm-content': {
+  '.cm-content': {
     padding: 0,
     // NOTE: Base font size (otherwise defined by HTML tag, which might be different for storybook).
     fontSize: '16px',
@@ -77,17 +77,17 @@ export const defaultTheme: ThemeStyles = {
   '&dark .cm-cursor, &dark .cm-dropCursor': {
     borderLeft: '2px solid white',
   },
-  '& .cm-placeholder': {
+  '.cm-placeholder': {
     fontWeight: 100,
   },
 
   //
   // line
   //
-  '& .cm-line': {
+  '.cm-line': {
     paddingInline: 0,
   },
-  '& .cm-activeLine': {
+  '.cm-activeLine': {
     background: 'inherit',
   },
 
@@ -131,28 +131,28 @@ export const defaultTheme: ThemeStyles = {
     mixBlendMode: 'screen',
   },
 
-  '& .cm-ySelectionInfo': {
+  '.cm-ySelectionInfo': {
     padding: '2px 4px',
     marginBlockStart: '-4px',
   },
-  '& .cm-ySelection, & .cm-selectionMatch': {
+  '.cm-ySelection, & .cm-selectionMatch': {
     paddingBlockStart: '.15em',
     paddingBlockEnd: '.15em',
   },
-  '& .cm-ySelectionCaret': {
+  '.cm-ySelectionCaret': {
     display: 'inline-block',
     insetBlockStart: '.1em',
     blockSize: '1.4em',
     verticalAlign: 'top',
   },
-  '& .cm-yLineSelection': {
+  '.cm-yLineSelection': {
     margin: 0,
   },
 
   //
   // link
   //
-  '& .cm-link': {
+  '.cm-link': {
     color: get(tokens, 'extend.colors.primary.500'),
     textDecorationLine: 'underline',
     textDecorationThickness: '1px',
@@ -164,34 +164,34 @@ export const defaultTheme: ThemeStyles = {
   //
   // tooltip
   //
-  '& .cm-tooltip': {
+  '.cm-tooltip': {
     border: 'none',
   },
-  '& .cm-tooltip-below': {},
+  '.cm-tooltip-below': {},
 
   //
   // autocomplete
   //
-  '& .cm-tooltip-autocomplete': {
+  '.cm-tooltip-autocomplete': {
     marginTop: '4px',
     marginLeft: '-3px',
   },
-  '& .cm-tooltip-autocomplete ul li': {},
-  '& .cm-tooltip-autocomplete ul li[aria-selected]': {},
-  '& .cm-completionIcon': {
+  '.cm-tooltip-autocomplete ul li': {},
+  '.cm-tooltip-autocomplete ul li[aria-selected]': {},
+  '.cm-completionIcon': {
     display: 'none',
   },
-  '& .cm-completionLabel': {
+  '.cm-completionLabel': {
     fontFamily: get(tokens, 'fontFamily.body', []).join(','),
   },
-  '& .cm-completionMatchedText': {
+  '.cm-completionMatchedText': {
     textDecoration: 'none',
   },
 
   //
   // widgets
   //
-  '& .cm-widgetBuffer': {
+  '.cm-widgetBuffer': {
     display: 'none',
     height: 0,
   },
@@ -199,26 +199,32 @@ export const defaultTheme: ThemeStyles = {
   //
   // table
   //
-  '& .cm-table *': {
+  '.cm-table *': {
     fontFamily: `${get(tokens, 'fontFamily.mono', []).join(',')} !important`,
     textDecoration: 'none !important',
   },
-  '& .cm-table-head': {
+  '.cm-table-head': {
     padding: '2px 16px 2px 0px',
     borderBottom: `1px solid ${get(tokens, 'extend.colors.neutral.500')}`,
     fontWeight: 100,
     textAlign: 'left',
     color: get(tokens, 'extend.colors.neutral.500'),
   },
-  '& .cm-table-cell': {
+  '.cm-table-cell': {
     padding: '2px 16px 2px 0px',
   },
 
   //
   // image
   //
-  '& .cm-image': {
-    margin: '0.5rem 0',
+  '.cm-image': {
+    display: 'block',
+    height: '0',
+  },
+  '.cm-image.cm-loaded-image': {
+    height: 'auto',
+    borderTop: '0.5rem solid transparent',
+    borderBottom: '0.5rem solid transparent',
   },
 
   //
@@ -250,14 +256,14 @@ export const defaultTheme: ThemeStyles = {
    *   </div>
    * </div
    */
-  '& .cm-panels': {
+  '.cm-panels': {
     border: `1px solid ${get(tokens, 'extend.colors.neutral.200')}`,
   },
-  '& .cm-panel': {
+  '.cm-panel': {
     background: get(tokens, 'extend.colors.neutral.50'),
     fontFamily: get(tokens, 'fontFamily.body', []).join(','),
   },
-  '& .cm-button': {
+  '.cm-button': {
     margin: '4px',
     fontFamily: get(tokens, 'fontFamily.body', []).join(','),
     background: get(tokens, 'extend.colors.neutral.100'),
@@ -271,32 +277,32 @@ export const defaultTheme: ThemeStyles = {
       backgroundImage: 'none',
     },
   },
-  '& .cm-panel input[type=checkbox]': {
+  '.cm-panel input[type=checkbox]': {
     marginRight: '0.4rem !important',
   },
 };
 
 export const textTheme: ThemeStyles = {
-  '& .cm-scroller': {
+  '.cm-scroller': {
     fontFamily: get(tokens, 'fontFamily.body', []).join(','),
   },
-  '& .cm-placeholder': {
+  '.cm-placeholder': {
     fontFamily: get(tokens, 'fontFamily.body', []).join(','),
   },
 };
 
 export const markdownTheme: ThemeStyles = {
   // NOTE: Must leave base font family as is (i.e., monospace) due to fenced code blocks.
-  '& .cm-placeholder': {
+  '.cm-placeholder': {
     fontFamily: get(tokens, 'fontFamily.body', []).join(','),
   },
 };
 
 export const codeTheme: ThemeStyles = {
-  '& .cm-scroller': {
+  '.cm-scroller': {
     fontFamily: get(tokens, 'fontFamily.mono', []).join(','),
   },
-  '& .cm-placeholder': {
+  '.cm-placeholder': {
     fontFamily: get(tokens, 'fontFamily.mono', []).join(','),
   },
 };

package/dist/types/src/extensions/mermaid.d.ts

@@ -1,3 +0,0 @@
-import { type Extension } from '@codemirror/state';
-export declare const mermaid: () => Extension;
-//# sourceMappingURL=mermaid.d.ts.map

package/dist/types/src/extensions/mermaid.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mermaid.d.ts","sourceRoot":"","sources":["../../../../src/extensions/mermaid.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAInD,eAAO,MAAM,OAAO,QAAO,SAE1B,CAAC"}

package/src/extensions/mermaid.ts

@@ -1,11 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { type Extension } from '@codemirror/state';
-
-// TODO(burdon): How will this interact with the code extension?
-// TODO(burdon): Move to mermaid-plugin (which should contribute this extension).
-export const mermaid = (): Extension => {
-  return [];
-};