@dxos/react-ui-editor 0.6.13-main.ed424a1 → 0.6.13-staging.1e988a3

package/src/hooks/useTextEditor.ts

@@ -19,12 +19,10 @@ import {
 import { log } from '@dxos/log';
 import { getProviderValue, isNotFalsy, type MaybeProvider } from '@dxos/util';
 
-import { editorInputMode } from '../extensions';
-import { type EditorSelection, documentId, createEditorStateTransaction } from '../state';
-import { debugDispatcher } from '../util';
+import { createEditorStateTransaction, documentId, editorInputMode, type EditorSelection } from '../extensions';
+import { logChanges } from '../util';
 
 export type UseTextEditor = {
-  // TODO(burdon): Rename.
   parentRef: RefObject<HTMLDivElement>;
   view?: EditorView;
   focusAttributes: ReturnType<typeof useFocusableGroup> & {
@@ -67,6 +65,8 @@ export const useTextEditor = (
 
   // NOTE: Increments by 2 in strict mode.
   const [instanceId] = useState(() => `text-editor-${++instanceCount}`);
+  // Callback once view is created.
+  const onUpdate = useRef<() => void>();
   const [view, setView] = useState<EditorView>();
   const parentRef = useRef<HTMLDivElement>(null);
 
@@ -87,45 +87,44 @@ export const useTextEditor = (
       }
 
       // https://codemirror.net/docs/ref/#state.EditorStateConfig
+      // NOTE: Don't set selection here in case it is invalid (and crashes the state); dispatch below.
       const state = EditorState.create({
         doc: initialValue,
-        // selection: initialSelection,
+        selection: initialSelection,
         extensions: [
           id && documentId.of(id),
-          extensions,
-          // NOTE: This doesn't catch errors in keymap functions.
+          // NOTE: Doesn't catch errors in keymap functions.
           EditorView.exceptionSink.of((err) => {
             log.catch(err);
           }),
-          // TODO(burdon): Factor out debug inspector.
-          // ViewPlugin.fromClass(
-          //   class {
-          //     constructor(_view: EditorView) {
-          //       log('construct', { id });
-          //     }
-          //
-          //     destroy() {
-          //       log('destroy', { id });
-          //     }
-          //   },
-          // ),
+          extensions,
+          EditorView.updateListener.of(() => {
+            setTimeout(() => {
+              onUpdate.current?.();
+            });
+          }),
         ].filter(isNotFalsy),
       });
 
       // https://codemirror.net/docs/ref/#view.EditorViewConfig
       view = new EditorView({
         parent: parentRef.current,
+        selection: initialSelection,
         state,
-        scrollTo: scrollTo ? EditorView.scrollIntoView(scrollTo, { yMargin: 96 }) : undefined, // TODO(burdon): Const.
-        dispatchTransactions: debug ? debugDispatcher : undefined,
+        // NOTE: Uncomment to debug/monitor all transactions.
+        // https://codemirror.net/docs/ref/#view.EditorView.dispatch
+        dispatchTransactions: (trs, view) => {
+          if (debug) {
+            logChanges(trs);
+          }
+          view.update(trs);
+        },
       });
 
-      // Move to end of line after document loaded (unless selection is specified).
-      if (moveToEndOfLine && !initialSelection) {
+      // Move to end of line after document loaded.
+      if (!initialValue && moveToEndOfLine) {
         const { to } = view.state.doc.lineAt(0);
-        if (to) {
-          view.dispatch({ selection: { anchor: to } });
-        }
+        view.dispatch({ selection: { anchor: to } });
       }
 
       setView(view);
@@ -139,21 +138,18 @@ export const useTextEditor = (
 
   useEffect(() => {
     if (view) {
+      // NOTE: Set selection after first update (since content may rerender on focus).
+      onUpdate.current = () => {
+        onUpdate.current = undefined;
+        view.dispatch(createEditorStateTransaction({ scrollTo, selection }));
+      };
+
       // Remove tabster attribute (rely on custom keymap).
       if (view.state.facet(editorInputMode).noTabster) {
         parentRef.current?.removeAttribute('data-tabster');
       }
-
-      if (scrollTo || selection) {
-        if (selection && selection.anchor > view.state.doc.length) {
-          log.warn('invalid selection', { length: view.state.doc.length, scrollTo, selection });
-          return;
-        }
-
-        view.dispatch(createEditorStateTransaction(view.state, { scrollTo, selection }));
-      }
     }
-  }, [view, scrollTo, selection]);
+  }, [view, selection, scrollTo]);
 
   useEffect(() => {
     if (view && autoFocus) {

package/src/index.ts

@@ -14,7 +14,6 @@ export * from './components';
 export * from './defaults';
 export * from './extensions';
 export * from './hooks';
-export * from './state';
 export * from './util';
 
 export { translations };

package/src/styles/markdown.ts

@@ -17,9 +17,11 @@ const headings: Record<HeadingLevel, string> = {
 };
 
 export const theme = {
+  mark: 'opacity-50',
   code: 'font-mono !no-underline text-neutral-700 dark:text-neutral-300',
   codeMark: 'font-mono text-primary-500',
-  mark: 'opacity-50',
+  // TODO(burdon): Replace with widget.
+  blockquote: 'pl-1 mr-1 border-is-4 border-orange-500 dark:border-orange-500 dark:text-neutral-500',
   heading: (level: HeadingLevel) => {
     return mx(headings[level], 'dark:text-primary-400');
   },

package/src/styles/theme.ts

@@ -71,11 +71,9 @@ export const defaultTheme: ThemeStyles = {
   /**
    * Gutters
    * NOTE: Gutters should have the same top margin as the content.
-   * NOTE: They can't be transparent since the content needs to scroll below.
    */
   '.cm-gutters': {
     background: 'var(--surface-bg)',
-    borderRight: 'none',
   },
   '.cm-gutter': {},
   '.cm-gutter.cm-lineNumbers .cm-gutterElement': {
@@ -97,7 +95,7 @@ export const defaultTheme: ThemeStyles = {
     paddingInline: 0,
   },
   '.cm-activeLine': {
-    background: 'var(--dx-cmActiveLine)',
+    background: 'var(--dx-hoverSurface)',
   },
 
   /**

package/src/util.ts

@@ -3,7 +3,6 @@
 //
 
 import type { Transaction } from '@codemirror/state';
-import { type EditorView } from '@codemirror/view';
 
 import { log } from '@dxos/log';
 
@@ -20,15 +19,6 @@ export const callbackWrapper = <T extends Function>(fn: T): T =>
     }
   }) as unknown as T;
 
-/**
- * Log all changes before dispatching them to the view.
- * https://codemirror.net/docs/ref/#view.EditorView.dispatch
- */
-export const debugDispatcher = (trs: readonly Transaction[], view: EditorView) => {
-  logChanges(trs);
-  view.update(trs);
-};
-
 export const logChanges = (trs: readonly Transaction[]) => {
   const changes = trs
     .flatMap((tr) => {

package/dist/lib/browser/chunk-CIQSMP7K.mjs

@@ -1,148 +0,0 @@
-// packages/ui/react-ui-editor/src/state/util.ts
-import { Facet } from "@codemirror/state";
-var singleValueFacet = (defaultValue) => Facet.define({
-  // Called immediately.
-  combine: (providers) => {
-    return providers[0] ?? defaultValue;
-  }
-});
-
-// packages/ui/react-ui-editor/src/state/cursor.ts
-var defaultCursorConverter = {
-  toCursor: (position) => position.toString(),
-  fromCursor: (cursor) => parseInt(cursor)
-};
-var Cursor = class _Cursor {
-  static {
-    this.converter = singleValueFacet(defaultCursorConverter);
-  }
-  static {
-    this.getCursorFromRange = (state2, range) => {
-      const cursorConverter = state2.facet(_Cursor.converter);
-      const from = cursorConverter.toCursor(range.from);
-      const to = cursorConverter.toCursor(range.to, -1);
-      return [
-        from,
-        to
-      ].join(":");
-    };
-  }
-  static {
-    this.getRangeFromCursor = (state2, cursor) => {
-      const cursorConverter = state2.facet(_Cursor.converter);
-      const parts = cursor.split(":");
-      const from = cursorConverter.fromCursor(parts[0]);
-      const to = cursorConverter.fromCursor(parts[1]);
-      return from !== void 0 && to !== void 0 ? {
-        from,
-        to
-      } : void 0;
-    };
-  }
-};
-
-// packages/ui/react-ui-editor/src/state/doc.ts
-var documentId = singleValueFacet();
-
-// packages/ui/react-ui-editor/src/state/state.ts
-import { Transaction } from "@codemirror/state";
-import { EditorView, keymap } from "@codemirror/view";
-import { debounce } from "@dxos/async";
-import { invariant } from "@dxos/invariant";
-import { isNotFalsy } from "@dxos/util";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/state/state.ts";
-var stateRestoreAnnotation = "dxos.org/cm/state-restore";
-var keyPrefix = "dxos.org/react-ui-editor/state";
-var localStorageStateStoreAdapter = {
-  getState: (id) => {
-    invariant(id, void 0, {
-      F: __dxlog_file,
-      L: 34,
-      S: void 0,
-      A: [
-        "id",
-        ""
-      ]
-    });
-    const state2 = localStorage.getItem(`${keyPrefix}/${id}`);
-    return state2 ? JSON.parse(state2) : void 0;
-  },
-  setState: (id, state2) => {
-    invariant(id, void 0, {
-      F: __dxlog_file,
-      L: 40,
-      S: void 0,
-      A: [
-        "id",
-        ""
-      ]
-    });
-    localStorage.setItem(`${keyPrefix}/${id}`, JSON.stringify(state2));
-  }
-};
-var createEditorStateTransaction = (state2, { scrollTo, selection }) => {
-  return {
-    selection,
-    scrollIntoView: !scrollTo,
-    effects: scrollTo ? EditorView.scrollIntoView(scrollTo, {
-      yMargin: 96
-    }) : void 0,
-    annotations: Transaction.userEvent.of(stateRestoreAnnotation)
-  };
-};
-var state = ({ getState, setState } = {}) => {
-  const setStateDebounced = debounce(setState, 1e3);
-  return [
-    // TODO(burdon): Track scrolling (currently only updates when cursor moves).
-    // EditorView.domEventHandlers({
-    //   scroll: (event) => {
-    //     setStateDebounced(id, {});
-    //   },
-    // }),
-    EditorView.updateListener.of(({ view, transactions }) => {
-      const id = view.state.facet(documentId);
-      if (!id || transactions.some((tr) => tr.isUserEvent(stateRestoreAnnotation))) {
-        return;
-      }
-      if (setState) {
-        const { scrollTop } = view.scrollDOM;
-        const pos = view.posAtCoords({
-          x: 0,
-          y: scrollTop
-        });
-        if (pos !== null) {
-          const { anchor, head } = view.state.selection.main;
-          setStateDebounced(id, {
-            scrollTo: pos,
-            selection: {
-              anchor,
-              head
-            }
-          });
-        }
-      }
-    }),
-    getState && keymap.of([
-      {
-        key: "ctrl-r",
-        run: (view) => {
-          const state2 = getState(view.state.facet(documentId));
-          if (state2) {
-            view.dispatch(createEditorStateTransaction(view.state, state2));
-          }
-          return true;
-        }
-      }
-    ])
-  ].filter(isNotFalsy);
-};
-
-export {
-  singleValueFacet,
-  Cursor,
-  documentId,
-  localStorageStateStoreAdapter,
-  createEditorStateTransaction,
-  state
-};
-//# sourceMappingURL=chunk-CIQSMP7K.mjs.map

package/dist/lib/browser/chunk-CIQSMP7K.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/state/util.ts", "../../../src/state/cursor.ts", "../../../src/state/doc.ts", "../../../src/state/state.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { Facet } from '@codemirror/state';\n\nexport const singleValueFacet = <I, O = I>(defaultValue?: O) =>\n  Facet.define<I, O>({\n    // Called immediately.\n    combine: (providers) => {\n      return (providers[0] ?? defaultValue) as O;\n    },\n  });\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type EditorState } from '@codemirror/state';\n\nimport { type Range } from './types';\nimport { singleValueFacet } from './util';\n\n/**\n * Converts indexes into the text document into stable peer-independent cursors.\n *\n * See:\n *  - https://automerge.org/automerge/api-docs/js/functions/next.getCursor.html\n *  - https://github.com/yjs/yjs?tab=readme-ov-file#relative-positions\n *\n * @param {assoc} number Negative values will associate the cursor with the previous character\n *  while positive - with the next one.\n */\nexport interface CursorConverter {\n  toCursor(position: number, assoc?: -1 | 1 | undefined): string;\n  fromCursor(cursor: string): number;\n}\n\nconst defaultCursorConverter: CursorConverter = {\n  toCursor: (position) => position.toString(),\n  fromCursor: (cursor) => parseInt(cursor),\n};\n\nexport class Cursor {\n  static readonly converter = singleValueFacet(defaultCursorConverter);\n\n  static readonly getCursorFromRange = (state: EditorState, range: Range) => {\n    const cursorConverter = state.facet(Cursor.converter);\n\n    const from = cursorConverter.toCursor(range.from);\n    const to = cursorConverter.toCursor(range.to, -1);\n    return [from, to].join(':');\n  };\n\n  static readonly getRangeFromCursor = (state: EditorState, cursor: string) => {\n    const cursorConverter = state.facet(Cursor.converter);\n\n    const parts = cursor.split(':');\n    const from = cursorConverter.fromCursor(parts[0]);\n    const to = cursorConverter.fromCursor(parts[1]);\n    return from !== undefined && to !== undefined ? { from, to } : undefined;\n  };\n}\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { singleValueFacet } from './util';\n\n/**\n * Currently edited document id as FQ string.\n */\nexport const documentId = singleValueFacet<string>();\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type EditorState, type Extension, Transaction, type TransactionSpec } from '@codemirror/state';\nimport { EditorView, keymap } from '@codemirror/view';\n\nimport { debounce } from '@dxos/async';\nimport { invariant } from '@dxos/invariant';\nimport { isNotFalsy } from '@dxos/util';\n\nimport { documentId } from './doc';\n\nconst stateRestoreAnnotation = 'dxos.org/cm/state-restore';\n\nexport type EditorSelection = {\n  anchor: number;\n  head?: number;\n};\n\nexport type EditorSelectionState = {\n  scrollTo?: number;\n  selection?: EditorSelection;\n};\n\nexport type EditorStateOptions = {\n  setState: (id: string, state: EditorSelectionState) => void;\n  getState: (id: string) => EditorSelectionState | undefined;\n};\n\nconst keyPrefix = 'dxos.org/react-ui-editor/state';\nexport const localStorageStateStoreAdapter: EditorStateOptions = {\n  getState: (id) => {\n    invariant(id);\n    const state = localStorage.getItem(`${keyPrefix}/${id}`);\n    return state ? JSON.parse(state) : undefined;\n  },\n\n  setState: (id, state) => {\n    invariant(id);\n    localStorage.setItem(`${keyPrefix}/${id}`, JSON.stringify(state));\n  },\n};\n\nexport const createEditorStateTransaction = (\n  state: EditorState,\n  { scrollTo, selection }: EditorSelectionState,\n): TransactionSpec => {\n  return {\n    selection,\n    scrollIntoView: !scrollTo,\n    effects: scrollTo ? EditorView.scrollIntoView(scrollTo, { yMargin: 96 }) : undefined,\n    annotations: Transaction.userEvent.of(stateRestoreAnnotation),\n  };\n};\n\n/**\n * Track scrolling and selection state to be restored when switching to document.\n */\n// TODO(burdon): Rename.\nexport const state = ({ getState, setState }: Partial<EditorStateOptions> = {}): Extension => {\n  const setStateDebounced = debounce(setState!, 1_000);\n\n  return [\n    // TODO(burdon): Track scrolling (currently only updates when cursor moves).\n    // EditorView.domEventHandlers({\n    //   scroll: (event) => {\n    //     setStateDebounced(id, {});\n    //   },\n    // }),\n    EditorView.updateListener.of(({ view, transactions }) => {\n      const id = view.state.facet(documentId);\n      if (!id || transactions.some((tr) => tr.isUserEvent(stateRestoreAnnotation))) {\n        return;\n      }\n\n      if (setState) {\n        const { scrollTop } = view.scrollDOM;\n        const pos = view.posAtCoords({ x: 0, y: scrollTop });\n        if (pos !== null) {\n          const { anchor, head } = view.state.selection.main;\n          setStateDebounced(id, { scrollTo: pos, selection: { anchor, head } });\n        }\n      }\n    }),\n    getState &&\n      keymap.of([\n        {\n          key: 'ctrl-r', // TODO(burdon): Setting to jump back to selection.\n          run: (view) => {\n            const state = getState(view.state.facet(documentId));\n            if (state) {\n              view.dispatch(createEditorStateTransaction(view.state, state));\n            }\n            return true;\n          },\n        },\n      ]),\n  ].filter(isNotFalsy);\n};\n"],
-  "mappings": "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",
-  "names": ["Facet", "singleValueFacet", "defaultValue", "Facet", "define", "combine", "providers", "defaultCursorConverter", "toCursor", "position", "toString", "fromCursor", "cursor", "parseInt", "Cursor", "converter", "singleValueFacet", "getCursorFromRange", "state", "range", "cursorConverter", "facet", "from", "to", "join", "getRangeFromCursor", "parts", "split", "undefined", "documentId", "singleValueFacet", "Transaction", "EditorView", "keymap", "debounce", "invariant", "isNotFalsy", "stateRestoreAnnotation", "keyPrefix", "localStorageStateStoreAdapter", "getState", "id", "invariant", "state", "localStorage", "getItem", "JSON", "parse", "undefined", "setState", "setItem", "stringify", "createEditorStateTransaction", "scrollTo", "selection", "scrollIntoView", "effects", "EditorView", "yMargin", "annotations", "Transaction", "userEvent", "of", "setStateDebounced", "debounce", "updateListener", "view", "transactions", "facet", "documentId", "some", "tr", "isUserEvent", "scrollTop", "scrollDOM", "pos", "posAtCoords", "x", "y", "anchor", "head", "main", "keymap", "key", "run", "dispatch", "filter", "isNotFalsy"]
-}

package/dist/lib/browser/state/index.mjs

@@ -1,17 +0,0 @@
-import {
-  Cursor,
-  createEditorStateTransaction,
-  documentId,
-  localStorageStateStoreAdapter,
-  singleValueFacet,
-  state
-} from "../chunk-CIQSMP7K.mjs";
-export {
-  Cursor,
-  createEditorStateTransaction,
-  documentId,
-  localStorageStateStoreAdapter,
-  singleValueFacet,
-  state
-};
-//# sourceMappingURL=index.mjs.map

package/dist/lib/browser/state/index.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}

package/dist/lib/node/chunk-GZWIENFM.cjs

@@ -1,169 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_GZWIENFM_exports = {};
-__export(chunk_GZWIENFM_exports, {
-  Cursor: () => Cursor,
-  createEditorStateTransaction: () => createEditorStateTransaction,
-  documentId: () => documentId,
-  localStorageStateStoreAdapter: () => localStorageStateStoreAdapter,
-  singleValueFacet: () => singleValueFacet,
-  state: () => state
-});
-module.exports = __toCommonJS(chunk_GZWIENFM_exports);
-var import_state = require("@codemirror/state");
-var import_state2 = require("@codemirror/state");
-var import_view = require("@codemirror/view");
-var import_async = require("@dxos/async");
-var import_invariant = require("@dxos/invariant");
-var import_util = require("@dxos/util");
-var singleValueFacet = (defaultValue) => import_state.Facet.define({
-  // Called immediately.
-  combine: (providers) => {
-    return providers[0] ?? defaultValue;
-  }
-});
-var defaultCursorConverter = {
-  toCursor: (position) => position.toString(),
-  fromCursor: (cursor) => parseInt(cursor)
-};
-var Cursor = class _Cursor {
-  static {
-    this.converter = singleValueFacet(defaultCursorConverter);
-  }
-  static {
-    this.getCursorFromRange = (state2, range) => {
-      const cursorConverter = state2.facet(_Cursor.converter);
-      const from = cursorConverter.toCursor(range.from);
-      const to = cursorConverter.toCursor(range.to, -1);
-      return [
-        from,
-        to
-      ].join(":");
-    };
-  }
-  static {
-    this.getRangeFromCursor = (state2, cursor) => {
-      const cursorConverter = state2.facet(_Cursor.converter);
-      const parts = cursor.split(":");
-      const from = cursorConverter.fromCursor(parts[0]);
-      const to = cursorConverter.fromCursor(parts[1]);
-      return from !== void 0 && to !== void 0 ? {
-        from,
-        to
-      } : void 0;
-    };
-  }
-};
-var documentId = singleValueFacet();
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/state/state.ts";
-var stateRestoreAnnotation = "dxos.org/cm/state-restore";
-var keyPrefix = "dxos.org/react-ui-editor/state";
-var localStorageStateStoreAdapter = {
-  getState: (id) => {
-    (0, import_invariant.invariant)(id, void 0, {
-      F: __dxlog_file,
-      L: 34,
-      S: void 0,
-      A: [
-        "id",
-        ""
-      ]
-    });
-    const state2 = localStorage.getItem(`${keyPrefix}/${id}`);
-    return state2 ? JSON.parse(state2) : void 0;
-  },
-  setState: (id, state2) => {
-    (0, import_invariant.invariant)(id, void 0, {
-      F: __dxlog_file,
-      L: 40,
-      S: void 0,
-      A: [
-        "id",
-        ""
-      ]
-    });
-    localStorage.setItem(`${keyPrefix}/${id}`, JSON.stringify(state2));
-  }
-};
-var createEditorStateTransaction = (state2, { scrollTo, selection }) => {
-  return {
-    selection,
-    scrollIntoView: !scrollTo,
-    effects: scrollTo ? import_view.EditorView.scrollIntoView(scrollTo, {
-      yMargin: 96
-    }) : void 0,
-    annotations: import_state2.Transaction.userEvent.of(stateRestoreAnnotation)
-  };
-};
-var state = ({ getState, setState } = {}) => {
-  const setStateDebounced = (0, import_async.debounce)(setState, 1e3);
-  return [
-    // TODO(burdon): Track scrolling (currently only updates when cursor moves).
-    // EditorView.domEventHandlers({
-    //   scroll: (event) => {
-    //     setStateDebounced(id, {});
-    //   },
-    // }),
-    import_view.EditorView.updateListener.of(({ view, transactions }) => {
-      const id = view.state.facet(documentId);
-      if (!id || transactions.some((tr) => tr.isUserEvent(stateRestoreAnnotation))) {
-        return;
-      }
-      if (setState) {
-        const { scrollTop } = view.scrollDOM;
-        const pos = view.posAtCoords({
-          x: 0,
-          y: scrollTop
-        });
-        if (pos !== null) {
-          const { anchor, head } = view.state.selection.main;
-          setStateDebounced(id, {
-            scrollTo: pos,
-            selection: {
-              anchor,
-              head
-            }
-          });
-        }
-      }
-    }),
-    getState && import_view.keymap.of([
-      {
-        key: "ctrl-r",
-        run: (view) => {
-          const state2 = getState(view.state.facet(documentId));
-          if (state2) {
-            view.dispatch(createEditorStateTransaction(view.state, state2));
-          }
-          return true;
-        }
-      }
-    ])
-  ].filter(import_util.isNotFalsy);
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Cursor,
-  createEditorStateTransaction,
-  documentId,
-  localStorageStateStoreAdapter,
-  singleValueFacet,
-  state
-});
-//# sourceMappingURL=chunk-GZWIENFM.cjs.map

package/dist/lib/node/chunk-GZWIENFM.cjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/state/util.ts", "../../../src/state/cursor.ts", "../../../src/state/doc.ts", "../../../src/state/state.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { Facet } from '@codemirror/state';\n\nexport const singleValueFacet = <I, O = I>(defaultValue?: O) =>\n  Facet.define<I, O>({\n    // Called immediately.\n    combine: (providers) => {\n      return (providers[0] ?? defaultValue) as O;\n    },\n  });\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type EditorState } from '@codemirror/state';\n\nimport { type Range } from './types';\nimport { singleValueFacet } from './util';\n\n/**\n * Converts indexes into the text document into stable peer-independent cursors.\n *\n * See:\n *  - https://automerge.org/automerge/api-docs/js/functions/next.getCursor.html\n *  - https://github.com/yjs/yjs?tab=readme-ov-file#relative-positions\n *\n * @param {assoc} number Negative values will associate the cursor with the previous character\n *  while positive - with the next one.\n */\nexport interface CursorConverter {\n  toCursor(position: number, assoc?: -1 | 1 | undefined): string;\n  fromCursor(cursor: string): number;\n}\n\nconst defaultCursorConverter: CursorConverter = {\n  toCursor: (position) => position.toString(),\n  fromCursor: (cursor) => parseInt(cursor),\n};\n\nexport class Cursor {\n  static readonly converter = singleValueFacet(defaultCursorConverter);\n\n  static readonly getCursorFromRange = (state: EditorState, range: Range) => {\n    const cursorConverter = state.facet(Cursor.converter);\n\n    const from = cursorConverter.toCursor(range.from);\n    const to = cursorConverter.toCursor(range.to, -1);\n    return [from, to].join(':');\n  };\n\n  static readonly getRangeFromCursor = (state: EditorState, cursor: string) => {\n    const cursorConverter = state.facet(Cursor.converter);\n\n    const parts = cursor.split(':');\n    const from = cursorConverter.fromCursor(parts[0]);\n    const to = cursorConverter.fromCursor(parts[1]);\n    return from !== undefined && to !== undefined ? { from, to } : undefined;\n  };\n}\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { singleValueFacet } from './util';\n\n/**\n * Currently edited document id as FQ string.\n */\nexport const documentId = singleValueFacet<string>();\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type EditorState, type Extension, Transaction, type TransactionSpec } from '@codemirror/state';\nimport { EditorView, keymap } from '@codemirror/view';\n\nimport { debounce } from '@dxos/async';\nimport { invariant } from '@dxos/invariant';\nimport { isNotFalsy } from '@dxos/util';\n\nimport { documentId } from './doc';\n\nconst stateRestoreAnnotation = 'dxos.org/cm/state-restore';\n\nexport type EditorSelection = {\n  anchor: number;\n  head?: number;\n};\n\nexport type EditorSelectionState = {\n  scrollTo?: number;\n  selection?: EditorSelection;\n};\n\nexport type EditorStateOptions = {\n  setState: (id: string, state: EditorSelectionState) => void;\n  getState: (id: string) => EditorSelectionState | undefined;\n};\n\nconst keyPrefix = 'dxos.org/react-ui-editor/state';\nexport const localStorageStateStoreAdapter: EditorStateOptions = {\n  getState: (id) => {\n    invariant(id);\n    const state = localStorage.getItem(`${keyPrefix}/${id}`);\n    return state ? JSON.parse(state) : undefined;\n  },\n\n  setState: (id, state) => {\n    invariant(id);\n    localStorage.setItem(`${keyPrefix}/${id}`, JSON.stringify(state));\n  },\n};\n\nexport const createEditorStateTransaction = (\n  state: EditorState,\n  { scrollTo, selection }: EditorSelectionState,\n): TransactionSpec => {\n  return {\n    selection,\n    scrollIntoView: !scrollTo,\n    effects: scrollTo ? EditorView.scrollIntoView(scrollTo, { yMargin: 96 }) : undefined,\n    annotations: Transaction.userEvent.of(stateRestoreAnnotation),\n  };\n};\n\n/**\n * Track scrolling and selection state to be restored when switching to document.\n */\n// TODO(burdon): Rename.\nexport const state = ({ getState, setState }: Partial<EditorStateOptions> = {}): Extension => {\n  const setStateDebounced = debounce(setState!, 1_000);\n\n  return [\n    // TODO(burdon): Track scrolling (currently only updates when cursor moves).\n    // EditorView.domEventHandlers({\n    //   scroll: (event) => {\n    //     setStateDebounced(id, {});\n    //   },\n    // }),\n    EditorView.updateListener.of(({ view, transactions }) => {\n      const id = view.state.facet(documentId);\n      if (!id || transactions.some((tr) => tr.isUserEvent(stateRestoreAnnotation))) {\n        return;\n      }\n\n      if (setState) {\n        const { scrollTop } = view.scrollDOM;\n        const pos = view.posAtCoords({ x: 0, y: scrollTop });\n        if (pos !== null) {\n          const { anchor, head } = view.state.selection.main;\n          setStateDebounced(id, { scrollTo: pos, selection: { anchor, head } });\n        }\n      }\n    }),\n    getState &&\n      keymap.of([\n        {\n          key: 'ctrl-r', // TODO(burdon): Setting to jump back to selection.\n          run: (view) => {\n            const state = getState(view.state.facet(documentId));\n            if (state) {\n              view.dispatch(createEditorStateTransaction(view.state, state));\n            }\n            return true;\n          },\n        },\n      ]),\n  ].filter(isNotFalsy);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,mBAAsB;AGAtB,IAAAA,gBAAoF;AACpF,kBAAmC;AAEnC,mBAAyB;AACzB,uBAA0B;AAC1B,kBAA2B;AHHpB,IAAMC,mBAAmB,CAAWC,iBACzCC,mBAAMC,OAAa;;EAEjBC,SAAS,CAACC,cAAAA;AACR,WAAQA,UAAU,CAAA,KAAMJ;EAC1B;AACF,CAAA;ACYF,IAAMK,yBAA0C;EAC9CC,UAAU,CAACC,aAAaA,SAASC,SAAQ;EACzCC,YAAY,CAACC,WAAWC,SAASD,MAAAA;AACnC;AAEO,IAAME,SAAN,MAAMA,QAAAA;EACX,OAAA;SAAgBC,YAAYd,iBAAiBM,sBAAAA;;EAE7C,OAAA;SAAgBS,qBAAqB,CAACC,QAAoBC,UAAAA;AACxD,YAAMC,kBAAkBF,OAAMG,MAAMN,QAAOC,SAAS;AAEpD,YAAMM,OAAOF,gBAAgBX,SAASU,MAAMG,IAAI;AAChD,YAAMC,KAAKH,gBAAgBX,SAASU,MAAMI,IAAI,EAAC;AAC/C,aAAO;QAACD;QAAMC;QAAIC,KAAK,GAAA;IACzB;;EAEA,OAAA;SAAgBC,qBAAqB,CAACP,QAAoBL,WAAAA;AACxD,YAAMO,kBAAkBF,OAAMG,MAAMN,QAAOC,SAAS;AAEpD,YAAMU,QAAQb,OAAOc,MAAM,GAAA;AAC3B,YAAML,OAAOF,gBAAgBR,WAAWc,MAAM,CAAA,CAAE;AAChD,YAAMH,KAAKH,gBAAgBR,WAAWc,MAAM,CAAA,CAAE;AAC9C,aAAOJ,SAASM,UAAaL,OAAOK,SAAY;QAAEN;QAAMC;MAAG,IAAIK;IACjE;;AACF;ACvCO,IAAMC,aAAa3B,iBAAAA;;ACI1B,IAAM4B,yBAAyB;AAiB/B,IAAMC,YAAY;AACX,IAAMC,gCAAoD;EAC/DC,UAAU,CAACC,OAAAA;AACTC,oCAAUD,IAAAA,QAAAA;;;;;;;;;AACV,UAAMhB,SAAQkB,aAAaC,QAAQ,GAAGN,SAAAA,IAAaG,EAAAA,EAAI;AACvD,WAAOhB,SAAQoB,KAAKC,MAAMrB,MAAAA,IAASU;EACrC;EAEAY,UAAU,CAACN,IAAIhB,WAAAA;AACbiB,oCAAUD,IAAAA,QAAAA;;;;;;;;;AACVE,iBAAaK,QAAQ,GAAGV,SAAAA,IAAaG,EAAAA,IAAMI,KAAKI,UAAUxB,MAAAA,CAAAA;EAC5D;AACF;AAEO,IAAMyB,+BAA+B,CAC1CzB,QACA,EAAE0B,UAAUC,UAAS,MAAwB;AAE7C,SAAO;IACLA;IACAC,gBAAgB,CAACF;IACjBG,SAASH,WAAWI,uBAAWF,eAAeF,UAAU;MAAEK,SAAS;IAAG,CAAA,IAAKrB;IAC3EsB,aAAaC,0BAAYC,UAAUC,GAAGvB,sBAAAA;EACxC;AACF;AAMO,IAAMZ,QAAQ,CAAC,EAAEe,UAAUO,SAAQ,IAAkC,CAAC,MAAC;AAC5E,QAAMc,wBAAoBC,uBAASf,UAAW,GAAA;AAE9C,SAAO;;;;;;;IAOLQ,uBAAWQ,eAAeH,GAAG,CAAC,EAAEI,MAAMC,aAAY,MAAE;AAClD,YAAMxB,KAAKuB,KAAKvC,MAAMG,MAAMQ,UAAAA;AAC5B,UAAI,CAACK,MAAMwB,aAAaC,KAAK,CAACC,OAAOA,GAAGC,YAAY/B,sBAAAA,CAAAA,GAA0B;AAC5E;MACF;AAEA,UAAIU,UAAU;AACZ,cAAM,EAAEsB,UAAS,IAAKL,KAAKM;AAC3B,cAAMC,MAAMP,KAAKQ,YAAY;UAAEC,GAAG;UAAGC,GAAGL;QAAU,CAAA;AAClD,YAAIE,QAAQ,MAAM;AAChB,gBAAM,EAAEI,QAAQC,KAAI,IAAKZ,KAAKvC,MAAM2B,UAAUyB;AAC9ChB,4BAAkBpB,IAAI;YAAEU,UAAUoB;YAAKnB,WAAW;cAAEuB;cAAQC;YAAK;UAAE,CAAA;QACrE;MACF;IACF,CAAA;IACApC,YACEsC,mBAAOlB,GAAG;MACR;QACEmB,KAAK;QACLC,KAAK,CAAChB,SAAAA;AACJ,gBAAMvC,SAAQe,SAASwB,KAAKvC,MAAMG,MAAMQ,UAAAA,CAAAA;AACxC,cAAIX,QAAO;AACTuC,iBAAKiB,SAAS/B,6BAA6Bc,KAAKvC,OAAOA,MAAAA,CAAAA;UACzD;AACA,iBAAO;QACT;MACF;KACD;IACHyD,OAAOC,sBAAAA;AACX;",
-  "names": ["import_state", "singleValueFacet", "defaultValue", "Facet", "define", "combine", "providers", "defaultCursorConverter", "toCursor", "position", "toString", "fromCursor", "cursor", "parseInt", "Cursor", "converter", "getCursorFromRange", "state", "range", "cursorConverter", "facet", "from", "to", "join", "getRangeFromCursor", "parts", "split", "undefined", "documentId", "stateRestoreAnnotation", "keyPrefix", "localStorageStateStoreAdapter", "getState", "id", "invariant", "localStorage", "getItem", "JSON", "parse", "setState", "setItem", "stringify", "createEditorStateTransaction", "scrollTo", "selection", "scrollIntoView", "effects", "EditorView", "yMargin", "annotations", "Transaction", "userEvent", "of", "setStateDebounced", "debounce", "updateListener", "view", "transactions", "some", "tr", "isUserEvent", "scrollTop", "scrollDOM", "pos", "posAtCoords", "x", "y", "anchor", "head", "main", "keymap", "key", "run", "dispatch", "filter", "isNotFalsy"]
-}