@dxos/react-ui-editor 0.8.4-main.dedc0f3 → 0.8.4-main.e8ec1fe

package/src/extensions/tags/xml-tags.ts

@@ -3,17 +3,34 @@
 //
 
 import { syntaxTree } from '@codemirror/language';
+import { Prec } from '@codemirror/state';
 import { type EditorState, type Extension, RangeSetBuilder, StateEffect, StateField } from '@codemirror/state';
-import { Decoration, type DecorationSet, EditorView, WidgetType } from '@codemirror/view';
+import { keymap } from '@codemirror/view';
+import { Decoration, type DecorationSet, EditorView, ViewPlugin, type ViewUpdate, WidgetType } from '@codemirror/view';
 import { type ComponentType, type FC } from 'react';
 
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 
+import { type Range } from '../../types';
 import { decorationSetToArray } from '../../util';
+import { scrollToLineEffect } from '../scrolling';
 
 import { nodeToJson } from './xml-util';
 
+/**
+ * StateEffect for navigating to previous bookmark.
+ */
+export const navigatePreviousEffect = StateEffect.define<void>();
+
+/**
+ * StateEffect for navigating to next bookmark.
+ */
+export const navigateNextEffect = StateEffect.define<void>();
+
+/**
+ * Dispatch function for updating state.
+ */
 export type StateDispatch<T> = T | ((state: T) => T);
 
 /**
@@ -28,9 +45,11 @@ export type XmlEventHandler<TEvent = any> = (event: TEvent) => void;
 /**
  * Widget component.
  */
-export type XmlWidgetProps<TContext = any, TProps = any> = TProps & {
+export type XmlWidgetProps<TProps = any, TContext = any> = TProps & {
   _tag: string;
-  context: TContext;
+  context?: TContext;
+  range?: { from: number; to: number };
+  view?: EditorView;
   onEvent?: XmlEventHandler;
 };
 
@@ -43,29 +62,37 @@ export type XmlWidgetFactory = (props: XmlWidgetProps, onEvent?: XmlEventHandler
  * Widget registry definition.
  */
 export type XmlWidgetDef = {
+  /** Block widget. */
   block?: boolean;
-  /** Native widget. */
+
+  /** Native widget (rendered inline). */
   factory?: XmlWidgetFactory;
-  /** React widget. */
+
+  /** React widget (rendered in portals outside of the editor). */
   Component?: FC<XmlWidgetProps>;
 };
 
 export type XmlWidgetRegistry = Record<string, XmlWidgetDef>;
 
+export const getXmlTextChild = (children: any[]): string | null => {
+  const child = children?.[0];
+  return typeof child === 'string' ? child : null;
+};
+
 /**
  * Update context.
  */
 export const xmlTagContextEffect = StateEffect.define<any>();
 
 /**
- * Update widget.
+ * Reset all state.
  */
-export const xmlTagUpdateEffect = StateEffect.define<{ id: string; value: any }>();
+export const xmlTagResetEffect = StateEffect.define();
 
 /**
- * Reset all state.
+ * Update widget.
  */
-export const xmlTagResetEffect = StateEffect.define();
+export const xmlTagUpdateEffect = StateEffect.define<{ id: string; value: any }>();
 
 type WidgetDecorationSet = {
   from: number;
@@ -76,9 +103,9 @@ type XmlWidgetStateMap = Record<string, any>;
 
 export type XmlWidgetState = {
   id: string;
-  props: any;
   root: HTMLElement;
-  Component: ComponentType<any>;
+  props: any;
+  Component: ComponentType<XmlWidgetProps>;
 };
 
 export interface XmlWidgetNotifier {
@@ -86,65 +113,243 @@ export interface XmlWidgetNotifier {
   unmounted(id: string): void;
 }
 
+/**
+ * Context state.
+ */
+const widgetContextStateField = StateField.define<any>({
+  create: () => undefined,
+  update: (value, tr) => {
+    for (const effect of tr.effects) {
+      if (effect.is(xmlTagContextEffect)) {
+        return effect.value;
+      }
+    }
+
+    return value;
+  },
+});
+
+/**
+ * Widget state management.
+ */
+const widgetStateMapStateField = StateField.define<XmlWidgetStateMap>({
+  create: () => ({}),
+  update: (map, tr) => {
+    for (const effect of tr.effects) {
+      if (effect.is(xmlTagResetEffect)) {
+        return {};
+      }
+
+      if (effect.is(xmlTagUpdateEffect)) {
+        // Update accumulated widget props by id.
+        const { id, value } = effect.value;
+        log('widget updated', { id, value });
+        const state = typeof value === 'function' ? value(map[id]) : value;
+        return { ...map, [id]: state };
+      }
+    }
+
+    return map;
+  },
+});
+
 export type XmlTagsOptions = {
+  /** Tag registry. */
   registry?: XmlWidgetRegistry;
-  /**
-   * Called when a widget is mounted or unmounted.
-   */
+
+  /** Called when widgets are mounted or unmounted. */
   setWidgets?: (widgets: XmlWidgetState[]) => void;
+
+  /** Tags to bookmark. */
+  bookmarks?: string[];
 };
 
 /**
- * Extension that adds thread-related functionality including XML tag decorations.
+ * Implements custom XML tags via CodeMirror-native Widgets and portaled React components.
+ *
+ * Basic mechanism:
+ * - Decorations are created from XML tags that matched the provided Widget registry.
+ * - Native widgets are rendered inline.
+ * - React widgets are rendered in portals outside of the editor via the PlaceholderWidget.
+ * - Widget state can be update via effects.
+ *   - NOTE: Widget state may be updated BEFORE the widget is mounted.
  */
-export const xmlTags = (options: XmlTagsOptions = {}): Extension => {
-  //
-  // Context state.
-  //
-  const contextState = StateField.define<any>({
-    create: () => undefined,
-    update: (value, tr) => {
-      for (const effect of tr.effects) {
-        if (effect.is(xmlTagContextEffect)) {
-          return effect.value;
-        }
-      }
-
-      return value;
-    },
-  });
+export const xmlTags = ({ registry, setWidgets, bookmarks }: XmlTagsOptions): Extension => {
+  const notifier = createWidgetMap(setWidgets);
+  const widgetDecorationsField = createWidgetDecorationsField(registry, notifier);
+  return [
+    widgetContextStateField,
+    widgetStateMapStateField,
+    widgetDecorationsField,
+    createWidgetUpdatePlugin(widgetDecorationsField, notifier),
+    createNavigationEffectPlugin(widgetDecorationsField, bookmarks),
+    bookmarks?.length ? Prec.highest(keyHandlers) : [],
+  ];
+};
 
-  //
-  // Active widgets.
-  //
+/**
+ * Manages the collection of widgets.
+ */
+const createWidgetMap = (setWidgets?: (widgets: XmlWidgetState[]) => void): XmlWidgetNotifier => {
   const widgets = new Map<string, XmlWidgetState>();
+
+  // TODO(burdon): Batch updates?
   const notifier = {
-    mounted: (widget: XmlWidgetState) => {
-      widgets.set(widget.id, widget);
-      options.setWidgets?.([...widgets.values()]);
+    mounted: (state: XmlWidgetState) => {
+      log('widget mounted', { id: state.id, tag: state.props._tag });
+      widgets.set(state.id, state);
+      setWidgets?.([...widgets.values()]);
     },
     unmounted: (id: string) => {
+      const state = widgets.get(id);
+      log('widget unmounted', { id, tag: state?.props._tag });
       widgets.delete(id);
-      options.setWidgets?.([...widgets.values()]);
+      setWidgets?.([...widgets.values()]);
     },
   } satisfies XmlWidgetNotifier;
 
-  //
-  // Widget decorations.
-  //
-  const decorationsState = StateField.define<WidgetDecorationSet>({
+  return notifier;
+};
+
+/**
+ * Navigation keys.
+ */
+const keyHandlers = keymap.of([
+  {
+    key: 'Mod-ArrowUp',
+    run: (view) => {
+      view.dispatch({ effects: navigatePreviousEffect.of() });
+      return true;
+    },
+  },
+  {
+    key: 'Mod-ArrowDown',
+    run: (view) => {
+      view.dispatch({ effects: navigateNextEffect.of() });
+      return true;
+    },
+  },
+]);
+
+/**
+ * Effect processing plugin for navigation.
+ * Handles navigation up/down effects.
+ */
+const createNavigationEffectPlugin = (
+  widgetDecorationsField: StateField<WidgetDecorationSet>,
+  bookmarks?: string[],
+) => {
+  return EditorView.updateListener.of((update) => {
+    update.transactions.forEach((transaction) => {
+      for (const effect of transaction.effects) {
+        if (effect.is(navigatePreviousEffect)) {
+          const view = update.view;
+          const cursorPos = view.state.doc.lineAt(view.state.selection.main.head).from;
+          let widget: { from: number; to: number; tag: string } | null = null;
+          const { decorations } = view.state.field(widgetDecorationsField);
+          for (const range of decorationSetToArray(decorations)) {
+            if (range.from < cursorPos) {
+              const tag = range.value.spec.tag;
+              if (bookmarks?.includes(tag)) {
+                if (!widget || range.from > widget.from) {
+                  widget = { from: range.from, to: range.to, tag };
+                }
+              }
+            }
+          }
+
+          const line = view.state.doc.lineAt(widget?.from ?? 0);
+          view.dispatch({
+            selection: { anchor: line.from, head: line.from },
+            effects: scrollToLineEffect.of({ line: line.number, options: { offset: -16 } }),
+          });
+
+          continue;
+        }
+
+        if (effect.is(navigateNextEffect)) {
+          const view = update.view;
+          const cursorPos = view.state.doc.lineAt(view.state.selection.main.head).to;
+          let widget: { from: number; to: number; tag: string } | null = null;
+          const { decorations } = view.state.field(widgetDecorationsField);
+          for (const range of decorationSetToArray(decorations)) {
+            if (range.from > cursorPos) {
+              const tag = range.value.spec.tag;
+              if (bookmarks?.includes(tag)) {
+                if (!widget || range.from < widget.from) {
+                  widget = { from: range.from, to: range.to, tag };
+                }
+              }
+            }
+          }
+
+          if (widget) {
+            const line = view.state.doc.lineAt(widget?.from);
+            view.dispatch({
+              selection: { anchor: line.to, head: line.to },
+              effects: scrollToLineEffect.of({ line: line.number, options: { offset: -16 } }),
+            });
+          } else {
+            const line = view.state.doc.lineAt(view.state.doc.length);
+            view.dispatch({
+              selection: { anchor: line.to, head: line.to },
+              effects: scrollToLineEffect.of({ line: line.number, options: { position: 'end' } }),
+            });
+          }
+
+          continue;
+        }
+      }
+    });
+  });
+};
+
+/**
+ * Handles effect that updates widget state.
+ */
+const createWidgetUpdatePlugin = (
+  widgetDecorationsField: StateField<WidgetDecorationSet>,
+  notifier: XmlWidgetNotifier,
+) =>
+  ViewPlugin.fromClass(
+    class {
+      update(update: ViewUpdate) {
+        const widgetStateMap = update.state.field(widgetStateMapStateField);
+        const { decorations } = update.state.field(widgetDecorationsField);
+
+        // Check for widget update effects and re-render widgets.
+        for (const effect of update.transactions.flatMap((tr) => tr.effects)) {
+          if (effect.is(xmlTagUpdateEffect)) {
+            const widgetState = widgetStateMap[effect.value.id];
+
+            // Find and render widget.
+            for (const range of decorationSetToArray(decorations)) {
+              const deco = range.value;
+              const widget = deco?.spec?.widget;
+
+              // NOTE: If the widget has not yet been mounted, then the root will be null.
+              if (widget && widget instanceof PlaceholderWidget && widget.id === effect.value.id && widget.root) {
+                const props = { ...widget.props, ...widgetState };
+                notifier.mounted({ id: widget.id, props, root: widget.root, Component: widget.Component });
+              }
+            }
+          }
+        }
+      }
+    },
+  );
+
+/**
+ * Builds and maintains decorations for XML widgets.
+ * Must be a StateField because block decorations cannot be provided via ViewPlugin.
+ */
+const createWidgetDecorationsField = (registry: XmlWidgetRegistry = {}, notifier: XmlWidgetNotifier) =>
+  StateField.define<WidgetDecorationSet>({
     create: (state) => {
-      return buildDecorations(
-        state,
-        0,
-        state.doc.length,
-        state.field(contextState),
-        state.field(widgetState),
-        options,
-        notifier,
-      );
+      return buildDecorations(state, { from: 0, to: state.doc.length }, registry, notifier);
     },
     update: ({ from, decorations }, tr) => {
+      // Check for reset effect.
       for (const effect of tr.effects) {
         if (effect.is(xmlTagResetEffect)) {
           return { from: 0, decorations: Decoration.none };
@@ -153,32 +358,22 @@ export const xmlTags = (options: XmlTagsOptions = {}): Extension => {
 
       if (tr.docChanged) {
         const { state } = tr;
-
         // Flag if the transaction has modified the head of the document.
-        // (i.e., any changes that touch before the current `from` position).
         const reset = tr.changes.touchesRange(0, from);
-
-        // Since append-only, rebuild decorations from after the last widget.
-        const result = buildDecorations(
-          state,
-          reset ? 0 : from,
-          state.doc.length,
-          state.field(contextState),
-          state.field(widgetState),
-          options,
-          notifier,
-        );
-
-        // Merge with existing decorations.
-        return {
-          from: result.from,
-          decorations: decorations.update({ add: decorationSetToArray(result.decorations) }),
-        };
+        if (reset) {
+          log('document reset', { from, to: state.doc.length });
+          // Full rebuild from start.
+          return buildDecorations(state, { from: 0, to: state.doc.length }, registry, notifier);
+        } else {
+          // Append-only: rebuild decorations from after the last widget and merge with existing decorations.
+          const result = buildDecorations(state, { from, to: state.doc.length }, registry, notifier);
+          return {
+            from: result.from,
+            decorations: decorations.update({ add: decorationSetToArray(result.decorations) }),
+          };
+        }
       }
 
-      // No document changes: avoid mapping decorations through an empty ChangeSet,
-      // which can throw when the decoration set was created for a different base length.
-      // Simply return the existing decorations unchanged.
       return { from, decorations };
     },
     provide: (field) => [
@@ -187,97 +382,66 @@ export const xmlTags = (options: XmlTagsOptions = {}): Extension => {
     ],
   });
 
-  //
-  // Widget state management.
-  //
-  const widgetState = StateField.define<XmlWidgetStateMap>({
-    create: () => ({}),
-    update: (map, tr) => {
-      for (const effect of tr.effects) {
-        if (effect.is(xmlTagResetEffect)) {
-          return {};
-        }
-
-        if (effect.is(xmlTagUpdateEffect)) {
-          // Update accumulated widget props by id.
-          const { id, value } = effect.value;
-          const state = typeof value === 'function' ? value(map[id]) : value;
-
-          // Find and render widget.
-          const { decorations } = tr.state.field(decorationsState);
-          for (const range of decorationSetToArray(decorations)) {
-            const deco = range.value;
-            const widget = deco?.spec?.widget;
-            if (widget && widget instanceof PlaceholderWidget && widget.id === effect.value.id && widget.root) {
-              const props = { ...widget.props, ...state };
-              notifier.mounted({ id: widget.id, props, root: widget.root, Component: widget.Component });
-            }
-          }
-
-          return { ...map, [id]: state };
-        }
-      }
-
-      return map;
-    },
-  });
-
-  return [contextState, decorationsState, widgetState];
-};
-
 /**
  * Creates widget decorations for XML tags in the document using the syntax tree.
  */
 const buildDecorations = (
   state: EditorState,
-  from: number,
-  to: number,
-  context: any,
-  widgetState: XmlWidgetStateMap,
-  options: XmlTagsOptions,
+  range: Range,
+  registry: XmlWidgetRegistry,
   notifier: XmlWidgetNotifier,
 ): WidgetDecorationSet => {
+  const context = state.field(widgetContextStateField, false);
+  const widgetStateMap = state.field(widgetStateMapStateField, false) ?? {};
+
   const builder = new RangeSetBuilder<Decoration>();
   const tree = syntaxTree(state);
   if (!tree || (tree.type.name === 'Program' && tree.length === 0)) {
-    return { from, decorations: Decoration.none };
+    return { from: range.from, decorations: Decoration.none };
   }
 
+  let last = range.from;
   tree.iterate({
-    from,
-    to,
+    from: range.from,
+    to: range.to,
     enter: (node) => {
       switch (node.type.name) {
         // XML Element.
         case 'Element': {
           try {
-            if (options.registry) {
-              const props = nodeToJson(state, node.node);
-              if (props) {
-                const def = options.registry[props._tag];
-                if (def) {
-                  const { block, factory, Component } = def;
-                  const state = props.id ? widgetState[props.id] : undefined;
-                  const args = { context, ...props, ...state };
-                  const widget: WidgetType | undefined = factory
-                    ? factory(args)
-                    : Component
-                      ? props.id && new PlaceholderWidget(props.id, Component, args, notifier)
-                      : undefined;
-
-                  if (widget) {
-                    from = node.node.to;
-                    builder.add(
-                      node.node.from,
-                      node.node.to,
-                      Decoration.replace({
-                        widget,
-                        block,
-                        atomic: true,
-                        inclusive: true,
-                      }),
-                    );
-                  }
+            const args = nodeToJson(state, node.node);
+            if (args) {
+              const def = registry[args._tag];
+              if (def) {
+                // NOTE: The widget state may already have been updated before the widget is mounted.
+                const { block, factory, Component } = def;
+                const widgetState = args.id ? widgetStateMap[args.id] : undefined;
+                const nodeRange = { from: node.node.from, to: node.node.to };
+                const props = { context, range: nodeRange, ...args, ...widgetState } satisfies XmlWidgetProps;
+
+                // Create widget.
+                const widget: WidgetType | undefined = factory
+                  ? factory(props)
+                  : Component
+                    ? args.id && new PlaceholderWidget(args.id, Component, props, notifier)
+                    : undefined;
+
+                // Add decoration.
+                if (widget) {
+                  builder.add(
+                    nodeRange.from,
+                    nodeRange.to,
+                    Decoration.replace({
+                      widget,
+                      block,
+                      atomic: true,
+                      inclusive: true,
+                      tag: args._tag,
+                    }),
+                  );
+
+                  // Track last widget (NOTE: range is inclusive).
+                  last = nodeRange.to - 1;
                 }
               }
             }
@@ -285,19 +449,20 @@ const buildDecorations = (
             log.catch(err);
           }
 
-          return false; // Don't descend into children.
+          // Don't descend into children.
+          return false;
         }
       }
     },
   });
 
-  return { from, decorations: builder.finish() };
+  return { from: last, decorations: builder.finish() };
 };
 
 /**
  * Placeholder for React widgets.
  */
-class PlaceholderWidget<TProps = {}> extends WidgetType {
+class PlaceholderWidget<TProps extends XmlWidgetProps> extends WidgetType {
   private _root: HTMLElement | null = null;
 
   constructor(
@@ -310,25 +475,25 @@ class PlaceholderWidget<TProps = {}> extends WidgetType {
     invariant(id);
   }
 
-  get root() {
+  get root(): HTMLElement | null {
     return this._root;
   }
 
-  override eq(other: WidgetType): boolean {
-    return other instanceof PlaceholderWidget && this.id === other.id;
+  override eq(other: this) {
+    return this.id === other.id;
   }
 
   override ignoreEvent() {
     return true;
   }
 
-  override toDOM(_view: EditorView): HTMLElement {
+  override toDOM(_view: EditorView) {
     this._root = document.createElement('span');
-    this.notifier.mounted({ id: this.id, props: this.props, root: this._root, Component: this.Component });
+    this.notifier.mounted({ id: this.id, root: this._root, props: this.props, Component: this.Component });
     return this._root;
   }
 
-  override destroy(_dom: HTMLElement): void {
+  override destroy(_dom: HTMLElement) {
     this.notifier.unmounted(this.id);
     this._root = null;
   }

package/src/extensions/typewriter.ts

@@ -35,7 +35,7 @@ export const typewriter = ({ delay = 75, items = defaultItems }: DemoOptions = {
       {
         // Next prompt.
         // TODO(burdon): Press 1-9 to select prompt?
-        key: "shift-meta-'",
+        key: "Shift-Meta-'",
         run: (view) => {
           clearTimeout(t);
           // TODO(burdon): Add space if needed.