@dxos/react-ui-editor 0.8.4-main.c4373fc → 0.8.4-main.d05673bc65

package/src/extensions/automerge/sync.ts

@@ -1,75 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-// Copyright 2024 Automerge
-// Ref: https://github.com/automerge/automerge-codemirror
-//
-
-import { next as A } from '@automerge/automerge';
-import { type StateField } from '@codemirror/state';
-import { type EditorView } from '@codemirror/view';
-
-import { type IDocHandle } from '@dxos/react-client/echo';
-
-import { type State, getLastHeads, getPath, isReconcile, reconcileAnnotation, updateHeads } from './defs';
-import { updateAutomerge } from './update-automerge';
-import { updateCodeMirror } from './update-codemirror';
-
-/**
- * Implements three-way merge (on each mutation).
- */
-export class Syncer {
-  private _pending = false;
-
-  // prettier-ignore
-  constructor(
-    private readonly _handle: IDocHandle,
-    private readonly _state: StateField<State>
-  ) {}
-
-  reconcile(view: EditorView, editor: boolean): void {
-    // TODO(burdon): Better way to do mutex?
-    if (this._pending) {
-      return;
-    }
-
-    this._pending = true;
-    if (editor) {
-      this.onEditorChange(view);
-    } else {
-      this.onAutomergeChange(view);
-    }
-    this._pending = false;
-  }
-
-  onEditorChange(view: EditorView): void {
-    // Apply the unreconciled transactions to the document.
-    const transactions = view.state.field(this._state).unreconciledTransactions.filter((tx) => !isReconcile(tx));
-    const newHeads = updateAutomerge(this._state, this._handle, transactions, view.state);
-
-    if (newHeads) {
-      view.dispatch({
-        effects: updateHeads(newHeads),
-        annotations: reconcileAnnotation.of(false),
-      });
-    }
-  }
-
-  onAutomergeChange(view: EditorView): void {
-    // Get the diff between the updated state of the document and the heads and apply that to the codemirror doc.
-    const oldHeads = getLastHeads(view.state, this._state);
-    const newHeads = A.getHeads(this._handle.doc()!);
-    const diff = A.equals(oldHeads, newHeads) ? [] : A.diff(this._handle.doc()!, oldHeads, newHeads);
-
-    const selection = view.state.selection;
-    const path = getPath(view.state, this._state);
-    updateCodeMirror(view, selection, path, diff);
-
-    // TODO(burdon): Test conflicts?
-    // A.getConflicts(this._handle.doc()!, path[0]);
-
-    view.dispatch({
-      effects: updateHeads(newHeads),
-      annotations: reconcileAnnotation.of(false),
-    });
-  }
-}

package/src/extensions/automerge/update-automerge.ts

@@ -1,50 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-// Copyright 2024 Automerge
-// Ref: https://github.com/automerge/automerge-codemirror
-//
-
-import { next as A, type Heads } from '@automerge/automerge';
-import { type EditorState, type StateField, type Text, type Transaction } from '@codemirror/state';
-
-import { type IDocHandle } from '@dxos/react-client/echo';
-
-import { type State } from './defs';
-
-export const updateAutomerge = (
-  field: StateField<State>,
-  handle: IDocHandle,
-  transactions: Transaction[],
-  state: EditorState, // TODO(burdon): Just pass in the state field value?
-): Heads | undefined => {
-  const { lastHeads, path } = state.field(field);
-
-  // We don't want to call `automerge.updateAt` if there are no changes.
-  // Otherwise, later on `automerge.diff` will return empty patches that result in a no-op but still mess up the selection.
-  let hasChanges = false;
-  for (const tr of transactions) {
-    tr.changes.iterChanges(() => {
-      hasChanges = true;
-    });
-  }
-
-  if (!hasChanges) {
-    return undefined;
-  }
-
-  const newHeads = handle.changeAt(lastHeads, (doc: A.Doc<unknown>) => {
-    const invertedTransactions: { from: number; del: number; insert: Text }[] = [];
-    for (const tr of transactions) {
-      tr.changes.iterChanges((fromA, toA, _fromB, _toB, insert) => {
-        invertedTransactions.push({ from: fromA, del: toA - fromA, insert });
-      });
-    }
-
-    // TODO(burdon): Hack to apply in reverse order to properly apply range.
-    invertedTransactions.reverse().forEach(({ from, del, insert }) => {
-      A.splice(doc, path.slice(), from, del, insert.toString());
-    });
-  });
-
-  return newHeads ?? undefined;
-};

package/src/extensions/automerge/update-codemirror.ts

@@ -1,115 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-// Copyright 2024 Automerge
-// Ref: https://github.com/automerge/automerge-codemirror
-//
-
-import {
-  type DelPatch,
-  type InsertPatch,
-  type Patch,
-  type Prop,
-  type PutPatch,
-  type SpliceTextPatch,
-} from '@automerge/automerge';
-import { ChangeSet, type ChangeSpec, type EditorSelection, type EditorState } from '@codemirror/state';
-import { type EditorView } from '@codemirror/view';
-
-import { reconcileAnnotation } from './defs';
-
-export const updateCodeMirror = (view: EditorView, selection: EditorSelection, target: Prop[], patches: Patch[]) => {
-  for (const patch of patches) {
-    const changeSpec = handlePatch(patch, target, view.state);
-    if (changeSpec != null) {
-      const changeSet = ChangeSet.of(changeSpec, view.state.doc.length, '\n');
-      selection = selection.map(changeSet, 1);
-      view.dispatch({
-        changes: changeSet,
-        annotations: reconcileAnnotation.of(false),
-      });
-    }
-  }
-
-  view.dispatch({
-    selection,
-    annotations: reconcileAnnotation.of(false),
-  });
-};
-
-const handlePatch = (patch: Patch, target: Prop[], state: EditorState): ChangeSpec | null => {
-  if (patch.action === 'insert') {
-    return handleInsert(target, patch);
-  } else if (patch.action === 'splice') {
-    return handleSplice(target, patch);
-  } else if (patch.action === 'del') {
-    return handleDel(target, patch);
-  } else if (patch.action === 'put') {
-    return handlePut(target, patch, state);
-  } else {
-    return null;
-  }
-};
-
-const handleInsert = (target: Prop[], patch: InsertPatch): Array<ChangeSpec> => {
-  const index = charPath(target, patch.path);
-  if (index == null) {
-    return [];
-  }
-
-  const text = patch.values.map((value) => (value ? value.toString() : '')).join('');
-  return [{ from: index, to: index, insert: text }];
-};
-
-const handleSplice = (target: Prop[], patch: SpliceTextPatch): Array<ChangeSpec> => {
-  const index = charPath(target, patch.path);
-  if (index == null) {
-    return [];
-  }
-
-  return [{ from: index, insert: patch.value }];
-};
-
-const handleDel = (target: Prop[], patch: DelPatch): Array<ChangeSpec> => {
-  const index = charPath(target, patch.path);
-  if (index == null) {
-    return [];
-  }
-
-  const length = patch.length || 1;
-  return [{ from: index, to: index + length }];
-};
-
-const handlePut = (target: Prop[], patch: PutPatch, state: EditorState): Array<ChangeSpec> => {
-  const index = charPath(target, [...patch.path, 0]);
-  if (index == null) {
-    return [];
-  }
-
-  const length = state.doc.length;
-  if (typeof patch.value !== 'string') {
-    return []; // TODO(dmaretskyi): How to handle non-string values?
-  }
-
-  return [{ from: 0, to: length, insert: patch.value as any }];
-};
-
-// If the path of the patch is of the form [path, <index>] then we know this is a path to a character
-// within the sequence given by path.
-const charPath = (textPath: Prop[], candidatePath: Prop[]): number | null => {
-  if (candidatePath.length !== textPath.length + 1) {
-    return null;
-  }
-
-  for (let i = 0; i < textPath.length; i++) {
-    if (textPath[i] !== candidatePath[i]) {
-      return null;
-    }
-  }
-
-  const index = candidatePath[candidatePath.length - 1];
-  if (typeof index === 'number') {
-    return index;
-  }
-
-  return null;
-};

package/src/extensions/autoscroll.ts

@@ -1,157 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { StateEffect } from '@codemirror/state';
-import { EditorView, ViewPlugin } from '@codemirror/view';
-
-import { Domino } from '@dxos/react-ui';
-
-const lineHeight = 24;
-
-export const scrollToBottomEffect = StateEffect.define<any>();
-
-export type AutoScrollOptions = {
-  overscroll: number;
-  throttle: number;
-};
-
-/**
- * Extension that supports pinning the scroll position and automatically scrolls to the bottom when content is added.
- */
-// TODO(burdon): Reconcile with transcript-extension.
-export const autoScroll = ({ overscroll = 4 * lineHeight, throttle = 2_000 }: Partial<AutoScrollOptions> = {}) => {
-  let isThrottled = false;
-  let isPinned = true;
-  let timeout: NodeJS.Timeout | undefined;
-  let buttonContainer: HTMLDivElement | undefined;
-  let lastScrollTop = 0;
-  let scrollCounter = 0;
-
-  const hideScrollbar = (view: EditorView) => {
-    view.scrollDOM.classList.add('cm-hide-scrollbar');
-    clearTimeout(timeout);
-    timeout = setTimeout(() => {
-      view.scrollDOM.classList.remove('cm-hide-scrollbar');
-    }, 1_000);
-  };
-
-  const scrollToBottom = (view: EditorView) => {
-    isPinned = true;
-    scrollCounter = 0;
-    buttonContainer?.classList.add('opacity-0');
-    requestAnimationFrame(() => {
-      hideScrollbar(view);
-      view.scrollDOM.scrollTo({
-        top: view.scrollDOM.scrollHeight,
-        behavior: 'smooth',
-      });
-    });
-  };
-
-  return [
-    // Update listener for logging when scrolling is needed.
-    EditorView.updateListener.of((update) => {
-      // Listen for effects.
-      update.transactions.forEach((transaction) => {
-        for (const effect of transaction.effects) {
-          if (effect.is(scrollToBottomEffect)) {
-            scrollToBottom(update.view);
-          }
-        }
-      });
-
-      // Maybe scroll if doc changed and pinned.
-      if (update.docChanged && isPinned && !isThrottled) {
-        const distanceFromBottom = calcDistance(update.view.scrollDOM);
-        if (distanceFromBottom >= overscroll) {
-          isThrottled = true;
-          requestAnimationFrame(() => {
-            scrollToBottom(update.view);
-          });
-
-          // Reset throttle.
-          setTimeout(() => {
-            isThrottled = false;
-            scrollToBottom(update.view);
-          }, throttle);
-        }
-      }
-    }),
-
-    // Detect user scroll.
-    // NOTE: Multiple scroll events are triggered during programmatic smooth scrolling.
-    EditorView.domEventHandlers({
-      scroll: (event, view) => {
-        const scroller = view.scrollDOM;
-        // Suspect delta goes positive when rendering widgets, so count positive deltas.
-        // TODO(burdon): Detect user scroll directly (wheel, touch, keys, etc.)
-        if (lastScrollTop > scroller.scrollTop) {
-          scrollCounter++;
-        }
-        lastScrollTop = scroller.scrollTop;
-        const distanceFromBottom = calcDistance(scroller);
-        if (distanceFromBottom === 0) {
-          // Pin to bottom.
-          isPinned = true;
-          buttonContainer?.classList.add('opacity-0');
-          scrollCounter = 0;
-        } else if (scrollCounter > 3) {
-          // Break pin if user scrolls up.
-          isPinned = false;
-          buttonContainer?.classList.remove('opacity-0');
-        }
-      },
-    }),
-
-    // Scroll button.
-    ViewPlugin.fromClass(
-      class {
-        constructor(view: EditorView) {
-          const scroller = view.scrollDOM.parentElement;
-          buttonContainer = Domino.of('div')
-            .classNames(true && 'cm-scroll-button transition-opacity duration-300 opacity-0')
-            .children(
-              Domino.of('button')
-                .classNames('dx-button bg-accentSurface')
-                .data('density', 'fine')
-                .children(Domino.of<any>('dx-icon').attr('icon', 'ph--arrow-down--regular'))
-                .on('click', () => {
-                  scrollToBottom(view);
-                }),
-            )
-            .build();
-          scroller?.appendChild(buttonContainer);
-        }
-      },
-    ),
-
-    // Styles.
-    EditorView.theme({
-      '.cm-scroller': {
-        paddingBottom: `${overscroll}px`,
-        scrollbarWidth: 'thin',
-      },
-      '.cm-scroller.cm-hide-scrollbar': {
-        scrollbarWidth: 'none',
-      },
-      '.cm-scroller.cm-hide-scrollbar::-webkit-scrollbar': {
-        display: 'none',
-      },
-
-      '.cm-scroll-button': {
-        position: 'absolute',
-        bottom: '0.5rem',
-        right: '1rem',
-      },
-    }),
-  ];
-};
-
-const calcDistance = (scroller: HTMLElement) => {
-  const scrollTop = scroller.scrollTop;
-  const scrollHeight = scroller.scrollHeight;
-  const clientHeight = scroller.clientHeight;
-  const distanceFromBottom = scrollHeight - (scrollTop + clientHeight);
-  return distanceFromBottom;
-};

package/src/extensions/awareness/awareness-provider.ts

@@ -1,127 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { DeferredTask, Event, sleep } from '@dxos/async';
-import { Context } from '@dxos/context';
-import { invariant } from '@dxos/invariant';
-import { log } from '@dxos/log';
-import { type Space } from '@dxos/react-client/echo';
-import { type GossipMessage } from '@dxos/react-client/mesh';
-
-import { type AwarenessInfo, type AwarenessPosition, type AwarenessProvider, type AwarenessState } from './awareness';
-
-type ProtocolMessage =
-  | {
-      kind: 'query';
-    }
-  | {
-      kind: 'post';
-      state: AwarenessState;
-    };
-
-const DEBOUNCE_INTERVAL = 100; // ms
-
-export type AwarenessProviderParams = {
-  space: Space;
-  channel: string;
-  peerId: string;
-  info: AwarenessInfo;
-};
-
-/**
- * Receives and broadcasts profile and cursor position.
- */
-export class SpaceAwarenessProvider implements AwarenessProvider {
-  private readonly _remoteStates = new Map<string, AwarenessState>();
-
-  private readonly _space: Space;
-  private readonly _channel: string;
-  private readonly _peerId: string;
-  private readonly _info: AwarenessInfo;
-
-  private _ctx?: Context;
-  private _postTask?: DeferredTask;
-  private _localState?: AwarenessState;
-
-  public readonly remoteStateChange = new Event<void>();
-
-  constructor(params: AwarenessProviderParams) {
-    this._space = params.space;
-    this._channel = params.channel;
-    this._peerId = params.peerId;
-    this._info = params.info;
-  }
-
-  open(): void {
-    this._ctx = new Context();
-    this._postTask = new DeferredTask(this._ctx, async () => {
-      if (this._localState) {
-        await this._space.postMessage(this._channel, {
-          kind: 'post',
-          state: this._localState,
-        } satisfies ProtocolMessage);
-
-        // TODO(burdon): Replace with throttle.
-        // TODO(burdon): Send heads?
-        await sleep(DEBOUNCE_INTERVAL);
-      }
-    });
-
-    this._ctx.onDispose(
-      this._space.listen(this._channel, (message: GossipMessage) => {
-        switch (message.payload.kind) {
-          case 'query': {
-            this._handleQueryMessage();
-            break;
-          }
-          case 'post': {
-            this._handlePostMessage(message.payload);
-            break;
-          }
-        }
-      }),
-    );
-
-    void this._space
-      .postMessage(this._channel, {
-        kind: 'query',
-      } satisfies ProtocolMessage)
-      .catch((err) => {
-        log.debug('failed to query awareness', { err });
-      });
-  }
-
-  close(): void {
-    void this._ctx?.dispose();
-    this._ctx = undefined;
-    this._postTask = undefined;
-  }
-
-  getRemoteStates(): AwarenessState[] {
-    return Array.from(this._remoteStates.values());
-  }
-
-  update(position: AwarenessPosition | undefined): void {
-    invariant(this._postTask);
-    this._localState = {
-      peerId: this._peerId,
-      position,
-      info: this._info,
-    };
-
-    this._postTask.schedule();
-  }
-
-  private _handleQueryMessage(): void {
-    invariant(this._postTask);
-    this._postTask.schedule();
-  }
-
-  private _handlePostMessage(message: ProtocolMessage): void {
-    invariant(message.kind === 'post');
-    // TODO(wittjosiah): Is it helpful or confusing to show cursors for self on other devices?
-    this._remoteStates.set(message.state.peerId, message.state);
-    this.remoteStateChange.emit();
-  }
-}