@dxos/react-ui-editor 0.3.11-main.668f0ff → 0.3.11-main.6f25445

package/src/extensions/awareness.ts

@@ -0,0 +1,316 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Annotation, Facet, type Extension, RangeSet, type Range } from '@codemirror/state';
+import {
+  Decoration,
+  type DecorationSet,
+  EditorView,
+  type PluginValue,
+  ViewPlugin,
+  type ViewUpdate,
+  WidgetType,
+} from '@codemirror/view';
+
+import { Event } from '@dxos/async';
+import { Context } from '@dxos/context';
+
+import { CursorConverter } from '../util';
+
+export interface AwarenessProvider {
+  remoteStateChange: Event<void>;
+
+  open(): void;
+  close(): void;
+
+  update(position: AwarenessPosition | undefined): void;
+  getRemoteStates(): AwarenessState[];
+}
+
+const dummyProvider: AwarenessProvider = {
+  remoteStateChange: new Event(),
+
+  open: () => {},
+  close: () => {},
+
+  update: () => {},
+  getRemoteStates: () => [],
+};
+
+export const AwarenessProvider = Facet.define<AwarenessProvider, AwarenessProvider>({
+  combine: (providers) => providers[0] ?? dummyProvider,
+});
+
+// TODO(dmaretskyi): Specify the users that actually changed. Currently, we recalculate positions for every user.
+const RemoteSelectionChangedAnnotation = Annotation.define();
+
+export type AwarenessPosition = {
+  anchor?: string;
+  head?: string;
+};
+
+export type AwarenessInfo = {
+  displayName?: string;
+  // TODO(burdon): Rename light/dark.
+  color?: string;
+  lightColor?: string;
+};
+
+export type AwarenessState = {
+  position?: AwarenessPosition;
+  peerId: string;
+  info: AwarenessInfo;
+};
+
+/**
+ * Extension provides presence information about other peers.
+ */
+// TODO(burdon): Why provide default?
+export const awareness = (provider = dummyProvider): Extension => {
+  return [
+    AwarenessProvider.of(provider),
+    ViewPlugin.fromClass(RemoteSelectionsDecorator, {
+      decorations: (value) => value.decorations,
+    }),
+    styles,
+  ];
+};
+
+/**
+ * Generates selection decorations from remote peers.
+ */
+export class RemoteSelectionsDecorator implements PluginValue {
+  public decorations: DecorationSet = RangeSet.of([]);
+
+  private readonly _ctx = new Context();
+
+  private _cursorConverter: CursorConverter;
+  private _provider: AwarenessProvider;
+  private _lastAnchor?: number = undefined;
+  private _lastHead?: number = undefined;
+
+  constructor(view: EditorView) {
+    this._cursorConverter = view.state.facet(CursorConverter);
+    this._provider = view.state.facet(AwarenessProvider);
+    this._provider.open();
+    this._provider.remoteStateChange.on(this._ctx, () => {
+      view.dispatch({ annotations: [RemoteSelectionChangedAnnotation.of([])] });
+    });
+  }
+
+  destroy() {
+    void this._ctx.dispose();
+    this._provider.close();
+  }
+
+  update(update: ViewUpdate) {
+    this._updateLocalSelection(update);
+    this._updateRemoteSelections(update);
+  }
+
+  private _updateLocalSelection(update: ViewUpdate) {
+    const hasFocus = update.view.hasFocus && update.view.dom.ownerDocument.hasFocus();
+    const { anchor = undefined, head = undefined } = hasFocus ? update.state.selection.main : {};
+    if (this._lastAnchor === anchor && this._lastHead === head) {
+      return;
+    }
+
+    this._lastAnchor = anchor;
+    this._lastHead = head;
+
+    this._provider.update(
+      anchor !== undefined && head !== undefined
+        ? {
+            anchor: this._cursorConverter.toCursor(anchor),
+            head: this._cursorConverter.toCursor(head),
+          }
+        : undefined,
+    );
+  }
+
+  private _updateRemoteSelections(update: ViewUpdate) {
+    const decorations: Range<Decoration>[] = [];
+    const awarenessStates = this._provider.getRemoteStates();
+    for (const state of awarenessStates) {
+      const anchor = state.position?.anchor ? this._cursorConverter.fromCursor(state.position.anchor) : null;
+      const head = state.position?.head ? this._cursorConverter.fromCursor(state.position.head) : null;
+      if (anchor == null || head == null) {
+        continue;
+      }
+
+      const start = Math.min(Math.min(anchor, head), update.view.state.doc.length);
+      const end = Math.min(Math.max(anchor, head), update.view.state.doc.length);
+
+      const startLine = update.view.state.doc.lineAt(start);
+      const endLine = update.view.state.doc.lineAt(end);
+
+      // TODO(burdon): Factor out styles.
+      const color = state.info.color ?? '#30bced';
+      const lightColor = state.info.lightColor ?? color + '33';
+
+      if (startLine.number === endLine.number) {
+        // Selected content in a single line.
+        decorations.push({
+          from: start,
+          to: end,
+          value: Decoration.mark({
+            attributes: { style: `background-color: ${lightColor}` },
+            class: 'cm-ySelection',
+          }),
+        });
+      } else {
+        // Selected content in multiple lines; first, render text-selection in the first line.
+        decorations.push({
+          from: start,
+          to: startLine.from + startLine.length,
+          value: Decoration.mark({
+            attributes: { style: `background-color: ${color}` },
+            class: 'cm-ySelection',
+          }),
+        });
+
+        // Render text-selection in the last line.
+        decorations.push({
+          from: endLine.from,
+          to: end,
+          value: Decoration.mark({
+            attributes: { style: `background-color: ${color}` },
+            class: 'cm-ySelection',
+          }),
+        });
+
+        for (let i = startLine.number + 1; i < endLine.number; i++) {
+          const linePos = update.view.state.doc.line(i).from;
+          decorations.push({
+            from: linePos,
+            to: linePos,
+            value: Decoration.line({
+              attributes: { style: `background-color: ${color}`, class: 'cm-yLineSelection' },
+            }),
+          });
+        }
+      }
+
+      decorations.push({
+        from: head,
+        to: head,
+        value: Decoration.widget({
+          side: head - anchor > 0 ? -1 : 1, // The local cursor should be rendered outside the remote selection.
+          block: false,
+          widget: new RemoteCaretWidget(state.info.displayName ?? 'Anonymous', color),
+        }),
+      });
+    }
+
+    this.decorations = Decoration.set(decorations, true);
+  }
+}
+
+class RemoteCaretWidget extends WidgetType {
+  constructor(public name: string, public color: string) {
+    super();
+    this.name = name;
+    this.color = color;
+  }
+
+  toDOM(): HTMLElement {
+    const span = document.createElement('span');
+    span.className = 'cm-ySelectionCaret';
+    span.style.backgroundColor = this.color;
+    span.style.borderColor = this.color;
+
+    const dot = document.createElement('div');
+    dot.className = 'cm-ySelectionCaretDot';
+
+    const info = document.createElement('div');
+    info.className = 'cm-ySelectionInfo';
+    info.innerText = this.name;
+
+    span.appendChild(document.createTextNode('\u2060'));
+    span.appendChild(dot);
+    span.appendChild(document.createTextNode('\u2060'));
+    span.appendChild(info);
+    span.appendChild(document.createTextNode('\u2060'));
+
+    return span;
+  }
+
+  override eq(widget: this) {
+    return widget.color === this.color;
+  }
+
+  compare(widget: this) {
+    return widget.color === this.color;
+  }
+
+  override updateDOM() {
+    return false;
+  }
+
+  override get estimatedHeight() {
+    return -1;
+  }
+
+  override ignoreEvent() {
+    return true;
+  }
+}
+
+// TODO(burdon): Rename prefix (y for yjs?)
+const styles = EditorView.baseTheme({
+  '.cm-ySelection': {},
+  '.cm-yLineSelection': {
+    padding: 0,
+    margin: '0px 2px 0px 4px',
+  },
+  '.cm-ySelectionCaret': {
+    position: 'relative',
+    borderLeft: '1px solid black',
+    borderRight: '1px solid black',
+    marginLeft: '-1px',
+    marginRight: '-1px',
+    boxSizing: 'border-box',
+    display: 'inline',
+  },
+  '.cm-ySelectionCaretDot': {
+    borderRadius: '50%',
+    position: 'absolute',
+    width: '.4em',
+    height: '.4em',
+    top: '-.2em',
+    left: '-.2em',
+    backgroundColor: 'inherit',
+    transition: 'transform .3s ease-in-out',
+    boxSizing: 'border-box',
+  },
+  '.cm-ySelectionCaret:hover > .cm-ySelectionCaretDot': {
+    transformOrigin: 'bottom center',
+    transform: 'scale(0)',
+  },
+  '.cm-ySelectionInfo': {
+    position: 'absolute',
+    top: '-1.05em',
+    left: '-1px',
+    fontSize: '.75em',
+    fontFamily: 'serif',
+    fontStyle: 'normal',
+    fontWeight: 'normal',
+    lineHeight: 'normal',
+    userSelect: 'none',
+    color: 'white',
+    paddingLeft: '2px',
+    paddingRight: '2px',
+    zIndex: 101,
+    transition: 'opacity .3s ease-in-out',
+    backgroundColor: 'inherit',
+    // these should be separate
+    opacity: 0,
+    transitionDelay: '0s',
+    whiteSpace: 'nowrap',
+  },
+  '.cm-ySelectionCaret:hover > .cm-ySelectionInfo': {
+    opacity: 1,
+    transitionDelay: '0s',
+  },
+});

package/src/{components/TextEditor/extensions → extensions}/code.ts

@@ -15,7 +15,7 @@ import get from 'lodash.get';
 
 import { mx } from '@dxos/react-ui-theme';
 
-import { tokens } from '../../../styles';
+import { tokens } from '../styles';
 
 const CODE_REGEX = /```[\s\S]*?```/gs;
 

package/src/{components/TextEditor/extensions → extensions}/comments.ts

@@ -16,6 +16,7 @@ import {
   WidgetType,
   type Rect,
 } from '@codemirror/view';
+import get from 'lodash.get';
 import sortBy from 'lodash.sortby';
 
 import { debounce } from '@dxos/async';
@@ -23,10 +24,10 @@ import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { nonNullable } from '@dxos/util';
 
-import { callbackWrapper } from './util';
-import { type CommentRange, type EditorModel, modelState, type Range } from '../../../hooks';
+import { type CommentRange, type EditorModel, type Range } from '../hooks';
+import { tokens } from '../styles';
+import { callbackWrapper, CursorConverter } from '../util';
 
-// TODO(burdon): Handle scroll to.
 // TODO(burdon): Handle delete, cut, copy, and paste (separately) text that includes comment range.
 // TODO(burdon): Consider breaking into separate plugin (since not standalone)? Like mermaid?
 
@@ -42,10 +43,10 @@ const styles = EditorView.baseTheme({
     backgroundColor: 'orange',
   },
   '& .cm-comment': {
-    backgroundColor: 'yellow',
+    backgroundColor: get(tokens, 'extend.colors.yellow.50'),
   },
   '& .cm-comment-active': {
-    backgroundColor: 'orange',
+    backgroundColor: get(tokens, 'extend.colors.yellow.100'),
   },
 });
 
@@ -71,9 +72,22 @@ export type CommentsState = CommentSelected & {
   ranges: ExtendedCommentRange[];
 };
 
+export const setFocus = (view: EditorView, thread: string) => {
+  const range = view.state.field(commentsStateField).ranges.find((range) => range.id === thread);
+  if (!range) {
+    return;
+  }
+
+  view.dispatch({
+    effects: setSelection.of({ active: thread }),
+    selection: { anchor: range.from },
+    scrollIntoView: true,
+  });
+};
+
 export const setCommentRange = StateEffect.define<{ model: EditorModel; comments: CommentRange[] }>();
 
-const setSelection = StateEffect.define<CommentSelected>();
+export const setSelection = StateEffect.define<CommentSelected>();
 
 const setCommentState = StateEffect.define<CommentsState>();
 
@@ -85,6 +99,8 @@ const setCommentState = StateEffect.define<CommentsState>();
 const commentsStateField = StateField.define<CommentsState>({
   create: () => ({ ranges: [] }),
   update: (value, tr) => {
+    const cursorConverter = tr.state.facet(CursorConverter);
+
     for (const effect of tr.effects) {
       // Update selection.
       if (effect.is(setSelection)) {
@@ -93,11 +109,13 @@ const commentsStateField = StateField.define<CommentsState>({
 
       // Update range from store.
       if (effect.is(setCommentRange)) {
-        const { model, comments } = effect.value;
-        const ranges: ExtendedCommentRange[] = comments.map((comment) => {
-          const range = model.getRangeFromCursor!(comment.cursor)!;
-          return { ...comment, ...range };
-        });
+        const { comments } = effect.value;
+        const ranges: ExtendedCommentRange[] = comments
+          .map((comment) => {
+            const range = getRangeFromCursor(cursorConverter, comment.cursor);
+            return range && { ...comment, ...range };
+          })
+          .filter(nonNullable);
 
         return { ...value, ranges };
       }
@@ -202,14 +220,15 @@ export const comments = (options: CommentsOptions = {}): Extension => {
    * Create comment thread action.
    */
   const createCommentThread: Command = (view) => {
+    const cursorConverter = view.state.facet(CursorConverter);
+
     invariant(options.onCreate);
     const { head, from, to } = view.state.selection.main;
     if (from === to) {
       return false;
     }
 
-    const model = view.state.field(modelState);
-    const relPos = model?.getCursorFromRange?.({ from, to });
+    const relPos = getCursorFromRange(cursorConverter, { from, to });
     if (relPos) {
       // Create thread via callback.
       const id = callbackWrapper(options.onCreate)(relPos);
@@ -322,27 +341,27 @@ export const comments = (options: CommentsOptions = {}): Extension => {
     // Monitor cursor movement and text updates.
     // TODO(burdon): Is there a better (finer grained) way to do this?
     //
-    EditorView.updateListener.of(({ view, state, startState, changes }) => {
+    EditorView.updateListener.of(({ view, state, changes }) => {
+      const cursorConverter = view.state.facet(CursorConverter);
+
       //
       // Test if need to recompute indexed range if document changes before the end of the range.
       //
       {
         let mod = false;
-        const model = state.field(modelState);
         const { active, ranges } = state.field(commentsStateField);
         changes.iterChanges((from, to, from2, to2) => {
-          invariant(model);
           ranges.forEach((range) => {
             if (from2 === to2) {
-              const newRange = model.getRangeFromCursor!(range.cursor);
-              if (newRange.to - newRange.from === 0) {
+              const newRange = getRangeFromCursor(cursorConverter, range.cursor);
+              if (!newRange || newRange.to - newRange.from === 0) {
                 // TODO(burdon): Delete range if empty.
                 log.info('deleted comment', { thread: range.id });
               }
             }
 
             if (from <= range.to) {
-              const newRange = model.getRangeFromCursor!(range.cursor);
+              const newRange = getRangeFromCursor(cursorConverter, range.cursor);
               Object.assign(range, newRange);
               mod = true;
             }
@@ -387,3 +406,16 @@ export const comments = (options: CommentsOptions = {}): Extension => {
     }),
   ];
 };
+
+const getCursorFromRange = (cursorConverter: CursorConverter, range: Range) => {
+  const from = cursorConverter.toCursor(range.from);
+  const to = cursorConverter.toCursor(range.to, -1);
+  return [from, to].join(':');
+};
+
+const getRangeFromCursor = (cursorConverter: CursorConverter, cursor: string) => {
+  const parts = cursor.split(':');
+  const from = cursorConverter.fromCursor(parts[0]);
+  const to = cursorConverter.fromCursor(parts[1]);
+  return from && to ? { from, to } : undefined;
+};

package/src/{components/TextEditor/extensions → extensions}/hr.ts

@@ -13,7 +13,7 @@ import {
 } from '@codemirror/view';
 import get from 'lodash.get';
 
-import { tokens } from '../../../styles';
+import { tokens } from '../styles';
 
 // TODO(burdon): Reconcile with theme.
 const styles = EditorView.baseTheme({

package/src/{components/TextEditor/extensions → extensions}/index.ts

@@ -3,6 +3,8 @@
 //
 
 export * from './autocomplete';
+export * from './automerge';
+export * from './awareness';
 export * from './basic';
 export * from './blast';
 export * from './code';
@@ -16,5 +18,5 @@ export * from './mention';
 export * from './mermaid';
 export * from './table';
 export * from './tasklist';
-export * from './tooltip';
 export * from './typewriter';
+export * from './yjs';

package/src/{components/TextEditor/extensions → extensions}/link.ts

@@ -12,7 +12,11 @@ import {
   StateField,
   type Transaction,
 } from '@codemirror/state';
-import { Decoration, EditorView, WidgetType } from '@codemirror/view';
+import { Decoration, EditorView, WidgetType, hoverTooltip } from '@codemirror/view';
+
+import { tooltipContent } from '@dxos/react-ui-theme';
+
+const markdownLinkRegexp = /\[([^\]]+)]\(([^)]+)\)/;
 
 // Adapted from:
 // https://codemirror.net/try/?c=aW1wb3J0IHsgYmFzaWNTZXR1cCwgRWRpdG9yVmlldyB9IGZyb20gImNvZGVtaXJyb3IiCmltcG9ydCB7IG1hcmtkb3duIH0gZnJvbSAiQGNvZGVtaXJyb3IvbGFuZy1tYXJrZG93biIKaW1wb3J0IHsgc3ludGF4VHJlZSB9IGZyb20gIkBjb2RlbWlycm9yL2xhbmd1YWdlIjsKaW1wb3J0IHsgRWRpdG9yU3RhdGUsIFJhbmdlU2V0QnVpbGRlciwgU3RhdGVGaWVsZCB9IGZyb20gIkBjb2RlbWlycm9yL3N0YXRlIjsKaW1wb3J0IHsgRGVjb3JhdGlvbiwgV2lkZ2V0VHlwZSB9IGZyb20gIkBjb2RlbWlycm9yL3ZpZXciOwoKY2xhc3MgTGluayBleHRlbmRzIFdpZGdldFR5cGUgewogIGNvbnN0cnVjdG9yKHRleHQsIHVybCkgewogICAgc3VwZXIoKQogICAgdGhpcy50ZXh0ID0gdGV4dAogICAgdGhpcy51cmwgPSB1cmwKICB9CiAgZXEob3RoZXIpIHsgcmV0dXJuIHRoaXMudGV4dCA9PSBvdGhlci50ZXh0ICYmIHRoaXMudXJsID09IG90aGVyLnVybCB9CiAgdG9ET00oKSB7CiAgICBsZXQgbGluayA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImEiKQogICAgbGluay50ZXh0Q29udGVudCA9IHRoaXMudGV4dAogICAgbGluay5ocmVmID0gdGhpcy51cmwKICAgIHJldHVybiBsaW5rOwogIH0KfQoKbGV0IGRlY29yYXRpb25zRmllbGQgPSBTdGF0ZUZpZWxkLmRlZmluZSh7CiAgY3JlYXRlKCkgewogICAgcmV0dXJuIERlY29yYXRpb24ubm9uZTsKICB9LAogIHVwZGF0ZShfLCB0cikgewogICAgY29uc3QgYnVpbGRlciA9IG5ldyBSYW5nZVNldEJ1aWxkZXIoKTsKICAgIGxldCBjdXJzb3IgPSB0ci5zdGF0ZS5zZWxlY3Rpb24ubWFpbi5oZWFkOwogICAgc3ludGF4VHJlZSh0ci5zdGF0ZSkuaXRlcmF0ZSh7CiAgICAgIGVudGVyOiAobm9kZSkgPT4gewogICAgICAgIGlmICgoY3Vyc29yIDwgbm9kZS5mcm9tIHx8IGN1cnNvciA+IG5vZGUudG8pICYmIG5vZGUubmFtZSA9PSAiTGluayIpIHsKICAgICAgICAgIGxldCBtYXJrcyA9IG5vZGUubm9kZS5nZXRDaGlsZHJlbigiTGlua01hcmsiKTsKICAgICAgICAgIGxldCB0ZXh0ID0gbWFya3MubGVuZ3RoID49IDIgPyB0ci5zdGF0ZS5zbGljZURvYyhtYXJrc1swXS50bywgbWFya3NbMV0uZnJvbSkgOiAiIgoKICAgICAgICAgIGxldCB1cmxOb2RlID0gbm9kZS5ub2RlLmdldENoaWxkKCJVUkwiKTsKICAgICAgICAgIGxldCB1cmwgPSB1cmxOb2RlID8gdHIuc3RhdGUuc2xpY2VEb2ModXJsTm9kZS5mcm9tLCB1cmxOb2RlLnRvKSA6ICIiCiAgICAgICAgICBidWlsZGVyLmFkZChub2RlLmZyb20sIG5vZGUudG8sIERlY29yYXRpb24ucmVwbGFjZSh7CiAgICAgICAgICAgIHdpZGdldDogbmV3IExpbmsodGV4dCwgdXJsKSwKICAgICAgICAgIH0pLAogICAgICAgICAgICAgICAgICAgICApOwogICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgIH0KICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgfSwKICAgIH0pOwogICAgcmV0dXJuIGJ1aWxkZXIuZmluaXNoKCk7CiAgfSwKICBwcm92aWRlOiAoZikgPT4gRWRpdG9yVmlldy5kZWNvcmF0aW9ucy5mcm9tKGYpLAp9KTsKCmxldCB2aWV3ID0gbmV3IEVkaXRvclZpZXcoewogIGRvYzogIiMgSGVsbG8gV29ybGRcblxuW1Rlc3RdKGh0dHBzOi8vZXhhbXBsZS5jb20pXG5cblxuIiwKICBleHRlbnNpb25zOiBbZGVjb3JhdGlvbnNGaWVsZCwgbWFya2Rvd24oKV0sCiAgcGFyZW50OiBkb2N1bWVudC5ib2R5LAp9KTsKCnZpZXcuZm9jdXMoKTs=
@@ -20,6 +24,7 @@ import { Decoration, EditorView, WidgetType } from '@codemirror/view';
 
 export type LinkOptions = {
   link?: boolean;
+  onHover?: (el: Element, url: string) => void;
   onRender?: (el: Element, url: string) => void;
 };
 
@@ -28,11 +33,62 @@ export type LinkOptions = {
  * https://codemirror.net/docs/ref/#state.StateField
  */
 export const link = (options: LinkOptions = {}): Extension => {
-  return StateField.define<RangeSet<any>>({
-    create: (state) => update(state, options),
-    update: (_: RangeSet<any>, tr: Transaction) => update(tr.state, options),
-    provide: (field) => EditorView.decorations.from(field),
-  });
+  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),
+    }),
+  ];
+
+  if (options.onHover) {
+    extensions.push(
+      // 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) {
+          return null;
+        }
+
+        const [, , url] = match ?? [];
+
+        return {
+          pos: idx + from,
+          end: idx + from + match[0].length,
+          above: true,
+          create: () => {
+            const el = document.createElement('div');
+            el.className = tooltipContent({}, 'pli-2 plb-1');
+            options.onHover!(el, url);
+            return { dom: el, offset: { x: 0, y: 4 } };
+          },
+        };
+      }),
+    );
+  }
+
+  return extensions;
 };
 
 class LinkButton extends WidgetType {
@@ -56,12 +112,12 @@ class LinkButton extends WidgetType {
 }
 
 class LinkText extends WidgetType {
-  constructor(private readonly _pos: number, private readonly _text: string, private readonly _url?: string) {
+  constructor(private readonly _text: string, private readonly _url?: string) {
     super();
   }
 
   override eq(other: LinkText) {
-    return this._pos === other._pos && this._url === other._url;
+    return this._url === other._url;
   }
 
   toDOM(view: EditorView) {
@@ -76,7 +132,7 @@ class LinkText extends WidgetType {
       link.onclick = () => {
         view.dispatch({
           selection: {
-            anchor: this._pos,
+            anchor: view.posAtDOM(link),
           },
         });
       };
@@ -112,7 +168,7 @@ const update = (state: EditorState, options: LinkOptions) => {
             node.from,
             node.to,
             Decoration.replace({
-              widget: new LinkText(node.from, text, options.link ? url : undefined),
+              widget: new LinkText(text, options.link ? url : undefined),
             }),
           );
         }

package/src/extensions/listener.ts

@@ -0,0 +1,35 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type Extension } from '@codemirror/state';
+import { EditorView } from '@codemirror/view';
+
+export type ListenerOptions = {
+  onFocus?: (focused: boolean) => void;
+  onChange?: (text: string) => void;
+};
+
+/**
+ * Event listener.
+ */
+export const listener = ({ onFocus, onChange }: ListenerOptions): Extension => {
+  const extensions: Extension[] = [];
+
+  onFocus &&
+    extensions.push(
+      EditorView.focusChangeEffect.of((_, focused) => {
+        onFocus(focused);
+        return null;
+      }),
+    );
+
+  onChange &&
+    extensions.push(
+      EditorView.updateListener.of((update) => {
+        onChange(update.state.doc.toString());
+      }),
+    );
+
+  return extensions;
+};

package/src/{components/TextEditor/extensions → extensions}/markdown/highlight.ts

@@ -19,7 +19,7 @@ import {
   mark,
   strikethrough,
   tokens,
-} from '../../../../styles';
+} from '../../styles';
 
 /**
  * Custom tags defined and processed by the GFM lezer extension.

package/src/{components/TextEditor/extensions → extensions}/typewriter.ts

@@ -19,7 +19,7 @@ const defaultItems = ['hello world!', 'this is a test.', 'this is [DXOS](https:/
  */
 export const typewriter = ({ delay = 75, items = defaultItems }: DemoOptions = {}): Extension => {
   let t: any;
-  let idx = 0;
+  let idx = 0; // TODO(burdon): Make global.
 
   return [
     keymap.of([