@dxos/react-ui-editor 0.3.10-main.cbe7692 → 0.3.10-main.cc91b2d

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

@@ -25,61 +25,57 @@ export const table = (options: TableOptions = {}) => {
 
 type Table = {
   from: number;
-  to?: number;
+  to: number;
   header?: string[];
   rows?: string[][];
 };
 
 const update = (state: EditorState, options: TableOptions) => {
   const builder = new RangeSetBuilder();
-  if (state.readOnly) {
-    const tables: Table[] = [];
-    const getTable = () => tables[tables.length - 1];
-    const getRow = () => {
-      const table = getTable();
-      return table.rows?.[table.rows.length - 1];
-    };
-
-    // Parse table.
-    // TODO(burdon): Use remark?: https://www.npmjs.com/package/remark-gfm
-    syntaxTree(state).iterate({
-      enter: (node) => {
-        // console.log(node.name);
-        // Check if cursor is inside text.
-        switch (node.name) {
-          case 'Table': {
-            tables.push({ from: node.from });
-            break;
-          }
-          case 'TableHeader': {
-            getTable().header = [];
-            break;
-          }
-          case 'TableRow': {
-            (getTable().rows ??= []).push([]);
-            break;
-          }
-          case 'TableCell': {
-            const row = getRow();
-            if (row) {
-              row.push(state.sliceDoc(node.from, node.to));
-            } else {
-              getTable().header?.push(state.sliceDoc(node.from, node.to));
-            }
-            break;
-          }
-          case 'TableDelimiter': {
-            getTable().to = node.to;
-            break;
+  const cursor = state.selection.main.head;
+
+  const tables: Table[] = [];
+  const getTable = () => tables[tables.length - 1];
+  const getRow = () => {
+    const table = getTable();
+    return table.rows?.[table.rows.length - 1];
+  };
+
+  // Parse table.
+  syntaxTree(state).iterate({
+    enter: (node) => {
+      // Check if cursor is inside text.
+      switch (node.name) {
+        case 'Table': {
+          tables.push({ from: node.from, to: node.to });
+          break;
+        }
+        case 'TableHeader': {
+          getTable().header = [];
+          break;
+        }
+        case 'TableRow': {
+          (getTable().rows ??= []).push([]);
+          break;
+        }
+        case 'TableCell': {
+          const row = getRow();
+          if (row) {
+            row.push(state.sliceDoc(node.from, node.to));
+          } else {
+            getTable().header?.push(state.sliceDoc(node.from, node.to));
           }
+          break;
         }
-      },
-    });
+      }
+    },
+  });
 
-    tables.forEach((table) =>
-      builder.add(table.from, table.to!, Decoration.replace({ widget: new TableWidget(table) })),
-    );
-  }
+  tables.forEach((table) => {
+    const hide = state.readOnly || cursor < table.from || cursor > table.to;
+    hide && builder.add(table.from, table.to, Decoration.replace({ widget: new TableWidget(table) }));
+    builder.add(table.from, table.to, Decoration.mark({ class: 'cm-table' }));
+  });
 
   return builder.finish();
 };
@@ -98,11 +94,11 @@ class TableWidget extends WidgetType {
 
     {
       const header = table.appendChild(document.createElement('thead'));
-      const row = header.appendChild(document.createElement('tr'));
+      const tr = header.appendChild(document.createElement('tr'));
       this._table.header?.forEach((cell) => {
         const th = document.createElement('th');
         th.setAttribute('class', 'cm-table-head');
-        row.appendChild(th).textContent = cell;
+        tr.appendChild(th).textContent = cell;
       });
     }
 

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

@@ -12,6 +12,14 @@ import {
   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,
@@ -53,14 +61,6 @@ class CheckboxWidget extends WidgetType {
   }
 }
 
-// TODO(burdon): Reconcile with theme.
-const styles = EditorView.baseTheme({
-  '& .cm-task-item': {
-    paddingLeft: '4px',
-    paddingRight: '8px',
-  },
-});
-
 export type TasklistOptions = {};
 
 export const tasklist = (options: TasklistOptions = {}) => {
@@ -109,7 +109,7 @@ export const tasklist = (options: TasklistOptions = {}) => {
       }
     },
     {
-      decorations: (instance) => instance.tasks,
+      decorations: (value) => value.tasks,
       provide: (plugin) =>
         EditorView.atomicRanges.of((view) => {
           return view.plugin(plugin)?.tasks || Decoration.none;

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

@@ -55,10 +55,10 @@ export const defaultTheme: {
   //
   // Cursor
   //
-  '&light .cm-cursor': {
+  '&light .cm-cursor, &light .cm-dropCursor': {
     borderLeft: '2px solid black',
   },
-  '&dark .cm-cursor': {
+  '&dark .cm-cursor, &dark .cm-dropCursor': {
     borderLeft: '2px solid white',
   },
   '& .cm-placeholder': {
@@ -173,6 +173,10 @@ export const defaultTheme: {
   //
   // 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')}`,
@@ -203,6 +207,43 @@ export const defaultTheme: {
     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: {

package/src/hooks/automerge/automerge.stories.tsx

@@ -9,6 +9,7 @@ import { basicSetup } from 'codemirror';
 import get from 'lodash.get';
 import React, { useEffect, useRef, useState } from 'react';
 
+// TODO(burdon): Why separate imports?
 import { type Prop } from '@dxos/automerge/automerge';
 import { type DocHandle, Repo } from '@dxos/automerge/automerge-repo';
 

package/src/hooks/useTextModel.ts

@@ -26,12 +26,19 @@ import { SpaceAwarenessProvider } from './yjs';
 // TODO(burdon): Move.
 type Awareness = awarenessProtocol.Awareness;
 
+export type DocumentRange = {
+  id: string;
+  from: number;
+  to: number;
+};
+
 // TODO(wittjosiah): Factor out to common package? @dxos/react-client?
 export type EditorModel = {
   id: string;
   // TODO(burdon): Remove.
   content: string | YText | YXmlFragment | DocAccessor;
   text: () => string;
+  ranges: DocumentRange[];
   extension?: Extension;
   awareness?: Awareness;
   peer?: {
@@ -80,6 +87,7 @@ const createYjsModel = ({ identity, space, text }: UseTextModelOptions): EditorM
     id: text.doc.guid,
     content: text.content,
     text: () => text.content!.toString(),
+    ranges: [],
     extension: yCollab(text.content as YText, provider?.awareness),
     awareness: provider?.awareness,
     peer: identity
@@ -99,6 +107,7 @@ const createAutomergeModel = ({ identity, text }: UseTextModelOptions): EditorMo
     id: obj.id,
     content: doc,
     text: () => get(doc.handle.docSync(), doc.path),
+    ranges: [],
     extension: automergePlugin(doc.handle, doc.path),
     peer: identity
       ? {

package/src/hooks/yjs/yjs.stories.tsx

@@ -16,6 +16,7 @@ import { MarkdownEditor } from '../../components';
 import { Replicator, useYjsModel } from '../../testing';
 
 export default {
+  title: 'react-ui-editor/YJS',
   component: MarkdownEditor,
   decorators: [withTheme],
 };
@@ -50,7 +51,6 @@ const Story = () => {
 };
 
 export const Default = {
-  title: 'react-ui-editor/YJS',
   // TODO(wittjosiah): Decorator for doing this without clients being initialized?
   render: () => <ClientRepeater count={2} Component={Story} />,
 };

package/src/styles/markdown.ts

@@ -6,12 +6,13 @@ import { mx } from '@dxos/react-ui-theme';
 
 export type HeadingLevel = 1 | 2 | 3 | 4 | 5 | 6;
 
+// TODO(burdon): Better way to align vertically than negative margin? Font-specific?
 // https://tailwindcss.com/docs/font-weight
 export const headings: Record<HeadingLevel, string[]> = {
-  1: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-4xl', '-ml-1.5'],
-  2: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-3xl', '-ml-1.5'],
-  3: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-2xl', '-ml-1.5'],
-  4: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-xl', '-ml-[5px]'],
+  1: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-4xl', '-ml-[10px]'],
+  2: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-3xl', '-ml-[8px]'],
+  3: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-2xl', '-ml-[7px]'],
+  4: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-xl', '-ml-[6px]'],
   5: ['mbs-4 mbe-2 font-medium text-inherit no-underline text-lg', '-ml-[5px]'],
   6: ['mbs-4 mbe-2 font-medium text-inherit no-underline', '-ml-[4px]'],
 };

package/src/testing/replicator.ts

@@ -169,6 +169,7 @@ export class Replicator {
       id: doc.guid,
       text: () => content.toString(),
       content,
+      ranges: [],
       awareness: provider.awareness,
       peer: { id },
     };