@dxos/react-ui-editor 0.3.10 → 0.3.11-main.00a28cb

package/src/components/TextEditor/extensions/tasklist.ts

@@ -1,121 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import {
-  EditorView,
-  Decoration,
-  WidgetType,
-  MatchDecorator,
-  ViewPlugin,
-  type DecorationSet,
-  type ViewUpdate,
-} from '@codemirror/view';
-
-// TODO(burdon): Reconcile with theme.
-const styles = EditorView.baseTheme({
-  '& .cm-task-item': {
-    paddingLeft: '4px',
-    paddingRight: '8px',
-  },
-});
-
-class CheckboxWidget extends WidgetType {
-  constructor(
-    private readonly _pos: number,
-    private _checked: boolean,
-    private readonly _indent: number,
-    private readonly _onCheck?: (check: boolean) => void,
-  ) {
-    super();
-  }
-
-  override eq(other: CheckboxWidget) {
-    return this._pos === other._pos && this._checked === other._checked && this._indent === other._indent;
-  }
-
-  toDOM(view: EditorView) {
-    const wrap = document.createElement('span');
-    wrap.className = 'cm-task-item';
-    wrap.setAttribute('aria-hidden', 'true');
-    wrap.style.setProperty('margin-left', this._indent * 24 + 'px');
-
-    const input = wrap.appendChild(document.createElement('input'));
-    input.type = 'checkbox';
-    input.checked = this._checked;
-    if (!this._onCheck) {
-      input.setAttribute('disabled', 'true');
-    }
-    if (this._onCheck) {
-      input.onchange = (event: Event) => {
-        this._onCheck?.((event.target as any).checked);
-        return true;
-      };
-    }
-
-    return wrap;
-  }
-
-  override ignoreEvent() {
-    return false;
-  }
-}
-
-export type TasklistOptions = {};
-
-export const tasklist = (options: TasklistOptions = {}) => {
-  // TODO(burdon): Matcher isn't as precise as syntax tree.
-  //  Allows for indents to be greater than AST would allow.
-  const taskMatcher = new MatchDecorator({
-    regexp: /^(\s*)- \[([ xX])\]\s/g,
-    decoration: (match, view, pos) => {
-      const indent = Math.floor(match[1].length / 2);
-      const checked = match[2] === 'x' || match[2] === 'X';
-      return Decoration.replace({
-        widget: new CheckboxWidget(
-          pos,
-          checked,
-          indent,
-          view.state.readOnly
-            ? undefined
-            : (checked) => {
-                const idx = pos + match[0].indexOf('[') + 1;
-                view.dispatch({
-                  changes: {
-                    from: idx,
-                    to: idx + 1,
-                    insert: checked ? 'x' : ' ',
-                  },
-                  // TODO(burdon): Restore cursor position? More useful to move to end of line (can indent).
-                  selection: {
-                    anchor: idx + 3,
-                  },
-                });
-              },
-        ),
-      });
-    },
-  });
-
-  const tasks = ViewPlugin.fromClass(
-    class {
-      tasks: DecorationSet;
-      constructor(view: EditorView) {
-        this.tasks = taskMatcher.createDeco(view);
-      }
-
-      update(update: ViewUpdate) {
-        this.tasks = taskMatcher.updateDeco(update, this.tasks);
-      }
-    },
-    {
-      decorations: (value) => value.tasks,
-      provide: (plugin) =>
-        EditorView.atomicRanges.of((view) => {
-          return view.plugin(plugin)?.tasks || Decoration.none;
-        }),
-    },
-  );
-
-  return [tasks, styles];
-};

package/src/components/TextEditor/extensions/tooltip.tsx

@@ -1,61 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import { type Extension } from '@codemirror/state';
-import { hoverTooltip } from '@codemirror/view';
-
-import { tooltipContent } from '@dxos/react-ui-theme';
-
-const markdownLinkRegexp = /\[([^\]]+)]\(([^)]+)\)/;
-
-export type TooltipOptions = {
-  onHover: (el: Element, url: string) => void;
-  regexp?: RegExp;
-};
-
-/**
- * https://codemirror.net/examples/tooltip
- * https://codemirror.net/docs/ref/#view.hoverTooltip
- * https://github.com/codemirror/view/blob/main/src/tooltip.ts
- */
-export const tooltip = ({ onHover, regexp = markdownLinkRegexp }: TooltipOptions): Extension =>
-  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(regexp);
-      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');
-        onHover(el, url);
-        return { dom: el, offset: { x: 0, y: 12 } };
-      },
-    };
-  });

package/src/components/TextEditor/themes/default.ts

@@ -1,279 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import get from 'lodash.get';
-import { type StyleSpec } from 'style-mod';
-
-import { tokens } from '../../../styles';
-
-/**
- * Minimal styles.
- * https://codemirror.net/examples/styling
- *
- * Examples:
- * - https://github.com/codemirror/view/blob/main/src/theme.ts
- * - https://github.com/codemirror/theme-one-dark/blob/main/src/one-dark.ts
- *
- * NOTE: Use one of '&', '&light', and '&dark' prefix to scope instance.
- * NOTE: `light` and `dark` selectors are preprocessed by CodeMirror and can only be in the base theme.
- */
-export const defaultTheme: {
-  [selector: string]: StyleSpec;
-} = {
-  //
-  // Main layout:
-  // <div class=".cm-editor .cm-focused">
-  //   <div class=".cm-scroller">
-  //     <div class=".cm-content" role="textbox" contenteditable="true">
-  //       <div class=".cm-line" />
-  //     </div>
-  //   </div>
-  // </div>
-  //
-  '&': {},
-  '&.cm-focused': {
-    outline: 'none',
-  },
-  '& .cm-scroller': {
-    overflow: 'visible',
-    fontFamily: get(tokens, 'fontFamily.mono', []).join(','),
-  },
-  '& .cm-content': {
-    padding: 0,
-    // Base font size (otherwise defined by HTML tag, which might be different for storybook).
-    fontSize: '16px',
-  },
-  '&light .cm-content': {
-    color: get(tokens, 'extend.colors.neutral.900', 'black'),
-    caretColor: 'black',
-  },
-  '&dark .cm-content': {
-    color: get(tokens, 'extend.colors.neutral.100', 'white'),
-    caretColor: 'white',
-  },
-
-  //
-  // Cursor
-  //
-  '&light .cm-cursor, &light .cm-dropCursor': {
-    borderLeft: '2px solid black',
-  },
-  '&dark .cm-cursor, &dark .cm-dropCursor': {
-    borderLeft: '2px solid white',
-  },
-  '& .cm-placeholder': {
-    fontWeight: 100,
-  },
-
-  //
-  // line
-  //
-  '& .cm-line': {
-    paddingInline: 0,
-  },
-  '& .cm-line *': {},
-  '& .cm-activeLine': {
-    backgroundColor: 'transparent',
-  },
-
-  //
-  // selection
-  //
-
-  '&light .cm-selectionBackground, &light.cm-focused .cm-selectionBackground': {
-    background: get(tokens, 'extend.colors.primary.150', '#00ffff'),
-  },
-  '&dark .cm-selectionBackground, &dark.cm-focused .cm-selectionBackground': {
-    background: get(tokens, 'extend.colors.primary.850', '#00ffff'),
-  },
-  '&light .cm-selectionMatch': {
-    background: get(tokens, 'extend.colors.primary.250', '#00ffff') + '44',
-  },
-  '&dark .cm-selectionMatch': {
-    background: get(tokens, 'extend.colors.primary.600', '#00ffff') + '44',
-  },
-
-  //
-  // collaboration
-  // TODO(burdon): Review classnames (YJS dependent?)
-  //
-
-  '&light .cm-ySelection, &light .cm-yLineSelection': {
-    mixBlendMode: 'multiply',
-  },
-  '&dark .cm-ySelection, &dark .cm-yLineSelection': {
-    mixBlendMode: 'screen',
-  },
-
-  '& .cm-ySelectionInfo': {
-    padding: '2px 4px',
-    marginBlockStart: '-4px',
-  },
-  '& .cm-ySelection, & .cm-selectionMatch': {
-    paddingBlockStart: '.15em',
-    paddingBlockEnd: '.15em',
-  },
-  '& .cm-ySelectionCaret': {
-    display: 'inline-block',
-    insetBlockStart: '.1em',
-    blockSize: '1.4em',
-    verticalAlign: 'top',
-  },
-  '& .cm-yLineSelection': {
-    margin: 0,
-  },
-
-  //
-  // link
-  //
-  '& .cm-link': {
-    color: get(tokens, 'extend.colors.primary.500'),
-    textDecorationLine: 'underline',
-    textDecorationThickness: '1px',
-    textUnderlineOffset: '2px',
-    borderRadius: '.125rem',
-    fontFamily: get(tokens, 'fontFamily.body', []).join(','),
-  },
-
-  //
-  // tooltip
-  //
-  '& .cm-tooltip': {
-    border: 'none',
-  },
-  '& .cm-tooltip-below': {},
-
-  //
-  // autocomplete
-  //
-  '& .cm-tooltip-autocomplete': {
-    marginTop: '4px',
-    marginLeft: '-3px',
-  },
-  '& .cm-tooltip-autocomplete ul li': {},
-  '& .cm-tooltip-autocomplete ul li[aria-selected]': {},
-  '& .cm-completionIcon': {
-    display: 'none',
-  },
-  '& .cm-completionLabel': {
-    fontFamily: get(tokens, 'fontFamily.body', []).join(','),
-  },
-  '& .cm-completionMatchedText': {
-    textDecoration: 'none',
-  },
-
-  //
-  // widgets
-  //
-  '& .cm-widgetBuffer': {
-    display: 'none',
-    height: 0,
-  },
-
-  //
-  // table
-  //
-  '& .cm-table *': {
-    fontFamily: `${get(tokens, 'fontFamily.mono', []).join(',')} !important`,
-    textDecoration: 'none !important',
-  },
-  '& .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': {
-    padding: '2px 16px 2px 0px',
-  },
-
-  //
-  // image
-  //
-  '& .cm-image': {
-    margin: '0.5rem 0',
-  },
-
-  //
-  // font size
-  // TODO(thure): This appears to be the best or only way to set selection caret heights, but it's far more verbose than it needs to be.
-  //
-  ...Object.keys(get(tokens, 'extend.fontSize', {})).reduce((acc: Record<string, any>, fontSize) => {
-    const height = get(tokens, ['extend', 'fontSize', fontSize, 1, 'lineHeight']);
-
-    acc[`& .text-${fontSize} + .cm-ySelectionCaret`] = { height };
-    acc[`& .text-${fontSize} + .cm-ySelection + .cm-ySelectionCaret`] = { height };
-    acc[`& .text-${fontSize} + .cm-widgetBuffer + .cm-ySelectionCaret`] = { height };
-    return acc;
-  }, {}),
-
-  /**
-   * Panels
-   * https://github.com/codemirror/search/blob/main/src/search.ts#L745
-   *
-   * Find/replace panel.
-   * <div class="cm-announced">...</div>
-   * <div class="cm-scroller">...</div>
-   * <div class="cm-panels cm-panels-bottom">
-   *   <div class="cm-search cm-panel">
-   *     <input class="cm-textfield" />
-   *     <button class="cm-button">...</button>
-   *     <label><input type="checkbox" />...</label>
-   *   </div>
-   * </div
-   */
-  '& .cm-panels': {
-    border: `1px solid ${get(tokens, 'extend.colors.neutral.200')}`,
-    borderBottom: 'none',
-  },
-  '& .cm-panel': {
-    background: get(tokens, 'extend.colors.neutral.50'),
-    fontFamily: get(tokens, 'fontFamily.body', []).join(','),
-  },
-  '& .cm-button': {
-    margin: '4px',
-    fontFamily: get(tokens, 'fontFamily.body', []).join(','),
-    background: get(tokens, 'extend.colors.neutral.100'),
-    border: 'none',
-  },
-
-  '& .cm-searchMatch': {
-    backgroundColor: get(tokens, 'extend.colors.yellow.100'),
-  },
-  '& .cm-searchMatch.cm-searchMatch-selected': {
-    backgroundColor: get(tokens, 'extend.colors.primary.100'),
-  },
-};
-
-export const textTheme: {
-  [selector: string]: StyleSpec;
-} = {
-  '& .cm-scroller': {
-    fontFamily: get(tokens, 'fontFamily.body', []).join(','),
-  },
-  '& .cm-placeholder': {
-    fontFamily: get(tokens, 'fontFamily.body', []).join(','),
-  },
-};
-
-export const markdownTheme: {
-  [selector: string]: StyleSpec;
-} = {
-  // NOTE: Must leave base font family as is (i.e., monospace) due to fenced code blocks.
-  '& .cm-placeholder': {
-    fontFamily: get(tokens, 'fontFamily.body', []).join(','),
-  },
-};
-
-export const codeTheme: {
-  [selector: string]: StyleSpec;
-} = {
-  '& .cm-scroller': {
-    fontFamily: get(tokens, 'fontFamily.mono', []).join(','),
-  },
-  '& .cm-placeholder': {
-    fontFamily: get(tokens, 'fontFamily.mono', []).join(','),
-  },
-};

package/src/hooks/automerge/handle.ts

@@ -1,14 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import type * as A from '@dxos/automerge/automerge';
-
-export type IDocHandle<T = any> = {
-  docSync(): A.Doc<T> | undefined;
-  change(callback: A.ChangeFn<T>, options?: A.ChangeOptions<T>): void;
-  changeAt(heads: A.Heads, callback: A.ChangeFn<T>, options?: A.ChangeOptions<T>): string[] | undefined;
-
-  addListener(event: 'change', listener: () => void): void;
-  removeListener(event: 'change', listener: () => void): void;
-};

package/src/hooks/automerge/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export { type IDocHandle } from './handle';
-export { automergePlugin, type AutomergePlugin } from './plugin';

package/src/hooks/automerge/plugin.ts

@@ -1,134 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import {
-  Annotation,
-  type EditorState,
-  type Extension,
-  Facet,
-  StateEffect,
-  StateField,
-  type Transaction,
-  type TransactionSpec,
-} from '@codemirror/state';
-import { ViewPlugin, type EditorView, type PluginValue, type ViewUpdate } from '@codemirror/view';
-
-import * as automerge from '@dxos/automerge/automerge';
-import { type Heads, type Prop } from '@dxos/automerge/automerge';
-
-import { PatchSemaphore } from './PatchSemaphore';
-import { type IDocHandle } from './handle';
-
-export type Value = {
-  lastHeads: Heads;
-  path: Prop[];
-  unreconciledTransactions: Transaction[];
-};
-
-type UpdateHeads = {
-  newHeads: Heads;
-};
-
-export const effectType = StateEffect.define<UpdateHeads>({});
-
-export const updateHeads = (newHeads: Heads): StateEffect<UpdateHeads> => effectType.of({ newHeads });
-
-export const getLastHeads = (state: EditorState, field: Field): Heads => state.field(field).lastHeads;
-
-export const getPath = (state: EditorState, field: Field): Prop[] => state.field(field).path;
-
-export type Field = StateField<Value>;
-
-const semaphoreFacet = Facet.define<PatchSemaphore, PatchSemaphore>({
-  combine: (values) => values.at(-1)!, // Take last.
-});
-
-export type AutomergePlugin = {
-  extension: Extension;
-};
-
-export const automergePlugin = (handle: IDocHandle, path: Prop[]): AutomergePlugin => {
-  const stateField: StateField<Value> = StateField.define({
-    create: () => ({
-      lastHeads: automerge.getHeads(handle.docSync()!),
-      unreconciledTransactions: [],
-      path: path.slice(),
-    }),
-    update: (value: Value, tr: Transaction) => {
-      const result: Value = {
-        lastHeads: value.lastHeads,
-        unreconciledTransactions: value.unreconciledTransactions.slice(),
-        path: path.slice(),
-      };
-      let clearUnreconciled = false;
-      for (const effect of tr.effects) {
-        if (effect.is(effectType)) {
-          result.lastHeads = effect.value.newHeads;
-          clearUnreconciled = true;
-        }
-      }
-      if (clearUnreconciled) {
-        result.unreconciledTransactions = [];
-      } else {
-        if (!isReconcileTx(tr)) {
-          result.unreconciledTransactions.push(tr);
-        }
-      }
-      return result;
-    },
-  });
-
-  const semaphore = new PatchSemaphore(stateField);
-
-  const viewPlugin = ViewPlugin.fromClass(
-    class AutomergeCodemirrorViewPlugin implements PluginValue {
-      private _view: EditorView;
-
-      constructor(view: EditorView) {
-        this._view = view;
-        handle.addListener('change', this._handleChange);
-      }
-
-      update(update: ViewUpdate) {
-        if (update.transactions.length > 0 && update.transactions.some((t) => !isReconcileTx(t))) {
-          queueMicrotask(() => {
-            this._view.state.facet(semaphoreFacet).reconcile(handle, this._view);
-          });
-        }
-      }
-
-      destroy() {
-        handle.addListener('change', this._handleChange);
-      }
-
-      private _handleChange = () => {
-        this._view.state.facet(semaphoreFacet).reconcile(handle, this._view);
-      };
-    },
-  );
-
-  return {
-    extension: [stateField, semaphoreFacet.of(semaphore), viewPlugin],
-  };
-};
-
-export const reconcileAnnotationType = Annotation.define<unknown>();
-
-export const isReconcileTx = (tr: Transaction): boolean => !!tr.annotation(reconcileAnnotationType);
-
-export const makeReconcile = (tr: TransactionSpec) => {
-  if (tr.annotations != null) {
-    if (tr.annotations instanceof Array) {
-      tr.annotations = [...tr.annotations, reconcileAnnotationType.of({})];
-    } else {
-      tr.annotations = [tr.annotations, reconcileAnnotationType.of({})];
-    }
-  } else {
-    tr.annotations = [reconcileAnnotationType.of({})];
-  }
-  // return {
-  // ...tr,
-  // annotations: reconcileAnnotationType.of({})
-  // }
-};

package/src/hooks/automerge/translation/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export * from './automerge-to-codemirror';
-export * from './codemirror-to-automerge';

package/src/hooks/yjs/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export * from './cursors';
-export * from './space-provider';