@dxos/react-ui-editor 0.3.11-main.42059c4 → 0.3.11-main.463e5cd

package/src/extensions/comments.ts

@@ -2,17 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Extension, StateEffect, StateField, type Text } from '@codemirror/state';
+import { invertedEffects } from '@codemirror/commands';
+import { type Extension, Facet, StateEffect, StateField, type Text, type ChangeDesc } from '@codemirror/state';
 import { hoverTooltip, keymap, type Command, Decoration, EditorView, type Rect } from '@codemirror/view';
 import sortBy from 'lodash.sortby';
+import { useEffect } from 'react';
 
 import { debounce } from '@dxos/async';
-import { invariant } from '@dxos/invariant';
 import { nonNullable } from '@dxos/util';
 
-import { semaphoreFacet } from './automerge/defs';
 import { Cursor } from './cursor';
-import { type CommentRange, type EditorModel, type Range } from '../hooks';
+import { type Comment, type Range } from '../hooks';
 import { getToken } from '../styles';
 import { callbackWrapper } from '../util';
 
@@ -21,49 +21,52 @@ const styles = EditorView.baseTheme({
   '& .cm-comment': {
     backgroundColor: getToken('extend.colors.yellow.50'),
   },
-  '& .cm-comment-active': {
+  '& .cm-comment-current': {
     backgroundColor: getToken('extend.colors.yellow.100'),
   },
 });
 
-const marks = {
-  highlight: Decoration.mark({ class: 'cm-comment' }),
-  highlightActive: Decoration.mark({ class: 'cm-comment-active' }),
+const commentMark = Decoration.mark({ class: 'cm-comment' });
+const commentCurrentMark = Decoration.mark({ class: 'cm-comment-current' });
+
+type CommentState = {
+  comment: Comment;
+  range: Range;
+  location?: Rect | null;
 };
 
-// TODO(burdon): Should this be part of state?
-type CommentSelected = {
-  active?: string;
+type SelectionState = {
+  current?: string;
   closest?: string;
 };
 
-// TODO(burdon): Rename.
-type ExtendedCommentRange = Range &
-  CommentRange & {
-    // TODO(burdon): Not part of state; just required for callback.
-    location?: Rect | null;
-  };
-
-export type CommentsState = CommentSelected & {
-  ranges: ExtendedCommentRange[];
+export type CommentsState = {
+  comments: CommentState[];
+  selection: SelectionState;
 };
 
-export const setFocus = (view: EditorView, thread: string) => {
-  const range = view.state.field(commentsStateField).ranges.find((range) => range.id === thread);
-  if (!range) {
+export const focusComment = (view: EditorView, id: string, center = true) => {
+  const comment = view.state.field(commentsState).comments.find((range) => range.comment.id === id);
+  if (!comment?.comment.cursor) {
     return;
   }
 
-  view.dispatch({
-    effects: setSelection.of({ active: thread }),
-    selection: { anchor: range.from },
-    scrollIntoView: true, // TODO(burdon): Scroll to y-position (or center of screen?)
-  });
+  const range = Cursor.getRangeFromCursor(view.state, comment.comment.cursor);
+  if (range) {
+    view.dispatch({
+      selection: { anchor: range.from },
+      effects: [
+        //
+        EditorView.scrollIntoView(range.from, center ? { y: 'center' } : undefined),
+        setSelection.of({ current: id }),
+      ],
+    });
+  }
 };
 
-export const setCommentRange = StateEffect.define<{ model: EditorModel; comments: CommentRange[] }>();
+export const setComments = StateEffect.define<Comment[]>();
 
-export const setSelection = StateEffect.define<CommentSelected>();
+export const setSelection = StateEffect.define<SelectionState>();
 
 const setCommentState = StateEffect.define<CommentsState>();
 
@@ -71,29 +74,30 @@ const setCommentState = StateEffect.define<CommentsState>();
  * State field (reducer) that tracks comment ranges.
  * The ranges are tracked as Automerge cursors from which the absolute indexed ranges can be computed.
  */
-const commentsStateField = StateField.define<CommentsState>({
-  create: () => ({ ranges: [] }),
+const commentsState = StateField.define<CommentsState>({
+  create: () => ({ comments: [], selection: {} }),
   update: (value, tr) => {
-    const cursorConverter = tr.state.facet(Cursor.converter);
-
     for (const effect of tr.effects) {
       // Update selection.
       if (effect.is(setSelection)) {
-        return { ...value, ...effect.value };
+        return { ...value, selection: effect.value };
       }
 
       // Update range from store.
-      if (effect.is(setCommentRange) && effect.value.comments.length > 0) {
-        const { comments } = effect.value;
-        const ranges: ExtendedCommentRange[] = comments
+      if (effect.is(setComments)) {
+        const comments: CommentState[] = effect.value
           .map((comment) => {
-            const range = Cursor.getRangeFromCursor(cursorConverter, comment.cursor);
-            // console.log('update', JSON.stringify({ range, cursor: comment.cursor }, undefined, 2));
-            return range && { ...comment, ...range };
+            // Skip cut/deleted comments.
+            if (!comment.cursor) {
+              return undefined;
+            }
+
+            const range = Cursor.getRangeFromCursor(tr.state, comment.cursor);
+            return range && { comment, range };
           })
           .filter(nonNullable);
 
-        return { ...value, ranges };
+        return { ...value, comments };
       }
 
       // Update entire state.
@@ -109,24 +113,27 @@ const commentsStateField = StateField.define<CommentsState>({
 /**
  * Decorate ranges.
  */
-const highlightDecorations = EditorView.decorations.compute([commentsStateField], (state) => {
-  const { active, ranges } = state.field(commentsStateField);
-  const decorations =
-    sortBy(ranges ?? [], (range) => range.from)
-      ?.flatMap((selection) => {
-        // TODO(burdon): Invalid range (e.g., deleted).
-        if (selection.from === selection.to) {
-          return undefined;
-        }
+const commentsDecorations = EditorView.decorations.compute([commentsState], (state) => {
+  const {
+    selection: { current },
+    comments,
+  } = state.field(commentsState);
+
+  const decorations = sortBy(comments ?? [], (range) => range.range.from)
+    ?.flatMap((comment) => {
+      const range = comment.range;
+      if (!range || range.from === range.to) {
+        console.warn('Invalid range:', range);
+        return undefined;
+      }
 
-        const range = { from: selection.from, to: selection.to };
-        if (selection.id === active) {
-          return marks.highlightActive.range(range.from, range.to);
-        } else {
-          return marks.highlight.range(range.from, range.to);
-        }
-      })
-      .filter(nonNullable) ?? [];
+      if (comment.comment.id === current) {
+        return commentCurrentMark.range(range.from, range.to);
+      } else {
+        return commentMark.range(range.from, range.to);
+      }
+    })
+    .filter(nonNullable);
 
   return Decoration.set(decorations);
 });
@@ -158,18 +165,18 @@ export type CommentsOptions = {
   onHover?: (el: Element, shortcut: string) => void;
 };
 
-// TODO(burdon): Handle cut/restore via undo (need to integrate with history?)
+type TrackedComment = { id: string; from: number; to: number };
+
 const trackPastedComments = (onUpdate: NonNullable<CommentsOptions['onUpdate']>) => {
-  // Cut/deleted comments.
   // Tracks indexed selections within text.
-  let tracked: { text: Text; comments: { id: string; from: number; to: number }[] } | null = null;
+  let tracked: { text: Text; comments: TrackedComment[] } | null = null;
 
   // Track cut or copy (enables cut-and-paste and copy-delete-paste to restore comment selection).
   const handleTrack = (event: Event, view: EditorView) => {
-    const comments = view.state.field(commentsStateField);
+    const comments = view.state.field(commentsState);
     const { main } = view.state.selection;
-    const selectedRanges = comments.ranges.filter(
-      (range) => range.from >= main.from && range.to <= main.to && range.from < range.to,
+    const selectedRanges = comments.comments.filter(
+      ({ range }) => range.from >= main.from && range.to <= main.to && range.from < range.to,
     );
 
     if (!selectedRanges.length) {
@@ -177,8 +184,8 @@ const trackPastedComments = (onUpdate: NonNullable<CommentsOptions['onUpdate']>)
     } else {
       tracked = {
         text: view.state.doc.slice(main.from, main.to),
-        comments: selectedRanges.map((range) => ({
-          id: range.id,
+        comments: selectedRanges.map(({ comment, range }) => ({
+          id: comment.id,
           from: range.from - main.from,
           to: range.to - main.from,
         })),
@@ -192,16 +199,48 @@ const trackPastedComments = (onUpdate: NonNullable<CommentsOptions['onUpdate']>)
       copy: handleTrack,
     }),
 
-    // Handle paste.
-    EditorView.updateListener.of(({ view, state, transactions }) => {
+    // Track deleted comments.
+    invertedEffects.of((tr) => {
+      const { comments } = tr.startState.field(commentsState);
+      const effects: StateEffect<any>[] = [];
+      tr.changes.iterChangedRanges((fromA, toA) => {
+        for (const {
+          comment: { id },
+          range: { from, to },
+        } of comments) {
+          if (from < to && from >= fromA && to <= toA) {
+            effects.push(restoreCommentEffect.of({ id, from, to }));
+          }
+        }
+      });
+
+      return effects;
+    }),
+
+    // Handle paste or the undo of comment deletion.
+    EditorView.updateListener.of((update) => {
+      const restore: TrackedComment[] = [];
+
+      for (let i = 0; i < update.transactions.length; i++) {
+        const tr = update.transactions[i];
+        for (let j = 0; j < restore.length; j++) {
+          restore[j] = mapTrackedComment(restore[j], tr.changes);
+        }
+        for (const effect of tr.effects) {
+          if (effect.is(restoreCommentEffect)) {
+            restore.push(effect.value);
+          }
+        }
+      }
+
       if (tracked) {
-        const paste = transactions.find((tr) => tr.isUserEvent('input.paste'));
+        const paste = update.transactions.find((tr) => tr.isUserEvent('input.paste'));
         if (paste) {
           let found = -1;
           paste.changes.iterChanges((fromA, toA, fromB, toB, text) => {
             if (text.eq(tracked!.text)) {
-              for (let i = transactions.indexOf(paste!) + 1; i < transactions.length; i++) {
-                fromB = transactions[i].changes.mapPos(fromB);
+              for (let i = update.transactions.indexOf(paste!) + 1; i < update.transactions.length; i++) {
+                fromB = update.transactions[i].changes.mapPos(fromB);
               }
 
               found = fromB;
@@ -209,34 +248,79 @@ const trackPastedComments = (onUpdate: NonNullable<CommentsOptions['onUpdate']>)
           });
 
           if (found > -1) {
-            const comments = tracked.comments;
-
-            // Sync before recomputing cursor/range.
-            // TODO(burdon): Decouple from automerge?
-            view.state.facet(semaphoreFacet).reconcile(view);
-
-            const active = state.field(commentsStateField).ranges;
-            for (const moved of comments) {
-              if (active.some((range) => range.id === moved.id && range.from === range.to)) {
-                const range = {
-                  from: found + moved.from,
-                  to: found + moved.to,
-                };
-
-                const cursor = Cursor.getCursorFromRange(state.facet(Cursor.converter), range);
-                // console.log('paste', JSON.stringify({ moved, range, cursor }, undefined, 2));
-                onUpdate(moved.id, cursor);
-              }
+            for (const moved of tracked.comments) {
+              restore.push({ id: moved.id, from: found + moved.from, to: found + moved.to });
             }
           }
 
           tracked = null;
         }
       }
+
+      for (const comment of restore) {
+        const { comments } = update.startState.field(commentsState);
+        const exists = comments.some((c) => c.comment.id === comment.id && c.range.from < c.range.to);
+        if (!exists) {
+          const cursor = Cursor.getCursorFromRange(update.state, comment);
+          onUpdate(comment.id, cursor);
+        }
+      }
     }),
   ];
 };
 
+const mapTrackedComment = (comment: TrackedComment, changes: ChangeDesc) => ({
+  id: comment.id,
+  from: changes.mapPos(comment.from, 1),
+  to: changes.mapPos(comment.to, 1),
+});
+
+// These are attached to undone/redone transactions in the editor for the purpose of restoring comments
+// that were deleted by the original changes.
+const restoreCommentEffect = StateEffect.define<TrackedComment>({ map: mapTrackedComment });
+
+const optionsFacet = Facet.define<CommentsOptions, CommentsOptions>({
+  combine: (providers) => providers[0],
+});
+
+/**
+ * Create comment thread action.
+ */
+export const createComment: Command = (view) => {
+  const options = view.state.facet(optionsFacet);
+  const { from, to } = view.state.selection.main;
+  if (from === to) {
+    return false;
+  }
+
+  // Don't allow selection at end of document.
+  if (to === view.state.doc.length) {
+    view.dispatch({
+      changes: {
+        from: to,
+        insert: '\n',
+      },
+    });
+  }
+
+  const cursor = Cursor.getCursorFromRange(view.state, { from, to });
+  if (cursor) {
+    // Create thread via callback.
+    const id = options.onCreate?.(cursor, view.coordsAtPos(from));
+    if (id) {
+      // Update range.
+      view.dispatch({
+        effects: setSelection.of({ current: id }),
+        selection: { anchor: to },
+      });
+
+      return true;
+    }
+  }
+
+  return false;
+};
+
 /**
  * Comment threads.
  * 1). Updates the EditorModel to store relative selections for a set of comments threads.
@@ -253,39 +337,10 @@ export const comments = (options: CommentsOptions = {}): Extension => {
 
   const handleSelect = debounce((state: CommentsState) => options.onSelect?.(state), 200);
 
-  /**
-   * Create comment thread action.
-   */
-  const createCommentThread: Command = (view) => {
-    const cursorConverter = view.state.facet(Cursor.converter);
-
-    invariant(options.onCreate);
-    const { from, to } = view.state.selection.main;
-    if (from === to) {
-      return false;
-    }
-
-    const cursor = Cursor.getCursorFromRange(cursorConverter, { from, to });
-    if (cursor) {
-      // Create thread via callback.
-      const id = callbackWrapper(options.onCreate)(cursor, view.coordsAtPos(from));
-      if (id) {
-        // Update range.
-        view.dispatch({
-          effects: setSelection.of({ active: id }),
-          selection: { anchor: from },
-        });
-
-        return true;
-      }
-    }
-
-    return false;
-  };
-
   return [
-    commentsStateField,
-    highlightDecorations,
+    optionsFacet.of(options),
+    commentsState,
+    commentsDecorations,
     styles,
 
     //
@@ -295,7 +350,7 @@ export const comments = (options: CommentsOptions = {}): Extension => {
       ? keymap.of([
           {
             key: shortcut,
-            run: callbackWrapper(createCommentThread),
+            run: callbackWrapper(createComment),
           },
         ])
       : [],
@@ -315,7 +370,7 @@ export const comments = (options: CommentsOptions = {}): Extension => {
                 above: true,
                 create: () => {
                   const el = document.createElement('div');
-                  options.onHover?.(el, shortcut);
+                  options.onHover!(el, shortcut);
                   return { dom: el, offset: { x: 0, y: 8 } };
                 },
               };
@@ -323,80 +378,99 @@ export const comments = (options: CommentsOptions = {}): Extension => {
 
             return null;
           },
-          { hideOnChange: true, hoverTime: 1000 },
+          {
+            // TODO(burdon): Hide on change triggered immediately?
+            // hideOnChange: true,
+            hoverTime: 1_000,
+          },
         )
       : [],
 
     //
-    // Monitor cursor movement and text updates.
-    // TODO(burdon): Is there a better (finer grained) way to do this?
+    // Track deleted ranges and update ranges for decorations.
     //
     EditorView.updateListener.of(({ view, state, changes }) => {
-      const cursorConverter = view.state.facet(Cursor.converter);
-
-      //
-      // Test if need to recompute indexed range if document changes before the end of the range.
-      //
-      {
-        let mod = false;
-        const { active, ranges } = state.field(commentsStateField);
-        changes.iterChanges((from, to, from2, to2) => {
-          // TODO(burdon): Skip deleted (tracked) ranges.
-          ranges.forEach((range) => {
-            if (from2 === to2) {
-              const newRange = Cursor.getRangeFromCursor(cursorConverter, range.cursor);
-              if (!newRange || newRange.to - newRange.from === 0) {
-                options.onDelete?.(range.id);
-              }
+      let mod = false;
+      const { comments, ...value } = state.field(commentsState);
+      changes.iterChanges((from, to, from2, to2) => {
+        comments.forEach(({ comment, range }) => {
+          // Test if range deleted.
+          if (from2 === to2) {
+            const newRange = Cursor.getRangeFromCursor(view.state, comment.cursor!);
+            if (!newRange || newRange.to - newRange.from === 0) {
+              options.onDelete?.(comment.id);
             }
+          }
 
-            if (from <= range.to) {
-              const newRange = Cursor.getRangeFromCursor(cursorConverter, range.cursor);
-              Object.assign(range, newRange);
-              mod = true;
-            }
-          });
+          // Update range.
+          if (from <= range.to) {
+            const newRange = Cursor.getRangeFromCursor(view.state, comment.cursor!);
+            Object.assign(range, newRange);
+            mod = true;
+          }
         });
+      });
 
-        if (mod) {
-          view.dispatch({ effects: setCommentState.of({ active, ranges }) });
-        }
+      if (mod) {
+        view.dispatch({ effects: setCommentState.of({ comments, ...value }) });
       }
+    }),
 
-      //
-      // Track the current selection.
-      //
-      {
-        const { head } = state.selection.main;
-
-        let min = Infinity;
-        const { active, closest, ranges } = state.field(commentsStateField);
-        const selected: CommentSelected = { active: undefined, closest: undefined };
-
-        // TODO(burdon): Skip deleted (tracked) ranges.
-        ranges.forEach((comment) => {
-          const d = Math.min(Math.abs(head - comment.from), Math.abs(head - comment.to));
-          if (head >= comment.from && head <= comment.to) {
-            selected.active = comment.id;
-          }
+    //
+    // Track selection/proximity.
+    //
+    EditorView.updateListener.of(({ view, state }) => {
+      let min = Infinity;
+      const {
+        selection: { current, closest },
+        comments,
+      } = state.field(commentsState);
+
+      const { head } = state.selection.main;
+      const selection: SelectionState = {};
+      comments.forEach(({ comment, range }) => {
+        if (head >= range.from && head <= range.to) {
+          selection.current = comment.id;
+          selection.closest = undefined;
+        }
+
+        if (!selection.current) {
+          const d = Math.min(Math.abs(head - range.from), Math.abs(head - range.to));
           if (d < min) {
-            selected.closest = comment.id;
+            selection.closest = comment.id;
             min = d;
           }
-        });
-
-        if (selected.active !== active || selected.closest !== closest) {
-          view.dispatch({ effects: setSelection.of(selected) });
-
-          // Update callback.
-          handleSelect({
-            ...selected,
-            ranges: ranges.map((range) => ({ ...range, location: view.coordsAtPos(range.from) })),
-          });
         }
+      });
+
+      if (selection.current !== current || selection.closest !== closest) {
+        view.dispatch({ effects: setSelection.of(selection) });
+
+        // Update callback.
+        handleSelect({
+          selection,
+          comments: comments.map(({ comment, range }) => ({
+            comment,
+            range,
+            location: view.coordsAtPos(range.from),
+          })),
+        });
       }
     }),
 
     options.onUpdate ? trackPastedComments(options.onUpdate) : [],
   ];
 };
+
+/**
+ * Update comments state field.
+ */
+export const useComments = (view: EditorView | null, comments: Comment[] = []) => {
+  useEffect(() => {
+    if (view) {
+      view.dispatch({
+        effects: setComments.of(comments),
+      });
+    }
+  }, [view, comments]);
+};

package/src/extensions/cursor.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Facet } from '@codemirror/state';
+import { type EditorState, Facet } from '@codemirror/state';
 
 import type { Range } from '../hooks';
 
@@ -31,13 +31,17 @@ export class Cursor {
     combine: (providers) => providers[0] ?? defaultCursorConverter,
   });
 
-  static readonly getCursorFromRange = (cursorConverter: CursorConverter, range: Range) => {
+  static readonly getCursorFromRange = (state: EditorState, range: Range) => {
+    const cursorConverter = state.facet(Cursor.converter);
+
     const from = cursorConverter.toCursor(range.from);
     const to = cursorConverter.toCursor(range.to, -1);
     return [from, to].join(':');
   };
 
-  static readonly getRangeFromCursor = (cursorConverter: CursorConverter, cursor: string) => {
+  static readonly getRangeFromCursor = (state: EditorState, cursor: string) => {
+    const cursorConverter = state.facet(Cursor.converter);
+
     const parts = cursor.split(':');
     const from = cursorConverter.fromCursor(parts[0]);
     const to = cursorConverter.fromCursor(parts[1]);

package/src/extensions/index.ts

@@ -7,16 +7,10 @@ export * from './automerge';
 export * from './awareness';
 export * from './basic';
 export * from './blast';
-export * from './code';
 export * from './comments';
 export * from './cursor';
-export * from './hr';
-export * from './image';
-export * from './link';
 export * from './listener';
 export * from './markdown';
 export * from './mention';
-export * from './table';
-export * from './tasklist';
+export * from './outliner';
 export * from './typewriter';
-export * from './yjs';